From 9b631189c5c6d43b481dd5a0e06a332e88f51623 Mon Sep 17 00:00:00 2001 From: Fabian Date: Tue, 25 Apr 2023 16:34:17 +0200 Subject: [PATCH] retrieve.smk: rename retrieve_load_data -> retrieve_electricity_demand --- doc/release_notes.rst | 4 +++- doc/retrieve.rst | 4 ++-- doc/tutorial.rst | 2 +- doc/tutorial_sector.rst | 4 ++-- rules/retrieve.smk | 4 ++-- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/doc/release_notes.rst b/doc/release_notes.rst index f859646b..192d828c 100644 --- a/doc/release_notes.rst +++ b/doc/release_notes.rst @@ -15,7 +15,9 @@ Upcoming Release * 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) ================================= diff --git a/doc/retrieve.rst b/doc/retrieve.rst index e4f47dec..cc93c3d9 100644 --- a/doc/retrieve.rst +++ b/doc/retrieve.rst @@ -80,8 +80,8 @@ This rule, as a substitute for :mod:`build_natura_raster`, downloads an already 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 `_. diff --git a/doc/tutorial.rst b/doc/tutorial.rst index f396b82c..1b87cefe 100644 --- a/doc/tutorial.rst +++ b/doc/tutorial.rst @@ -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"]; 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"]; - 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 2 -> 1 20 -> 1 diff --git a/doc/tutorial_sector.rst b/doc/tutorial_sector.rst index 039271db..29971e3a 100644 --- a/doc/tutorial_sector.rst +++ b/doc/tutorial_sector.rst @@ -141,7 +141,7 @@ successfully. 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"]; 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"]; 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"]; @@ -368,7 +368,7 @@ implemented in the workflow: 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"]; 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"]; 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"]; diff --git a/rules/retrieve.smk b/rules/retrieve.smk index 37deb44d..0a96406a 100644 --- a/rules/retrieve.smk +++ b/rules/retrieve.smk @@ -140,7 +140,7 @@ if config["sector"]["gas_network"] or config["sector"]["H2_retrofit"]: "../scripts/retrieve_gas_infrastructure_data.py" -rule retrieve_load_data: +rule retrieve_electricity_demand: input: HTTP.remote( "data.open-power-system-data.org/time_series/2019-06-05/time_series_60min_singleindex.csv", @@ -150,7 +150,7 @@ rule retrieve_load_data: output: "data/load_raw.csv", log: - LOGS + "retrieve_load_data.log", + LOGS + "retrieve_electricity_demand.log", resources: mem_mb=5000, retries: 2