some updates to CRF 2022 and 2023 specs

UNFCCC_GHG_data/UNFCCC_CRF_reader/crf_specifications/CRF2022_specification.py

@@ -852,7 +852,7 @@ CRF2022 = {
             ['Biomass', ['1.A.3.b.v.6', 'Biomass'], 4],
             ['Other Fossil Fuels (please specify)', ['1.A.3.b.v.6', 'OtherFF'], 4],
             # BEL
-            ['Lubricant Two-Stroke Engines', ['1.A.3.b.v.7', 'Total'], 3],
+            ['Lubricant Two-Stroke Engines', ['1.A.3.b.v.7', 'Lubricants'], 3],
             ['Other Liquid Fuels (please specify)', ['1.A.3.b.v.7', 'OtherLiquid'], 4],
             # ROU
             ['Gaseous Fuels', ['1.A.3.b.v.8', 'Total'], 3],
@@ -2526,4 +2526,141 @@ CRF2022 = {
             "class": "Total",
         },
     },  # tested
+    "Summary1.As1": {  # Summary 1, sheet 1
+        "status": "tested",
+         "table": {
+            "firstrow": 5,
+            "lastrow": 28,
+            "header": ['entity', 'unit'],
+            "col_for_categories": "GREENHOUSE GAS SOURCE AND SINK CATEGORIES",
+            "categories": ["category"],
+            "cols_to_ignore": [],
+            "stop_cats": ["", np.nan],
+            "unit_info": unit_info["summary"],
+        },
+        "sector_mapping": [
+            ['Total national emissions and removals', ['0']],
+            ['1. Energy', ['1']],
+            ['A. Fuel combustion Reference approach(2)', ['1.A-ref']],
+            ['Sectoral approach(2)', ['1.A']],
+            ['1. Energy industries', ['1.A.1']],
+            ['2. Manufacturing industries and construction', ['1.A.2']],
+            ['3. Transport', ['1.A.3']],
+            ['4. Other sectors', ['1.A.4']],
+            ['5. Other', ['1.A.5']],
+            ['B. Fugitive emissions from fuels', ['1.B']],
+            ['1. Solid fuels', ['1.B.1']],
+            ['2. Oil and natural gas and other emissions from energy production',
+             ['1.B.2']],
+            ['C. CO2 Transport and storage', ['1.C']],
+            ['2. Industrial processes and product use', ['2']],
+            ['A. Mineral industry', ['2.A']],
+            ['B. Chemical industry', ['2.B']],
+            ['C. Metal industry', ['2.C']],
+            ['D. Non-energy products from fuels and solvent use', ['2.D']],
+            ['E. Electronic industry', ['2.E']],
+            ['F. Product uses as substitutes for ODS', ['2.F']],
+            ['G. Other product manufacture and use', ['2.G']],
+            ['H. Other(3)', ['2.H']],
+        ],
+        "entity_mapping": {
+            'NOX': 'NOx',
+            'Net CO2 emissions/removals': 'CO2',
+            'HFCs(1)': 'HFCS (AR4GWP100)',
+            'PFCs(1)': 'PFCS (AR4GWP100)',
+            'Unspecified mix of HFCs and PFCs(1)': 'UnspMixOfHFCsPFCs (AR4GWP100)',
+        },
+        "coords_defaults": {
+            "class": "Total",
+        },
+    },  # tested
+    "Summary1.As2": {  # Summary 1, sheet 2
+        "status": "tested",
+         "table": {
+            "firstrow": 5,
+            "lastrow": 34,
+            "header": ['entity', 'entity', 'unit'],
+            "header_fill": [True, False, True],
+            "col_for_categories": "GREENHOUSE GAS SOURCE AND SINK CATEGORIES",
+            "categories": ["category"],
+            "cols_to_ignore": [],
+            "stop_cats": ["", np.nan],
+            "unit_info": unit_info["summary"],
+        },
+        "sector_mapping": [
+            ['3. Agriculture', ['3']],
+            ['A. Enteric fermentation', ['3.A']],
+            ['B. Manure management', ['3.B']],
+            ['C. Rice cultivation', ['3.C']],
+            ['D. Agricultural soils', ['3.D']],
+            ['E. Prescribed burning of savannas', ['3.E']],
+            ['F. Field burning of agricultural residues', ['3.F']],
+            ['G. Liming', ['3.G']],
+            ['H. Urea application', ['3.H']],
+            ['I. Other carbon-contining fertilizers', ['3.I']],
+            ['J. Other', ['3.J']],
+            ['4. Land use, land-use change and forestry (4)', ['4']],
+            ['A. Forest land (4)', ['4.A']],
+            ['B. Cropland (4)', ['4.B']],
+            ['C. Grassland (4)', ['4.C']],
+            ['D. Wetlands (4)', ['4.D']],
+            ['E. Settlements (4)', ['4.E']],
+            ['F. Other land (4)', ['4.F']],
+            ['G. Harvested wood products', ['4.G']],
+            ['H. Other (4)', ['4.H']],
+            ['5. Waste', ['5']],
+            ['A. Solid waste disposal (5)', ['5.A']],
+            ['B. Biological treatment of solid waste (5)', ['5.B']],
+            ['C. Incineration and open burning of waste (5)', ['5.C']],
+            ['D. Wastewater treatment and discharge', ['5.D']],
+            ['E. Other (5)', ['5.E']],
+            ['6. Other (please specify)(6)', ['6']],
+        ],
+        "entity_mapping": {
+            'NOX': 'NOx',
+            'Net CO2 emissions/removals': 'CO2',
+            'HFCs (1)': 'HFCS (AR4GWP100)',
+            'PFCs(1)': 'PFCS (AR4GWP100)',
+            'Unspecified mix of HFCs and PFCs(1)': 'UnspMixOfHFCsPFCs (AR4GWP100)',
+        },
+        "coords_defaults": {
+            "class": "Total",
+        },
+    },  # tested
+    "Summary1.As3": {  # Summary 1, sheet 3
+        "status": "tested",
+         "table": {
+            "firstrow": 5,
+            "lastrow": 17,
+            "header": ['entity', 'entity', 'unit'],
+            "header_fill": [True, False, True],
+            "col_for_categories": "GREENHOUSE GAS SOURCE AND SINK CATEGORIES",
+            "categories": ["category"],
+            "cols_to_ignore": [],
+            "stop_cats": ["", np.nan],
+            "unit_info": unit_info["summary"],
+        },
+        "sector_mapping": [
+            ['Memo items:(7)', ['\IGNORE']],
+            ['International bunkers', ['M.Memo.Int']],
+            ['Aviation', ['M.Memo.Int.Avi']],
+            ['Navigation', ['M.Memo.Int.Mar']],
+            ['Multilateral operations', ['M.Memo.Mult']],
+            ['CO2 emissions from biomass', ['M.Memo.Bio']],
+            ['CO2 captured', ['M.Memo.CO2Cap']],
+            ['Long-term storage of C in waste disposal sites', ['M.Memo.LTSW']],
+            ['Indirect N2O', ['M.Memo.IndN2O']],
+            ['Indirect CO2', ['M.Memo.IndCO2']],
+        ],
+        "entity_mapping": {
+            'NOX': 'NOx',
+            'Net CO2 emissions/removals': 'CO2',
+            'HFCs(1)': 'HFCS (AR4GWP100)',
+            'PFCs(1)': 'PFCS (AR4GWP100)',
+            'Unspecified mix of HFCs and PFCs(1)': 'UnspMixOfHFCsPFCs (AR4GWP100)',
+        },
+        "coords_defaults": {
+            "class": "Total",
+        },
+    },  # tested
 }

