move transport data input path to Snakefile

This commit is contained in:
lisazeyen 2020-10-21 13:45:49 +02:00
parent 0563c986a2
commit 75ff2d19ee
2 changed files with 5 additions and 3 deletions

View File

@ -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",

View File

@ -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