Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add USD-GDP deflators, remove exchange rate to EUR #43

Merged
merged 3 commits into from
Jul 24, 2023
Merged

Add USD-GDP deflators, remove exchange rate to EUR #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d3531f0
Add USD-GDP deflators, remove exchange rate to EUR
danielhuppmann Jul 11, 2023
c81da69
Make black
danielhuppmann Jul 19, 2023
f51387c
Reinsert implicit USD-EUR currency conversion
danielhuppmann Jul 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 27 additions & 3 deletions iam_units/data/definitions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,33 @@ USD_2005 = 0.8038 * EUR_2005 = USD

# United States' GDP deflator, data from
# https://data.worldbank.org/indicator/NY.GDP.DEFL.ZS?locations=US

USD_2010 = USD_2005 * 83.426 / 91.718

# last update: 2023-06-29

USD_2015 = USD_2005 * 0.8358

USD_2000 = USD_2015 / 0.7453
USD_2001 = USD_2015 / 0.7621
USD_2002 = USD_2015 / 0.774
USD_2003 = USD_2015 / 0.7892
USD_2004 = USD_2015 / 0.8104
# USD_2005 = USD_2015 / 0.8358
USD_2006 = USD_2015 / 0.8616
USD_2007 = USD_2015 / 0.8849
USD_2008 = USD_2015 / 0.9019
USD_2009 = USD_2015 / 0.9077
USD_2010 = USD_2015 / 0.9186
USD_2011 = USD_2015 / 0.9377
USD_2012 = USD_2015 / 0.9552
USD_2013 = USD_2015 / 0.9719
USD_2014 = USD_2015 / 0.9901
# USD_2015
USD_2016 = USD_2015 / 1.01
USD_2017 = USD_2015 / 1.0292
USD_2018 = USD_2015 / 1.054
USD_2019 = USD_2015 / 1.0729
USD_2020 = USD_2015 / 1.0869
USD_2021 = USD_2015 / 1.1357
USD_2022 = USD_2015 / 1.2152

# Transportation activity

Expand Down
2 changes: 1 addition & 1 deletion iam_units/update.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ def emissions():

# Format and write the species defs file
lines = [_EMI_HEADER]
for (species, alias) in _EMI_EQUIV.items():
for species, alias in _EMI_EQUIV.items():
lines.extend(
f"a_{a} = {factor or ''}a_{species}" for a, factor in alias.items()
)
Expand Down