[DATALAD] Recorded changes

conv_FAO_IPPCC2006_PRIMAP_CO2.csv

@@ -1,8 +1,8 @@
 # references: CO2 emissions only
 # last_update: 2024-10-14
 FAO,IPCC2006_PRIMAP,comment
-4,3.B.1,Carbon stock change in forests
-4.B,M.NFC,Net Forest conversion
+4,3.B.1,FAO 4 Carbon stock change in forests to IPCC 3.B.1 Forest land
+4.B,M.NFC,FAO 4.B Net forest conversion to IPCC Net forest conversion
 5.A,M.3.B.3.DOS,FAO 5.A Drained grassland to IPCC 3.B.3 Grassland (drained organic soils)
 5.B,M.3.B.2.DOS,FAO 5.B Drained cropland to IPCC 3.B.2 Cropland (drained organic soils)
 6.A,M.3.C.1.a, FAO 6.A forest fires to IPCC M.3.C.1.a Biomass burning in forest lands (M category because it is not contained in the 3.C.1 sum)

conv_FAO_IPPCC2006_PRIMAP_N2O.csv

@@ -7,8 +7,8 @@ M.3.MP, M.3.C.MP, FAO Manure left on pasture to IPCC Direct and indirect emissio
 M.3.MA, M.3.C.MA, FAO Manure applied to soils to IPCC Direct and indirect emissions from manure applied to soils
 M.1.CR, M.3.C.CR, FAO Crop residues to IPCC Direct and indirect emissions from crop residues
 M.3.MP + M.3.MA + M.1.CR, 3.C.4
-1.B.1,M.3.C.4.SF,Better to map indivudually in case it covers different range of years
-1.B.2.a + 1.B.2.b,M.3.C.5.SF,Better to map individually in case it covers different range of years
+1.B.1,M.3.C.4.SF, FAO Synthetic fertilisers direct emissions to IPCC Synthetic fertiliser emissions from direct N2O Emissions from Managed Soils - Better to map indivudually in case it covers different range of years
+1.B.2.a + 1.B.2.b,M.3.C.5.SF, FAO Synthetic fertilisers direct emissions to IPCC Synthetic fertiliser emissions from direct N2O Emissions from Managed Soils - Better to map individually in case it covers different range of years
 5.A,3.B.3,FAO 5.A Drained grassland to IPCC 3.B.3 Grassland
 5.B,3.B.2,Drained cropland
 6.A,3.C.1.a, FAO 6.A forest fires to IPCC 3.C.1.a Biomass burning in forest lands

src/faostat_data_primap/helper/category_aggregation.py

