From 75ff2d19ee6428ea04f001b9376f9798d0e152a8 Mon Sep 17 00:00:00 2001 From: lisazeyen Date: Wed, 21 Oct 2020 13:45:49 +0200 Subject: [PATCH] move transport data input path to Snakefile --- Snakefile | 1 + scripts/prepare_sector_network.py | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Snakefile b/Snakefile index 57792c24..95106dea 100644 --- a/Snakefile +++ b/Snakefile @@ -290,6 +290,7 @@ rule prepare_sector_network: energy_totals_name='resources/energy_totals.csv', co2_totals_name='resources/co2_totals.csv', transport_name='resources/transport_data.csv', + traffic_data = "data/emobility/", biomass_potentials='resources/biomass_potentials.csv', timezone_mappings='data/timezone_mappings.csv', heat_profile="data/heat_load_profile_BDEW.csv", diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index aa4e1962..f88d75ed 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -456,8 +456,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"), @@ -511,7 +511,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