Forráskód Böngészése

[DATALAD] Recorded changes

Daniel Busch 3 hete
szülő
commit
40f15abacc

+ 1 - 1
extracted_data/v2023-12-13/FAOSTAT_Agrifood_system_emissions_v2023-12-13.nc

@@ -1 +1 @@
-../../.git/annex/objects/kp/vZ/MD5E-s2060452--d7732a88ad51e73b64bc605e9a4a861d.nc/MD5E-s2060452--d7732a88ad51e73b64bc605e9a4a861d.nc
+../../.git/annex/objects/kp/vK/MD5E-s2060452--58e83164882ea4c6c00edf632822fb8a.nc/MD5E-s2060452--58e83164882ea4c6c00edf632822fb8a.nc

+ 1 - 1
extracted_data/v2023-12-13/FAOSTAT_Agrifood_system_emissions_v2023-12-13_raw.csv

@@ -1 +1 @@
-../../.git/annex/objects/6W/6g/MD5E-s34171577--9f7391b62123e300849ff4df4b8ea8bf.csv/MD5E-s34171577--9f7391b62123e300849ff4df4b8ea8bf.csv
+../../.git/annex/objects/fw/GZ/MD5E-s34374190--768dde56e1c4fc7f81797b7b27af4974.csv/MD5E-s34374190--768dde56e1c4fc7f81797b7b27af4974.csv

+ 1 - 1
extracted_data/v2023-12-13/FAOSTAT_Agrifood_system_emissions_v2023-12-13_raw.nc

@@ -1 +1 @@
-../../.git/annex/objects/Q6/F6/MD5E-s14450580--a43c6824e8130ab4c56b300043374e93.nc/MD5E-s14450580--a43c6824e8130ab4c56b300043374e93.nc
+../../.git/annex/objects/gF/Qq/MD5E-s14547165--24cf0274bd2391c902b55a416ce18713.nc/MD5E-s14547165--24cf0274bd2391c902b55a416ce18713.nc

+ 1 - 1
extracted_data/v2024-11-14/FAOSTAT_Agrifood_system_emissions_v2024-11-14.nc

@@ -1 +1 @@
-../../.git/annex/objects/m3/kK/MD5E-s2312541--ff444b4069808a639ac2bb785296921a.nc/MD5E-s2312541--ff444b4069808a639ac2bb785296921a.nc
+../../.git/annex/objects/zF/0v/MD5E-s2312541--e26a340a34dd26f6e0ecc1fc9a054995.nc/MD5E-s2312541--e26a340a34dd26f6e0ecc1fc9a054995.nc

+ 1 - 1
extracted_data/v2024-11-14/FAOSTAT_Agrifood_system_emissions_v2024-11-14_raw.csv

@@ -1 +1 @@
-../../.git/annex/objects/vp/pV/MD5E-s34289102--5198b88b05708f715b0db35ed579d6af.csv/MD5E-s34289102--5198b88b05708f715b0db35ed579d6af.csv
+../../.git/annex/objects/2Z/6J/MD5E-s34497846--b63b101b17be9b087c2da0ecc314cae6.csv/MD5E-s34497846--b63b101b17be9b087c2da0ecc314cae6.csv

+ 1 - 1
extracted_data/v2024-11-14/FAOSTAT_Agrifood_system_emissions_v2024-11-14_raw.nc

@@ -1 +1 @@
-../../.git/annex/objects/VV/k7/MD5E-s15222746--49d853c6b5d16eb09b0ecae01cb7bc55.nc/MD5E-s15222746--49d853c6b5d16eb09b0ecae01cb7bc55.nc
+../../.git/annex/objects/8X/PP/MD5E-s15324811--6fa001f28131894516b9ef9de70fa7d9.nc/MD5E-s15324811--6fa001f28131894516b9ef9de70fa7d9.nc

+ 11 - 2
src/faostat_data_primap/helper/category_aggregation.py

@@ -224,6 +224,14 @@ agg_info_fao = {
             ],
             "sel": {"variable": ["N2O", "CH4"]},
         },
