From 555002a35bc527e9750214ebc3584c489b8f9498 Mon Sep 17 00:00:00 2001 From: Fabian Neumann Date: Wed, 19 May 2021 13:57:44 +0200 Subject: [PATCH] fixup: remove remaining instances of {network} wildcard from recent PR --- Snakefile | 4 ++-- scripts/build_retro_cost.py | 2 +- scripts/prepare_sector_network.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Snakefile b/Snakefile index c8b1d65e..9ab7d2f1 100644 --- a/Snakefile +++ b/Snakefile @@ -179,7 +179,7 @@ rule build_industrial_production_per_country: input: ammonia_production="resources/ammonia_production.csv" output: - industrial_production_per_country="resources/industrial_production_per_country.csv" + industrial_production_per_country="resources/industrial_production_per_country.csv" threads: 1 resources: mem_mb=1000 script: 'scripts/build_industrial_production_per_country.py' @@ -282,7 +282,7 @@ rule build_retro_cost: input: building_stock="data/retro/data_building_stock.csv", data_tabula="data/retro/tabula-calculator-calcsetbuilding.csv", - air_temperature = "resources/temp_air_total_{network}_s{simpl}_{clusters}.nc", + air_temperature = "resources/temp_air_total_elec_s{simpl}_{clusters}.nc", u_values_PL="data/retro/u_values_poland.csv", tax_w="data/retro/electricity_taxes_eu.csv", construction_index="data/retro/comparative_level_investment.csv", diff --git a/scripts/build_retro_cost.py b/scripts/build_retro_cost.py index cb0acf41..7730e490 100644 --- a/scripts/build_retro_cost.py +++ b/scripts/build_retro_cost.py @@ -841,7 +841,7 @@ if __name__ == "__main__": building_stock="data/retro/data_building_stock.csv", data_tabula="data/retro/tabula-calculator-calcsetbuilding.csv", u_values_PL="data/retro/u_values_poland.csv", - air_temperature = "resources/temp_air_total_{network}_s{simpl}_{clusters}.nc", + air_temperature = "resources/temp_air_total_elec_s{simpl}_{clusters}.nc", tax_w="data/retro/electricity_taxes_eu.csv", construction_index="data/retro/comparative_level_investment.csv", floor_area_missing="data/retro/floor_area_missing.csv", diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index f30fad57..485c70cc 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -1915,7 +1915,7 @@ if __name__ == "__main__": retro_cost_energy = "resources/retro_cost_elec_s{simpl}_{clusters}.csv", floor_area = "resources/floor_area_elec_s{simpl}_{clusters}.csv" ), - output=['results/version-cb48be3/prenetworks/{network}_s{simpl}_{clusters}_lv{lv}__{sector_opts}_{planning_horizons}.nc'] + output=['results/version-cb48be3/prenetworks/elec_s{simpl}_{clusters}_lv{lv}__{sector_opts}_{planning_horizons}.nc'] ) import yaml with open('config.yaml', encoding='utf8') as f: