Skip to content

Update emissions.py with CO2 equivalent notation #36

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

Open
byersiiasa wants to merge 4 commits into
base: main
Choose a base branch
from
+2 −1
Open

Update emissions.py with CO2 equivalent notation #36

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
567e455
Update emissions.py
byersiiasa Mar 8, 2022
35f975a
Apply black 22.1
khaeru Mar 8, 2022
2d7fee5
Edit _EMI_EQUIV for CO2-eq
byersiiasa Mar 8, 2022
7fe1feb
Remove CO2-eq
byersiiasa Mar 8, 2022
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
2 changes: 1 addition & 1 deletion iam_units/emissions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@

# Sets of symbols that refer to the same species and are interchangeable.
EQUIV = [
set(["CO2", "CO2_eq", "CO2e", "CO2eq", "C", "Ce"]),
set(["CO2", "CO2_eq", "CO2e", "CO2eq", "CO2-eq", "C", "Ce"]),
]

# Regular expression for one *SPECIES* in a pint-compatible unit string.
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 @@ -43,7 +43,7 @@
# - Preceded by a space or '-' character.
# - Followed by a space, '-', '/', end-of-string, or non-word (\w) character.
# The latter avoids matching only the 'C' within 'CH4'.
_EMI_CODE = fr"""{_EMI_HEADER}
_EMI_CODE = rf"""{_EMI_HEADER}
import re

GWP_VERSION = '{gwp.__version__}'
Expand Down