+        "M.1.CR": {  # N2O emissions from crop residues
+            "tolerance": 1,
+            "sources": [
+                "M.1.CR.direct",  # direct emissions from crop residues
+                "M.1.CR.indirect",  # indirect emissions from crop residues
+            ],
+            "sel": {"variable": ["N2O"]},
+        },
         "1.A": {
             # crops
             "tolerance": 1,
@@ -417,7 +425,7 @@ agg_info_ipcc2006_primap_N2O = {
             "sources": [
                 "M.3.C.45.MP",  # Direct and indirect emissions from manure left on pasture (FAO M.3.MP)
                 "M.3.C.45.MA",  # Direct and indirect emissions from manure applied to soils (FAO M.3.MA)
-                "M.3.C.45.CR",  # Direct and indirect emissions from crop residues (FAO M.1.CR)
+                "M.3.C.4.CR",  # Direct emissions from crop residues (FAO M.1.CR.direct),
                 "3.C.4.a",  # synthetic fertilisers direct (FAO 1.B.1)
                 "M.3.C.4.DOS.CL",  # Drained cropland (FAO 5.A drained cropland)
                 "M.3.C.4.DOS.GL",  # Drained grassland (FAO 5.B drained grassland)
@@ -428,8 +436,9 @@ agg_info_ipcc2006_primap_N2O = {
             "sources": [
                 # Similarly to 3.C.4, 3.C.5 does not accurately represent the IPCC categories
                 # There should be only indirect emissions in this category, but we only have direct and indirect combined,
-                # except for "M.3.C.5.SF" which is only indirect
+                # except for "M.3.C.5.SF", "M.3.C.5.CR" which are only indirect
                 "M.3.C.5.SF",  # synthetic fertilisers indirect - there is no IPCC sub-category for this
+                "M.3.C.5.CR",  # Indirect emissions from crop residues (FAO M.1.CR.indirect)
             ],
             "sel": {"variable": ["N2O"]},
         },

+ 5 - 11
src/faostat_data_primap/helper/definitions.py

@@ -295,13 +295,11 @@ read_config_all: Any = {
                 "Sorghum - Crops total (Emissions N2O)": "1.A.11",
                 "Soya beans - Crops total (Emissions N2O)": "1.A.12",
                 "All Crops - Crop residues (Emissions N2O)": "M.1.CR",
+                "All Crops - Crop residues (Direct emissions N2O)": "M.1.CR.direct",
+                "All Crops - Crop residues (Indirect emissions N2O)": "M.1.CR.indirect",
                 "All Crops - Burning crop residues (Emissions N2O)": "M.1.BCR",
                 "All Crops - Burning crop residues (Emissions CH4)": "M.1.BCR",
             },
-            "items-elements_to_remove": [
-                "All Crops - Crop residues (Direct emissions N2O)",
-                "All Crops - Crop residues (Indirect emissions N2O)",
-            ],
             "columns_to_drop": [
                 "Element",
                 "Element Code",
@@ -417,16 +415,12 @@ read_config_all: Any = {
                 "Rice - Crops total (Emissions CH4)": "1.A.2",
                 "Wheat - Crops total (Emissions N2O)": "1.A.1",
                 "Wheat - Crops total (Emissions CH4)": "1.A.1",
-                "All Crops - Crop residues (Emissions N2O)": "M.1.CR",
                 "All Crops - Burning crop residues (Emissions N2O)": "M.1.BCR",
                 "All Crops - Burning crop residues (Emissions CH4)": "M.1.BCR",
+                "All Crops - Crop residues (Emissions N2O)": "M.1.CR",
+                "All Crops - Crop residues (Direct emissions N2O)": "M.1.CR.direct",
+                "All Crops - Crop residues (Indirect emissions N2O)": "M.1.CR.indirect",
             },
-            "items-elements_to_remove": [
-                "All Crops - Crop residues (Direct emissions N2O)",
-                "All Crops - Crop residues (Indirect emissions N2O)",
-                # "All Crops - Burning crop residues (Emissions N2O)",
-                # "All Crops - Burning crop residues (Emissions CH4)",
-            ],
             "columns_to_drop": [
                 "Element",
                 "Element Code",