UNFCCC_GHG_data/UNFCCC_CRF_reader/crf_specifications/CRF2023_specification.py

@@ -1144,7 +1144,8 @@ CRF2023 = {
             ['heavy fuel oil', ['1.A.4.c.ii', 'HeavyFuelOil'], 4],  # NOR
             ['Other motor fuels', ['1.A.4.c.ii', 'OMotorFuels'], 4],  # RUS
             ['Biodiesel (5 percent fossil portion)', ['1.A.4.c.ii', 'OLBiodieselFC'], 4],  # CAN
-            ['Lubricating Oil (Two-Stroke Engines)', ['1.A.4.c.ii', 'OLBiodieselFC'], 4],  # CAN
+            ['Lubricating Oil (Two-Stroke Engines)', ['1.A.4.c.ii', 'Lubricants'], 4],
+            # CAN new in 2023
             ['Gaseous fuels', ['1.A.4.c.ii', 'Gaseous'], 3],
             ['Biomass(6)', ['1.A.4.c.ii', 'Biomass'], 3],
             ['Other fossil fuels (please specify)(4)', ['1.A.4.c.ii', 'OtherFF'], 3],
@@ -2474,16 +2475,16 @@ CRF2023 = {
             ['Other (please specify)', ['5.C.2.a.ii'], 2],
             ['agricultural waste', ['5.C.2.a.ii.1'], 3],  # ITA
             ['Agricultural residues', ['5.C.2.a.ii.1'], 3],  # ESP
-            ['Agriculture residues', ['5.C.2.a.ii.1'], 3],  # PRT
+            ['Agriculture residues', ['5.C.2.a.ii.1'], 3],  # PRT new in 2023
             ['Natural residues', ['5.C.2.a.ii.2'], 3],  # CHE
             ['Wood waste', ['5.C.2.a.ii.3'], 3],  # GBR, GBK
             ['Bonfires etc.', ['5.C.2.a.ii.4'], 3],  # DEU
             ['Bonfires', ['5.C.2.a.ii.4'], 3],  # NLD, ISL
             ['Other', ['5.C.2.a.ii.5'], 3],  # EST
             ['Other waste', ['5.C.2.a.ii.5'], 3],  # CZE
-            ['Waste', ['5.C.2.a.ii.5'], 3],  # GBR
+            ['Waste', ['5.C.2.a.ii.5'], 3],  # GBR new in 2023
             ['Industrial Solid Waste', ['5.C.2.a.ii.6'], 3],  # JPN
-            ['Vine', ['5.C.2.a.ii.7'], 3], # AUT
+            ['Vine', ['5.C.2.a.ii.7'], 3], # AUT new in 2023
             ['Non-biogenic', ['5.C.2.b'], 1],
             ['Municipal solid waste', ['5.C.2.b.i'], 2],
             ['Other (please specify)', ['5.C.2.b.ii'], 2],
@@ -2493,7 +2494,7 @@ CRF2023 = {
             ['Bonfires', ['5.C.2.b.ii.4'], 3],  # ISL
             ['Other', ['5.C.2.b.ii.5'], 3],  # EST
             ['Other waste', ['5.C.2.b.ii.5'], 3],  # CZE
-            ['Waste', ['5.C.2.b.ii.5'], 3],  # GBR
+            ['Waste', ['5.C.2.b.ii.5'], 3],  # GBR new in 2023
             ['Industrial Solid Waste', ['5.C.2.b.ii.6'], 3],  # JPN
         ],
         "entity_mapping": {