From 990ab035c3f05264a95ba70c82e682a8e39a08d0 Mon Sep 17 00:00:00 2001 From: Tom Brown Date: Fri, 19 Jul 2019 10:19:21 +0200 Subject: [PATCH] Include light-rail and high-speed-rail in "electricity rail" This then conforms with JRC IDEES totals --- scripts/build_energy_totals.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/build_energy_totals.py b/scripts/build_energy_totals.py index f3086aeb..1682ac40 100644 --- a/scripts/build_energy_totals.py +++ b/scripts/build_energy_totals.py @@ -221,8 +221,10 @@ def build_idees(year): assert df.iloc[15,0] == "Passenger transport" totals.loc[ct,"total rail passenger"] = df.loc[15,year] + assert df.iloc[16,0] == "Metro and tram, urban light rail" assert df.iloc[19,0] == "Electric" - totals.loc[ct,"electricity rail passenger"] = df.loc[19,year] + assert df.iloc[20,0] == "High speed passenger trains" + totals.loc[ct,"electricity rail passenger"] = df.loc[[16,19,20],year].sum() assert df.iloc[21,0] == "Freight transport" totals.loc[ct,"total rail freight"] = df.loc[21,year]