From 30adabbcaa534bd1f354069ad9ff6926ea4a2985 Mon Sep 17 00:00:00 2001 From: eb5194 Date: Fri, 2 Oct 2020 12:22:25 +0200 Subject: [PATCH] Snakefile: input files in pypsa-eur became .csv --- Snakefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Snakefile b/Snakefile index b01d7edd..028c2c78 100644 --- a/Snakefile +++ b/Snakefile @@ -245,7 +245,8 @@ rule prepare_sector_network: co2_budget="data/co2_budget.csv", profile_offwind_ac=pypsaeur("resources/profile_offwind-ac.nc"), profile_offwind_dc=pypsaeur("resources/profile_offwind-dc.nc"), - clustermaps=pypsaeur('resources/clustermaps_{network}_s{simpl}_{clusters}.h5'), + busmap_s=pypsaeur("resources/busmap_{network}_s{simpl}.csv"), + busmap=pypsaeur("resources/busmap_{network}_s{simpl}_{clusters}.csv"), clustered_pop_layout="resources/pop_layout_{network}_s{simpl}_{clusters}.csv", simplified_pop_layout="resources/pop_layout_{network}_s{simpl}.csv", industrial_demand="resources/industrial_demand_{network}_s{simpl}_{clusters}.csv", @@ -365,7 +366,8 @@ if config["foresight"] == "myopic": input: network=config['results_dir'] + config['run'] + '/prenetworks/{network}_s{simpl}_{clusters}_lv{lv}_{opts}_{sector_opts}_{co2_budget_name}_{planning_horizons}.nc', powerplants=pypsaeur('resources/powerplants.csv'), - clustermaps=pypsaeur('resources/clustermaps_{network}_s{simpl}_{clusters}.h5'), + busmap_s=pypsaeur("resources/busmap_{network}_s{simpl}.csv"), + busmap=pypsaeur("resources/busmap_{network}_s{simpl}_{clusters}.csv"), clustered_pop_layout="resources/pop_layout_{network}_s{simpl}_{clusters}.csv", costs=config['costs_dir'] + "costs_{}.csv".format(config['scenario']['planning_horizons'][0]), cop_soil_total="resources/cop_soil_total_{network}_s{simpl}_{clusters}.nc",