@@ -386,36 +386,28 @@ agg_info_fao = {
 # We can change it back to one dict once it's all organised
 agg_info_ipcc2006_primap_N2O = {
     "category (IPCC2006_PRIMAP)": {
-        "3.C.1": {  # Emissions from Biomass Burning
+        "M.3.C.1.AG": {  # AG-related emissions from Biomass Burning
             "sources": [
-                # "3.C.1.a",  # leaving out "Biomass Burning In Forest Lands", because not included in 2023 release
-                "3.C.1.b",  # Biomass Burning In Croplands
-                "3.C.1.c",  # Biomass Burning in Grasslands
+                "3.C.1.b",  # Biomass Burning In Croplands (FAO M.1.BCR All Crops - Burning crop residues)
+                "3.C.1.c",  # Biomass Burning in Grasslands (FAO 6.B savanna fires)
             ],
             "sel": {"variable": ["N2O"]},
         },
-        "M.3.C.1.AG": {  # AG-related emissions from Biomass Burning
-            "sources": [
-                "3.C.1.b",  # Biomass Burning In Croplands
-                "3.C.1.c",  # Biomass Burning in Grasslands
-            ],
+        "3.C.1": {  # Emissions from Biomass Burning (the same as M.3.C.1.AG)
+            "sources": ["M.3.C.1.AG"],
             "sel": {"variable": ["N2O"]},
         },
         "M.3.C.AG": {
             "sources": [
-                "3.C.1.b",  # Biomass Burning In Croplands - looks good (CH4, N2O)
-                "3.C.1.c",  # Biomass Burning in Grasslands - looks good (CH4)
-                "3.C.4",  # Direct N2O Emissions from Managed Soils
-                # "M.3.C.MP",
-                # "M.3.C.MA",
-                # "M.3.C.CR",
+                "M.3.C.1.AG",  # AG-related emissions from Biomass Burning
+                "M.3.C.MP",  # Direct and indirect emissions from manure left on pasture (FAO M.3.MP)
+                "M.3.C.MA",  # Direct and indirect emissions from manure applied to soils (FAO M.3.MA)
+                "M.3.C.CR",  # Direct and indirect emissions from crop residues (FAO M.1.CR)
                 "M.3.C.4.SF",  # synthetic fertilisers direct
-                # "3.C.5",  # Indirect N2O Emissions from Managed Soils, currently empty
                 "M.3.C.5.SF",  # synthetic fertilisers indirect
-                # "3.C.6",  # Indirect N2O Emissions from Manure Management, currently empty
                 "3.C.7",  # rice cultivation
-                "3.B.2",  # Drained grassland, was in LULUCF orginally
-                "3.B.3",  # Drained cropland, was in LULUCF originally
+                "3.B.2",  # Drained grassland
+                "3.B.3",  # Drained cropland
             ],
             "sel": {"variable": ["N2O"]},
         },
@@ -424,48 +416,13 @@ agg_info_ipcc2006_primap_N2O = {
             "sel": {"variable": ["N2O"]},  # "M.3.D.AG" is zero
         },
         "3.C": {
-            "sources": [
-                "M.3.C.1.AG",  # TODO 3.C.1 would be correct, but doesn't match 2023
-                "3.C.4",  # Direct N2O Emissions from Managed Soils
-                # "M.3.C.MP",
-                # "M.3.C.MA",
-                # "M.3.C.CR",
-                "M.3.C.4.SF",  # synthetic fertilisers direct
-                # "3.C.5",  # Indirect N2O Emissions from Managed Soils, empty
-                "M.3.C.5.SF",  # synthetic fertilisers indirect
-                # "3.C.6",  # Indirect N2O Emissions from Manure Management, empty
-                "3.C.7",  # rice cultivation
-                "3.B.2",  # Drained grassland, was in LULUCF orginally
-                "3.B.3",  # Drained cropland, was in LULUCF originally
-            ],
+            "sources": ["M.3.C.AG"],
             "sel": {"variable": ["N2O"]},
         },
-        # TODO 3.A.2.x are currently not read in
-        # "3.A.2.a": {  # decomposition of manure - CH4, N2O
-        #     "sources": [
-        #         "3.A.2.a.i",  # cattle (dairy)
-        #         "3.A.2.a.ii",  # cattle (non-dairy)
-        #     ],
-        #     "sel": {"variable": ["N2O"]},
-        # },
-        # # consistency check
-        # "3.A.2": {  # decomposition of manure - CH4, N2O
-        #     "sources": [
-        #         "3.A.2.a",
-        #         "3.A.2.b",
-        #         "3.A.2.c",
-        #         "3.A.2.d",
-        #         "3.A.2.e",
-        #         "3.A.2.f",
-        #         "3.A.2.g",
-        #         "3.A.2.h",
-        #         "3.A.2.i",
-        #         "3.A.2.j",
-        #     ],
-        #     "sel": {"variable": ["N2O"]},
-        # },
         "3.A": {
-            "sources": ["3.A.1", "3.A.2"],
+            "sources": [
+                "3.A.2"
+            ],  # Manure management (3.A.1 is enteric fermentation and CH4 only)
             "sel": {"variable": ["N2O"]},
         },
         "M.AG": {
@@ -478,9 +435,7 @@ agg_info_ipcc2006_primap_N2O = {
         "M.LULUCF": {
             "sources": [
                 "3.B.1",  # Carbon stock change in forests (FAO 4, or 4.A and 4.B)
-                "M.NFC",
-                # "3.B.2",  # Drained grassland
-                # "3.B.3",  # Drained cropland
+                "M.NFC",  # Net forest conversion
                 "3.C.1.a",  # Biomass Burning In Forests
             ],
             "sel": {"variable": ["N2O"]},

tests/unit/test_conversion.py

@@ -1,6 +1,7 @@
 """Note that these tests only run locally, because they require the downloaded data"""
 import primap2 as pm2
 import pytest
+import xarray as xr
 
 from faostat_data_primap.helper.paths import (
     downloaded_data_path,
@@ -36,9 +37,11 @@ def test_processed_output_remains_the_same():
     ]
 
     # compare
-    # xr.testing.assert_allclose(ds_processed, ds_processed_new, rtol=1e-5, atol=1e-8)
+    xr.testing.assert_allclose(
+        ds_processed, ds_processed_new, rtol=1e-10, check_dim_order=False
+    )
 
-    assert ds_processed.broadcast_equals(ds_processed_new)
+    # assert ds_processed.broadcast_equals(ds_processed_new)
 
 
 @pytest.mark.parametrize(