From b4f1c570d62de5e60fe0689cdaa5a51113cb33aa Mon Sep 17 00:00:00 2001 From: lisazeyen Date: Tue, 20 Oct 2020 10:13:02 +0200 Subject: [PATCH] move input data path for emobility/transport data to snakemake input --- scripts/prepare_sector_network.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index e068fd02..31feaa21 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -449,8 +449,8 @@ def prepare_data(network): ## Get overall demand curve for all vehicles - dir_name = "data/emobility/" - traffic = pd.read_csv(os.path.join(dir_name,"KFZ__count"),skiprows=2)["count"] + traffic = pd.read_csv(snakemake.input.traffic_data + "KFZ__count", + skiprows=2)["count"] #Generate profiles transport_shape = generate_periodic_profiles(dt_index=network.snapshots.tz_localize("UTC"), @@ -504,7 +504,8 @@ def prepare_data(network): ## derive plugged-in availability for PKW's (cars) - traffic = pd.read_csv(os.path.join(dir_name,"Pkw__count"),skiprows=2)["count"] + traffic = pd.read_csv(snakemake.input.traffic_data + "Pkw__count", + skiprows=2)["count"] avail_max = 0.95 @@ -1780,6 +1781,7 @@ if __name__ == "__main__": cop_air_urban="resources/cop_air_urban_{network}_s{simpl}_{clusters}.nc", solar_thermal_total="resources/solar_thermal_total_{network}_s{simpl}_{clusters}.nc", solar_thermal_urban="resources/solar_thermal_urban_{network}_s{simpl}_{clusters}.nc", + traffic_data = "data/emobility/", solar_thermal_rural="resources/solar_thermal_rural_{network}_s{simpl}_{clusters}.nc", ), output=['pypsa-eur-sec/results/test/prenetworks/{network}_s{simpl}_{clusters}_lv{lv}__{sector_opts}_{co2_budget_name}_{planning_horizons}.nc']