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

bugfix: ensure separately calculated sums are entered (follow-up to #990)

Browse Source
This commit is contained in:
Fabian Neumann 2024-05-25 18:02:56 +02:00
parent fd9e93b4b0
commit a60e6fca55
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/build_energy_totals.py
View File

@ -940,20 +940,21 @@ def rescale_idees_from_eurostat(
).values ).values
# set the total of agriculture/road to the sum of all agriculture/road categories (corresponding to the IDEES data) # set the total of agriculture/road to the sum of all agriculture/road categories (corresponding to the IDEES data)
sel = [ rows = idx[country, :]
cols = [
"total agriculture electricity", "total agriculture electricity",
"total agriculture heat", "total agriculture heat",
"total agriculture machinery", "total agriculture machinery",
] ]
energy.loc[country, "total agriculture"] = energy.loc[country, sel].sum(axis=1) energy.loc[rows, "total agriculture"] = energy.loc[rows, cols].sum(axis=1)
sel = [ cols = [
"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", "total heavy duty road freight",
] ]
energy.loc[country, "total road"] = energy.loc[country, sel].sum(axis=1) energy.loc[rows, "total road"] = energy.loc[rows, cols].sum(axis=1)
return energy return energy