Skip to content

Commit

Permalink
Remove years from fleet averages.
Browse files Browse the repository at this point in the history
  • Loading branch information
Loisel committed May 27, 2021
1 parent 109e0d5 commit 43bd1d8
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions lca2rmnd/reporting.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,16 +115,16 @@ def _act_from_variable(self, variable, db, year, region, scale=1):
if region in ["CHA", "REF", "IND"]:
demand = {
Activity(Act.get(
(Act.name == "transport, passenger car, fleet average, {}, {}".format(
techmap[tech]["petrol"], year))
(Act.name == "transport, passenger car, fleet average, {}".format(
techmap[tech]["petrol"]))
& (Act.location == region)
& (Act.database == db.name))): scale
}
else:
demand = {
Activity(Act.get(
(Act.name == "transport, passenger car, fleet average, {}, {}".format(
techmap[tech][liq], year))
(Act.name == "transport, passenger car, fleet average, {}".format(
techmap[tech][liq]))
& (Act.location == region)
& (Act.database == db.name))): scale * liq_share[liq]
for liq in ["diesel", "petrol"]
Expand Down Expand Up @@ -218,7 +218,7 @@ def _get_material_bioflows_for_bev(self):
method = ('ILCD 2.0 2018 midpoint',
'resources', 'minerals and metals')
year = self.years[0]
act_str = "transport, passenger car, fleet average, battery electric, {}".format(year)
act_str = "transport, passenger car, fleet average, battery electric"

# upstream material demands are the same for all regions
# so we can use GLO here
Expand Down

0 comments on commit 43bd1d8

Please sign in to comment.