From 9fac6f539247333cab50345a17e12ae3f575d65a Mon Sep 17 00:00:00 2001 From: eb5194 Date: Fri, 2 Oct 2020 12:20:55 +0200 Subject: [PATCH 1/3] prepare_sector_network: read input file as .csv --- scripts/prepare_sector_network.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index 0bab8487..536378f2 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -68,11 +68,9 @@ def update_wind_solar_costs(n,costs): #assign clustered bus #map initial network -> simplified network - busmap_s = pd.read_hdf(snakemake.input.clustermaps, - key="/busmap_s") + busmap_s = pd.read_csv(snakemake.input.busmap_s, index_col=0).squeeze() #map simplified network -> clustered network - busmap = pd.read_hdf(snakemake.input.clustermaps, - key="/busmap") + busmap = pd.read_csv(snakemake.input.busmap, index_col=0).squeeze() #map initial network -> clustered network clustermaps = busmap_s.map(busmap) @@ -1747,7 +1745,8 @@ if __name__ == "__main__": costs='technology-data/outputs/costs_{planning_horizons}.csv', profile_offwind_ac='pypsa-eur/resources/profile_offwind-ac.nc', profile_offwind_dc='pypsa-eur/resources/profile_offwind-dc.nc', - clustermaps="pypsa-eur/resources/clustermaps_{network}_s{simpl}_{clusters}.h5", + busmap_s='pypsa-eur/resources/busmap_{network}_s{simpl}.csv', + busmap='pypsa-eur/resources/busmap_{network}_s{simpl}_{clusters}.csv', cop_air_total='pypsa-eur-sec/resources/cop_air_total_{network}_s{simpl}_{clusters}.nc', cop_soil_total='pypsa-eur-sec/resources/cop_soil_total_{network}_s{simpl}_{clusters}.nc', solar_thermal_total='pypsa-eur-sec/resources/solar_thermal_total_{network}_s{simpl}_{clusters}.nc', From 5dabdac28865e7b2ee6a1533658a539c3bd323e4 Mon Sep 17 00:00:00 2001 From: eb5194 Date: Fri, 2 Oct 2020 12:21:31 +0200 Subject: [PATCH 2/3] add_existing_baseyear: read input file as .csv --- scripts/add_existing_baseyear.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/scripts/add_existing_baseyear.py b/scripts/add_existing_baseyear.py index 5010e8e7..cfef2e5e 100644 --- a/scripts/add_existing_baseyear.py +++ b/scripts/add_existing_baseyear.py @@ -170,10 +170,8 @@ def add_power_capacities_installed_before_baseyear(n, grouping_years, costs, bas df_agg.Fueltype = df_agg.Fueltype.map(rename_fuel) #assign clustered bus - busmap_s = pd.read_hdf(snakemake.input.clustermaps, - key="/busmap_s") - busmap = pd.read_hdf(snakemake.input.clustermaps, - key="/busmap") + busmap_s = pd.read_csv(snakemake.input.busmap_s, index_col=0).squeeze() + busmap = pd.read_csv(snakemake.input.busmap, index_col=0).squeeze() clustermaps = busmap_s.map(busmap) clustermaps.index = clustermaps.index.astype(int) @@ -416,7 +414,8 @@ if __name__ == "__main__": planning_horizons='2020'), input=dict(network='pypsa-eur-sec/results/test/prenetworks/{network}_s{simpl}_{clusters}_lv{lv}__{sector_opts}_{co2_budget_name}_{planning_horizons}.nc', powerplants='pypsa-eur/resources/powerplants.csv', - clustermaps='pypsa-eur/resources/clustermaps_{network}_s{simpl}_{clusters}.h5', + busmap_s='pypsa-eur/resources/busmap_{network}_s{simpl}.csv', + busmap='pypsa-eur/resources/busmap_{network}_s{simpl}_{clusters}.csv', costs='pypsa-eur-sec/data/costs/costs_{planning_horizons}.csv', cop_air_total="pypsa-eur-sec/resources/cop_air_total_{network}_s{simpl}_{clusters}.nc", cop_soil_total="pypsa-eur-sec/resources/cop_soil_total_{network}_s{simpl}_{clusters}.nc"), From 30adabbcaa534bd1f354069ad9ff6926ea4a2985 Mon Sep 17 00:00:00 2001 From: eb5194 Date: Fri, 2 Oct 2020 12:22:25 +0200 Subject: [PATCH 3/3] 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",