Skip to content

Commit

Permalink
Merge branch 'main' into camelot-new-name
Browse files Browse the repository at this point in the history
  • Loading branch information
mikapfl committed Oct 23, 2024
2 parents e5f99eb + 2459e1c commit fdfa8c1
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 1 deletion.
1 change: 1 addition & 0 deletions changelog_unreleased/163.improvement.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* add M.BIO category
4 changes: 4 additions & 0 deletions climate_categories/data/IPCC2006_PRIMAP.py
Original file line number Diff line number Diff line change
Expand Up @@ -2615,6 +2615,10 @@
"title": "International Aviation",
"comment": "International aviation bunkers. same as 1.A.3.a.i, excluded from CRF total",
},
"M.BIO": {
"title": "CO₂ emissions from biomass burning",
"comment": "CO₂ emissions from biomass burning for energy use",
},
"M.BK.M": {
"title": "International Navigation",
"comment": "International marine bunkers. same as 1.A.3.d.i, excluded from CRF total",
Expand Down
3 changes: 3 additions & 0 deletions climate_categories/data/IPCC2006_PRIMAP.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4775,6 +4775,9 @@ categories:
3.A.1.i:
title: Poultry
comment: From CRF data
M.BIO:
title: CO₂ emissions from biomass burning
comment: CO₂ emissions from biomass burning for energy use
M.BK:
title: International Bunkers
comment: M category as not included in national total in CRF data
Expand Down
2 changes: 1 addition & 1 deletion climate_categories/tests/test_primap.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

def test_number_of_categories():
assert (
len(climate_categories.IPCC2006_PRIMAP) == len(climate_categories.IPCC2006) + 13
len(climate_categories.IPCC2006_PRIMAP) == len(climate_categories.IPCC2006) + 14
)


Expand Down
4 changes: 4 additions & 0 deletions data_generation/IPCC2006_PRIMAP.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ def main():
"comment": "Agricultural part of AFOLU excluding livestock",
},
"3.A.1.i": {"title": "Poultry", "comment": "From CRF data"},
"M.BIO" : {
"title" : "CO₂ emissions from biomass burning",
"comment" : "CO₂ emissions from biomass burning for energy use",
},
"M.BK": {
"title": "International Bunkers",
"comment": "M category as not included in national total in CRF data",
Expand Down

0 comments on commit fdfa8c1

Please sign in to comment.