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

Merge branch 'master' into validation

Browse Source
This commit is contained in:
Fabian 2023-04-25 16:58:48 +02:00
commit 8994561569
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/release_notes.rst
View File

@ -15,7 +15,9 @@ Upcoming Release
* Bugfix: Correct typo in the CPLEX solver configuration in ``config.default.yaml``. * Bugfix: Correct typo in the CPLEX solver configuration in ``config.default.yaml``.
* Renamed script file from PyPSA-EUR ``build_load_data`` to ``build_electricity_demand``. * Renamed script file from PyPSA-EUR ``build_load_data`` to ``build_electricity_demand`` and ``retrieve_load_data`` to ``retrieve_electricity_demand``.
PyPSA-Eur 0.8.0 (18th March 2023) PyPSA-Eur 0.8.0 (18th March 2023)
================================= =================================

4
doc/retrieve.rst
View File

@ -80,8 +80,8 @@ This rule, as a substitute for :mod:`build_natura_raster`, downloads an already
For details see :mod:`build_natura_raster`. For details see :mod:`build_natura_raster`.
Rule ``retrieve_load_data`` Rule ``retrieve_electricity_demand``
================================ ====================================
This rule downloads hourly electric load data for each country from the `OPSD platform <https://data.open-power-system-data.org/time_series/latest/time_series_60min_singleindex.csv>`_. This rule downloads hourly electric load data for each country from the `OPSD platform <https://data.open-power-system-data.org/time_series/latest/time_series_60min_singleindex.csv>`_.

2
doc/tutorial.rst
View File

@ -156,7 +156,7 @@ This triggers a workflow of multiple preceding jobs that depend on each rule's i
20[label = "retrieve_cost_data", color = "0.30 0.6 0.85", style="rounded"]; 20[label = "retrieve_cost_data", color = "0.30 0.6 0.85", style="rounded"];
21[label = "build_powerplants", color = "0.16 0.6 0.85", style="rounded"]; 21[label = "build_powerplants", color = "0.16 0.6 0.85", style="rounded"];
22[label = "build_electricity_demand", color = "0.00 0.6 0.85", style="rounded"]; 22[label = "build_electricity_demand", color = "0.00 0.6 0.85", style="rounded"];
23[label = "retrieve_load_data", color = "0.34 0.6 0.85", style="rounded,dashed"]; 23[label = "retrieve_electricity_demand", color = "0.34 0.6 0.85", style="rounded,dashed"];
1 -> 0 1 -> 0
2 -> 1 2 -> 1
20 -> 1 20 -> 1

4
doc/tutorial_sector.rst
View File

@ -141,7 +141,7 @@ successfully.
19[label = "retrieve_cost_data", color = "0.50 0.6 0.85", style="rounded"]; 19[label = "retrieve_cost_data", color = "0.50 0.6 0.85", style="rounded"];
20[label = "build_powerplants", color = "0.49 0.6 0.85", style="rounded"]; 20[label = "build_powerplants", color = "0.49 0.6 0.85", style="rounded"];
21[label = "build_electricity_demand", color = "0.39 0.6 0.85", style="rounded"]; 21[label = "build_electricity_demand", color = "0.39 0.6 0.85", style="rounded"];
22[label = "retrieve_load_data", color = "0.05 0.6 0.85", style="rounded"]; 22[label = "retrieve_electricity_demand", color = "0.05 0.6 0.85", style="rounded"];
23[label = "build_gas_input_locations", color = "0.45 0.6 0.85", style="rounded"]; 23[label = "build_gas_input_locations", color = "0.45 0.6 0.85", style="rounded"];
24[label = "prepare_network", color = "0.31 0.6 0.85", style="rounded"]; 24[label = "prepare_network", color = "0.31 0.6 0.85", style="rounded"];
25[label = "add_extra_components", color = "0.23 0.6 0.85", style="rounded"]; 25[label = "add_extra_components", color = "0.23 0.6 0.85", style="rounded"];
@ -368,7 +368,7 @@ implemented in the workflow:
19[label = "retrieve_cost_data", color = "0.04 0.6 0.85", style="rounded"]; 19[label = "retrieve_cost_data", color = "0.04 0.6 0.85", style="rounded"];
20[label = "build_powerplants", color = "0.28 0.6 0.85", style="rounded"]; 20[label = "build_powerplants", color = "0.28 0.6 0.85", style="rounded"];
21[label = "build_electricity_demand", color = "0.46 0.6 0.85", style="rounded"]; 21[label = "build_electricity_demand", color = "0.46 0.6 0.85", style="rounded"];
22[label = "retrieve_load_data", color = "0.44 0.6 0.85", style="rounded"]; 22[label = "retrieve_electricity_demand", color = "0.44 0.6 0.85", style="rounded"];
23[label = "build_energy_totals", color = "0.53 0.6 0.85", style="rounded"]; 23[label = "build_energy_totals", color = "0.53 0.6 0.85", style="rounded"];
24[label = "build_population_weighted_energy_totals", color = "0.03 0.6 0.85", style="rounded"]; 24[label = "build_population_weighted_energy_totals", color = "0.03 0.6 0.85", style="rounded"];
25[label = "build_clustered_population_layouts", color = "0.34 0.6 0.85", style="rounded"]; 25[label = "build_clustered_population_layouts", color = "0.34 0.6 0.85", style="rounded"];

4
rules/retrieve.smk
View File

@ -140,7 +140,7 @@ if config["sector"]["gas_network"] or config["sector"]["H2_retrofit"]:
"../scripts/retrieve_gas_infrastructure_data.py" "../scripts/retrieve_gas_infrastructure_data.py"
rule retrieve_load_data: rule retrieve_electricity_demand:
input: input:
HTTP.remote( HTTP.remote(
"data.open-power-system-data.org/time_series/latest/time_series_60min_singleindex.csv", "data.open-power-system-data.org/time_series/latest/time_series_60min_singleindex.csv",
@ -150,7 +150,7 @@ rule retrieve_load_data:
output: output:
"data/load_raw.csv", "data/load_raw.csv",
log: log:
LOGS + "retrieve_load_data.log", LOGS + "retrieve_electricity_demand.log",
resources: resources:
mem_mb=5000, mem_mb=5000,
retries: 2 retries: 2