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

Merge branch 'fix_energy_totals'

Browse Source
This commit is contained in:
Fabian Neumann 2024-05-20 15:38:09 +02:00
commit f76f7879f0
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/build_energy_totals.py
View File

@ -854,6 +854,7 @@ def rescale_idees_from_eurostat(
"total passenger cars", "total passenger cars",
"total other road passenger", "total other road passenger",
"total light duty road freight", "total light duty road freight",
"total heavy duty road freight",
], ],
"elec": [ "elec": [
"electricity road", "electricity road",
@ -891,6 +892,7 @@ def rescale_idees_from_eurostat(
navigation = [ navigation = [
"total domestic navigation", "total domestic navigation",
] ]
# international navigation is already read in from the eurostat data directly
for country in idees_countries: for country in idees_countries:
filling_years = [(2015, slice(2016, 2021)), (2000, slice(1990, 1999))] filling_years = [(2015, slice(2016, 2021)), (2000, slice(1990, 1999))]
@ -940,6 +942,22 @@ def rescale_idees_from_eurostat(
energy.loc[slicer_source, navigation].squeeze(axis=0), energy.loc[slicer_source, navigation].squeeze(axis=0),
).values ).values
# set the total of agriculture/road to the sum of all agriculture/road categories (corresponding to the IDEES data)
sel = [
"total agriculture electricity",
"total agriculture heat",
"total agriculture machinery",
]
energy.loc[country, "total agriculture"] = energy.loc[country, sel].sum(axis=1)
sel = [
"total passenger cars",
"total other road passenger",
"total light duty road freight",
"total heavy duty road freight",
]
energy.loc[country, "total road"] = energy.loc[country, sel].sum(axis=1)
return energy return energy