bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[pre-commit.ci] auto fixes from pre-commit.com hooks

Browse Source 
for more information, see https://pre-commit.ci
This commit is contained in:
pre-commit-ci[bot] 2024-03-13 12:42:57 +00:00
parent 955d6837fd
commit 721c64a5bd
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/gr-e-11.03.02.01.01-cc.csv
View File

@ -42,4 +42,4 @@
2020,4658335,88293,452186,195082,75659,771586,229421 2020,4658335,88293,452186,195082,75659,771586,229421
2021,4709366,97805,466857,196530,77672,791323,244572 2021,4709366,97805,466857,196530,77672,791323,244572
2022,4721280,105158,475714,196942,79691,789794,257753 2022,4721280,105158,475714,196942,79691,789794,257753
2023,4760948,114299,485303,197678,81241,805653, 2023,4760948,114299,485303,197678,81241,805653,

1 year passenger cars passenger vehicles goods vehicles agricultural vehicles industrial vehicles motorcycles mopeds (incl. fast e-bikes)¹
42 2020 4658335 88293 452186 195082 75659 771586 229421
43 2021 4709366 97805 466857 196530 77672 791323 244572
44 2022 4721280 105158 475714 196942 79691 789794 257753
45 2023 4760948 114299 485303 197678 81241 805653

9
scripts/build_energy_totals.py
View File

@ -721,21 +721,18 @@ def build_transport_data(countries, population, idees):
transport_data = pd.DataFrame(idees["passenger cars"]) transport_data = pd.DataFrame(idees["passenger cars"])
# https://www.bfs.admin.ch/bfs/en/home/statistics/mobility-transport/transport-infrastructure-vehicles/vehicles/road-vehicles-stock-level-motorisation.html # https://www.bfs.admin.ch/bfs/en/home/statistics/mobility-transport/transport-infrastructure-vehicles/vehicles/road-vehicles-stock-level-motorisation.html
if "CH" in countries: if "CH" in countries:
fn = snakemake.input.swiss_transport fn = snakemake.input.swiss_transport
swiss_cars = pd.read_csv(fn, index_col=0).loc[1990:2021, ["passenger cars"]] swiss_cars = pd.read_csv(fn, index_col=0).loc[1990:2021, ["passenger cars"]]
swiss_cars.index = pd.MultiIndex.from_product( swiss_cars.index = pd.MultiIndex.from_product(
[["CH"], swiss_cars.index], [["CH"], swiss_cars.index], names=["country", "year"]
names=["country", "year"]
) )
transport_data = pd.concat([transport_data, swiss_cars]).sort_index() transport_data = pd.concat([transport_data, swiss_cars]).sort_index()
transport_data.rename( transport_data.rename(columns={"passenger cars": "number cars"}, inplace=True)
columns={"passenger cars": "number cars"}, inplace=True
)
missing = transport_data.index[transport_data["number cars"].isna()] missing = transport_data.index[transport_data["number cars"].isna()]
if not missing.empty: if not missing.empty: