فهرست منبع

Merge remote-tracking branch 'origin/master'

Johannes 1 سال پیش
والد
کامیت
1c591820ee
100فایلهای تغییر یافته به همراه2425 افزوده شده و 84 حذف شده
  1. 62 13
      UNFCCC_GHG_data/UNFCCC_CRF_reader/UNFCCC_CRF_reader_core.py
  2. 88 12
      UNFCCC_GHG_data/UNFCCC_CRF_reader/UNFCCC_CRF_reader_devel.py
  3. 41 4
      UNFCCC_GHG_data/UNFCCC_CRF_reader/UNFCCC_CRF_reader_prod.py
  4. 1722 0
      UNFCCC_GHG_data/UNFCCC_CRF_reader/crf_specifications/CRF2023_AUS_specification.py
  5. 23 19
      UNFCCC_GHG_data/UNFCCC_CRF_reader/crf_specifications/CRF2023_specification.py
  6. 2 1
      UNFCCC_GHG_data/UNFCCC_CRF_reader/crf_specifications/__init__.py
  7. 7 0
      UNFCCC_GHG_data/UNFCCC_CRF_reader/crf_specifications/util.py
  8. 4 0
      UNFCCC_GHG_data/UNFCCC_CRF_reader/test_read_UNFCCC_CRF_for_year.py
  9. 82 31
      UNFCCC_GHG_data/UNFCCC_DI_reader/UNFCCC_DI_reader_config.py
  10. 4 1
      UNFCCC_GHG_data/UNFCCC_DI_reader/UNFCCC_DI_reader_proc.py
  11. 5 0
      UNFCCC_GHG_data/UNFCCC_reader/Israel/config_ISR_BUR2.py
  12. 3 1
      UNFCCC_GHG_data/UNFCCC_reader/Israel/read_ISR_BUR2_from_pdf.py
  13. 1 0
      datasets/UNFCCC/CRF2023/CRF2023_raw_2023-09-08.csv
  14. 1 0
      datasets/UNFCCC/CRF2023/CRF2023_raw_2023-09-08.nc
  15. 30 0
      datasets/UNFCCC/CRF2023/CRF2023_raw_2023-09-08.yaml
  16. 1 0
      datasets/UNFCCC/CRF2023/CRF2023_raw_2023-09-10.csv
  17. 1 0
      datasets/UNFCCC/CRF2023/CRF2023_raw_2023-09-10.nc
  18. 30 0
      datasets/UNFCCC/CRF2023/CRF2023_raw_2023-09-10.yaml
  19. 1 0
      datasets/UNFCCC/CRF2023/CRF2023_raw_2023-09-13.csv
  20. 1 0
      datasets/UNFCCC/CRF2023/CRF2023_raw_2023-09-13.nc
  21. 30 0
      datasets/UNFCCC/CRF2023/CRF2023_raw_2023-09-13.yaml
  22. 1 0
      datasets/UNFCCC/CRF2023/CRF2023_raw_2023-09-17.csv
  23. 1 0
      datasets/UNFCCC/CRF2023/CRF2023_raw_2023-09-17.nc
  24. 30 0
      datasets/UNFCCC/CRF2023/CRF2023_raw_2023-09-17.yaml
  25. 1 0
      datasets/UNFCCC/CRF2023/CRF2023_raw_2023-09-18.csv
  26. 1 0
      datasets/UNFCCC/CRF2023/CRF2023_raw_2023-09-18.nc
  27. 30 0
      datasets/UNFCCC/CRF2023/CRF2023_raw_2023-09-18.yaml
  28. 1 0
      datasets/UNFCCC/CRF2023/CRF2023_raw_2023-09-21.csv
  29. 1 0
      datasets/UNFCCC/CRF2023/CRF2023_raw_2023-09-21.nc
  30. 30 0
      datasets/UNFCCC/CRF2023/CRF2023_raw_2023-09-21.yaml
  31. 1 0
      datasets/UNFCCC/DI_non_AnnexI/DI_non_AnnexI_2023-09-13.csv
  32. 1 0
      datasets/UNFCCC/DI_non_AnnexI/DI_non_AnnexI_2023-09-13.nc
  33. 1 0
      datasets/UNFCCC/DI_non_AnnexI/DI_non_AnnexI_2023-09-13.yaml
  34. 1 0
      datasets/UNFCCC/DI_non_AnnexI/DI_non_AnnexI_517132d494ad9e7331e21ac20165b3ea_hash.csv
  35. 1 0
      datasets/UNFCCC/DI_non_AnnexI/DI_non_AnnexI_517132d494ad9e7331e21ac20165b3ea_hash.nc
  36. 41 0
      datasets/UNFCCC/DI_non_AnnexI/DI_non_AnnexI_517132d494ad9e7331e21ac20165b3ea_hash.yaml
  37. 1 0
      datasets/UNFCCC/DI_non_AnnexI/DI_non_AnnexI_637927eddc7bc1dde7652d48c879b516_hash.csv
  38. 1 0
      datasets/UNFCCC/DI_non_AnnexI/DI_non_AnnexI_637927eddc7bc1dde7652d48c879b516_hash.nc
  39. 41 0
      datasets/UNFCCC/DI_non_AnnexI/DI_non_AnnexI_637927eddc7bc1dde7652d48c879b516_hash.yaml
  40. 1 0
      datasets/UNFCCC/DI_non_AnnexI/DI_non_AnnexI_e2ec0afc94b872062fc75a11a002f4ef_hash.csv
  41. 1 0
      datasets/UNFCCC/DI_non_AnnexI/DI_non_AnnexI_e2ec0afc94b872062fc75a11a002f4ef_hash.nc
  42. 41 0
      datasets/UNFCCC/DI_non_AnnexI/DI_non_AnnexI_e2ec0afc94b872062fc75a11a002f4ef_hash.yaml
  43. 2 1
      dodo.py
  44. 1 0
      downloaded_data/UNFCCC/00_new_downloads_CRF2023-2023-09-06.csv
  45. 1 0
      downloaded_data/UNFCCC/00_new_downloads_CRF2023-2023-09-21.csv
  46. 1 0
      downloaded_data/UNFCCC/France/CRF2023/FRK_2023_1990_29082023_172247.xlsx
  47. 1 0
      downloaded_data/UNFCCC/France/CRF2023/FRK_2023_1991_29082023_172332.xlsx
  48. 1 0
      downloaded_data/UNFCCC/France/CRF2023/FRK_2023_1992_29082023_172417.xlsx
  49. 1 0
      downloaded_data/UNFCCC/France/CRF2023/FRK_2023_1993_29082023_172501.xlsx
  50. 1 0
      downloaded_data/UNFCCC/France/CRF2023/FRK_2023_1994_29082023_172545.xlsx
  51. 1 0
      downloaded_data/UNFCCC/France/CRF2023/FRK_2023_1995_29082023_172629.xlsx
  52. 1 0
      downloaded_data/UNFCCC/France/CRF2023/FRK_2023_1996_29082023_172713.xlsx
  53. 1 0
      downloaded_data/UNFCCC/France/CRF2023/FRK_2023_1997_29082023_172758.xlsx
  54. 1 0
      downloaded_data/UNFCCC/France/CRF2023/FRK_2023_1998_29082023_172843.xlsx
  55. 1 0
      downloaded_data/UNFCCC/France/CRF2023/FRK_2023_1999_29082023_172927.xlsx
  56. 1 0
      downloaded_data/UNFCCC/France/CRF2023/FRK_2023_2000_29082023_173011.xlsx
  57. 1 0
      downloaded_data/UNFCCC/France/CRF2023/FRK_2023_2001_29082023_173056.xlsx
  58. 1 0
      downloaded_data/UNFCCC/France/CRF2023/FRK_2023_2002_29082023_173140.xlsx
  59. 1 0
      downloaded_data/UNFCCC/France/CRF2023/FRK_2023_2003_29082023_173224.xlsx
  60. 1 0
      downloaded_data/UNFCCC/France/CRF2023/FRK_2023_2004_29082023_173308.xlsx
  61. 1 0
      downloaded_data/UNFCCC/France/CRF2023/FRK_2023_2005_29082023_173353.xlsx
  62. 1 0
      downloaded_data/UNFCCC/France/CRF2023/FRK_2023_2006_29082023_173438.xlsx
  63. 1 0
      downloaded_data/UNFCCC/France/CRF2023/FRK_2023_2007_29082023_173522.xlsx
  64. 1 0
      downloaded_data/UNFCCC/France/CRF2023/FRK_2023_2008_29082023_173607.xlsx
  65. 1 0
      downloaded_data/UNFCCC/France/CRF2023/FRK_2023_2009_29082023_173651.xlsx
  66. 1 0
      downloaded_data/UNFCCC/France/CRF2023/FRK_2023_2010_29082023_173735.xlsx
  67. 1 0
      downloaded_data/UNFCCC/France/CRF2023/FRK_2023_2011_29082023_173820.xlsx
  68. 1 0
      downloaded_data/UNFCCC/France/CRF2023/FRK_2023_2012_29082023_173905.xlsx
  69. 1 0
      downloaded_data/UNFCCC/France/CRF2023/FRK_2023_2013_29082023_173949.xlsx
  70. 1 0
      downloaded_data/UNFCCC/France/CRF2023/FRK_2023_2014_29082023_174034.xlsx
  71. 1 0
      downloaded_data/UNFCCC/France/CRF2023/FRK_2023_2015_29082023_174118.xlsx
  72. 1 0
      downloaded_data/UNFCCC/France/CRF2023/FRK_2023_2016_29082023_174203.xlsx
  73. 1 0
      downloaded_data/UNFCCC/France/CRF2023/FRK_2023_2017_29082023_174248.xlsx
  74. 1 0
      downloaded_data/UNFCCC/France/CRF2023/FRK_2023_2018_29082023_174332.xlsx
  75. 1 0
      downloaded_data/UNFCCC/France/CRF2023/FRK_2023_2019_29082023_174417.xlsx
  76. 1 0
      downloaded_data/UNFCCC/France/CRF2023/FRK_2023_2020_29082023_174502.xlsx
  77. 1 0
      downloaded_data/UNFCCC/France/CRF2023/FRK_2023_2021_29082023_174547.xlsx
  78. 1 0
      downloaded_data/UNFCCC/France/CRF2023/frk-2023-crf-29aug23_AR5.zip
  79. 1 0
      downloaded_data/UNFCCC/Guatemala/BUR1/2022_IIN_GT-v2.pdf
  80. 0 1
      downloaded_data/UNFCCC/Liechtenstein/CRF2023/LIE_2023_2022_12042023_174927.xlsx
  81. 1 0
      downloaded_data/UNFCCC/Liechtenstein/CRF2023/ignore/LIE_2023_2022_12042023_174927.xlsx
  82. 1 0
      downloaded_data/UNFCCC/Russian_Federation/CRF2023/RUS_2023_1990_22082023_000303.xlsx
  83. 1 0
      downloaded_data/UNFCCC/Russian_Federation/CRF2023/RUS_2023_1991_22082023_000345.xlsx
  84. 1 0
      downloaded_data/UNFCCC/Russian_Federation/CRF2023/RUS_2023_1992_22082023_000427.xlsx
  85. 1 0
      downloaded_data/UNFCCC/Russian_Federation/CRF2023/RUS_2023_1993_22082023_000507.xlsx
  86. 1 0
      downloaded_data/UNFCCC/Russian_Federation/CRF2023/RUS_2023_1994_22082023_000549.xlsx
  87. 1 0
      downloaded_data/UNFCCC/Russian_Federation/CRF2023/RUS_2023_1995_22082023_000630.xlsx
  88. 1 0
      downloaded_data/UNFCCC/Russian_Federation/CRF2023/RUS_2023_1996_22082023_000712.xlsx
  89. 1 0
      downloaded_data/UNFCCC/Russian_Federation/CRF2023/RUS_2023_1997_22082023_000754.xlsx
  90. 1 0
      downloaded_data/UNFCCC/Russian_Federation/CRF2023/RUS_2023_1998_22082023_000835.xlsx
  91. 1 0
      downloaded_data/UNFCCC/Russian_Federation/CRF2023/RUS_2023_1999_22082023_000917.xlsx
  92. 1 0
      downloaded_data/UNFCCC/Russian_Federation/CRF2023/RUS_2023_2000_22082023_000959.xlsx
  93. 1 0
      downloaded_data/UNFCCC/Russian_Federation/CRF2023/RUS_2023_2001_22082023_001041.xlsx
  94. 1 0
      downloaded_data/UNFCCC/Russian_Federation/CRF2023/RUS_2023_2002_22082023_001123.xlsx
  95. 1 0
      downloaded_data/UNFCCC/Russian_Federation/CRF2023/RUS_2023_2003_22082023_001204.xlsx
  96. 1 0
      downloaded_data/UNFCCC/Russian_Federation/CRF2023/RUS_2023_2004_22082023_001246.xlsx
  97. 1 0
      downloaded_data/UNFCCC/Russian_Federation/CRF2023/RUS_2023_2005_22082023_001328.xlsx
  98. 1 0
      downloaded_data/UNFCCC/Russian_Federation/CRF2023/RUS_2023_2006_22082023_001410.xlsx
  99. 1 0
      downloaded_data/UNFCCC/Russian_Federation/CRF2023/RUS_2023_2007_22082023_001452.xlsx
  100. 1 0
      downloaded_data/UNFCCC/Russian_Federation/CRF2023/RUS_2023_2008_22082023_001534.xlsx

+ 62 - 13
UNFCCC_GHG_data/UNFCCC_CRF_reader/UNFCCC_CRF_reader_core.py

@@ -5,6 +5,7 @@ well as for test-reading to check for new categories etc.
 """
 
 import re
+import os
 import json
 import numpy as np
 import pandas as pd
@@ -155,6 +156,7 @@ def read_crf_table(
         data_year: Optional[Union[int, List[int]]]=None,
         date: Optional[str]=None,
         folder: Optional[str]=None,
+        debug: Optional[bool]=False,
 ) -> Tuple[pd.DataFrame, List[List], List[List]]:
     """
     Read CRF table for given submission year and country / or countries
@@ -188,6 +190,9 @@ def read_crf_table(
         Folder that contains the xls files. If not given fodlers are determined by the
         submissions_year and country_code variables
 
+    debug: bool (optional)
+        if true print some debug information like column headers
+
     Returns
     _______
         Tuple[pd.DataFrame, List[List], List[List]]:
@@ -241,10 +246,26 @@ def read_crf_table(
                               f"folder={folder}.")
 
     # get specification
-    try:
-        crf_spec = getattr(crf, f"CRF{submission_year}")
-    except:
-        raise ValueError(f"No terminology exists for submission year {submission_year}")
+    # if we only have a single country check if we might have a country specific
+    # specification (currently only Australia, 2023)
+    if len(country_codes) == 1:
+        try:
+            crf_spec = getattr(crf, f"CRF{submission_year}_{country_codes[0]}")
+            print(f"Using country specific specification: " 
+                  f"CRF{submission_year}_{country_codes[0]}")
+        except:
+            # no country specific specification, check for general specification
+            try:
+                crf_spec = getattr(crf, f"CRF{submission_year}")
+            except:
+                raise ValueError(f"No terminology exists for submission year "
+                                 f"{submission_year}")
+    else:
+        try:
+            crf_spec = getattr(crf, f"CRF{submission_year}")
+        except:
+            raise ValueError(f"No terminology exists for submission year "
+                             f"{submission_year}")
 
     # now loop over files and read them
     df_all = None
@@ -255,7 +276,7 @@ def read_crf_table(
         try:
             int(file_info["data_year"])
             df_this_file, unknown_rows_this_file, last_row_info_this_file = \
-                read_crf_table_from_file(file, table, crf_spec[table])
+                read_crf_table_from_file(file, table, crf_spec[table], debug=debug)
             if df_all is None:
                 df_all = df_this_file.copy(deep=True)
                 unknown_rows = unknown_rows_this_file
@@ -274,6 +295,7 @@ def read_crf_table_from_file(
         file: Path,
         table: str,
         table_spec: Dict[str, Dict],
+        debug: Optional[bool]=False,
 ) -> Tuple[pd.DataFrame, List[List], List[List]]:
     """
     Read a single CRF table from a given file. This is the core function of the CRF
@@ -290,6 +312,9 @@ def read_crf_table_from_file(
     table_spec: Dict[str, Dict]
         Specification for the given table, e.g. CRF2021["Table4"]
 
+    debug: bool (optional)
+        if true print some debug information like column headers
+
     Returns
     _______
         Tuple[pd.DataFrame, List[List], List[List]]:
@@ -341,6 +366,22 @@ def read_crf_table_from_file(
         last_row_nan = True
     else:
         last_row_nan = False
+    
+
+    cols_to_drop = []
+    # remove empty first column (for Australia tables start with an empty column)
+    # df_raw = df_raw.dropna(how="all", axis=1)
+    if df_raw.iloc[:, 0].isna().all():
+        cols_to_drop.append(df_raw.columns.values[0])
+    # select only first table by cutting everything after a all-nan column (unless
+    # it's the first column)
+    for colIdx in range(1, len(df_raw.columns.values)):
+        if df_raw.iloc[:, colIdx].isna().all():
+            cols_to_drop = cols_to_drop + list(df_raw.columns.values[colIdx : ])
+            break
+
+    if cols_to_drop is not None:
+        df_raw = df_raw.drop(columns=cols_to_drop)
 
     #### prepare the header (2 row header, first entity, then unit)
     # We do this before removing columns and any other processing to
@@ -397,7 +438,8 @@ def read_crf_table_from_file(
 
     df_current.iloc[0] = units
     df_current.columns = entities
-
+    if debug:
+        print(f"Columns present: {entities}")
     # remove all columns to ignore
     df_current = df_current.drop(columns=table_properties["cols_to_ignore"])
 
@@ -505,7 +547,6 @@ def read_crf_table_from_file(
     # set index
     df_current = df_current.set_index(index_cols)
     # process the unit information using the primap2 functions
-
     df_current = pm2.pm2io.nir_add_unit_information(df_current, **table_properties["unit_info"])
 
     # convert to long format
@@ -618,8 +659,10 @@ def get_crf_files(
                 input_files = input_files + \
                               filter_filenames(input_folder.glob("*.xlsx"),
                                                **file_filter)
-        else:
-            raise ValueError(f"Folder {input_folder} does not exist")
+        #else:
+        #    raise ValueError(f"Folder {input_folder} does not exist")
+    if len(input_files) == 0:
+        raise ValueError(f"No input files found in {country_folders}")
 
     # make sure no files is in the list twice (happens when multiple input folder
     # contain the same submission which is possible when the country name is changed)
@@ -651,10 +694,11 @@ def get_info_from_crf_filename(
     dict with fields:
         party: the party that submitted the data (3 letter UNFCCC_GHG_data)
         submission_year: year of submission
-        data_year: year in which the meissions took place
+        data_year: year in which the emissions took place
         date: date of the submission
         extra: rest of the file name
     """
+    filename = os.path.splitext(filename)[0]
     name_parts = filename.split("_")
     file_info = {}
     file_info["party"] = name_parts[0]
@@ -666,7 +710,11 @@ def get_info_from_crf_filename(
               "could not be converted to int.")
         file_info["data_year"] = name_parts[2]
     file_info["date"] = name_parts[3]
-    file_info["extra"] = name_parts[4]
+    # the last part (time code) is missing for Australia since 2023
+    if len(name_parts) > 4:
+        file_info["extra"] = name_parts[4]
+    else:
+        file_info["extra"] = ""
     return file_info
 
 
@@ -948,8 +996,9 @@ def get_latest_date_for_country(
         else:
             dates = []
             for folder in country_folders:
-                dates = dates + get_submission_dates(
-                    downloaded_data_path_UNFCCC / folder / f"CRF{submission_year}", file_filter)
+                folder_submission = downloaded_data_path_UNFCCC / folder / f"CRF{submission_year}"
+                if folder_submission.exists():
+                    dates = dates + get_submission_dates(folder_submission, file_filter)
             submission_date = find_latest_date(dates)
     else:
         raise ValueError(f"No data folder found for country {country_code}. "

+ 88 - 12
UNFCCC_GHG_data/UNFCCC_CRF_reader/UNFCCC_CRF_reader_devel.py

@@ -23,6 +23,7 @@ def read_year_to_test_specs(
         submission_year: int,
         data_year: Optional[int]=None,
         totest: Optional[bool]=False,
+        country_code: Optional=None,
 ) -> xr.Dataset:
     """
     Read one xlsx file (so one data year) for each country for a submission year to
@@ -41,11 +42,33 @@ def read_year_to_test_specs(
     if totest:
         print("Reading only tables to test.")
     print("#"*80)
-    try:
-        crf_spec = getattr(crf, f"CRF{submission_year}")
-    except:
-        raise ValueError(f"No terminology exists for submission years {submission_year}, "
-                         f"{submission_year - 1}")
+
+
+    # get specification
+    # if we only have a single country check if we might have a country specific
+    # specification (currently only Australia, 2023)
+    if country_code is not None:
+        try:
+            crf_spec = getattr(crf, f"CRF{submission_year}_{country_code}")
+            print(
+                f"Using country specific specification: "
+                f"CRF{submission_year}_{country_code}"
+            )
+        except:
+            # no country specific specification, check for general specification
+            try:
+                crf_spec = getattr(crf, f"CRF{submission_year}")
+            except:
+                raise ValueError(
+                    f"No terminology exists for submission year " f"{submission_year}"
+                )
+    else:
+        try:
+            crf_spec = getattr(crf, f"CRF{submission_year}")
+        except:
+            raise ValueError(
+                f"No terminology exists for submission year " f"{submission_year}"
+            )
 
     if totest:
         tables = [table for table in crf_spec.keys()
@@ -57,7 +80,11 @@ def read_year_to_test_specs(
           f"CRF{submission_year} specification: {tables}")
     print("#" * 80)
 
-    for country_code in all_crf_countries:
+    if country_code is not None:
+        countries_to_read = [country_code]
+    else:
+        countries_to_read = all_crf_countries
+    for country_code in countries_to_read:
         # get country name
         country_name = get_country_name(country_code)
         print(f"Reading for {country_name}")
@@ -73,7 +100,8 @@ def read_year_to_test_specs(
             for table in tables:
                 # read table for all years
                 ds_table, new_unknown_categories, new_last_row_info = read_crf_table(
-                    country_code, table, submission_year, date=submission_date, data_year=[data_year])
+                    country_code, table, submission_year, date=submission_date,
+                    data_year=[data_year], debug=True)
 
                 # collect messages on unknown rows etc
                 unknown_categories = unknown_categories + new_unknown_categories
@@ -103,6 +131,32 @@ def read_year_to_test_specs(
                     # now convert to native PRIMAP2 format
                     ds_table_pm2 = pm2.pm2io.from_interchange_format(ds_table_if)
 
+                    # if individual data for emissions and removals / recovery exist combine
+                    # them
+                    if (('CO2 removals' in ds_table_pm2.data_vars) and
+                            ('CO2 emissions' in ds_table_pm2.data_vars) and not
+                            ('CO2' in ds_table_pm2.data_vars)):
+                        # we can just sum to CO2 as we made sure that it doesn't exist.
+                        # If we have CO2 and removals but not emissions, CO2 already has
+                        # removals subtracted and we do nothing here
+                        ds_table_pm2["CO2"] = ds_table_pm2[["CO2 emissions",
+                                                            "CO2 removals"]].pr.sum(
+                            dim="entity", skipna=True, min_count=1
+                        )
+                        ds_table_pm2["CO2"].attrs["entity"] = "CO2"
+
+                    if (('CH4 removals' in ds_table_pm2.data_vars) and
+                            ('CH4 emissions' in ds_table_pm2.data_vars) and not
+                            ('CH4' in ds_table_pm2.data_vars)):
+                        # we can just sum to CH4 as we made sure that it doesn't exist.
+                        # If we have CH4 and removals but not emissions, CH4 already has
+                        # removals subtracted and we do nothing here
+                        ds_table_pm2["CH4"] = ds_table_pm2[["CH4 emissions",
+                                                            "CH4 removals"]].pr.sum(
+                            dim="entity", skipna=True, min_count=1
+                        )
+                        ds_table_pm2["CH4"].attrs["entity"] = "CH4"
+
                     # combine per table DS
                     if ds_all is None:
                         ds_all = ds_table_pm2
@@ -116,14 +170,32 @@ def read_year_to_test_specs(
     # process log messages.
     today = date.today()
     if len(unknown_categories) > 0:
-        log_location = log_path / f"CRF{submission_year}" \
-                       / f"{data_year}_unknown_categories_{today.strftime('%Y-%m-%d')}.csv"
+        if country_code is not None:
+            log_location = (
+                log_path
+                / f"CRF{submission_year}"
+                / f"{data_year}_unknown_categories_{country_code}"
+                  f"_{today.strftime('%Y-%m-%d')}.csv"
+            )
+        else:
+            log_location = (log_path / f"CRF{submission_year}"
+                            / f"{data_year}_unknown_categories_"
+                              f"{today.strftime('%Y-%m-%d')}.csv")
         print(f"Unknown rows found. Savin log to {log_location}")
         save_unknown_categories_info(unknown_categories, log_location)
 
     if len(last_row_info) > 0:
-        log_location = log_path / f"CRF{submission_year}" \
-                       / f"{data_year}_last_row_info_{today.strftime('%Y-%m-%d')}.csv"
+        if country_code is not None:
+            log_location = (
+               log_path
+               / f"CRF{submission_year}"
+               / f"{data_year}_last_row_info_{country_code}_"
+                 f"{today.strftime('%Y-%m-%d')}.csv"
+           )
+        else:
+            log_location = (log_path / f"CRF{submission_year}"
+                            / f"{data_year}_last_row_info_"
+                              f"{today.strftime('%Y-%m-%d')}.csv")
         print(f"Data found in the last row. Saving log to "
               f"{log_location}")
         save_last_row_info(last_row_info, log_location)
@@ -131,7 +203,11 @@ def read_year_to_test_specs(
     # save the data:
     compression = dict(zlib=True, complevel=9)
     output_folder = log_path / f"test_read_CRF{submission_year}"
-    output_filename = f"CRF{submission_year}_{today.strftime('%Y-%m-%d')}"
+    if country_code is not None:
+        output_filename = (f"CRF{submission_year}_{country_code}_"
+                           f"{today.strftime('%Y-%m-%d')}")
+    else:
+        output_filename = f"CRF{submission_year}_{today.strftime('%Y-%m-%d')}"
     if totest:
         output_filename = output_filename + "_totest"
 

+ 41 - 4
UNFCCC_GHG_data/UNFCCC_CRF_reader/UNFCCC_CRF_reader_prod.py

@@ -90,12 +90,23 @@ def read_crf_for_country(
     # get country name
     country_name = get_country_name(country_code)
 
-    # get specification and available tables
+
+    # get specification
+    # if we only have a single country check if we might have a country specific
+    # specification (currently only Australia, 2023)
     try:
-        crf_spec = getattr(crf, f"CRF{submission_year}")
-        #print(table_spec)
+        crf_spec = getattr(crf, f"CRF{submission_year}_{country_code}")
+        print(f"Using country specific specification: "
+              f"CRF{submission_year}_{country_code}")
     except:
-        raise ValueError(f"No terminology exists for submission year {submission_year}")
+        # no country specific specification, check for general specification
+        try:
+            crf_spec = getattr(crf, f"CRF{submission_year}")
+        except:
+            raise ValueError(
+                f"No terminology exists for submission year " f"{submission_year}"
+            )
+
 
     tables = [table for table in crf_spec.keys()
               if crf_spec[table]["status"] == "tested"]
@@ -146,6 +157,32 @@ def read_crf_for_country(
             # now convert to native PRIMAP2 format
             ds_table_pm2 = pm2.pm2io.from_interchange_format(ds_table_if)
 
+            # if individual data for emissions and removals / recovery exist combine
+            # them
+            if (('CO2 removals' in ds_table_pm2.data_vars) and
+                    ('CO2 emissions' in ds_table_pm2.data_vars) and not
+                    ('CO2' in ds_table_pm2.data_vars)):
+                # we can just sum to CO2 as we made sure that it doesn't exist.
+                # If we have CO2 and removals but not emissions, CO2 already has
+                # removals subtracted and we do nothing here
+                ds_table_pm2["CO2"] = ds_table_pm2[["CO2 emissions",
+                                                "CO2 removals"]].pr.sum(
+                    dim="entity", skipna=True, min_count=1
+                )
+                ds_table_pm2["CO2"].attrs["entity"] = "CO2"
+
+            if (('CH4 removals' in ds_table_pm2.data_vars) and
+                    ('CH4 emissions' in ds_table_pm2.data_vars) and not
+                    ('CH4' in ds_table_pm2.data_vars)):
+                # we can just sum to CH4 as we made sure that it doesn't exist.
+                # If we have CH4 and removals but not emissions, CH4 already has
+                # removals subtracted and we do nothing here 
+                ds_table_pm2["CH4"] = ds_table_pm2[["CH4 emissions",
+                                                "CH4 removals"]].pr.sum(
+                    dim="entity", skipna=True, min_count=1
+                )
+                ds_table_pm2["CH4"].attrs["entity"] = "CH4"
+
             # combine per table DS
             if ds_all is None:
                 ds_all = ds_table_pm2

+ 1722 - 0
UNFCCC_GHG_data/UNFCCC_CRF_reader/crf_specifications/CRF2023_AUS_specification.py

@@ -0,0 +1,1722 @@
+""" CRF2023 specification for Australia.
+Currently not all tables are included. Extend if you need all country
+specific items in categories 2, 3.H-G, 4
+
+tables included:
+* Energy
+    'Table1s1', Table1s2',
+    'Table1.A(a)s1', 'Table1.A(a)s2', 'Table1.A(a)s3', 'Table1.A(a)s4',
+    'Table1.B.1', 'Table1.B.2', 'Table1.C', 'Table1.D',
+* Industrial processes
+    'Table2(I)s1', 'Table2(I)s2',
+    'Table2(II)',
+* Agriculture
+    'Table3s1', 'Table3s2',
+    'Table3.C', 'Table3.D', 'Table3.E',
+* LULUCF
+    'Table4',
+* Waste
+    'Table5', 'Table5.A', 'Table5.B', 'Table5.C', 'Table5.D'
+* Summary Tables (for "Other" and to check for consistency)
+
+missing tables are:
+* Energy
+    'Table1.D'
+* Industrial processes
+    'Table2(I).A-Hs1', 'Table2(I).A-Hs2',
+    'Table2(II)B-Hs1', 'Table2(II)B-Hs2',
+* Agriculture
+    'Table3.As1', 'Table3.As2' (no additional emissions data)
+    'Table3.F', 'Table3.G-I',
+* LULUCF
+    All tables except Table4
+* Waste
+    All tables read
+
+TODO:
+* Add missing tables
+* Add activity data
+
+"""
+
+import numpy as np
+from .util import unit_info
+
+CRF2023_AUS = {
+    # Table1 instead of 1s1 and 1s2
+    "Table1": {
+        "status": "tested",
+        "table": {
+            "firstrow": 8,
+            "lastrow": 59,
+            "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["industry"],
+        },
+        "sector_mapping": [
+            ["Total Energy", ["1"]],
+            ["1.A. Fuel combustion activities (sectoral approach)", ["1.A"]],
+            ["1.A.1. Energy industries", ["1.A.1"]],
+            ["1.A.1.a. Public electricity and heat production", ["1.A.1.a"]],
+            ["1.A.1.b. Petroleum refining", ["1.A.1.b"]],
+            [
+                "1.A.1.c. Manufacture of solid fuels and other energy industries",
+                ["1.A.1.c"],
+            ],
+            ["1.A.2. Manufacturing industries and construction", ["1.A.2"]],
+            ["1.A.2.a. Iron and steel", ["1.A.2.a"]],
+            ["1.A.2.b. Non-ferrous metals", ["1.A.2.b"]],
+            ["1.A.2.c. Chemicals", ["1.A.2.c"]],
+            ["1.A.2.d. Pulp, paper and print", ["1.A.2.d"]],
+            ["1.A.2.e. Food processing, beverages and tobacco", ["1.A.2.e"]],
+            ["1.A.2.f. Non-metallic minerals", ["1.A.2.f"]],
+            ["1.A.2.g. Other", ["1.A.2.g"]],
+            ["1.A.3. Transport", ["1.A.3"]],
+            ["1.A.3.a. Domestic aviation", ["1.A.3.a"]],
+            ["1.A.3.b. Road transportation", ["1.A.3.b"]],
+            ["1.A.3.c. Railways", ["1.A.3.c"]],
+            ["1.A.3.d. Domestic navigation", ["1.A.3.d"]],
+            ["1.A.3.e. Other transportation", ["1.A.3.e"]],
+            ["1.A.4. Other sectors", ["1.A.4"]],
+            ["1.A.4.a. Commercial/institutional", ["1.A.4.a"]],
+            ["1.A.4.b. Residential", ["1.A.4.b"]],
+            ["1.A.4.c. Agriculture/forestry/fishing", ["1.A.4.c"]],
+            ["1.A.5. Other", ["1.A.5"]],
+            ["1.A.5.a. Stationary", ["1.A.5.a"]],
+            ["1.A.5.b. Mobile", ["1.A.5.b"]],
+            ["1.B. Fugitive emissions from fuels", ["1.B"]],
+            ["1.B.1. Solid fuels", ["1.B.1"]],
+            ["1.B.1.a. Coal mining and handling", ["1.B.1.a"]],
+            ["1.B.1.b. Fuel transformation", ["1.B.1.b"]],
+            ["1.B.1.c. Other", ["1.B.1.c"]],
+            [
+                "1.B.2. Oil and natural gas and other emissions from energy production",
+                ["1.B.2"],
+            ],
+            ["1.B.2.a. Oil", ["1.B.2.a"]],
+            ["1.B.2.b. Natural gas", ["1.B.2.b"]],
+            ["1.B.2.c. Venting and flaring", ["1.B.2.c"]],
+            ["1.B.2.d. Other", ["1.B.2.d"]],
+            ["1.C. CO2 Transport and storage", ["1.C"]],
+            ["1.C.1. Transport of CO2", ["1.C.1"]],
+            ["1.C.2. Injection and storage", ["1.C.2"]],
+            ["1.C.3. Other", ["1.C.3"]],
+            ["1.D. Memo items: (3)", ["\IGNORE"]],
+            ["1.D.1. International bunkers", ["M.Memo.Int"]],
+            ["1.D.1.a. Aviation", ["M.Memo.Int.Avi"]],
+            ["1.D.1.b.Navigation", ["M.Memo.Int.Mar"]],
+            ["1.D.2. Multilateral operations", ["M.Memo.Mult"]],
+            ["1.D.3. CO2 emissions from biomass", ["M.Memo.Bio"]],
+            ["1.D.4. CO2 captured", ["M.Memo.CO2Cap"]],
+            ["1.D.4.a. For domestic storage", ["M.Memo.CO2Cap.Dom"]],
+            ["1.D.4.b. For storage in other countries", ["M.Memo.CO2Cap.Exp"]],
+        ],
+        "entity_mapping": {
+            "NOX": "NOx",
+            "Total GHG emissions (1)": "KYOTOGHG (AR4GWP100)",
+        },
+        "coords_defaults": {
+            "class": "Total",
+        },
+    },  # tested
+    "Table1.A(a)s1": {
+        "status": "tested",
+        "table": {
+            "firstrow": 7,
+            "lastrow": 88,
+            "header": ["group", "entity", "unit"],
+            "col_for_categories": "GREENHOUSE GAS SOURCE AND SINK CATEGORIES",
+            "categories": ["category", "class"],
+            "cols_to_ignore": [
+                "AGGREGATE ACTIVITY DATA Consumption",
+                "AGGREGATE ACTIVITY DATA Consumption",
+                "IMPLIED EMISSION FACTORS CO2 (1)",
+                "IMPLIED EMISSION FACTORS CH4",
+                "IMPLIED EMISSION FACTORS N2O",
+                "AMOUNT CAPTURED (4) CO2",
+            ],
+            "stop_cats": ["", np.nan],
+            "unit_info": unit_info["default"],
+        },
+        "sector_mapping": [
+            ["1.A. Fuel combustion", ["1.A", "Total"], 0],
+            ["Liquid fuels", ["1.A", "Liquid"], 1],
+            ["Solid fuels", ["1.A", "Solid"], 1],
+            ["Gaseous fuels (6)", ["1.A", "Gaseous"], 1],
+            ["Other fossil fuels (7)", ["1.A", "OtherFF"], 1],
+            ["Peat (8)", ["1.A", "Peat"], 1],
+            ["Biomass (3)", ["1.A", "Biomass"], 1],
+            # 1.A.1. Energy industries
+            ["1.A.1. Energy industries", ["1.A.1", "Total"], 1],
+            ["Liquid fuels", ["1.A.1", "Liquid"], 2],
+            ["Solid fuels", ["1.A.1", "Solid"], 2],
+            ["Gaseous fuels (6)", ["1.A.1", "Gaseous"], 2],
+            ["Other fossil fuels (7)", ["1.A.1", "OtherFF"], 2],
+            ["Peat (8)", ["1.A.1", "Peat"], 2],
+            ["Biomass (3)", ["1.A.1", "Biomass"], 2],
+            # a. Public electricity and heat production
+            [
+                "1.A.1.a. Public electricity and heat production (9)",
+                ["1.A.1.a", "Total"],
+                2,
+            ],
+            ["Liquid fuels", ["1.A.1.a", "Liquid"], 3],
+            ["Solid fuels", ["1.A.1.a", "Solid"], 3],
+            ["Gaseous fuels (6)", ["1.A.1.a", "Gaseous"], 3],
+            ["Other fossil fuels (7)", ["1.A.1.a", "OtherFF"], 3],
+            ["Peat (8)", ["1.A.1.a", "Peat"], 3],
+            ["Biomass (3)", ["1.A.1.a", "Biomass"], 3],
+            ["Drop-down list:", ["\IGNORE", "\IGNORE"], 3],  # (empty)
+            # 1.A.1.a.i Electricity Generation
+            ["1.A.1.a.i. Electricity generation", ["1.A.1.a.i", "Total"], 3],
+            ["Liquid fuels", ["1.A.1.a.i", "Liquid"], 4],
+            ["Solid fuels", ["1.A.1.a.i", "Solid"], 4],
+            ["Gaseous fuels (6)", ["1.A.1.a.i", "Gaseous"], 4],
+            ["Other fossil fuels (7)", ["1.A.1.a.i", "OtherFF"], 4],
+            ["Peat (8)", ["1.A.1.a.i", "Peat"], 4],
+            ["Biomass (3)", ["1.A.1.a.i", "Biomass"], 4],
+            # 1.A.1.a.ii Combined heat and power generation
+            [
+                "1.A.1.a.ii. Combined heat and power generation",
+                ["1.A.1.a.ii", "Total"],
+                3,
+            ],
+            ["Liquid fuels", ["1.A.1.a.ii", "Liquid"], 4],
+            ["Solid fuels", ["1.A.1.a.ii", "Solid"], 4],
+            ["Gaseous fuels (6)", ["1.A.1.a.ii", "Gaseous"], 4],
+            ["Other fossil fuels (7)", ["1.A.1.a.ii", "OtherFF"], 4],
+            ["Peat (8)", ["1.A.1.a.ii", "Peat"], 4],
+            ["Biomass (3)", ["1.A.1.a.ii", "Biomass"], 4],
+            # 1.A.1.a.iii heat plants
+            ["1.A.1.a.iii. Heat plants", ["1.A.1.a.iii", "Total"], 3],
+            ["Liquid fuels", ["1.A.1.a.iii", "Liquid"], 4],
+            ["Solid fuels", ["1.A.1.a.iii", "Solid"], 4],
+            ["Gaseous fuels (6)", ["1.A.1.a.iii", "Gaseous"], 4],
+            ["Other fossil fuels (7)", ["1.A.1.a.iii", "OtherFF"], 4],
+            ["Peat (8)", ["1.A.1.a.iii", "Peat"], 4],
+            ["Biomass (3)", ["1.A.1.a.iii", "Biomass"], 4],
+            # b. Petroleum refining
+            ["1.A.1.b. Petroleum refining", ["1.A.1.b", "Total"], 2],
+            ["Liquid fuels", ["1.A.1.b", "Liquid"], 3],
+            ["Solid fuels", ["1.A.1.b", "Solid"], 3],
+            ["Gaseous fuels (6)", ["1.A.1.b", "Gaseous"], 3],
+            ["Other fossil fuels (7)", ["1.A.1.b", "OtherFF"], 3],
+            ["Peat (8)", ["1.A.1.b", "Peat"], 3],
+            ["Biomass (3)", ["1.A.1.b", "Biomass"], 3],
+            # c. Manufacture of solid fuels and other energy industries
+            [
+                "1.A.1.c. Manufacture of solid fuels and other energy industries (10)",
+                ["1.A.1.c", "Total"],
+                2,
+            ],
+            ["Liquid fuels", ["1.A.1.c", "Liquid"], 3],
+            ["Solid fuels", ["1.A.1.c", "Solid"], 3],
+            ["Gaseous fuels (6)", ["1.A.1.c", "Gaseous"], 3],
+            ["Other fossil fuels (7)", ["1.A.1.c", "OtherFF"], 3],
+            ["Peat (8)", ["1.A.1.c", "Peat"], 3],
+            ["Biomass (3)", ["1.A.1.c", "Biomass"], 3],
+            ["Drop-down list:", ["\IGNORE", "\IGNORE"], 3],  # (empty)
+            # 1.A.1.c.i Manufacture of solid fuels
+            ["1.A.1.c.i. Manufacture of solid fuels", ["1.A.1.c.i", "Total"], 3],
+            ["Liquid fuels", ["1.A.1.c.i", "Liquid"], 4],
+            ["Solid fuels", ["1.A.1.c.i", "Solid"], 4],
+            ["Gaseous fuels (6)", ["1.A.1.c.i", "Gaseous"], 4],
+            ["Other fossil fuels (7)", ["1.A.1.c.i", "OtherFF"], 4],
+            ["Peat (8)", ["1.A.1.c.i", "Peat"], 4],
+            ["Biomass (3)", ["1.A.1.c.i", "Biomass"], 4],
+            # 1.A.1.c.ii Oil and gas extraction
+            ["1.A.1.c.ii. Oil and gas extraction", ["1.A.1.c.ii", "Total"], 3],
+            ["Liquid fuels", ["1.A.1.c.ii", "Liquid"], 4],
+            ["Solid fuels", ["1.A.1.c.ii", "Solid"], 4],
+            ["Gaseous fuels (6)", ["1.A.1.c.ii", "Gaseous"], 4],
+            ["Other fossil fuels (7)", ["1.A.1.c.ii", "OtherFF"], 4],
+            ["Peat (8)", ["1.A.1.c.ii", "Peat"], 4],
+            ["Biomass (3)", ["1.A.1.c.ii", "Biomass"], 4],
+            # 1.A.1.c.iii Other energy industries
+            ["1.A.1.c.iii. Other energy industries", ["1.A.1.c.iii", "Total"], 3],
+            ["Liquid fuels", ["1.A.1.c.iii", "Liquid"], 4],
+            ["Solid fuels", ["1.A.1.c.iii", "Solid"], 4],
+            ["Gaseous fuels (6)", ["1.A.1.c.iii", "Gaseous"], 4],
+            ["Other fossil fuels (7)", ["1.A.1.c.iii", "OtherFF"], 4],
+            ["Peat (8)", ["1.A.1.c.iii", "Peat"], 4],
+            ["Biomass (3)", ["1.A.1.c.iii", "Biomass"], 4],
+        ],
+        "entity_mapping": {
+            "EMISSIONS CH4": "CH4",
+            "EMISSIONS CO2 (2,3)": "CO2",
+            "EMISSIONS N2O": "N2O",
+        },
+    },  # tested
+    "Table1.A(a)s2": {
+        "status": "tested",
+        "table": {
+            "firstrow": 7,
+            "lastrow": 119,
+            "header": ["group", "entity", "unit"],
+            "col_for_categories": "GREENHOUSE GAS SOURCE AND SINK CATEGORIES",
+            "categories": ["category", "class"],
+            "cols_to_ignore": [
+                "AGGREGATE ACTIVITY DATA Consumption",
+                "AGGREGATE ACTIVITY DATA Consumption",
+                "IMPLIED EMISSION FACTORS CO2 (1)",
+                "IMPLIED EMISSION FACTORS CH4",
+                "IMPLIED EMISSION FACTORS N2O",
+                "AMOUNT CAPTURED (4) CO2",
+            ],
+            "stop_cats": ["", np.nan],
+            "unit_info": unit_info["default"],
+        },
+        "sector_mapping": [
+            ["1.A.2 Manufacturing industries and construction", ["1.A.2", "Total"], 0],
+            ["Liquid fuels", ["1.A.2", "Liquid"], 1],
+            ["Solid fuels", ["1.A.2", "Solid"], 1],
+            ["Gaseous fuels (6)", ["1.A.2", "Gaseous"], 1],
+            ["Other fossil fuels (7)", ["1.A.2", "OtherFF"], 1],
+            ["Peat (8)", ["1.A.2", "Peat"], 1],
+            ["Biomass (3)", ["1.A.2", "Biomass"], 1],
+            # a. Iron and Steel
+            ["1.A.2.a. Iron and steel", ["1.A.2.a", "Total"], 1],
+            ["Liquid fuels", ["1.A.2.a", "Liquid"], 2],
+            ["Solid fuels", ["1.A.2.a", "Solid"], 2],
+            ["Gaseous fuels (6)", ["1.A.2.a", "Gaseous"], 2],
+            ["Other fossil fuels (7)", ["1.A.2.a", "OtherFF"], 2],
+            ["Peat (8)", ["1.A.2.a", "Peat"], 2],
+            ["Biomass (3)", ["1.A.2.a", "Biomass"], 2],
+            # b. non-ferrous metals
+            ["1.A.2.b. Non-ferrous metals", ["1.A.2.b", "Total"], 1],
+            ["Liquid fuels", ["1.A.2.b", "Liquid"], 2],
+            ["Solid fuels", ["1.A.2.b", "Solid"], 2],
+            ["Gaseous fuels (6)", ["1.A.2.b", "Gaseous"], 2],
+            ["Other fossil fuels (7)", ["1.A.2.b", "OtherFF"], 2],
+            ["Peat (8)", ["1.A.2.b", "Peat"], 2],
+            ["Biomass (3)", ["1.A.2.b", "Biomass"], 2],
+            # c. Chemicals
+            ["1.A.2.c. Chemicals", ["1.A.2.c", "Total"], 1],
+            ["Liquid fuels", ["1.A.2.c", "Liquid"], 2],
+            ["Solid fuels", ["1.A.2.c", "Solid"], 2],
+            ["Gaseous fuels (6)", ["1.A.2.c", "Gaseous"], 2],
+            ["Other fossil fuels (7)", ["1.A.2.c", "OtherFF"], 2],
+            ["Peat (8)", ["1.A.2.c", "Peat"], 2],
+            ["Biomass (3)", ["1.A.2.c", "Biomass"], 2],
+            # d. Pulp paper print
+            ["1.A.2.d. Pulp, paper and print", ["1.A.2.d", "Total"], 1],
+            ["Liquid fuels", ["1.A.2.d", "Liquid"], 2],
+            ["Solid fuels", ["1.A.2.d", "Solid"], 2],
+            ["Gaseous fuels (6)", ["1.A.2.d", "Gaseous"], 2],
+            ["Other fossil fuels (7)", ["1.A.2.d", "OtherFF"], 2],
+            ["Peat (8)", ["1.A.2.d", "Peat"], 2],
+            ["Biomass (3)", ["1.A.2.d", "Biomass"], 2],
+            # e. Food processing, beverages and tobacco
+            [
+                "1.A.2.e. Food processing, beverages and tobacco",
+                ["1.A.2.e", "Total"],
+                1,
+            ],
+            ["Liquid fuels", ["1.A.2.e", "Liquid"], 2],
+            ["Solid fuels", ["1.A.2.e", "Solid"], 2],
+            ["Gaseous fuels (6)", ["1.A.2.e", "Gaseous"], 2],
+            ["Other fossil fuels (7)", ["1.A.2.e", "OtherFF"], 2],
+            ["Peat (8)", ["1.A.2.e", "Peat"], 2],
+            ["Biomass (3)", ["1.A.2.e", "Biomass"], 2],
+            # f. non-metallic minerals
+            ["1.A.2.f. Non-metallic minerals", ["1.A.2.f", "Total"], 1],
+            ["Liquid fuels", ["1.A.2.f", "Liquid"], 2],
+            ["Solid fuels", ["1.A.2.f", "Solid"], 2],
+            ["Gaseous fuels (6)", ["1.A.2.f", "Gaseous"], 2],
+            ["Other fossil fuels (7)", ["1.A.2.f", "OtherFF"], 2],
+            ["Peat (8)", ["1.A.2.f", "Peat"], 2],
+            ["Biomass (3)", ["1.A.2.f", "Biomass"], 2],
+            # g. other
+            ["1.A.2.g. Other (please specify) (11)", ["1.A.2.g", "Total"], 1],
+            ["Dropdown list", ["\IGNORE", "\IGNORE"], 2],
+            # 1.A.2.g.i Manufacturing of machinery
+            ["1.A.2.g.i. Manufacturing of machinery", ["1.A.2.g.i", "Total"], 2],
+            ["Liquid fuels", ["1.A.2.g.i", "Liquid"], 3],
+            ["Solid fuels", ["1.A.2.g.i", "Solid"], 3],
+            ["Gaseous fuels (6)", ["1.A.2.g.i", "Gaseous"], 3],
+            ["Other fossil fuels (7)", ["1.A.2.g.i", "OtherFF"], 3],
+            ["Peat (8)", ["1.A.2.g.i", "Peat"], 3],
+            ["Biomass (3)", ["1.A.2.g.i", "Biomass"], 3],
+            # 1.A.2.g.ii Manufacturing of transport equipment
+            [
+                "1.A.2.g.ii. Manufacturing of transport equipment",
+                ["1.A.2.g.ii", "Total"],
+                2,
+            ],
+            ["Liquid fuels", ["1.A.2.g.ii", "Liquid"], 3],
+            ["Solid fuels", ["1.A.2.g.ii", "Solid"], 3],
+            ["Gaseous fuels (6)", ["1.A.2.g.ii", "Gaseous"], 3],
+            ["Other fossil fuels (7)", ["1.A.2.g.ii", "OtherFF"], 3],
+            ["Peat (8)", ["1.A.2.g.ii", "Peat"], 3],
+            ["Biomass (3)", ["1.A.2.g.ii", "Biomass"], 3],
+            # 1.A.2.g.iii Mining (excluding fuels) and quarrying
+            [
+                "1.A.2.g.iii. Mining (excluding fuels) and quarrying",
+                ["1.A.2.g.iii", "Total"],
+                2,
+            ],
+            ["Liquid fuels", ["1.A.2.g.iii", "Liquid"], 3],
+            ["Solid fuels", ["1.A.2.g.iii", "Solid"], 3],
+            ["Gaseous fuels (6)", ["1.A.2.g.iii", "Gaseous"], 3],
+            ["Other fossil fuels (7)", ["1.A.2.g.iii", "OtherFF"], 3],
+            ["Peat (8)", ["1.A.2.g.iii", "Peat"], 3],
+            ["Biomass (3)", ["1.A.2.g.iii", "Biomass"], 3],
+            # 1.A.2.g.iv Wood and wood products
+            ["1.A.2.g.iv. Wood and wood products", ["1.A.2.g.iv", "Total"], 2],
+            ["Liquid fuels", ["1.A.2.g.iv", "Liquid"], 3],
+            ["Solid Fuels", ["1.A.2.g.iv", "Solid"], 3],
+            ["Gaseous fuels (6)", ["1.A.2.g.iv", "Gaseous"], 3],
+            ["Other fossil fuels (7)", ["1.A.2.g.iv", "OtherFF"], 3],
+            ["Peat (8)", ["1.A.2.g.iv", "Peat"], 3],
+            ["Biomass (3)", ["1.A.2.g.iv", "Biomass"], 3],
+            # 1.A.2.g.v Construction
+            ["1.A.2.g.v. Construction", ["1.A.2.g.v", "Total"], 2],
+            ["Liquid fuels", ["1.A.2.g.v", "Liquid"], 3],
+            ["Solid fuels", ["1.A.2.g.v", "Solid"], 3],
+            ["Gaseous fuels (6)", ["1.A.2.g.v", "Gaseous"], 3],
+            ["Other fossil fuels (7)", ["1.A.2.g.v", "OtherFF"], 3],
+            ["Peat (8)", ["1.A.2.g.v", "Peat"], 3],
+            ["Biomass (3)", ["1.A.2.g.v", "Biomass"], 3],
+            # 1.A.2.g.vi Textile and leather
+            ["1.A.2.g.vi. Textile and leather", ["1.A.2.g.vi", "Total"], 2],
+            ["Liquid fuels", ["1.A.2.g.vi", "Liquid"], 3],
+            ["Solid fuels", ["1.A.2.g.vi", "Solid"], 3],
+            ["Gaseous fuels (6)", ["1.A.2.g.vi", "Gaseous"], 3],
+            ["Other fossil fuels (7)", ["1.A.2.g.vi", "OtherFF"], 3],
+            ["Peat (8)", ["1.A.2.g.vi", "Peat"], 3],
+            ["Biomass (3)", ["1.A.2.g.vi", "Biomass"], 3],
+            # 1.A.2.g.vii Off-road vehicles and other machinery
+            [
+                "1.A.2.g.vii. Off-road vehicles and other machinery",
+                ["1.A.2.g.vii", "Total"],
+                2,
+            ],
+            ["Gasoline", ["1.A.2.g.vii", "Gasoline"], 3],
+            ["Diesel oil", ["1.A.2.g.vii", "DieselOil"], 3],
+            ["Liquefied petroleum gases (LPG)", ["1.A.2.g.vii", "LPG"], 3],
+            ["Other liquid fuels (please specify)", ["1.A.2.g.vii", "OtherLiquid"], 3],
+            ["NA", ["\IGNORE", "\IGNORE"], 3],
+            ["Gaseous fuels (6)", ["1.A.2.g.vii", "Gaseous"], 3],
+            ["Other fossil fuels (7)", ["1.A.2.g.vii", "OtherFF"], 3],
+            ["Biomass (3)", ["1.A.2.g.vii", "Biomass"], 3],
+            # 1.A.2.g.viii Other (please specify)
+            ["1.A.2.g.viii. Other (please specify)", ["1.A.2.g.viii", "Total"], 2],
+            ["All Other Manufacturing", ["1.A.2.g.viii.3", "Total"], 3],
+            ["Liquid fuels", ["1.A.2.g.viii.3", "Liquid"], 4],
+            ["Solid fuels", ["1.A.2.g.viii.3", "Solid"], 4],
+            ["Gaseous fuels (6)", ["1.A.2.g.viii.3", "Gaseous"], 4],
+            ["Other fossil fuels (7)", ["1.A.2.g.viii.3", "OtherFF"], 4],
+            ["Peat (8)", ["1.A.2.g.viii.3", "Peat"], 4],
+            ["Biomass (3)", ["1.A.2.g.viii.3", "Biomass"], 4],
+        ],
+        "entity_mapping": {
+            "EMISSIONS CH4": "CH4",
+            "EMISSIONS CO2 (2,3)": "CO2",
+            "EMISSIONS N2O": "N2O",
+        },
+    },  # tested
+    "Table1.A(a)s3": {
+        "status": "tested",
+        "table": {
+            "firstrow": 7,
+            "lastrow": 121,
+            "header": ["group", "entity", "unit"],
+            "col_for_categories": "GREENHOUSE GAS SOURCE AND SINK CATEGORIES",
+            "categories": ["category", "class"],
+            "cols_to_ignore": [
+                "AGGREGATE ACTIVITY DATA Consumption",
+                "AGGREGATE ACTIVITY DATA Consumption",
+                "IMPLIED EMISSION FACTORS CO2 (1)",
+                "IMPLIED EMISSION FACTORS CH4",
+                "IMPLIED EMISSION FACTORS N2O",
+            ],
+            "stop_cats": ["", np.nan],
+            "unit_info": unit_info["default"],
+        },
+        "sector_mapping": [
+            ["1.A.3 Transport", ["1.A.3", "Total"], 0],
+            ["Liquid fuels", ["1.A.3", "Liquid"], 1],
+            ["Solid fuels", ["1.A.3", "Solid"], 1],
+            ["Gaseous fuels (6)", ["1.A.3", "Gaseous"], 1],
+            ["Other fossil fuels (7)", ["1.A.3", "OtherFF"], 1],
+            ["Biomass (3)", ["1.A.3", "Biomass"], 1],
+            # a. Domestic Aviation
+            ["1.A.3.a. Domestic aviation (12)", ["1.A.3.a", "Total"], 1],
+            ["Aviation gasoline", ["1.A.3.a", "AvGasoline"], 2],
+            ["Jet kerosene", ["1.A.3.a", "JetKerosene"], 2],
+            ["Biomass", ["1.A.3.a", "Biomass"], 2],
+            # b. road Transportation
+            ["1.A.3.b. Road transportation (13)", ["1.A.3.b", "Total"], 1],
+            ["Gasoline", ["1.A.3.b", "Gasoline"], 2],
+            ["Diesel oil", ["1.A.3.b", "DieselOil"], 2],
+            ["Liquefied petroleum gases (LPG)", ["1.A.3.b", "LPG"], 2],
+            ["Other liquid fuels (please specify)", ["1.A.3.b", "OtherLiquid"], 2],
+            ["NA", ["\IGNORE", "\IGNORE"], 3],
+            ["Gaseous fuels (6)", ["1.A.3.b", "Gaseous"], 2],
+            ["Biomass (3)", ["1.A.3.b", "Biomass"], 2],
+            ["Other fossil fuels (please specify) (7)", ["1.A.3.b", "OtherFF"], 2],
+            ["Lubricants", ["1.A.3.b", "OFFLubricants"], 3],
+            # i. Cars
+            ["1.A.3.b.i. Cars", ["1.A.3.b.i", "Total"], 2],
+            ["Gasoline", ["1.A.3.b.i", "Gasoline"], 3],
+            ["Diesel oil", ["1.A.3.b.i", "DieselOil"], 3],
+            ["Liquefied petroleum gases (LPG)", ["1.A.3.b.i", "LPG"], 3],
+            ["Other liquid fuels (please specify)", ["1.A.3.b.i", "OtherLiquid"], 3],
+            ["NA", ["\IGNORE", "\IGNORE"], 4],
+            ["Gaseous fuels (6)", ["1.A.3.b.i", "Gaseous"], 3],
+            ["Biomass (3)", ["1.A.3.b.i", "Biomass"], 3],
+            ["Other fossil fuels (please specify)(7)", ["1.A.3.b.i", "OtherFF"], 3],
+            ["Lubricants", ["1.A.3.b.i", "OFFLubricants"], 4],
+            # ii. Light duty trucks
+            ["1.A.3.b.ii. Light duty trucks", ["1.A.3.b.ii", "Total"], 2],
+            ["Gasoline", ["1.A.3.b.ii", "Gasoline"], 3],
+            ["Diesel oil", ["1.A.3.b.ii", "DieselOil"], 3],
+            ["Liquefied petroleum gases (LPG)", ["1.A.3.b.ii", "LPG"], 3],
+            ["Other liquid fuels (please specify)", ["1.A.3.b.ii", "OtherLiquid"], 3],
+            ["NA", ["\IGNORE", "\IGNORE"], 4],
+            ["Gaseous fuels (6)", ["1.A.3.b.ii", "Gaseous"], 3],
+            ["Biomass (3)", ["1.A.3.b.ii", "Biomass"], 3],
+            ["Other fossil fuels (please specify)(7)", ["1.A.3.b.ii", "OtherFF"], 3],
+            ["Lubricants", ["1.A.3.b.ii", "OFFLubricants"], 4],
+            # iii. Heavy duty trucks and buses
+            ["1.A.3.b.iii. Heavy duty trucks and buses", ["1.A.3.b.iii", "Total"], 2],
+            ["Gasoline", ["1.A.3.b.iii", "Gasoline"], 3],
+            ["Diesel oil", ["1.A.3.b.iii", "DieselOil"], 3],
+            ["Liquefied petroleum gases (LPG)", ["1.A.3.b.iii", "LPG"], 3],
+            ["Other liquid fuels (please specify)", ["1.A.3.b.iii", "OtherLiquid"], 3],
+            ["NA", ["\IGNORE", "\IGNORE"], 4],
+            ["Gaseous fuels (6)", ["1.A.3.b.iii", "Gaseous"], 3],
+            ["Biomass (3)", ["1.A.3.b.iii", "Biomass"], 3],
+            ["Other fossil fuels (please specify)(7)", ["1.A.3.b.iii", "OtherFF"], 3],
+            ["Lubricants", ["1.A.3.b.iii", "OFFLubricants"], 4],
+            # iv. Motorcycles
+            ["1.A.3.b.iv. Motorcycles", ["1.A.3.b.iv", "Total"], 2],
+            ["Gasoline", ["1.A.3.b.iv", "Gasoline"], 3],
+            ["Diesel oil", ["1.A.3.b.iv", "DieselOil"], 3],
+            ["Liquefied petroleum gases (LPG)", ["1.A.3.b.iv", "LPG"], 3],
+            ["Other liquid fuels (please specify)", ["1.A.3.b.iv", "OtherLiquid"], 3],
+            ["NA", ["\IGNORE", "\IGNORE"], 4],
+            ["Gaseous fuels (6)", ["1.A.3.b.iv", "Gaseous"], 3],
+            ["Biomass (3)", ["1.A.3.b.iv", "Biomass"], 3],
+            ["Other fossil fuels (please specify)(7)", ["1.A.3.b.iv", "OtherFF"], 3],
+            ["Lubricants", ["1.A.3.b.iv", "OFFLubricants"], 4],
+            # v. Other
+            ["1.A.3.b.v. Other (please specify)", ["1.A.3.b.v", "Total"], 2],
+            ["NA", ["\IGNORE", "\IGNORE"], 3],
+            ["Gasoline", ["1.A.3.b.v", "Gasoline"], 4],
+            ["Diesel oil", ["1.A.3.b.v", "DieselOil"], 4],
+            ["Liquefied petroleum gases (LPG)", ["1.A.3.b.v", "LPG"], 4],
+            ["Other liquid fuels (please specify)", ["1.A.3.b.v", "OtherLiquid"], 4],
+            ["NA", ["\IGNORE", "\IGNORE"], 5],
+            ["Gaseous fuels (6)", ["1.A.3.b.v", "Gaseous"], 4],
+            ["Biomass (3)", ["1.A.3.b.v", "Biomass"], 4],
+            ["Other fossil fuels (please specify)(7)", ["1.A.3.b.v", "OtherFF"], 4],
+            ["Lubricants", ["1.A.3.b.v", "OFFLubricants"], 5],
+            # c. Railways
+            ["1.A.3.c. Railways", ["1.A.3.c", "Total"], 1],
+            ["Liquid fuels", ["1.A.3.c", "Liquid"], 2],
+            ["Solid fuels", ["1.A.3.c", "Solid"], 2],
+            ["Gaseous fuels (6)", ["1.A.3.c", "Gaseous"], 2],
+            ["Biomass (3)", ["1.A.3.c", "Biomass"], 2],
+            ["Other fossil fuels (please specify)(7)", ["1.A.3.c", "OtherFF"], 2],
+            ["Lubricants", ["1.A.3.c", "OFFLubricants"], 3],
+            # d. Domestic navigation
+            ["1.A.3.d. Domestic Navigation (12)", ["1.A.3.d", "Total"], 1],
+            ["Residual fuel oil", ["1.A.3.d", "ResFuelOil"], 2],
+            ["Gas/diesel oil", ["1.A.3.d", "GasDieselOil"], 2],
+            ["Gasoline", ["1.A.3.d", "Gasoline"], 2],
+            ["Other liquid fuels (please specify)", ["1.A.3.d", "OtherLiquid"], 2],
+            ["NA", ["\IGNORE", "\IGNORE"], 3],
+            ["Gaseous fuels (6)", ["1.A.3.d", "Gaseous"], 2],
+            ["Biomass (3)", ["1.A.3.d", "Biomass"], 2],
+            ["Other fossil fuels (please specify)(7)", ["1.A.3.d", "OtherFF"], 2],
+            ["Coal", ["1.A.3.d", "OFFCoal"], 3],
+            ["Lubricants", ["1.A.3.d", "OFFLubricants"], 3],
+            # e. other transportation
+            # keep details also for top category as it's present
+            ["1.A.3.e. Other transportation (please specify)", ["1.A.3.e", "Total"], 1],
+            ["Liquid fuels", ["1.A.3.e", "Liquid"], 2],
+            ["Solid fuels", ["1.A.3.e", "Solid"], 2],
+            ["Gaseous fuels (6)", ["1.A.3.e", "Gaseous"], 2],
+            ["Other fossil fuels (7)", ["1.A.3.e", "OtherFF"], 2],
+            ["Biomass (3)", ["1.A.3.e", "Biomass"], 2],
+            # i. pipeline
+            ["1.A.3.e.i. Pipeline transport", ["1.A.3.e.i", "Total"], 2],
+            ["Liquid fuels", ["1.A.3.e.i", "Liquid"], 3],
+            ["Solid fuels", ["1.A.3.e.i", "Solid"], 3],
+            ["Gaseous fuels (6)", ["1.A.3.e.i", "Gaseous"], 3],
+            ["Other fossil fuels (7)", ["1.A.3.e.i", "OtherFF"], 3],
+            ["Biomass (3)", ["1.A.3.e.i", "Biomass"], 3],
+            # ii other
+            ["1.A.3.e.ii. Other (please specify)", ["1.A.3.e.ii", "Total"], 2],
+            ["Off-road vehicles", ["1.A.3.e.ii.1", "Total"], 3],
+            ["Gasoline", ["1.A.3.e.ii.1", "Gasoline"], 4],
+            ["Diesel oil", ["1.A.3.e.ii.1", "DieselOil"], 4],
+            ["Liquefied petroleum gases (LPG)", ["1.A.3.e.ii.1", "LPG"], 4],
+            ["Other liquid fuels (please specify)", ["1.A.3.e.ii.1", "OtherLiquid"], 4],
+            ["NA", ["\IGNORE", "\IGNORE"], 5],
+            ["Solid fuels", ["1.A.3.e.ii.1", "Solid"], 4],
+            ["Gaseous fuels (6)", ["1.A.3.e.ii.1", "Gaseous"], 4],
+            ["Biomass (3)", ["1.A.3.e.ii.1", "Biomass"], 4],
+            ["Other fossil fuels (7)", ["1.A.3.e.ii.1", "OtherFF"], 4],
+            ["Biomass (3)", ["1.A.3.e.ii.1", "Biomass"], 4],
+        ],
+        "entity_mapping": {
+            "EMISSIONS CH4": "CH4",
+            "EMISSIONS CO2 (2,3)": "CO2",
+            "EMISSIONS N2O": "N2O",
+        },
+    },  # tested
+    "Table1.A(a)s4": {
+        "status": "tested",
+        "table": {
+            "firstrow": 7,
+            "lastrow": 118,
+            "header": ["group", "entity", "unit"],
+            "col_for_categories": "GREENHOUSE GAS SOURCE AND SINK CATEGORIES",
+            "categories": ["category", "class"],
+            "cols_to_ignore": [
+                "AGGREGATE ACTIVITY DATA Consumption",
+                "AGGREGATE ACTIVITY DATA Consumption",
+                "IMPLIED EMISSION FACTORS CO2 (1)",
+                "IMPLIED EMISSION FACTORS CH4",
+                "IMPLIED EMISSION FACTORS N2O",
+                "AMOUNT CAPTURED (4) CO2",
+            ],
+            "stop_cats": ["", np.nan],
+            "unit_info": unit_info["default"],
+        },
+        "sector_mapping": [
+            ["1.A.4 Other sectors", ["1.A.4", "Total"], 0],
+            ["Liquid fuels", ["1.A.4", "Liquid"], 1],
+            ["Solid fuels", ["1.A.4", "Solid"], 1],
+            ["Gaseous fuels (6)", ["1.A.4", "Gaseous"], 1],
+            ["Other fossil fuels (7)", ["1.A.4", "OtherFF"], 1],
+            ["Peat (8)", ["1.A.4", "Peat"], 1],
+            ["Biomass(3)", ["1.A.4", "Biomass"], 1],
+            # a. Commercial/institutional(12)
+            ["1.A.4.a. Commercial/institutional (14)", ["1.A.4.a", "Total"], 1],
+            ["Liquid fuels", ["1.A.4.a", "Liquid"], 2],
+            ["Solid fuels", ["1.A.4.a", "Solid"], 2],
+            ["Gaseous fuels (6)", ["1.A.4.a", "Gaseous"], 2],
+            ["Other fossil fuels (7)", ["1.A.4.a", "OtherFF"], 2],
+            ["Peat (8)", ["1.A.4.a", "Peat"], 2],
+            ["Biomass (3)", ["1.A.4.a", "Biomass"], 2],
+            ["Drop-down list:", ["\IGNORE", "\IGNORE"], 2],  # (empty)
+            # 1.A.4.a.i Stationary combustion
+            ["1.A.4.a.i. Stationary combustion", ["1.A.4.a.i", "Total"], 2],
+            ["Liquid fuels", ["1.A.4.a.i", "Liquid"], 3],
+            ["Solid fuels", ["1.A.4.a.i", "Solid"], 3],
+            ["Gaseous fuels (6)", ["1.A.4.a.i", "Gaseous"], 3],
+            ["Other fossil fuels (7)", ["1.A.4.a.i", "OtherFF"], 3],
+            ["Peat (8)", ["1.A.4.a.i", "Peat"], 3],
+            ["Biomass (3)", ["1.A.4.a.i", "Biomass"], 3],
+            # 1.A.4.a.ii Off-road vehicles and other machinery
+            [
+                "1.A.4.a.ii. Off-road vehicles and other machinery",
+                ["1.A.4.a.ii", "Total"],
+                2,
+            ],
+            ["Liquid fuels", ["1.A.4.a.ii", "Liquid"], 3],
+            ["Solid fuels", ["1.A.4.a.ii", "Solid"], 3],
+            ["Gaseous fuels (6)", ["1.A.4.a.ii", "Gaseous"], 3],
+            ["Other fossil fuels (7)", ["1.A.4.a.ii", "OtherFF"], 3],
+            ["Biomass (3)", ["1.A.4.a.ii", "Biomass"], 3],
+            # b. Residential(13)
+            ["1.A.4.b. Residential (14)", ["1.A.4.b", "Total"], 1],
+            ["Liquid fuels", ["1.A.4.b", "Liquid"], 2],
+            ["Solid fuels", ["1.A.4.b", "Solid"], 2],
+            ["Gaseous fuels (6)", ["1.A.4.b", "Gaseous"], 2],
+            ["Other fossil fuels (7)", ["1.A.4.b", "OtherFF"], 2],
+            ["Peat (8)", ["1.A.4.b", "Peat"], 2],
+            ["Biomass (3)", ["1.A.4.b", "Biomass"], 2],
+            ["Drop-down list:", ["\IGNORE", "\IGNORE"], 2],  # (empty)
+            # 1.A.4.b.i Stationary combustion
+            ["1.A.4.b.i. Stationary combustion", ["1.A.4.b.i", "Total"], 2],
+            ["Liquid fuels", ["1.A.4.b.i", "Liquid"], 3],
+            ["Solid fuels", ["1.A.4.b.i", "Solid"], 3],
+            ["Gaseous fuels (6)", ["1.A.4.b.i", "Gaseous"], 3],
+            ["Other fossil fuels (7)", ["1.A.4.b.i", "OtherFF"], 3],
+            ["Peat (8)", ["1.A.4.b.i", "Peat"], 3],
+            ["Biomass (3)", ["1.A.4.b.i", "Biomass"], 3],
+            # 1.A.4.b.ii Off-road vehicles and other machinery
+            [
+                "1.A.4.b.ii. Off-road vehicles and other machinery",
+                ["1.A.4.b.ii", "Total"],
+                2,
+            ],
+            ["Liquid fuels", ["1.A.4.b.ii", "Liquid"], 3],
+            ["Solid fuels", ["1.A.4.b.ii", "Solid"], 3],
+            ["Gaseous fuels (6)", ["1.A.4.b.ii", "Gaseous"], 3],
+            ["Other fossil fuels (7)", ["1.A.4.b.ii", "OtherFF"], 3],
+            ["Peat (8)", ["1.A.4.b.ii", "Peat"], 3],
+            ["Biomass (3)", ["1.A.4.b.ii", "Biomass"], 3],
+            # c. Agriculture/forestry/fishing
+            ["1.A.4.c. Agriculture/forestry/fishing", ["1.A.4.c", "Total"], 1],
+            ["Liquid fuels", ["1.A.4.c", "Liquid"], 2],
+            ["Solid fuels", ["1.A.4.c", "Solid"], 2],
+            ["Gaseous fuels (6)", ["1.A.4.c", "Gaseous"], 2],
+            ["Other fossil fuels (7)", ["1.A.4.c", "OtherFF"], 2],
+            ["Peat (8)", ["1.A.4.c", "Peat"], 2],
+            ["Biomass (3)", ["1.A.4.c", "Biomass"], 2],
+            # i. Stationary
+            ["1.A.4.c.i. Stationary", ["1.A.4.c.i", "Total"], 2],
+            ["Liquid fuels", ["1.A.4.c.i", "Liquid"], 3],
+            ["Solid fuels", ["1.A.4.c.i", "Solid"], 3],
+            ["Gaseous fuels (6)", ["1.A.4.c.i", "Gaseous"], 3],
+            ["Other fossil fuels (7)", ["1.A.4.c.i", "OtherFF"], 3],
+            ["Peat (8)", ["1.A.4.c.i", "Peat"], 3],
+            ["Biomass (3)", ["1.A.4.c.i", "Biomass"], 3],
+            # ii. Off-road vehicles and other machinery
+            [
+                "1.A.4.c.ii. Off-road vehicles and other machinery",
+                ["1.A.4.c.ii", "Total"],
+                2,
+            ],
+            ["Gasoline", ["1.A.4.c.ii", "Gasoline"], 3],
+            ["Diesel oil", ["1.A.4.c.ii", "DieselOil"], 3],
+            ["Liquefied petroleum gases (LPG)", ["1.A.4.c.ii", "LPG"], 3],
+            ["Other liquid fuels (please specify)", ["1.A.4.c.ii", "OtherLiquid"], 3],
+            ["NA", ["\IGNORE", "\IGNORE"], 4],
+            ["Gaseous fuels (6)", ["1.A.4.c.ii", "Gaseous"], 3],
+            ["Biomass (3)", ["1.A.4.c.ii", "Biomass"], 3],
+            ["Other fossil fuels (please specify)(7)", ["1.A.4.c.ii", "OtherFF"], 3],
+            ["NA", ["\IGNORE", "\IGNORE"], 4],
+            # iii. Fishing
+            ["1.A.4.c.iii. Fishing", ["1.A.4.c.iii", "Total"], 2],
+            ["Residual fuel oil", ["1.A.4.c.iii", "ResFuelOil"], 3],
+            ["Gas/diesel oil", ["1.A.4.c.iii", "GasDieselOil"], 3],
+            ["Gasoline", ["1.A.4.c.iii", "Gasoline"], 3],
+            ["Other liquid fuels (please specify)", ["1.A.4.c.iii", "OtherLiquid"], 3],
+            ["NA", ["\IGNORE", "\IGNORE"], 4],
+            ["Gaseous fuels (6)", ["1.A.4.c.iii", "Gaseous"], 3],
+            ["Biomass(3)", ["1.A.4.c.iii", "Biomass"], 3],
+            ["Other fossil fuels (please specify)(7)", ["1.A.4.c.iii", "OtherFF"], 3],
+            ["NA", ["\IGNORE", "\IGNORE"], 4],
+            # 1.A.5 Other (Not specified elsewhere)(14)
+            ["1.A.5 Other (Not specified elsewhere)(15)", ["1.A.5", "Total"], 0],
+            ["Liquid fuels", ["1.A.5", "Liquid"], 1],
+            ["Solid fuels", ["1.A.5", "Solid"], 1],
+            ["Gaseous fuels (6)", ["1.A.5", "Gaseous"], 1],
+            ["Other fossil fuels(7)", ["1.A.5", "OtherFF"], 1],
+            ["Peat (8)", ["1.A.5", "Peat"], 1],
+            ["Biomass (3)", ["1.A.5", "Biomass"], 1],
+            # a. Stationary (please specify)
+            ["1.A.5.a. Stationary (please specify)", ["1.A.5.a", "Total"], 1],
+            ["NA", ["\IGNORE", "\IGNORE"], 2],
+            ["Liquid fuels", ["1.A.5.a", "Liquid"], 2],
+            ["Solid fuels", ["1.A.5.a", "Solid"], 2],
+            ["Gaseous fuels (6)", ["1.A.5.a", "Gaseous"], 2],
+            ["Other fossil fuels(7)", ["1.A.5.a", "OtherFF"], 2],
+            ["Peat (8)", ["1.A.5.a", "Peat"], 2],
+            ["Biomass (3)", ["1.A.5.a", "Biomass"], 2],
+            # b. Mobile (please specify)
+            ["1.A.5.b. Mobile (please specify)", ["1.A.5.b", "Total"], 1],
+            ["Military Transport", ["1.A.5.b.xii", "Total"], 2],
+            ["Liquid fuels", ["1.A.5.b.xii", "Liquid"], 3],
+            ["Solid fuels", ["1.A.5.b.xii", "Solid"], 3],
+            ["Gaseous fuels (6)", ["1.A.5.b.xii", "Gaseous"], 3],
+            ["Other fossil fuels (7)", ["1.A.5.b.xii", "OtherFF"], 3],
+            ["Biomass(3)", ["1.A.5.b.xii", "Biomass"], 3],
+            # Information Item
+            ["Information item: (16)", ["\IGNORE", "\IGNORE"], 0],
+            [
+                "Waste incineration with energy recovery included as:",
+                ["\IGNORE", "\IGNORE"],
+                1,
+            ],
+            ["Biomass (3)", ["\IGNORE", "\IGNORE"], 1],
+            ["Fossil fuels (7)", ["\IGNORE", "\IGNORE"], 1],
+        ],
+        "entity_mapping": {
+            "EMISSIONS CH4": "CH4",
+            "EMISSIONS CO2 (2,3)": "CO2",
+            "EMISSIONS N2O": "N2O",
+        },
+    },  # tested
+    "Table1.B.1": {
+        "status": "tested",
+        "table": {
+            "firstrow": 7,
+            "lastrow": 32,
+            "header": ["group", "entity", "unit"],
+            "col_for_categories": "GREENHOUSE GAS SOURCE AND SINK CATEGORIES",
+            "categories": ["category"],
+            "cols_to_ignore": [
+                "ACTIVITY DATA Amount of fuel produced",
+                "IMPLIED EMISSION FACTORS CH4 (3)",
+                "IMPLIED EMISSION FACTORS CO2",
+            ],
+            "stop_cats": ["", np.nan],
+            "unit_info": unit_info["default"],
+        },
+        "sector_mapping": [
+            ["1. B. 1. a. Coal mining and handling", ["1.B.1.a"], 0],
+            ["1.B.1.a.i. Underground mines (4)", ["1.B.1.a.i"], 1],
+            ["1.B.1.a.i.1. Mining activities", ["1.B.1.a.i.1"], 2],
+            ["1.B.1.a.i.2. Post-mining activities", ["1.B.1.a.i.2"], 2],
+            ["1.B.1.a.i.3. Abandoned underground mines", ["1.B.1.a.i.3"], 2],
+            [
+                "1.B.1.a.i.4. Flaring of drained methane or conversion of "
+                "methane to CO2 (5)",
+                ["1.B.1.a.i.4"],
+                2,
+            ],
+            ["1.B.1.a.i.5. Other (please specify)", ["1.B.1.a.i.5"], 2],
+            ["NA", ["\IGNORE"], 3],
+            ["1.B.1.a.ii. Surface mines (4)", ["1.B.1.a.ii"], 1],
+            ["1.B.1.a.ii.1. Mining activities", ["1.B.1.a.ii.1"], 2],
+            ["1.B.1.a.ii.2. Post-mining activities", ["1.B.1.a.ii.2"], 2],
+            ["1.B.1.a.ii.3. Other (please specify)", ["1.B.1.a.ii.3"], 2],
+            ["NA", ["\IGNORE"], 3],
+            ["1. B. 1. b. Fuel transformation (6)", ["1.B.1.b"], 0],
+            ["Drop down list:", ["\IGNORE"], 1],
+            ["1.B.1.b.i. Charcoal and biochar production (7)", ["1.B.1.b.i"], 1],
+            ["1.B.1.b.ii. Coke production", ["1.B.1.b.ii"], 1],
+            ["1.B.1.b.iii. Coal to liquids", ["1.B.1.b.iii"], 1],
+            ["1.B.1.b.iv. Gas to liquids", ["1.B.1.b.iv"], 1],
+            ["1.B.1.b.v. Other (please specify)", ["1.B.1.b.v"], 1],
+            ["NA", ["\IGNORE"], 2],
+            ["1. B. 1. c. Other (please specify) (8)", ["1.B.1.c"], 0],
+            ["NA", ["\IGNORE"], 1],
+        ],
+        "entity_mapping": {
+            "EMISSIONS (1) CH4": "CH4 emissions", # this is necessary because there
+            # is an error in the table and the CH4 emissions don't have the removals
+            # subtracted which would be correct according to the footnotes
+            "EMISSIONS (1) CO2": "CO2", #  emissions",
+            "RECOVERY/FLARING (2) CH4": "CH4 removals",
+            "RECOVERY/FLARING (2) CO2": "CO2 removals",
+        },
+        "coords_defaults": {
+            "class": "Total",
+        },
+    },  # tested
+    "Table1.B.2": {
+        "status": "tested",
+        "table": {
+            "firstrow": 7,
+            "lastrow": 45,
+            "header": ["group", "entity", "unit"],
+            "col_for_categories": "GREENHOUSE GAS SOURCE AND SINK CATEGORIES",
+            "categories": ["category"],
+            "cols_to_ignore": [
+                "ACTIVITY DATA (1) Description (1)",
+                "ACTIVITY DATA (1) Unit (1)",
+                "ACTIVITY DATA (1) Value",
+                "IMPLIED EMISSION FACTORS CO2 (3)",
+                "IMPLIED EMISSION FACTORS CH4",
+                "IMPLIED EMISSION FACTORS N2O",
+            ],
+            "stop_cats": [".", np.nan],
+            "unit_info": unit_info["default"],
+        },
+        "sector_mapping": [
+            ["1.B.2.a. Oil (7)", ["1.B.2.a"], 0],
+            ["1.B.2.a.i. Exploration", ["1.B.2.a.1"], 1],
+            ["1.B.2.a.ii. Production and upgrading (8)", ["1.B.2.a.2"], 1],
+            ["1.B.2.a.iii. Transport", ["1.B.2.a.3"], 1],
+            ["1.B.2.a.iv. Refining/storage", ["1.B.2.a.4"], 1],
+            ["1.B.2.a.v. Distribution of oil products", ["1.B.2.a.5"], 1],
+            ["1.B.2.a.vi. Other", ["1.B.2.a.6"], 1],
+            ["Drop down list:", ["\IGNORE"], 2],
+            ["1.B.2.a.vi.1. Abandoned wells", ["1.B.2.a.6.1"], 2],
+            ["1.B.2.a.vi.2. Other (please specify)", ["1.B.1.a.6.2"], 2],
+            ["NA", ["\IGNORE"], 3],
+            ["1.B.2.b. Natural gas", ["1.B.2.b"], 0],
+            ["1.B.2.b.i. Exploration", ["1.B.2.b.1"], 1],
+            ["1.B.2.b.ii. Production and gathering (8)", ["1.B.2.b.2"], 1],
+            ["1.B.2.b.iii. Processing", ["1.B.2.b.3"], 1],
+            ["1.B.2.b.iv. Transmission and storage", ["1.B.2.b.4"], 1],
+            ["1.B.2.b.v. Distribution", ["1.B.2.b.5"], 1],
+            ["1.B.2.b.vi. Other", ["1.B.2.b.6"], 1],
+            ["Drop down list:", ["\IGNORE"], 2],
+            ["1.B.2.b.vi.1. Gas post-meter", ["1.B.2.b.6.1"], 3],
+            ["1.B.2.b.vi.2. Abandoned wells", ["1.B.2.b.6.2"], 3],
+            ["1.B.2.b.vi.3. Other (please specify)", ["1.B.2.b.6.3"], 3],
+            ["LNG Terminals", ["1.B.2.b.6.3.a"], 4],
+            ["LNG Storage", ["1.B.2.b.6.3.b"], 4],
+            ["Natural Gas Storage", ["1.B.2.b.6.3.c"], 4],
+            ["1.B.2.c. Venting and flaring", ["1.B.2.c"], 0],
+            ["1.B.2.c.i. Venting", ["1.B.2.c-ven"], 1],
+            ["1.B.2.c.i.1. Oil", ["1.B.2.c-ven.i"], 2],
+            ["1.B.2.c.i.2. Gas", ["1.B.2.c-ven.ii"], 2],
+            ["1.B.2.c.i.3. Combined", ["1.B.2.c-ven.iii"], 2],
+            ["1.B.2.c.ii. Flaring (9)", ["1.B.2.c-fla"], 1],
+            ["1.B.2.c.ii.1. Oil", ["1.B.2.c-fla.i"], 2],
+            ["1.B.2.c.ii.2. Gas", ["1.B.2.c-fla.ii"], 2],
+            ["1.B.2.c.ii.3. Combined", ["1.B.2.c-fla.iii"], 2],
+            ["1.B.2.d. Other (please specify) (10)", ["1.B.2.d"], 0],
+            ["NA", ["\IGNORE"], 1],
+        ],
+        "entity_mapping": {
+            "EMISSIONS CH4 (5)": "CH4",
+            "EMISSIONS CO2 (4)": "CO2", #"CO2 emissions",
+            "EMISSIONS N2O": "N2O",
+            "RECOVERY (2) CO2": "CO2 removals",
+        },
+        "coords_defaults": {
+            "class": "Total",
+        },
+    },  # tested
+    "Table1.C": {
+        "status": "tested",
+        "table": {
+            "firstrow": 7,
+            "lastrow": 29,
+            "header": ["group", "entity", "unit"],
+            "col_for_categories": "GREENHOUSE GAS SOURCE AND SINK CATEGORIES",
+            "categories": ["category"],
+            "cols_to_ignore": [
+                "ACTIVITY DATA CO2 transported or injected (1)",
+                "IMPLIED EMISSION FACTORS CO2",
+            ],
+            "stop_cats": ["", np.nan],
+            "unit_info": unit_info["default"],
+        },
+        "sector_mapping": [
+            ["1.C.1. Transport of CO2", ["1.C.1"], 0],
+            ["1.C.1.a. Pipelines", ["1.C.1.a"], 1],
+            ["1.C.1.b. Ships", ["1.C.1.b"], 1],
+            ["1.C.1.c. Other (please specify)", ["1.C.1.c"], 1],
+            ["NA", ["\IGNORE"], 2],
+            ["1.C.2. Injection and storage (3)", ["1.C.2"], 0],
+            ["1.C.2.a. Injection", ["1.C.2.a"], 1],
+            ["1.C.2.b. Storage", ["1.C.2.b"], 1],
+            ["1.C.3. Other (please specify)", ["1.C.3"], 0],
+            ["NA", ["\IGNORE"], 1],
+            ["Information item (4, 5, 6)", ["\IGNORE"], 0],
+            ["Total amount captured for storage (7)", ["M.Info.A.TACS"], 1],
+            ["Total amount of imports for storage (7)", ["M.Info.A.TAIS"], 1],
+            ["Total A", ["M.Info.A"], 1],
+            ["Total amount of exports for storage", ["M.Info.B.TAES"], 1],
+            ["Total amount of CO2 injected at storage sites", ["M.Info.B.TAI"], 1],
+            ["CO2 injected for operational usage (8)", ["M.Info.B.IOU"], 1],
+            [
+                "Total leakage from transport, injection and storage",
+                ["M.Info.B.TLTIS"],
+                1,
+            ],
+            ["Total B", ["M.Info.B"], 1],
+            ["Difference (A-B)(6)", ["\IGNORE"], 1],
+        ],
+        "entity_mapping": {
+            "EMISSIONS CO2 (2)": "CO2",
+        },
+        "coords_defaults": {
+            "class": "Total",
+        },
+    },  # tested
+    "Table1.D": {
+        "status": "TODO",
+        "table": {
+            "firstrow": 7,
+            "lastrow": 24,
+            "header": ["group", "entity", "unit"],
+            "col_for_categories": "GREENHOUSE GAS SOURCE AND SINK CATEGORIES",
+            "categories": ["category", "class"],
+            "cols_to_ignore": [],
+            "stop_cats": ["", np.nan],
+            "unit_info": unit_info["default"],
+        },
+        "sector_mapping": [],
+        "entity_mapping": [],
+        "coords_defaults": {
+            "class": "Total",
+        },
+    },  # TODO
+    "Table2(I)": {
+        "status": "tested",
+        "table": {
+            "firstrow": 8,
+            "lastrow": 58,
+            "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["industry"],
+        },
+        "sector_mapping": [
+            ["2. Total industrial processes", ["2"]],
+            ["2.A. Mineral industry", ["2.A"]],
+            ["2.A.1. Cement production", ["2.A.1"]],
+            ["2.A.2. Lime production", ["2.A.2"]],
+            ["2.A.3. Glass production", ["2.A.3"]],
+            ["2.A.4. Other process uses of carbonates", ["2.A.4"]],
+            ["2.B. Chemical industry", ["2.B"]],
+            ["2.B.1. Ammonia production", ["2.B.1"]],
+            ["2.B.2. Nitric acid production", ["2.B.2"]],
+            ["2.B.3. Adipic acid production", ["2.B.3"]],
+            ["2.B.4. Caprolactam, glyoxal and glyoxylic acid production", ["2.B.4"]],
+            ["2.B.5. Carbide production", ["2.B.5"]],
+            ["2.B.6. Titanium dioxide production", ["2.B.6"]],
+            ["2.B.7. Soda ash production", ["2.B.7"]],
+            ["2.B.8. Petrochemical and carbon black production", ["2.B.8"]],
+            ["2.B.9. Fluorochemical production", ["2.B.9"]],
+            ["2.B.10. Other", ["2.B.10"]],
+            ["2.C. Metal industry", ["2.C"]],
+            ["2.C.1. Iron and steel production", ["2.C.1"]],
+            ["2.C.2. Ferroalloys production", ["2.C.2"]],
+            ["2.C.3. Aluminium production", ["2.C.3"]],
+            ["2.C.4. Magnesium production", ["2.C.4"]],
+            ["2.C.5. Lead production", ["2.C.5"]],
+            ["2.C.6. Zinc production", ["2.C.6"]],
+            ["2.C.7. Other", ["2.C.7"]],
+            ["2.D. Non-energy products from fuels and solvent use (4)", ["2.D"]],
+            ["2.D.1. Lubricant use", ["2.D.1"]],
+            ["2.D.2. Paraffin wax use", ["2.D.2"]],
+            ["2.D.3. Other", ["2.D.3"]],
+            ["2.E. Electronics industry", ["2.E"]],
+            ["2.E.1. Integrated circuit or semiconductor", ["2.E.1"]],
+            ["2.E.2. TFT flat panel display", ["2.E.2"]],
+            ["2.E.3. Photovoltaics", ["2.E.3"]],
+            ["2.E.4. Heat transfer fluid", ["2.E.4"]],
+            ["2.E.5. Other", ["2.E.5"]],
+            ["2.F. Product uses as substitutes for ODS", ["2.F"]],
+            ["2.F.1. Refrigeration and air conditioning", ["2.F.1"]],
+            ["2.F.2. Foam blowing agents", ["2.F.2"]],
+            ["2.F.3. Fire protection", ["2.F.3"]],
+            ["2.F.4. Aerosols", ["2.F.4"]],
+            ["2.F.5. Solvents", ["2.F.5"]],
+            ["2.F.6. Other applications", ["2.F.6"]],
+            ["2.G. Other product manufacture and use", ["2.G"]],
+            ["2.G.1. Electrical equipment", ["2.G.1"]],
+            ["2.G.2. SF6 and PFCs from other product use", ["2.G.2"]],
+            ["2.G.3. N2O from product uses", ["2.G.3"]],
+            ["2.G.4. Other", ["2.G.4"]],
+            ["2.H. Other (please specify) (5)", ["2.H"]],
+            ["2.H.2. Food and Beverages Industry", ["2.H.2"]],
+        ],
+        "entity_mapping": {
+            "HFCs (1)": "HFCS (AR4GWP100)",
+            "PFCs (1)": "PFCS (AR4GWP100)",
+            "Unspecified mix of HFCs and PFCs (1)": "UnspMixOfHFCsPFCs (AR4GWP100)",
+            "Total GHG emissions (2)": "KYOTOGHG (AR4GWP100)",
+        },
+        "coords_defaults": {
+            "class": "Total",
+        },
+    },  # tested
+    "Table2(II)": {
+        "status": "tested",
+        "table": {
+            "firstrow": 8,
+            "lastrow": 37,  # ignore the totals
+            "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["fgases"],
+        },
+        "sector_mapping": [
+            [
+                "2. Total actual emissions of halocarbons (by chemical), SF6 and NF3",
+                ["2"],
+            ],
+            ["2.B. Chemical industry", ["2.B"]],
+            ["2.B.9. Fluorochemical production", ["2.B.9"]],
+            ["2.B.9.a. By-product emissions", ["2.B.9.a"]],
+            ["2.B.9.b. Fugitive emissions", ["2.B.9.b"]],
+            ["2.B.10. Other", ["2.B.10"]],
+            ["2.C. Metal industry", ["2.C"]],
+            ["2.C.3. Aluminium production", ["2.C.3"]],
+            ["2.C.4. Magnesium production", ["2.C.4"]],
+            ["2.C.7. Other", ["2.C.7"]],
+            ["2.E. Electronics industry", ["2.E"]],
+            ["2.E.1. Integrated circuit or semiconductor", ["2.E.1"]],
+            ["2.E.2. TFT flat panel display", ["2.E.2"]],
+            ["2.E.3. Photovoltaics", ["2.E.3"]],
+            ["2.E.4. Heat transfer fluid", ["2.E.4"]],
+            ["2.E.5. Other", ["2.E.5"]],
+            ["2.F. Product uses as substitutes for ODS", ["2.F"]],
+            ["2.F.1. Refrigeration and air conditioning", ["2.F.1"]],
+            ["2.F.2. Foam blowing agents", ["2.F.2"]],
+            ["2.F.3. Fire protection", ["2.F.3"]],
+            ["2.F.4. Aerosols", ["2.F.4"]],
+            ["2.F.5. Solvents", ["2.F.5"]],
+            ["2.F.6. Other applications", ["2.F.6"]],
+            ["2.G. Other product manufacture and use", ["2.G"]],
+            ["2.G.1. Electrical equipment", ["2.G.1"]],
+            ["2.G.2. SF6 and PFCs from other product use", ["2.G.2"]],
+            ["2.G.4. Other", ["2.G.4"]],
+            ["2.H. Other", ["2.H"]],
+            ["2.H.1 Pulp and paper", ["2.H.1"]],
+            ["2.H.2 Food and beverages industry", ["2.H.2"]],
+            ["2.H.3 Other (please specify)", ["2.H.3"]],
+        ],
+        "entity_mapping": {
+            #'C3F8': 'C3F8',
+            #'C10F18' 'C2F6' 'C4F10' 'C5F12' 'C6F14' 'CF4'
+            "HFC-125": "HFC125",
+            "HFC-134": "HFC134",
+            "HFC-134a": "HFC134a",
+            "HFC-143": "HFC143",
+            "HFC-143a": "HFC143a",
+            "HFC-152": "HFC152",
+            "HFC-152a": "HFC152a",
+            "HFC-161": "HFC161",
+            "HFC-227ea": "HFC227ea",
+            "HFC-23": "HFC23",
+            "HFC-236cb": "HFC236cb",
+            "HFC-236ea": "HFC236ea",
+            "HFC-236fa": "HFC236fa",
+            "HFC-245ca": "HFC245ca",
+            "HFC-245fa": "HFC245fa",
+            "HFC-32": "HFC32",
+            "HFC-365mfc": "HFC365mfc",
+            "HFC-41": "HFC41",
+            "HFC-43-10mee": "HFC4310mee",
+            "Unspecified mix of HFCs (1)": "UnspMixOfHFCs (AR4GWP100)",
+            "Unspecified mix of HFCs and PFCs(1)": "UnspMixOfHFCsPFCs (AR4GWP100)",
+            "Unspecified mix of PFCs (1)": "UnspMixOfPFCs (AR4GWP100)",
+            "c-C3F6": "cC3F6",
+            "c-C4F8": "cC4F8",
+        },
+        "coords_defaults": {
+            "class": "Total",
+        },
+    },  # tested
+    "Table3": {  # Agriculture summary
+        "status": "tested",
+        "table": {
+            "firstrow": 8,
+            "lastrow": 48,
+            "header": ["entity", "unit"],
+            "col_for_categories": "GREENHOUSE GAS SOURCE AND",
+            "categories": ["category"],
+            "cols_to_ignore": [],
+            "stop_cats": ["", np.nan],
+            "unit_info": unit_info["industry"],
+        },
+        "sector_mapping": [
+            ["3. Total agriculture", ["3"], 0],
+            # A. Enteric fermentation
+            ["3.A. Enteric fermentation", ["3.A"], 1],
+            ["Option A:", ["\IGNORE"], 2],
+            ["3.A.1.a. Dairy cattle", ["3.A.1.Aa"], 3],
+            ["3.A.1.b. Non-dairy cattle", ["3.A.1.Ab"], 3],
+            ["Option B (country-specific):", ["\IGNORE"], 2],
+            ["3.A.1.a. Other", ["3.A.1.C"], 3],
+            # Other livestock
+            ["3.A.2. Sheep", ["3.A.2"], 2],
+            ["3.A.3. Swine", ["3.A.3"], 2],
+            ["3.A.4. Other livestock", ["3.A.4"], 2],
+            # Manure Management
+            ["3.B. Manure management", ["3.B"], 1],
+            ["3.B.1. Cattle(3)", ["3.B.1"], 2],
+            ["Option A:", ["\IGNORE"], 3],
+            ["3.B.1.a. Dairy cattle", ["3.B.1.Aa"], 4],
+            ["3.B.1.b. Non-dairy cattle", ["3.B.1.Ab"], 4],
+            ["Option B (country-specific):", ["\IGNORE"], 3],
+            ["3.B.1.a. Other", ["3.B.1.C"], 4],
+            ["3.B.2. Sheep", ["3.B.2"], 2],
+            ["3.B.3. Swine", ["3.B.3"], 2],
+            ["3.B.4. Other livestock", ["3.B.4"], 2],
+            ["3.B.5. Indirect N2O emissions", ["3.B.5"], 2],
+            ["3.C. Rice cultivation", ["3.C"], 1],
+            ["3.D. Agricultural soils(4,5)", ["3.D"], 1],
+            ["3.D.1. Direct N2O emissions from managed soils", ["3.D.a"], 2],
+            ["3.D.1.a. Inorganic N fertilizers", ["3.D.a.1"], 3],
+            ["3.D.1.b. Organic N fertilizers", ["3.D.a.2"], 3],
+            ["3.D.1.c. Urine and dung deposited by grazing animals", ["3.D.a.3"], 3],
+            ["3.D.1.d. Crop residues", ["3.D.a.4"], 3],
+            [
+                "3.D.1.e. Mineralization/immobilization associated with loss/gain of "
+                "soil organic matter",
+                ["3.D.a.5"],
+                3,
+            ],
+            ["3.D.1.f. Cultivation of organic soils (i.e. histosols)", ["3.D.a.6"], 3],
+            ["3.D.1.g. Other", ["3.D.a.7"], 3],
+            ["3.D.2. Indirect N2O Emissions from managed soils", ["3.D.b"], 2],
+            ["3.E. Prescribed burning of savannahs", ["3.E"], 1],
+            ["3.F. Field burning of agricultural residues", ["3.F"], 1],
+            ["3.G. Liming", ["3.G"], 1],
+            ["3.H. Urea application", ["3.H"], 1],
+            ["3.I. Other carbon-containing fertilizers", ["3.I"], 1],
+            ["3.J. Other (please specify)", ["3.J"], 1],
+            ["NA", ["\IGNORE"], 2],
+        ],
+        "entity_mapping": {"Total GHG emissions (1)": "KYOTOGHG (AR4GWP100)"},
+        "coords_defaults": {
+            "class": "Total",
+        },
+    },  # tested
+    "Table3.A": {  # Interic fermentation
+        "status": "tested",
+        "table": {
+            "firstrow": 7,
+            "lastrow": 45,
+            "header": ["entity", "entity", "unit"],
+            "col_for_categories": "GREENHOUSE GAS SOURCE AND SINK CATEGORIES",
+            "categories": ["category"],
+            "cols_to_ignore": [
+                "ACTIVITY DATA AND OTHER RELATED INFORMATION Population size (1)",
+                "ACTIVITY DATA AND OTHER RELATED INFORMATION Average gross energy intake (GE)",
+                "ACTIVITY DATA AND OTHER RELATED INFORMATION Average CH4 conversion rate (Ym) (2)",
+                "IMPLIED EMISSION FACTORS CH4",
+            ],
+            "stop_cats": ["", np.nan],
+            "unit_info": unit_info["default"],
+        },
+        "sector_mapping": [
+            ["3.A.1. Cattle", ["3.A.1"], 0],
+            ["Option A:", ["\IGNORE"], 1],
+            ["3.A.1.a. Dairy cattle", ["3.A.1.Aa"], 2],
+            ["3.A.1.b. Non-dairy cattle", ["3.A.1.Ab"], 2],
+            ["Option B (country-specific): (3)", ["\IGNORE"], 1],
+            ["3.A.1.a. Other", ["\IGNORE"], 2],
+            ["Drop-down list:", ["\IGNORE"], 3],
+            ["3.A.1.a.i. Mature dairy cattle", ["\IGNORE"], 3],
+            ["3.A.1.a.ii. Other mature cattle", ["\IGNORE"], 3],
+            ["3.A.1.a.iii. Growing cattle", ["\IGNORE"], 3],
+            ["3.A.1.a.iv. Other (please specify)", ["3.A.1.C"], 3],
+            ["Dairy Cattle", ["3.A.1.C-AUS-a"], 4],
+            ["Beef Cattle - Pasture", ["3.A.1.C-AUS-b"], 4],
+            ["Beef Cattle - Feedlot", ["3.A.1.C-AUS-c"], 4],
+            ["3.A.2. Sheep", ["3.A.2"], 0],
+            ["3.A.2.a. Other (please specify)", ["\IGNORE"], 1],
+            ["Sheep", ["\IGNORE"], 2],
+            ["3.A.3. Swine", ["3.A.3"], 0],
+            ["3.A.3.a. Other (please specify)", ["\IGNORE"], 1],
+            ["Swine", ["\IGNORE"], 2],
+            ["3.A.4. Other livestock (please specify) (4)", ["3.A.4"], 0],
+            ["Drop down list:", ["\IGNORE"], 1],
+            ["3.A.4.a. Buffalo", ["3.A.4.a"], 2],
+            ["3.A.4.b. Camels", ["3.A.4.b"], 2],
+            ["3.A.4.c. Deer", ["3.A.4.c"], 2],
+            ["3.A.4.d. Goats", ["3.A.4.d"], 2],
+            ["3.A.4.e. Horses", ["3.A.4.e"], 2],
+            ["3.A.4.f. Mules and asses", ["3.A.4.f"], 2],
+            ["3.A.4.g. Poultry", ["3.A.4.g"], 2],
+            ["3.A.4.h. Other (please specify)", ["3.A.4.h"], 2],
+            ["3.A.4.h.i. Rabbit", ["3.A.4.h.i"], 3],
+            ["3.A.4.h.ii. Reindeer", ["3.A.4.h.ii"], 3],
+            ["3.A.4.h.iii. Ostrich", ["3.A.4.h.iii"], 3],
+            ["3.A.4.h.iv. Fur-bearing animals (5)", ["3.A.4.h.iv"], 3],
+            ["3.A.4.h.v. Other (please specity)", ["3.A.4.h.v"], 3],
+            ["Alpacas", ["\IGNORE"], 4],
+        ],
+        "entity_mapping": {"EMISSIONS CH4": "CH4"},
+        "coords_defaults": {
+            "class": "Total",
+        },
+    },  # tested
+    "Table3.B(a)": {  # Manure management CH4
+        "status": "tested",
+        "table": {
+            "firstrow": 6,
+            "lastrow": 45,
+            "header": ["entity", "entity", "entity", "unit"],
+            "col_for_categories": "GREENHOUSE GAS SOURCE AND SINK CATEGORIES",
+            "categories": ["category"],
+            "cols_to_ignore": [
+                "ACTIVITY DATA AND OTHER RELATED INFORMATION Population size",
+                "ACTIVITY DATA AND OTHER RELATED INFORMATION Allocation by climate region (1) Cool",
+                "ACTIVITY DATA AND OTHER RELATED INFORMATION Allocation by climate region (1) Temperate",
+                "ACTIVITY DATA AND OTHER RELATED INFORMATION Allocation by climate region (1) Warm",
+                "ACTIVITY DATA AND OTHER RELATED INFORMATION Typical animal mass (average) Warm",
+                "ACTIVITY DATA AND OTHER RELATED INFORMATION VS(2) daily excretion (average) Warm",
+                "ACTIVITY DATA AND OTHER RELATED INFORMATION CH4 producing potential (Bo) (2) (average) Warm",
+                "IMPLIED EMISSION FACTORS CH4 producing potential (Bo) (2) (average) CH4",
+            ],
+            "stop_cats": ["", np.nan],
+            "unit_info": unit_info["default"],
+        },
+        "sector_mapping": [
+            ["3.B.1. Cattle", ["3.B.1"], 0],
+            ["Option A:", ["\IGNORE"], 1],
+            ["3.B.1.a. Dairy cattle", ["3.B.1.Aa"], 2],
+            ["3.B.1.b. Non-dairy cattle", ["3.B.1.Ab"], 2],
+            ["Option B (country-specific): (3)", ["\IGNORE"], 1],
+            ["3.B.1.a. Other", ["\IGNORE"], 2],
+            ["Drop down list:", ["\IGNORE"], 3],
+            ["3.B.1.a.i. Mature dairy cattle", ["\IGNORE"], 3],
+            ["3.B.1.a.ii. Other mature cattle", ["\IGNORE"], 3],
+            ["3.B.1.a.iii. Growing cattle", ["\IGNORE"], 3],
+            ["3.B.1.a.iv. Other (please specify)", ["3.B.1.C"], 3],
+            ["Dairy Cattle", ["3.B.1.C-AUS-a"], 4],
+            ["Beef Cattle - Pasture", ["3.B.1.C-AUS-b"], 4],
+            ["Beef Cattle - Feedlot", ["3.B.1.C-AUS-c"], 4],
+            ["3.B.2. Sheep", ["3.B.2"], 0],
+            ["3.B.2.a. Other (please specify)", ["\IGNORE"], 1],
+            ["Sheep", ["\IGNORE"], 2],
+            ["3.B.3. Swine", ["3.B.3"], 0],
+            ["3.B.3.a. Other (please specify)", ["\IGNORE"], 1],
+            ["Swine", ["\IGNORE"], 2],
+            ["3.B.4. Other livestock (4)", ["3.B.4"], 0],
+            ["Drop-down list:", ["\IGNORE"], 1],
+            ["3.B.4.a. Buffalo", ["3.B.4.a"], 2],
+            ["3.B.4.b. Camels", ["3.B.4.b"], 2],
+            ["3.B.4.c. Deer", ["3.B.4.c"], 2],
+            ["3.B.4.d. Goats", ["3.B.4.d"], 2],
+            ["3.B.4.e. Horses", ["3.B.4.e"], 2],
+            ["3.B.4.f. Mules and Asses", ["3.B.4.f"], 2],
+            ["3.B.4.g. Poultry", ["3.B.4.g"], 2],
+            ["3.B.4.h. Other (please specify)", ["3.B.4.h"], 2],
+            ["3.B.4.h.i. Rabbit", ["3.B.4.h.i"], 3],
+            ["3.B.4.h.ii. Reindeer", ["3.B.4.h.ii"], 3],
+            ["3.B.4.h.iii. Ostrich", ["3.B.4.h.iii"], 3],
+            ["3.B.4.h.iv. Fur-bearing animals (5)", ["3.B.4.h.iv"], 3],
+            ["3.B.4.h.v. Other (please specity)", ["3.B.4.h.v"], 3],
+            ["Alpacas", ["\IGNORE"], 4],
+        ],
+        "entity_mapping": {
+            "EMISSIONS CH4 producing potential (Bo) (2) (average) CH4": "CH4"
+        },
+        "coords_defaults": {
+            "class": "Total",
+        },
+    },  # tested
+    "Table3.B(b)": {  # Manure management N2O
+        "status": "tested",
+        "table": {
+            "firstrow": 5,
+            "lastrow": 45,  # don't read indirect emissions as we have them from
+            # Table3 and reading them makes the specification very complicated
+            "header": ["entity", "entity", "entity", "entity", "unit"],
+            "col_for_categories": "GREENHOUSE GAS SOURCE AND SINK CATEGORIES",
+            "categories": ["category"],
+            "cols_to_ignore": [
+                "ACTIVITY DATA AND OTHER RELATED INFORMATION Population size (1000s)",
+                "ACTIVITY DATA AND OTHER RELATED INFORMATION Nitrogen excretion rate "
+                "(kg N/ head/yr)",
+                "ACTIVITY DATA AND OTHER RELATED INFORMATION Typical animal mass "
+                "(average) (kg/ animal)",
+                "ACTIVITY DATA AND OTHER RELATED INFORMATION Nitrogen excretion per "
+                "manure management system (MMS) (kg N/yr) Anaerobic lagoon",
+                "ACTIVITY DATA AND OTHER RELATED INFORMATION Nitrogen excretion per "
+                "manure management system (MMS) (kg N/yr) Liquid system",
+                "ACTIVITY DATA AND OTHER RELATED INFORMATION Nitrogen excretion per "
+                "manure management system (MMS) (kg N/yr) Daily spread",
+                "ACTIVITY DATA AND OTHER RELATED INFORMATION Nitrogen excretion per "
+                "manure management system (MMS) (kg N/yr) Solid storage",
+                "ACTIVITY DATA AND OTHER RELATED INFORMATION Nitrogen excretion per "
+                "manure management system (MMS) (kg N/yr) Pit storage",
+                "ACTIVITY DATA AND OTHER RELATED INFORMATION Nitrogen excretion per "
+                "manure management system (MMS) (kg N/yr) Dry lot",
+                "ACTIVITY DATA AND OTHER RELATED INFORMATION Nitrogen excretion per "
+                "manure management system (MMS) (kg N/yr) Deep bedding",
+                "ACTIVITY DATA AND OTHER RELATED INFORMATION Nitrogen excretion per "
+                "manure management system (MMS) (kg N/yr) Pasture range and paddock (1)",
+                "ACTIVITY DATA AND OTHER RELATED INFORMATION Nitrogen excretion per "
+                "manure management system (MMS) (kg N/yr) Composting",
+                "ACTIVITY DATA AND OTHER RELATED INFORMATION Nitrogen excretion per "
+                "manure management system (MMS) (kg N/yr) Digesters",
+                "ACTIVITY DATA AND OTHER RELATED INFORMATION Nitrogen excretion per "
+                "manure management system (MMS) (kg N/yr) Burned for fuel or as waste (2)",
+                "ACTIVITY DATA AND OTHER RELATED INFORMATION Nitrogen excretion per "
+                "manure management system (MMS) (kg N/yr) Other (3)",
+                "ACTIVITY DATA AND OTHER RELATED INFORMATION Total N excreted Other (3)",
+                "ACTIVITY DATA AND OTHER RELATED INFORMATION Total N volatilised as "
+                "NH3, NOX and N2 (4)",
+                "ACTIVITY DATA AND OTHER RELATED INFORMATION N lost through leaching "
+                "and run-off",
+                "IMPLIED EMISSION FACTORS Emission factor per animals Direct and run-off",
+                "IMPLIED EMISSION FACTORS Emission factor per animals Indirect "
+                "Atmospheric deposition",
+                "IMPLIED EMISSION FACTORS Emission factor per animals Indirect "
+                "Nitrogen leaching and run-off",
+                "EMISSIONS N2O Indirect Atmospheric deposition",
+                "EMISSIONS N2O Indirect Nitrogen leaching and run-off",
+            ],
+            "stop_cats": ["", np.nan, "3.B.5. Indirect N2O emissions"],
+            "unit_info": unit_info["default"],
+        },
+        "sector_mapping": [
+            ["3.B.1. Cattle", ["3.B.1"], 0],
+            ["Option A:", ["\IGNORE"], 1],
+            ["3.B.1.a. Dairy cattle", ["3.B.1.Aa"], 2],
+            ["3.B.1.b. Non-dairy cattle", ["3.B.1.Ab"], 2],
+            ["Option B (country-specific): (5)", ["\IGNORE"], 1],
+            ["3.B.1.a. Other", ["\IGNORE"], 2],
+            ["Drop-down list", ["\IGNORE"], 3],
+            ["3.B.1.a.i. Mature dairy cattle", ["\IGNORE"], 3],
+            ["3.B.1.a.ii. Other mature cattle", ["\IGNORE"], 3],
+            ["3.B.1.a.iii. Growing cattle", ["\IGNORE"], 3],
+            ["3.B.1.a.iv. Other (please specify)", ["3.B.1.C"], 3],
+            ["Dairy Cattle", ["3.B.1.C-AUS-a"], 4],
+            ["Beef Cattle - Pasture", ["3.B.1.C-AUS-b"], 4],
+            ["Beef Cattle - Feedlot", ["3.B.1.C-AUS-c"], 4],
+            ["3.B.2. Sheep", ["3.B.2"], 0],
+            ["3.B.2.a. Other (please specify)", ["\IGNORE"], 1],
+            ["Sheep", ["\IGNORE"], 2],
+            ["3.B.3. Swine", ["3.B.3"], 0],
+            ["3.B.3.a. Other (please specify)", ["\IGNORE"], 1],
+            ["Swine", ["\IGNORE"], 2],
+            ["3.B.4. Other livestock (6)", ["3.B.4"], 0],
+            ["Drop-down list", ["\IGNORE"], 1],
+            ["3.B.4.a. Buffalo", ["3.B.4.a"], 2],
+            ["3.B.4.b. Camels", ["3.B.4.b"], 2],
+            ["3.B.4.c. Deer", ["3.B.4.c"], 2],
+            ["3.B.4.d. Goats", ["3.B.4.d"], 2],
+            ["3.B.4.e. Horses", ["3.B.4.e"], 2],
+            ["3.B.4.f. Mules and asses", ["3.B.4.f"], 2],
+            ["3.B.4.g. Poultry", ["3.B.4.g"], 2],
+            ["3.B.4.h. Other (please specify)", ["3.B.4.h"], 2],
+            ["3.B.4.h.i. Rabbit", ["3.B.4.h.i"], 3],
+            ["3.B.4.h.ii. Reindeer", ["3.B.4.h.ii"], 3],
+            ["3.B.4.h.iii. Ostrich", ["3.B.4.h.iii"], 3],
+            ["3.B.4.h.iv Fur-bearing animals (7)", ["3.B.4.h.iv"], 3],
+            ["3.B.4.h.v. Other (please specity)", ["3.B.4.h.v"], 3],
+            ["Alpacas", ["\IGNORE"], 4],
+        ],
+        "entity_mapping": {
+            "EMISSIONS N2O Direct Nitrogen leaching and run-off": "N2O",
+        },
+        "coords_defaults": {
+            "class": "Total",
+        },
+    },  # tested
+    # TODO: tables 3.A and 3.B for livestock details as they are not contained in table3
+    "Table3.C": {  # rice cultivation details
+        "status": "tested",
+        "table": {
+            "firstrow": 7,
+            "lastrow": 25,
+            "header": ["group", "entity", "unit"],
+            "col_for_categories": "GREENHOUSE GAS SOURCE AND SINK CATEGORIES",
+            "categories": ["category"],
+            "cols_to_ignore": [
+                "ACTIVITY DATA AND OTHER RELATED INFORMATION Harvested area (2)",
+                "ACTIVITY DATA AND OTHER RELATED INFORMATION Organic amendments added (3)",
+                "IMPLIED EMISSION FACTOR (1) CH4",
+            ],
+            "stop_cats": ["", np.nan],
+            "unit_info": unit_info["default"],
+        },
+        "sector_mapping": [
+            ["3.C.1. Irrigated", ["3.C.1"]],
+            ["3.C.1.a. Continuously flooded", ["3.C.1.a"]],
+            ["3.C.1.b. Intermittently flooded", ["3.C.1.b"]],
+            ["3.C.1.b.i. Single aeration", ["3.C.1.b.i"]],
+            ["3.C.1.b.ii.Multiple aeration", ["3.C.1.b.ii"]],
+            ["3.C.2. Rain-fed", ["3.C.2"]],
+            ["3.C.2.a. Flood-prone", ["3.C.2.a"]],
+            ["3.C.2.b. Drought-prone", ["3.C.2.b"]],
+            ["3.C.3. Deep water", ["3.C.3"]],
+            ["3.C.3.a. Water depth 50–100 cm", ["3.C.3.a"]],
+            ["3.C.3.b. Water depth > 100 cm", ["3.C.3.b"]],
+            ["3.C.4. Other (please specify)", ["3.C.4"]],
+            ["NA", ["\IGNORE"]],
+            ["Upland rice(4)", ["\IGNORE"]],
+            ["Total(4)", ["\IGNORE"]],
+        ],
+        "entity_mapping": {
+            "EMISSIONS CH4": "CH4",
+        },
+        "coords_defaults": {
+            "class": "Total",
+        },
+    },  # tested
+    "Table3.D": {  # direct and indirect N2O from soils
+        "status": "tested",
+        "table": {
+            "firstrow": 7,
+            "lastrow": 23,
+            "header": ["group", "entity", "unit"],
+            "col_for_categories": "GREENHOUSE GAS SOURCE AND SINK CATEGORIES",
+            "categories": ["category"],
+            "cols_to_ignore": [
+                "ACTIVITY DATA AND OTHER RELATED INFORMATION Description",
+                "ACTIVITY DATA AND OTHER RELATED INFORMATION Value",
+                "IMPLIED EMISSION FACTORS Value",
+                # "Fraction (a) FracGASF",
+                # "Description Fraction of synthetic fertilizer N applied to soils that "
+                # "volatilises as NH3 and NOX",
+                # "Value 0.11",
+            ],
+            "stop_cats": ["", np.nan],
+            "unit_info": unit_info["default"],
+        },
+        "sector_mapping": [
+            ["3.D.1. Direct N2O emissions from managed soils", ["3.D.a"]],
+            ["3.D.1.a. Inorganic N fertilizers (3)", ["3.D.a.1"]],
+            ["3.D.1.b. Organic N fertilizers (3)", ["3.D.a.2"]],
+            ["3.D.1.b.i. Animal manure applied to soils", ["3.D.a.2.a"]],
+            ["3.D.1.b.ii. Sewage sludge applied to soils", ["3.D.a.2.b"]],
+            ["3.D.1.b.iii. Other organic fertilizers applied to soils", ["3.D.a.2.c"]],
+            ["3.D.1.c. Urine and dung deposited by grazing animals", ["3.D.a.3"]],
+            ["3.D.1.d. Crop residues", ["3.D.a.4"]],
+            [
+                "3.D.1.e. Mineralization/immobilization associated with loss/gain of "
+                "soil organic matter (4,5)",
+                ["3.D.a.5"],
+            ],
+            ["3.D.1.f. Cultivation of organic soils (i.e. histosols) (2)", ["3.D.a.6"]],
+            ["3.D.1.g. Other", ["3.D.a.7"]],
+            ["3.D.2. Indirect N2O Emissions from managed soils", ["3.D.b"]],
+            ["3.D.2.a. Atmospheric deposition (6)", ["3.D.b.1"]],
+            ["3.D.2.b. Nitrogen leaching and run-off", ["3.D.b.2"]],
+        ],
+        "entity_mapping": {
+            "EMISSIONS N2O": "N2O",
+        },
+        "coords_defaults": {
+            "class": "Total",
+        },
+    },  # tested
+    "Table3.E": {  # savanna burning details
+        "status": "TODO",  # actually done but empty and crashes
+        "table": {
+            "firstrow": 7,
+            "lastrow": 13,
+            "header": ["group", "entity", "unit"],
+            "col_for_categories": "GREENHOUSE GAS SOURCE AND SINK CATEGORIES",
+            "categories": ["category"],
+            "cols_to_ignore": [
+                "ACTIVITY DATA AND OTHER RELATED INFORMATION Area of savannah burned",
+                "ACTIVITY DATA AND OTHER RELATED INFORMATION Average above-ground biomass density",
+                "ACTIVITY DATA AND OTHER RELATED INFORMATION Biomass burned",
+                "ACTIVITY DATA AND OTHER RELATED INFORMATION Fraction of savannah "
+                "burned",
+                "ACTIVITY DATA AND OTHER RELATED INFORMATION Nitrogen fraction in biomass",
+                "IMPLIED EMISSION FACTORS CH4",
+                "IMPLIED EMISSION FACTORS N2O",
+            ],
+            "stop_cats": ["", ".", np.nan],
+            "unit_info": unit_info["default"],
+        },
+        "sector_mapping": [
+            ["3.E.1. Forest land (specify ecological zone) (2)", ["3.E.1"], 0],
+            ["NA", ["\IGNORE"], 1],
+            ["3.E.2. Grassland (specify ecological zone) (2)", ["3.E.2"], 0],
+            ["NA", ["\IGNORE"], 1],
+        ],
+        "entity_mapping": {
+            "EMISSIONS (2) CH4": "CH4",
+            "EMISSIONS (2) N2O": "N2O",
+        },
+        "coords_defaults": {
+            "class": "Total",
+        },
+    },  # TODO
+    "Table3.F": {  # field burning details
+        "status": "TODO",
+        "table": {
+            "firstrow": 7,
+            "lastrow": 29,
+            "header": ["group", "entity", "unit"],
+            "col_for_categories": "GREENHOUSE GAS SOURCE AND SINK CATEGORIES",
+            "categories": ["category"],
+            "cols_to_ignore": [],
+            "stop_cats": ["", np.nan],
+            "unit_info": unit_info["default"],
+        },
+        "sector_mapping": [],
+        "entity_mapping": [],
+        "coords_defaults": {
+            "class": "Total",
+        },
+    },  # TODO
+    "Table3.G-I": {  # liming, urea, carbon containing fertilizer
+        "status": "TODO",
+        "table": {
+            "firstrow": 5,
+            "lastrow": 13,
+            "header": ["group", "entity", "unit"],
+            "col_for_categories": "GREENHOUSE GAS SOURCE AND SINK CATEGORIES",
+            "categories": ["category"],
+            "cols_to_ignore": [],
+            "stop_cats": ["", np.nan],
+            "unit_info": unit_info["default"],
+        },
+        "sector_mapping": [],
+        "entity_mapping": [],
+        "coords_defaults": {
+            "class": "Total",
+        },
+    },  # TODO
+    "Table4": {  # LULUCF overview
+        "status": "tested",
+        "table": {
+            "firstrow": 8,
+            "lastrow": 33,
+            "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["industry"],
+        },
+        "sector_mapping": [
+            ["4. Total LULUCF", ["4"]],
+            ["4.A. Forest land", ["4.A"]],
+            ["4.A.1. Forest land remaining forest land", ["4.A.1"]],
+            ["4.A.2. Land converted to forest land", ["4.A.2"]],
+            ["4.B. Cropland", ["4.B"]],
+            ["4.B.1. Cropland remaining cropland", ["4.B.1"]],
+            ["4.B.2. Land converted to cropland", ["4.B.2"]],
+            ["4.C. Grassland", ["4.C"]],
+            ["4.C.1. Grassland remaining grassland", ["4.C.1"]],
+            ["4.C.2. Land converted to grassland", ["4.C.2"]],
+            ["4.D. Wetlands (5)", ["4.D"]],
+            ["4.D.1. Wetlands remaining wetlands", ["4.D.1"]],
+            ["4.D.2. Land converted to wetlands", ["4.D.2"]],
+            ["4.E. Settlements", ["4.E"]],
+            ["4.E.1. Settlements remaining settlements", ["4.E.1"]],
+            ["4.E.2. Land converted to settlements", ["4.E.2"]],
+            ["4.F. Other land (6)", ["4.F"]],
+            ["4.F.1. Other land remaining other land", ["4.F.1"]],
+            ["4.F.2. Land converted to other land", ["4.F.2"]],
+            ["4.G. Harvested wood products (7)", ["4.G"]],
+            ["4.H. Other (please specify)", ["4.H"]],
+            ["Land converted to Settlement", ["4.H.1"]],
+            ["Aquaculture", ["4.H.10"]],
+            ["Seagrass", ["4.H.11"]],
+            # currently ignoring memo item
+        ],
+        "entity_mapping": {
+            "CH4(2)": "CH4",
+            "N2O(2)": "N2O",
+            "Net CO2 emissions/removals (1,2)": "CO2",
+            "Total GHG emissions/removals (3)": "KYOTOGHG (AR4GWP100)",
+        },
+        "coords_defaults": {
+            "class": "Total",
+        },
+    },  # tested
+    # TODO: all other LULUCF tables
+    "Table5": {  # Waste overview
+        "status": "tested",
+        "table": {
+            "firstrow": 8,
+            "lastrow": 30,
+            "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["industry"],
+        },
+        "sector_mapping": [
+            ["5. Total waste", ["5"]],
+            ["5.A. Solid waste disposal", ["5.A"]],
+            ["5.A.1. Managed waste disposal sites", ["5.A.1"]],
+            ["5.A.2. Unmanaged waste disposal sites", ["5.A.2"]],
+            ["5.A.3. Uncategorized waste disposal sites", ["5.A.3"]],
+            ["5.B. Biological treatment of solid waste", ["5.B"]],
+            ["5.B.1. Composting", ["5.B.1"]],
+            ["5.B.2. Anaerobic digestion at biogas facilities", ["5.B.2"]],
+            ["5.C. Incineration and open burning of waste", ["5.C"]],
+            ["5.C.1. Waste incineration", ["5.C.1"]],
+            ["5.C.2. Open burning of waste", ["5.C.2"]],
+            ["5.D. Wastewater treatment and discharge", ["5.D"]],
+            ["5.D.1. Domestic wastewater", ["5.D.1"]],
+            ["5.D.2. Industrial wastewater", ["5.D.2"]],
+            ["5.D.3. Other", ["5.D.3"]],
+            ["5.E. Other (please specify)", ["5.E"]],
+            ["Accidential fires at Solid Waste Disposal Sites", ["5.E.9"]],
+            ["Memo item: (3)", ["\IGNORE"]],
+            ["5.F.1. Long-term storage of C in waste disposal sites", ["M.Memo.LTSW"]],
+            ["5.F.1.a. Annual change in total long-term C storage", ["M.Memo.ACLT"]],
+            [
+                "5.F.1.b. Annual change in total long-term C storage in HWP waste (4)",
+                ["M.Memo.ACLTHWP"],
+            ],
+        ],
+        "entity_mapping": {
+            "CO2(1)": "CO2",
+            "Total GHG emissions (1)": "KYOTOGHG (AR4GWP100)",
+        },
+        "coords_defaults": {
+            "class": "Total",
+        },
+    },  # tested
+    # TODO 5.A-D
+    "Summary1": {  # Summary 1
+        "status": "tested",
+        "table": {
+            "firstrow": 8,
+            "lastrow": 70,
+            "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"]],
+            ["1.A. Fuel combustion", ["1.A"]],
+            ["1.A.1. Energy industries", ["1.A.1"]],
+            ["1.A.2. Manufacturing industries and construction", ["1.A.2"]],
+            ["1.A.3. Transport", ["1.A.3"]],
+            ["1.A.4. Other sectors", ["1.A.4"]],
+            ["1.A.5. Other", ["1.A.5"]],
+            ["1.B. Fugitive emissions from fuels", ["1.B"]],
+            ["1.B.1. Solid fuels", ["1.B.1"]],
+            [
+                "1.B.2. Oil and natural gas and other emissions from energy production",
+                ["1.B.2"],
+            ],
+            ["1.C. CO2 Transport and storage", ["1.C"]],
+            ["2. Industrial processes and product use", ["2"]],
+            ["2.A. Mineral industry", ["2.A"]],
+            ["2.B. Chemical industry", ["2.B"]],
+            ["2.C. Metal industry", ["2.C"]],
+            ["2.D. Non-energy products from fuels and solvent use", ["2.D"]],
+            ["2.E. Electronic industry", ["2.E"]],
+            ["2.F. Product uses as substitutes for ODS", ["2.F"]],
+            ["2.G. Other product manufacture and use", ["2.G"]],
+            ["2.H. Other (4)", ["2.H"]],
+            ["3. Agriculture", ["3"]],
+            ["3.A. Enteric fermentation", ["3.A"]],
+            ["3.B. Manure management", ["3.B"]],
+            ["3.C. Rice cultivation", ["3.C"]],
+            ["3.D. Agricultural soils", ["3.D"]],
+            ["3.E. Prescribed burning of savannahs", ["3.E"]],
+            ["3.F. Field burning of agricultural residues", ["3.F"]],
+            ["3.G. Liming", ["3.G"]],
+            ["3.H. Urea application", ["3.H"]],
+            ["3.I. Other carbon-containing fertilizers", ["3.I"]],
+            ["3.J. Other", ["3.J"]],
+            ["4. Land use, land-use change and forestry (5)", ["4"]],
+            ["4.A. Forest land (5)", ["4.A"]],
+            ["4.B. Cropland (5)", ["4.B"]],
+            ["4.C. Grassland (5)", ["4.C"]],
+            ["4.D. Wetlands (5)", ["4.D"]],
+            ["4.E. Settlements (5)", ["4.E"]],
+            ["4.F. Other land (5)", ["4.F"]],
+            ["4.G. Harvested wood products (5)", ["4.G"]],
+            ["4.H. Other (5)", ["4.H"]],
+            ["5. Waste", ["5"]],
+            ["5.A. Solid waste disposal (6)", ["5.A"]],
+            ["5.B. Biological treatment of solid waste", ["5.B"]],
+            ["5.C. Incineration and open burning of waste (6)", ["5.C"]],
+            ["5.D. Wastewater treatment and discharge", ["5.D"]],
+            ["5.E. Other (6)", ["5.E"]],
+            ["6. Other (please specify) (7)", ["6"]],
+            ["NA", ["\IGNORE"]],
+            ["", ["\IGNORE"]],
+            [np.nan, ["\IGNORE"]],
+            ["Memo items: (8)", ["\IGNORE"]],
+            ["1.D.1. International bunkers", ["M.Memo.Int"]],
+            ["1.D.1.a. Aviation", ["M.Memo.Int.Avi"]],
+            ["1.D.1.b. Navigation", ["M.Memo.Int.Mar"]],
+            ["1.D.2. Multilateral operations", ["M.Memo.Mult"]],
+            ["1.D.3. CO2 emissions from biomass", ["M.Memo.Bio"]],
+            ["1.D.4. CO2 captured", ["M.Memo.CO2Cap"]],
+            ["5.F.1. 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)",
+            "Total GHG emissions/removals (2)": "KYOTOGHG (AR4GWP100)",
+        },
+        "coords_defaults": {
+            "class": "Total",
+        },
+    },  # tested
+}

+ 23 - 19
UNFCCC_GHG_data/UNFCCC_CRF_reader/crf_specifications/CRF2023_specification.py

@@ -42,6 +42,10 @@ TODO:
 import numpy as np
 from .util import unit_info
 
+# TODO: GWPs now differ by country. This has to be implemented (maybe giving
+#  gwp_to_use as a parameter to the specification)
+gwp_to_use = "AR4GWP100"
+
 CRF2023 = {
     "Table1s1": {
         "status": "tested",
@@ -1643,9 +1647,9 @@ CRF2023 = {
             ['7. Other (as specified in table 2(I).A-H)', ['2.C.7']],
         ],
         "entity_mapping": {
-            'HFCs(1)': 'HFCS (AR4GWP100)',
-            'PFCs(1)': 'PFCS (AR4GWP100)',
-            'Unspecified mix of HFCs and PFCs(1)': 'UnspMixOfHFCsPFCs (AR4GWP100)',
+            'HFCs(1)': f'HFCS ({gwp_to_use})',
+            'PFCs(1)': f'PFCS ({gwp_to_use})',
+            'Unspecified mix of HFCs and PFCs(1)': f'UnspMixOfHFCsPFCs ({gwp_to_use})',
         },
         "coords_defaults": {
             "class": "Total",
@@ -1689,9 +1693,9 @@ CRF2023 = {
             ['H. Other (as specified in tables 2(I).A-H and 2(II))(3)', ['2.H']],
         ],
         "entity_mapping": {
-            'HFCs(1)': 'HFCS (AR4GWP100)',
-            'PFCs(1)': 'PFCS (AR4GWP100)',
-            'Unspecified mix of HFCs and PFCs(1)': 'UnspMixOfHFCsPFCs (AR4GWP100)',
+            'HFCs(1)': f'HFCS ({gwp_to_use})',
+            'PFCs(1)': f'PFCS ({gwp_to_use})',
+            'Unspecified mix of HFCs and PFCs(1)': f'UnspMixOfHFCsPFCs ({gwp_to_use})',
         },
         "coords_defaults": {
             "class": "Total",
@@ -1804,9 +1808,9 @@ CRF2023 = {
             'HFC-365mfc': 'HFC365mfc',
             'HFC-41': 'HFC41',
             'HFC-43-10mee': 'HFC4310mee',
-            'Unspecified mix of HFCs (1)': 'UnspMixOfHFCs (AR4GWP100)',
-            'Unspecified mix of HFCs and PFCs(1)': 'UnspMixOfHFCsPFCs (AR4GWP100)',
-            'Unspecified mix of PFCs (1)': 'UnspMixOfPFCs (AR4GWP100)',
+            'Unspecified mix of HFCs (1)': f'UnspMixOfHFCs ({gwp_to_use})',
+            'Unspecified mix of HFCs and PFCs(1)': f'UnspMixOfHFCsPFCs ({gwp_to_use})',
+            'Unspecified mix of PFCs (1)': f'UnspMixOfPFCs ({gwp_to_use})',
             'c-C3F6': 'cC3F6',
             'c-C4F8': 'cC4F8',
         },
@@ -2046,7 +2050,7 @@ CRF2023 = {
         "sector_mapping": [
             ['1. Irrigated', ['3.C.1']],
             ['Continuously flooded', ['3.C.1.a']],
-            ['Intermittently flooded Single aeration', ['3.C.1.a.i']],
+            ['Intermittently flooded Single aeration', ['3.C.1.b.i']],
             ['Intermittently flooded Multiple aeration', ['3.C.1.b.ii']],
             ['2. Rainfed', ['3.C.2']],
             ['Flood prone', ['3.C.2.a']],
@@ -2584,9 +2588,9 @@ CRF2023 = {
         "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)',
+            'HFCs(1)': f'HFCS ({gwp_to_use})',
+            'PFCs(1)': f'PFCS ({gwp_to_use})',
+            'Unspecified mix of HFCs and PFCs(1)': f'UnspMixOfHFCsPFCs ({gwp_to_use})',
         },
         "coords_defaults": {
             "class": "Total",
@@ -2637,9 +2641,9 @@ CRF2023 = {
         "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)',
+            'HFCs (1)': f'HFCS ({gwp_to_use})',
+            'PFCs(1)': f'PFCS ({gwp_to_use})',
+            'Unspecified mix of HFCs and PFCs(1)': f'UnspMixOfHFCsPFCs ({gwp_to_use})',
         },
         "coords_defaults": {
             "class": "Total",
@@ -2673,9 +2677,9 @@ CRF2023 = {
         "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)',
+            'HFCs(1)': f'HFCS ({gwp_to_use})',
+            'PFCs(1)': f'PFCS ({gwp_to_use})',
+            'Unspecified mix of HFCs and PFCs(1)': f'UnspMixOfHFCsPFCs ({gwp_to_use})',
         },
         "coords_defaults": {
             "class": "Total",

+ 2 - 1
UNFCCC_GHG_data/UNFCCC_CRF_reader/crf_specifications/__init__.py

@@ -5,5 +5,6 @@ Define the CRF specifications here for easy access
 from .CRF2021_specification import CRF2021
 from .CRF2022_specification import CRF2022
 from .CRF2023_specification import CRF2023
+from .CRF2023_AUS_specification import CRF2023_AUS
 
-__all__ = ["CRF2021", "CRF2022", "CRF2023"]
+__all__ = ["CRF2021", "CRF2022", "CRF2023", "CRF2023_AUS"]

+ 7 - 0
UNFCCC_GHG_data/UNFCCC_CRF_reader/crf_specifications/util.py

@@ -16,6 +16,7 @@ unit_info = {
         "regexp_unit": r"\((.*)\)",
         "manual_repl_unit": {
             "CO2 equivalent (kt)": "kt CO2eq",
+            "CO2 equivalents (kt) (2)": "kt CO2eq", # for AUS Table2(II)
         },
         "default_unit": "t",
     },
@@ -26,6 +27,11 @@ unit_info = {
         "regexp_unit": r"\((.*)\)",
         "manual_repl_unit": {
             "CO2 equivalent (kt)": "kt CO2eq",
+            "CO2 equivalents (kt) (2) ": "kt CO2eq", # for AUS Table1
+            "CO2 equivalent (kt) (3)": "kt CO2eq", # for AUS, Table2(I)
+            "CO2 equivalents (kt) (3)": "kt CO2eq", # for AUS, Table2(I)
+            "CO2 equivalents (kt) (2)": "kt CO2eq", # for AUS Table3
+            "CO2 equivalents (kt) (4)": "kt CO2eq", # for AUS Table4
         },
         "default_unit": "kt",
     },
@@ -36,6 +42,7 @@ unit_info = {
         "regexp_unit": r"\((.*)\)",
         "manual_repl_unit": {
             "(kt CO2 equivalent)": "kt CO2eq",
+            "CO2 equivalents (kt) (3)": "kt CO2eq", # for AUS
         },
         "default_unit": "kt",
     },

+ 4 - 0
UNFCCC_GHG_data/UNFCCC_CRF_reader/test_read_UNFCCC_CRF_for_year.py

@@ -9,12 +9,15 @@ import argparse
 parser = argparse.ArgumentParser()
 parser.add_argument('--submission_year', help='Submission round to read', type=int)
 parser.add_argument('--data_year', help='Data year to read', type=int, default=2010)
+parser.add_argument('--country', help='Country to read', type=str, default=None)
 parser.add_argument('--totest', help='read tables to test', action='store_true')
 args = parser.parse_args()
 
 
 submission_year = args.submission_year
 data_year = args.data_year
+country = args.country
+#print(f"totest: {args.totest}")
 if args.totest:
     totest = True
 else:
@@ -24,6 +27,7 @@ read_year_to_test_specs(
     submission_year=submission_year,
     data_year=data_year,
     totest=totest,
+    country_code=country,
 )
 
 

+ 82 - 31
UNFCCC_GHG_data/UNFCCC_DI_reader/UNFCCC_DI_reader_config.py

@@ -1171,16 +1171,20 @@ di_processing_templates = {
     },
     # GHA: 1990-2006
     # GIN: 1994, 2000
-    # GMB: 1993, 2000
     'GMB': {
         'DI2023-05-24': { # 1993, 2000
             'remove_ts': {
                 'waste': { # very high in 1994
-                    'category': ['6', '6.A', '6.B'],
+                    'category': ['6', '6.A', '6.B', '15163', '24540'],
                     'entities': ['CH4', 'N2O', f'KYOTOGHG ({gwp_to_use})'],
                         'time': ['1993'],
                 },
             },
+            'basket_copy': {
+                'GWPs_to_add': ["AR4GWP100", "AR5GWP100", "AR6GWP100"],
+                'entities': ["UnspMixOfHFCs"],
+                'source_GWP': gwp_to_use,
+            },
         }
     },
     'GNB': {
@@ -1235,8 +1239,16 @@ di_processing_templates = {
         },
     },
     'IND': {
-        'DI2023-05-24': { # 1994,2000, 2010, 2016. Subsectors doffer a bit especilly
+        'DI2023-05-24': { # 1994,2000, 2010, 2016. Subsectors differ a bit especially
             # for 1994 and for LULUCF data
+            'remove_ts': {
+                '2C': { # inconsistent with other sources
+                    'category': ['2.C', '2', '15163', '24540'],
+                    'entities': ['CH4', 'N2O', f'KYOTOGHG ({gwp_to_use})', 'CO2',
+                                 'C2F6', 'CF4', f'PFCS ({gwp_to_use})', 'SF6' ],
+                    'time': ['1994'],
+                },
+            },
             'downscale': {
                 'sectors': { # for 1994
                     '1.A': {
@@ -1261,21 +1273,36 @@ di_processing_templates = {
                         'time': ['1994'],
                 },
             },
+            'basket_copy': {
+                'GWPs_to_add': ["AR4GWP100", "AR5GWP100", "AR6GWP100"],
+                'entities': ["UnspMixOfHFCs", "UnspMixOfPFCs"],
+                'source_GWP': gwp_to_use,
+            },
         },
     },
     # JOR: M.AG in 2000 is very low but it's like that in NC2 and no comment on error
     # in comparison in NC3
-    # 'JOR': {
-    #     'DI2023-05-24': {
-    #         'remove_ts': {
-    #             'agri_N2O': {
-    #                 'category': [''],
-    #                 'entities': ['N2O'],
-    #                 'time': ['2000']
-    #             },
-    #         },
-    #     }
-    # }
+    'JOR': {
+        'DI2023-05-24': {
+            'remove_ts': {
+                # 'agri_N2O': {
+                #     'category': [''],
+                #     'entities': ['N2O'],
+                #     'time': ['2000']
+                # },
+                'waste': {
+                    'category': ['6', '6.A', '6.B', '6.C', '6.D', '15163', '24540'],
+                    'entities': ['CH4', f'KYOTOGHG ({gwp_to_use})'],
+                    'time': ['1994'],
+                },
+            },
+            'basket_copy': {
+                'GWPs_to_add': ["AR4GWP100", "AR5GWP100", "AR6GWP100"],
+                'entities': ["UnspMixOfHFCs"],
+                'source_GWP': gwp_to_use,
+            },
+        }
+    },
     'KEN': {
         'DI2023-05-24': { # 1994,1995, 2000, 2005, 2010. Subsectors doffer a bit
             # especilly for 1994
@@ -1582,7 +1609,19 @@ di_processing_templates = {
             },
         },
     },
-    # PLW: 1994, 1995-1999 (partial), 2000, 2005
+    'PLW': { # 1994, 1995-1999 (partial), 2000, 2005}
+        'DI2023-05-24': {
+            'remove_ts': {
+                'waste': {
+                    'category': ['6', '6.A', '6.B', '6.C', '6.D', '15163', '24540'],
+                    'entities': ['CO2', 'CH4', 'N2O', 'KYOTOGHG (AR4GWP100)'],
+                    'time': ['1994'],
+                },
+            },
+            'remove_years': ['1995', '1996', '1997', '1998', '1999'],
+            # only few sectors covered and data found neither in NC1 nor NC2
+        },
+    },
     # PRK: 1990, 1994, 2000, 2002
     # PRY: 1990, 1994, 2000, 2005, 2011, 2012, 2015, 2017 land use sectors not
     # consistent, more data in BUR3 but not read yet
@@ -1885,12 +1924,12 @@ di_processing_templates = {
         },
     },
     # ZWE:
-    'ZWE': { # 1994, 2000, 2006 consistency of sectors and coverage does not look good,
-    # especially for subsectors
-        'DI2023-05-24': {  # remove all years
-            'remove_years': ['1994', '2000', '2006'],
-        },
-    },
+    # 'ZWE': { # 1994, 2000, 2006 consistency of sectors and coverage does not look good,
+    # # especially for subsectors
+    #     'DI2023-05-24': {  # remove all years
+    #         'remove_years': ['1994', '2000', '2006'],
+    #     },
+    # },
 }
 
 di_processing_info = {
@@ -1980,13 +2019,17 @@ di_processing_info = {
         'DI2023-05-24': di_processing_templates['GEO']['DI2023-05-24'],
     },
     'GMB': {
-        'default': di_processing_templates['general']['copyUnspHFC'],
-        'DI2023-05-24': di_processing_templates['general']['copyUnspHFC'],
+        'default': di_processing_templates['GMB']['DI2023-05-24'],
+        'DI2023-05-24': di_processing_templates['GMB']['DI2023-05-24'],
     },
     'GNB': {
         'default': di_processing_templates['GNB']['DI2023-05-24'],
         'DI2023-05-24': di_processing_templates['GNB']['DI2023-05-24'],
     },
+    'GRD': {
+        'default': di_processing_templates['GRD']['DI2023-05-24'],
+        'DI2023-05-24': di_processing_templates['GRD']['DI2023-05-24'],
+    },
     'IDN': {
         'default': di_processing_templates['IDN']['DI2023-05-24'],
         'DI2023-05-24': di_processing_templates['IDN']['DI2023-05-24'],
@@ -2000,17 +2043,21 @@ di_processing_info = {
         'DI2023-05-24': di_processing_templates['general']['copyHFCPFC'],
     },
     'JAM': {
-        'default': di_processing_templates['general']['copyUnspHFCUnspPFC'],
-        'DI2023-05-24': di_processing_templates['general']['copyUnspHFCUnspPFC'],
+        'default': di_processing_templates['JAM']['DI2023-05-24'],
+        'DI2023-05-24': di_processing_templates['JAM']['DI2023-05-24'],
     },
     'JOR': {
-        'default': di_processing_templates['general']['copyUnspHFC'],
-        'DI2023-05-24': di_processing_templates['general']['copyUnspHFC'],
+        'default': di_processing_templates['JOR']['DI2023-05-24'],
+        'DI2023-05-24': di_processing_templates['JOR']['DI2023-05-24'],
     },
     'KEN': {
         'default': di_processing_templates['KEN']['DI2023-05-24'],
         'DI2023-05-24': di_processing_templates['KEN']['DI2023-05-24'],
     },
+    'KIR': {
+        'default': di_processing_templates['KIR']['DI2023-05-24'],
+        'DI2023-05-24': di_processing_templates['KIR']['DI2023-05-24'],
+    },
     'KGZ': {
         'default': di_processing_templates['general']['copyUnspHFC'],
         'DI2023-05-24': di_processing_templates['general']['copyUnspHFC'],
@@ -2083,6 +2130,10 @@ di_processing_info = {
         'default': di_processing_templates['PHL']['DI2023-05-24'],
         'DI2023-05-24': di_processing_templates['PHL']['DI2023-05-24'],
     },
+    'PLW': {
+        'default': di_processing_templates['PLW']['DI2023-05-24'],
+        'DI2023-05-24': di_processing_templates['PLW']['DI2023-05-24'],
+    },
     'PRY': {
         'default': di_processing_templates['general']['copyUnspHFCUnspPFC'],
         'DI2023-05-24': di_processing_templates['general']['copyUnspHFCUnspPFC'],
@@ -2139,10 +2190,10 @@ di_processing_info = {
         'default': di_processing_templates['ZMB']['DI2023-05-24'],
         'DI2023-05-24': di_processing_templates['ZMB']['DI2023-05-24'],
     },
-    'ZWE': {
-        'default': di_processing_templates['ZWE']['DI2023-05-24'],
-        'DI2023-05-24': di_processing_templates['ZWE']['DI2023-05-24'],
-    },
+    # 'ZWE': {
+    #     'default': di_processing_templates['ZWE']['DI2023-05-24'],
+    #     'DI2023-05-24': di_processing_templates['ZWE']['DI2023-05-24'],
+    # },
 }
 
 basket_copy_HFCPFC = {

+ 4 - 1
UNFCCC_GHG_data/UNFCCC_DI_reader/UNFCCC_DI_reader_proc.py

@@ -72,7 +72,10 @@ def process_and_save_UNFCCC_DI_for_country(
     )
 
     # save
-    save_DI_country_data(data_processed, raw=False)
+    if data_processed.coords['time'].values.size > 0:
+        save_DI_country_data(data_processed, raw=False)
+    else:
+        print(f"No data left after processing for {country_code}")
 
     return data_processed
 

+ 5 - 0
UNFCCC_GHG_data/UNFCCC_reader/Israel/config_ISR_BUR2.py

@@ -420,6 +420,11 @@ gas_baskets = {
     'KYOTOGHG (AR6GWP100)': ['CO2', 'CH4', 'N2O', 'FGASES (AR6GWP100)'],
 }
 
+basket_copy = {
+    'GWPs_to_add': ["AR4GWP100", "AR5GWP100", "AR6GWP100"],
+    'entities': ["HFCS", "PFCS"],
+    'source_GWP': gwp_to_use,
+}
 
 #### functions
 def is_int(input: str) -> bool:

+ 3 - 1
UNFCCC_GHG_data/UNFCCC_reader/Israel/read_ISR_BUR2_from_pdf.py

@@ -16,7 +16,7 @@ from config_ISR_BUR2 import coords_cols, coords_terminologies, coords_defaults,
     coords_value_mapping, filter_remove, filter_keep, meta_data
 from config_ISR_BUR2 import cat_conversion, sectors_to_save, downscaling, \
     cats_to_agg, gas_baskets, terminology_proc
-from config_ISR_BUR2 import is_int
+from config_ISR_BUR2 import is_int, basket_copy
 
 ### genral configuration
 input_folder = downloaded_data_path / 'UNFCCC' / 'Israel' / 'BUR2'
@@ -267,7 +267,9 @@ data_proc_pm2 = process_data_for_country(
 
 country_processing_step2 = {
     'downscale': downscaling,
+    'basket_copy': basket_copy,
 }
+
 data_proc_pm2 = process_data_for_country(
     data_proc_pm2,
     entities_to_ignore=[],

+ 1 - 0
datasets/UNFCCC/CRF2023/CRF2023_raw_2023-09-08.csv

@@ -0,0 +1 @@
+../../../.git/annex/objects/9q/q4/MD5E-s34973513--516f6654a86e9bf4a981d8c1eb6aa2aa.csv/MD5E-s34973513--516f6654a86e9bf4a981d8c1eb6aa2aa.csv

+ 1 - 0
datasets/UNFCCC/CRF2023/CRF2023_raw_2023-09-08.nc

@@ -0,0 +1 @@
+../../../.git/annex/objects/p4/fw/MD5E-s60843916--a792562b679509edd60c972e8b895052.nc/MD5E-s60843916--a792562b679509edd60c972e8b895052.nc

+ 30 - 0
datasets/UNFCCC/CRF2023/CRF2023_raw_2023-09-08.yaml

@@ -0,0 +1,30 @@
+attrs:
+  references: https://unfccc.int/ghg-inventories-annex-i-parties/2023
+  rights: ''
+  contact: mail@johannes-guetschow.de
+  title: 'Data submitted in 2023 to the UNFCCC in the common reporting format (CRF)
+    by Australia. Submission date: 13042023'
+  comment: Read fom xlsx file by Johannes Gütschow
+  institution: United Nations Framework Convention on Climate Change (www.unfccc.int)
+  cat: category (CRF2013_2023)
+  area: area (ISO3)
+  scen: scenario (PRIMAP)
+  sec_cats:
+  - c
+  - l
+  - a
+  - s
+  - s
+time_format: '%Y'
+dimensions:
+  '*':
+  - time
+  - category (CRF2013_2023)
+  - scenario (PRIMAP)
+  - class
+  - provenance
+  - source
+  - area (ISO3)
+  - entity
+  - unit
+data_file: CRF2023_raw_2023-09-08.csv

+ 1 - 0
datasets/UNFCCC/CRF2023/CRF2023_raw_2023-09-10.csv

@@ -0,0 +1 @@
+../../../.git/annex/objects/Fm/5g/MD5E-s35655447--102667deeaffa8d8aa0b474e443bb2b4.csv/MD5E-s35655447--102667deeaffa8d8aa0b474e443bb2b4.csv

+ 1 - 0
datasets/UNFCCC/CRF2023/CRF2023_raw_2023-09-10.nc

@@ -0,0 +1 @@
+../../../.git/annex/objects/FZ/JM/MD5E-s66594322--6570218bfb04c3574fba7ac05faa1f6d.nc/MD5E-s66594322--6570218bfb04c3574fba7ac05faa1f6d.nc

+ 30 - 0
datasets/UNFCCC/CRF2023/CRF2023_raw_2023-09-10.yaml

@@ -0,0 +1,30 @@
+attrs:
+  references: https://unfccc.int/ghg-inventories-annex-i-parties/2023
+  rights: ''
+  contact: mail@johannes-guetschow.de
+  title: 'Data submitted in 2023 to the UNFCCC in the common reporting format (CRF)
+    by Australia. Submission date: 13042023'
+  comment: Read fom xlsx file by Johannes Gütschow
+  institution: United Nations Framework Convention on Climate Change (www.unfccc.int)
+  cat: category (CRF2013_2023)
+  area: area (ISO3)
+  scen: scenario (PRIMAP)
+  sec_cats:
+  - c
+  - l
+  - a
+  - s
+  - s
+time_format: '%Y'
+dimensions:
+  '*':
+  - time
+  - category (CRF2013_2023)
+  - scenario (PRIMAP)
+  - class
+  - provenance
+  - source
+  - area (ISO3)
+  - entity
+  - unit
+data_file: CRF2023_raw_2023-09-10.csv

+ 1 - 0
datasets/UNFCCC/CRF2023/CRF2023_raw_2023-09-13.csv

@@ -0,0 +1 @@
+../../../.git/annex/objects/77/gq/MD5E-s35690503--011e873a58d006d334f44ccc8ad69c28.csv/MD5E-s35690503--011e873a58d006d334f44ccc8ad69c28.csv

+ 1 - 0
datasets/UNFCCC/CRF2023/CRF2023_raw_2023-09-13.nc

@@ -0,0 +1 @@
+../../../.git/annex/objects/38/kw/MD5E-s66349302--45702253293b4622a5a71213aa3ebc7f.nc/MD5E-s66349302--45702253293b4622a5a71213aa3ebc7f.nc

+ 30 - 0
datasets/UNFCCC/CRF2023/CRF2023_raw_2023-09-13.yaml

@@ -0,0 +1,30 @@
+attrs:
+  references: https://unfccc.int/ghg-inventories-annex-i-parties/2023
+  rights: ''
+  contact: mail@johannes-guetschow.de
+  title: 'Data submitted in 2023 to the UNFCCC in the common reporting format (CRF)
+    by Australia. Submission date: 13042023'
+  comment: Read fom xlsx file by Johannes Gütschow
+  institution: United Nations Framework Convention on Climate Change (www.unfccc.int)
+  cat: category (CRF2013_2023)
+  area: area (ISO3)
+  scen: scenario (PRIMAP)
+  sec_cats:
+  - c
+  - l
+  - a
+  - s
+  - s
+time_format: '%Y'
+dimensions:
+  '*':
+  - time
+  - provenance
+  - scenario (PRIMAP)
+  - category (CRF2013_2023)
+  - area (ISO3)
+  - class
+  - source
+  - entity
+  - unit
+data_file: CRF2023_raw_2023-09-13.csv

+ 1 - 0
datasets/UNFCCC/CRF2023/CRF2023_raw_2023-09-17.csv

@@ -0,0 +1 @@
+../../../.git/annex/objects/q2/X5/MD5E-s35406349--1a1f1743bdac1497ee9fcb881053cd10.csv/MD5E-s35406349--1a1f1743bdac1497ee9fcb881053cd10.csv

+ 1 - 0
datasets/UNFCCC/CRF2023/CRF2023_raw_2023-09-17.nc

@@ -0,0 +1 @@
+../../../.git/annex/objects/3X/Kv/MD5E-s66048798--ce75304b714bb85ff8a7ce5f7155dffd.nc/MD5E-s66048798--ce75304b714bb85ff8a7ce5f7155dffd.nc

+ 30 - 0
datasets/UNFCCC/CRF2023/CRF2023_raw_2023-09-17.yaml

@@ -0,0 +1,30 @@
+attrs:
+  references: https://unfccc.int/ghg-inventories-annex-i-parties/2023
+  rights: ''
+  contact: mail@johannes-guetschow.de
+  title: 'Data submitted in 2023 to the UNFCCC in the common reporting format (CRF)
+    by Australia. Submission date: 13042023'
+  comment: Read fom xlsx file by Johannes Gütschow
+  institution: United Nations Framework Convention on Climate Change (www.unfccc.int)
+  cat: category (CRF2013_2023)
+  area: area (ISO3)
+  scen: scenario (PRIMAP)
+  sec_cats:
+  - c
+  - l
+  - a
+  - s
+  - s
+time_format: '%Y'
+dimensions:
+  '*':
+  - time
+  - provenance
+  - scenario (PRIMAP)
+  - class
+  - area (ISO3)
+  - source
+  - category (CRF2013_2023)
+  - entity
+  - unit
+data_file: CRF2023_raw_2023-09-17.csv

+ 1 - 0
datasets/UNFCCC/CRF2023/CRF2023_raw_2023-09-18.csv

@@ -0,0 +1 @@
+../../../.git/annex/objects/fq/V9/MD5E-s35386478--13c62ae10263cfc831034c32d7c3bb6d.csv/MD5E-s35386478--13c62ae10263cfc831034c32d7c3bb6d.csv

+ 1 - 0
datasets/UNFCCC/CRF2023/CRF2023_raw_2023-09-18.nc

@@ -0,0 +1 @@
+../../../.git/annex/objects/fV/8K/MD5E-s64757707--fdd37600f9f482e321b4266a600486a3.nc/MD5E-s64757707--fdd37600f9f482e321b4266a600486a3.nc

+ 30 - 0
datasets/UNFCCC/CRF2023/CRF2023_raw_2023-09-18.yaml

@@ -0,0 +1,30 @@
+attrs:
+  references: https://unfccc.int/ghg-inventories-annex-i-parties/2023
+  rights: ''
+  contact: mail@johannes-guetschow.de
+  title: 'Data submitted in 2023 to the UNFCCC in the common reporting format (CRF)
+    by Australia. Submission date: 13042023'
+  comment: Read fom xlsx file by Johannes Gütschow
+  institution: United Nations Framework Convention on Climate Change (www.unfccc.int)
+  cat: category (CRF2013_2023)
+  area: area (ISO3)
+  scen: scenario (PRIMAP)
+  sec_cats:
+  - c
+  - l
+  - a
+  - s
+  - s
+time_format: '%Y'
+dimensions:
+  '*':
+  - time
+  - category (CRF2013_2023)
+  - source
+  - class
+  - area (ISO3)
+  - scenario (PRIMAP)
+  - provenance
+  - entity
+  - unit
+data_file: CRF2023_raw_2023-09-18.csv

+ 1 - 0
datasets/UNFCCC/CRF2023/CRF2023_raw_2023-09-21.csv

@@ -0,0 +1 @@
+../../../.git/annex/objects/1g/VP/MD5E-s35356953--ae49405404ad8e4c0d022f672e986165.csv/MD5E-s35356953--ae49405404ad8e4c0d022f672e986165.csv

+ 1 - 0
datasets/UNFCCC/CRF2023/CRF2023_raw_2023-09-21.nc

@@ -0,0 +1 @@
+../../../.git/annex/objects/xZ/mK/MD5E-s64749022--68de375adef8db435f7d5bbf7bfb1c62.nc/MD5E-s64749022--68de375adef8db435f7d5bbf7bfb1c62.nc

+ 30 - 0
datasets/UNFCCC/CRF2023/CRF2023_raw_2023-09-21.yaml

@@ -0,0 +1,30 @@
+attrs:
+  references: https://unfccc.int/ghg-inventories-annex-i-parties/2023
+  rights: ''
+  contact: mail@johannes-guetschow.de
+  title: 'Data submitted in 2023 to the UNFCCC in the common reporting format (CRF)
+    by Australia. Submission date: 13042023'
+  comment: Read fom xlsx file by Johannes Gütschow
+  institution: United Nations Framework Convention on Climate Change (www.unfccc.int)
+  cat: category (CRF2013_2023)
+  area: area (ISO3)
+  scen: scenario (PRIMAP)
+  sec_cats:
+  - c
+  - l
+  - a
+  - s
+  - s
+time_format: '%Y'
+dimensions:
+  '*':
+  - time
+  - category (CRF2013_2023)
+  - source
+  - class
+  - area (ISO3)
+  - scenario (PRIMAP)
+  - provenance
+  - entity
+  - unit
+data_file: CRF2023_raw_2023-09-21.csv

+ 1 - 0
datasets/UNFCCC/DI_non_AnnexI/DI_non_AnnexI_2023-09-13.csv

@@ -0,0 +1 @@
+DI_non_AnnexI_517132d494ad9e7331e21ac20165b3ea_hash.csv

+ 1 - 0
datasets/UNFCCC/DI_non_AnnexI/DI_non_AnnexI_2023-09-13.nc

@@ -0,0 +1 @@
+DI_non_AnnexI_517132d494ad9e7331e21ac20165b3ea_hash.nc

+ 1 - 0
datasets/UNFCCC/DI_non_AnnexI/DI_non_AnnexI_2023-09-13.yaml

@@ -0,0 +1 @@
+DI_non_AnnexI_517132d494ad9e7331e21ac20165b3ea_hash.yaml

+ 1 - 0
datasets/UNFCCC/DI_non_AnnexI/DI_non_AnnexI_517132d494ad9e7331e21ac20165b3ea_hash.csv

@@ -0,0 +1 @@
+../../../.git/annex/objects/01/72/MD5E-s14890012--aa3b34d7414ce4cc88dff6386c6ad5b0.csv/MD5E-s14890012--aa3b34d7414ce4cc88dff6386c6ad5b0.csv

+ 1 - 0
datasets/UNFCCC/DI_non_AnnexI/DI_non_AnnexI_517132d494ad9e7331e21ac20165b3ea_hash.nc

@@ -0,0 +1 @@
+../../../.git/annex/objects/gz/M5/MD5E-s6447869--e5a7bddf2739c37ac19d6dcad903b67e.nc/MD5E-s6447869--e5a7bddf2739c37ac19d6dcad903b67e.nc

+ 41 - 0
datasets/UNFCCC/DI_non_AnnexI/DI_non_AnnexI_517132d494ad9e7331e21ac20165b3ea_hash.yaml

@@ -0,0 +1,41 @@
+attrs:
+  references: https://di.unfccc.int
+  rights: ''
+  contact: mail@johannes-guetschow.de
+  institution: United Nations Framework Convention on Climate Change (www.unfccc.int)
+  cat: category (IPCC2006_PRIMAP)
+  area: area (ISO3)
+  scen: scenario (Process_Date)
+  sec_cats:
+  - class
+  - measure
+  comment: Data read from the UNFCCC DI flexible query interface using the API. Data
+    read on 2023-05-24. Processed on 2023-09-13
+  title: 'Data submitted by the following non-AnnexI countries and available in the
+    DI interface, converted to IPCC2006 categories and downscaled where applicable.
+    For download date see scenario. Countries: AFG, AGO, ALB, ARE, ARG, ARM, ATG,
+    AZE, BDI, BEN, BFA, BGD, BHR, BHS, BIH, BOL, BRA, BRB, BRN, BTN, BWA, CAF, CHL,
+    CHN, CIV, CMR, COD, COG, COK, COL, COM, CPV, CRI, CUB, DJI, DMA, DOM, DZA, ECU,
+    EGY, ERI, ETH, FJI, FSM, GAB, GEO, GHA, GIN, GMB, GNB, GRD, GTM, GUY, HND, HTI,
+    IDN, IND, IRN, IRQ, ISR, JAM, JOR, KEN, KGZ, KHM, KIR, KNA, KOR, KWT, LAO, LBN,
+    LBR, LCA, LKA, LSO, MAR, MDA, MDG, MDV, MEX, MHL, MKD, MLI, MMR, MNE, MNG, MOZ,
+    MRT, MUS, MWI, MYS, NAM, NER, NGA, NIC, NIU, NPL, NRU, OMN, PAK, PAN, PER, PHL,
+    PLW, PNG, PRK, PRY, PSE, QAT, RWA, SAU, SDN, SEN, SGP, SLB, SLV, SMR, SRB, SSD,
+    STP, SUR, SWZ, SYC, SYR, TCD, TGO, THA, TJK, TKM, TLS, TON, TTO, TUN, TUV, TZA,
+    UGA, URY, UZB, VCT, VEN, VNM, VUT, WSM, YEM, ZAF, ZMB'
+time_format: '%Y'
+dimensions:
+  '*':
+  - time
+  - source
+  - measure
+  - class
+  - scenario (Process_Date)
+  - area (ISO3)
+  - provenance
+  - category (IPCC2006_PRIMAP)
+  - entity
+  - unit
+additional_coordinates:
+  orig_cat_name: category (IPCC2006_PRIMAP)
+data_file: DI_non_AnnexI_517132d494ad9e7331e21ac20165b3ea_hash.csv

+ 1 - 0
datasets/UNFCCC/DI_non_AnnexI/DI_non_AnnexI_637927eddc7bc1dde7652d48c879b516_hash.csv

@@ -0,0 +1 @@
+../../../.git/annex/objects/J0/gF/MD5E-s14890122--9f7c9a843e732e79d065fa92e84504e4.csv/MD5E-s14890122--9f7c9a843e732e79d065fa92e84504e4.csv

+ 1 - 0
datasets/UNFCCC/DI_non_AnnexI/DI_non_AnnexI_637927eddc7bc1dde7652d48c879b516_hash.nc

@@ -0,0 +1 @@
+../../../.git/annex/objects/P1/9V/MD5E-s6447942--a41f0f534d78228a4012f6a20711c489.nc/MD5E-s6447942--a41f0f534d78228a4012f6a20711c489.nc

+ 41 - 0
datasets/UNFCCC/DI_non_AnnexI/DI_non_AnnexI_637927eddc7bc1dde7652d48c879b516_hash.yaml

@@ -0,0 +1,41 @@
+attrs:
+  references: https://di.unfccc.int
+  rights: ''
+  contact: mail@johannes-guetschow.de
+  institution: United Nations Framework Convention on Climate Change (www.unfccc.int)
+  cat: category (IPCC2006_PRIMAP)
+  area: area (ISO3)
+  scen: scenario (Process_Date)
+  sec_cats:
+  - class
+  - measure
+  comment: Data read from the UNFCCC DI flexible query interface using the API. Data
+    read on 2023-05-24. Processed on 2023-09-13
+  title: 'Data submitted by the following non-AnnexI countries and available in the
+    DI interface, converted to IPCC2006 categories and downscaled where applicable.
+    For download date see scenario. Countries: AFG, AGO, ALB, ARE, ARG, ARM, ATG,
+    AZE, BDI, BEN, BFA, BGD, BHR, BHS, BIH, BOL, BRA, BRB, BRN, BTN, BWA, CAF, CHL,
+    CHN, CIV, CMR, COD, COG, COK, COL, COM, CPV, CRI, CUB, DJI, DMA, DOM, DZA, ECU,
+    EGY, ERI, ETH, FJI, FSM, GAB, GEO, GHA, GIN, GMB, GNB, GRD, GTM, GUY, HND, HTI,
+    IDN, IND, IRN, IRQ, ISR, JAM, JOR, KEN, KGZ, KHM, KIR, KNA, KOR, KWT, LAO, LBN,
+    LBR, LCA, LKA, LSO, MAR, MDA, MDG, MDV, MEX, MHL, MKD, MLI, MMR, MNE, MNG, MOZ,
+    MRT, MUS, MWI, MYS, NAM, NER, NGA, NIC, NIU, NPL, NRU, OMN, PAK, PAN, PER, PHL,
+    PLW, PNG, PRK, PRY, PSE, QAT, RWA, SAU, SDN, SEN, SGP, SLB, SLV, SMR, SRB, SSD,
+    STP, SUR, SWZ, SYC, SYR, TCD, TGO, THA, TJK, TKM, TLS, TON, TTO, TUN, TUV, TZA,
+    UGA, URY, UZB, VCT, VEN, VNM, VUT, WSM, YEM, ZAF, ZMB'
+time_format: '%Y'
+dimensions:
+  '*':
+  - time
+  - source
+  - measure
+  - class
+  - scenario (Process_Date)
+  - area (ISO3)
+  - provenance
+  - category (IPCC2006_PRIMAP)
+  - entity
+  - unit
+additional_coordinates:
+  orig_cat_name: category (IPCC2006_PRIMAP)
+data_file: DI_non_AnnexI_637927eddc7bc1dde7652d48c879b516_hash.csv

+ 1 - 0
datasets/UNFCCC/DI_non_AnnexI/DI_non_AnnexI_e2ec0afc94b872062fc75a11a002f4ef_hash.csv

@@ -0,0 +1 @@
+../../../.git/annex/objects/vG/v3/MD5E-s14750672--1da53e55dbb18f7d73859158ef50c64c.csv/MD5E-s14750672--1da53e55dbb18f7d73859158ef50c64c.csv

+ 1 - 0
datasets/UNFCCC/DI_non_AnnexI/DI_non_AnnexI_e2ec0afc94b872062fc75a11a002f4ef_hash.nc

@@ -0,0 +1 @@
+../../../.git/annex/objects/KF/0V/MD5E-s6439288--c15256a048ee23e211f6c695a760ec73.nc/MD5E-s6439288--c15256a048ee23e211f6c695a760ec73.nc

+ 41 - 0
datasets/UNFCCC/DI_non_AnnexI/DI_non_AnnexI_e2ec0afc94b872062fc75a11a002f4ef_hash.yaml

@@ -0,0 +1,41 @@
+attrs:
+  references: https://di.unfccc.int
+  rights: ''
+  contact: mail@johannes-guetschow.de
+  institution: United Nations Framework Convention on Climate Change (www.unfccc.int)
+  cat: category (IPCC2006_PRIMAP)
+  area: area (ISO3)
+  scen: scenario (Process_Date)
+  sec_cats:
+  - class
+  - measure
+  comment: Data read from the UNFCCC DI flexible query interface using the API. Data
+    read on 2023-05-24. Processed on 2023-09-13
+  title: 'Data submitted by the following non-AnnexI countries and available in the
+    DI interface, converted to IPCC2006 categories and downscaled where applicable.
+    For download date see scenario. Countries: AFG, AGO, ALB, ARE, ARG, ARM, ATG,
+    AZE, BDI, BEN, BFA, BGD, BHR, BHS, BIH, BOL, BRA, BRB, BRN, BTN, BWA, CAF, CHL,
+    CHN, CIV, CMR, COD, COG, COK, COL, COM, CPV, CRI, CUB, DJI, DMA, DOM, DZA, ECU,
+    EGY, ERI, ETH, FJI, FSM, GAB, GEO, GHA, GIN, GMB, GNB, GRD, GTM, GUY, HND, HTI,
+    IDN, IRN, IRQ, ISR, JAM, JOR, KEN, KGZ, KHM, KIR, KNA, KOR, KWT, LAO, LBN, LBR,
+    LCA, LKA, LSO, MAR, MDA, MDG, MDV, MEX, MHL, MKD, MLI, MMR, MNE, MNG, MOZ, MRT,
+    MUS, MWI, MYS, NAM, NER, NGA, NIC, NIU, NPL, NRU, OMN, PAK, PAN, PER, PHL, PLW,
+    PNG, PRK, PRY, PSE, QAT, RWA, SAU, SDN, SEN, SGP, SLB, SLV, SMR, SRB, SSD, STP,
+    SUR, SWZ, SYC, SYR, TCD, TGO, THA, TJK, TKM, TLS, TON, TTO, TUN, TUV, TZA, UGA,
+    URY, UZB, VCT, VEN, VNM, VUT, WSM, YEM, ZAF, ZMB'
+time_format: '%Y'
+dimensions:
+  '*':
+  - time
+  - source
+  - measure
+  - class
+  - scenario (Process_Date)
+  - area (ISO3)
+  - provenance
+  - category (IPCC2006_PRIMAP)
+  - entity
+  - unit
+additional_coordinates:
+  orig_cat_name: category (IPCC2006_PRIMAP)
+data_file: DI_non_AnnexI_e2ec0afc94b872062fc75a11a002f4ef_hash.csv

+ 2 - 1
dodo.py

@@ -202,7 +202,7 @@ read_config_crf = {
     "re_read": get_var('re_read', False),
     "countries": get_var('countries', None),
     "data_year": get_var('data_year', None),
-    "totest": get_var('data_year', None),
+    "totest": get_var('totest', None),
 }
 
 def task_read_unfccc_crf_submission():
@@ -255,6 +255,7 @@ def task_test_read_unfccc_crf_for_year():
                f"UNFCCC_GHG_data/UNFCCC_CRF_reader"
                f"/test_read_UNFCCC_CRF_for_year.py "
                f"--submission_year={read_config_crf['submission_year']} "
+               f"--country={read_config_crf['country']} "
                ]
     if read_config_crf["totest"] == "True":
         actions[0] = actions[0] + " --totest"

+ 1 - 0
downloaded_data/UNFCCC/00_new_downloads_CRF2023-2023-09-06.csv

@@ -0,0 +1 @@
+../../.git/annex/objects/0g/vX/MD5E-s166--015bf4b76df5e01612860920cab7b269.csv/MD5E-s166--015bf4b76df5e01612860920cab7b269.csv

+ 1 - 0
downloaded_data/UNFCCC/00_new_downloads_CRF2023-2023-09-21.csv

@@ -0,0 +1 @@
+../../.git/annex/objects/2F/Mg/MD5E-s185--34c045e45cdfa214460669f64a905cbb.csv/MD5E-s185--34c045e45cdfa214460669f64a905cbb.csv

+ 1 - 0
downloaded_data/UNFCCC/France/CRF2023/FRK_2023_1990_29082023_172247.xlsx

@@ -0,0 +1 @@
+../../../../.git/annex/objects/FV/4M/MD5E-s857876--1ef2c5a7293be54f9927901b1b112f85.xlsx/MD5E-s857876--1ef2c5a7293be54f9927901b1b112f85.xlsx

+ 1 - 0
downloaded_data/UNFCCC/France/CRF2023/FRK_2023_1991_29082023_172332.xlsx

@@ -0,0 +1 @@
+../../../../.git/annex/objects/MX/K8/MD5E-s666733--350617d4ef936ed75377cce8bb580bd3.xlsx/MD5E-s666733--350617d4ef936ed75377cce8bb580bd3.xlsx

+ 1 - 0
downloaded_data/UNFCCC/France/CRF2023/FRK_2023_1992_29082023_172417.xlsx

@@ -0,0 +1 @@
+../../../../.git/annex/objects/66/mV/MD5E-s672037--7542ae2cebf418f7b6e15ca3d3eb7af6.xlsx/MD5E-s672037--7542ae2cebf418f7b6e15ca3d3eb7af6.xlsx

+ 1 - 0
downloaded_data/UNFCCC/France/CRF2023/FRK_2023_1993_29082023_172501.xlsx

@@ -0,0 +1 @@
+../../../../.git/annex/objects/P1/Pj/MD5E-s675903--7ca9f568f028ddb30e039115107ab943.xlsx/MD5E-s675903--7ca9f568f028ddb30e039115107ab943.xlsx

+ 1 - 0
downloaded_data/UNFCCC/France/CRF2023/FRK_2023_1994_29082023_172545.xlsx

@@ -0,0 +1 @@
+../../../../.git/annex/objects/Q9/X3/MD5E-s679891--e62c961777aa9318f4bf1bf01fd50965.xlsx/MD5E-s679891--e62c961777aa9318f4bf1bf01fd50965.xlsx

+ 1 - 0
downloaded_data/UNFCCC/France/CRF2023/FRK_2023_1995_29082023_172629.xlsx

@@ -0,0 +1 @@
+../../../../.git/annex/objects/VV/Qv/MD5E-s684121--bf1e396740cbc699313fa7e77224bced.xlsx/MD5E-s684121--bf1e396740cbc699313fa7e77224bced.xlsx

+ 1 - 0
downloaded_data/UNFCCC/France/CRF2023/FRK_2023_1996_29082023_172713.xlsx

@@ -0,0 +1 @@
+../../../../.git/annex/objects/GX/47/MD5E-s687547--b602de0de1cb10cf467d19feeaf91e4c.xlsx/MD5E-s687547--b602de0de1cb10cf467d19feeaf91e4c.xlsx

+ 1 - 0
downloaded_data/UNFCCC/France/CRF2023/FRK_2023_1997_29082023_172758.xlsx

@@ -0,0 +1 @@
+../../../../.git/annex/objects/0f/Qv/MD5E-s690861--c50c12803df8cbd40aa85323dacf93c7.xlsx/MD5E-s690861--c50c12803df8cbd40aa85323dacf93c7.xlsx

+ 1 - 0
downloaded_data/UNFCCC/France/CRF2023/FRK_2023_1998_29082023_172843.xlsx

@@ -0,0 +1 @@
+../../../../.git/annex/objects/8m/qg/MD5E-s693985--1397630051ce1dfe2d530ce3128cf644.xlsx/MD5E-s693985--1397630051ce1dfe2d530ce3128cf644.xlsx

+ 1 - 0
downloaded_data/UNFCCC/France/CRF2023/FRK_2023_1999_29082023_172927.xlsx

@@ -0,0 +1 @@
+../../../../.git/annex/objects/F0/zW/MD5E-s697120--2146e45ac3028107e97b2e8cc7790687.xlsx/MD5E-s697120--2146e45ac3028107e97b2e8cc7790687.xlsx

+ 1 - 0
downloaded_data/UNFCCC/France/CRF2023/FRK_2023_2000_29082023_173011.xlsx

@@ -0,0 +1 @@
+../../../../.git/annex/objects/PW/zQ/MD5E-s700402--8e74a3b6efe5361c8e15a8b111527519.xlsx/MD5E-s700402--8e74a3b6efe5361c8e15a8b111527519.xlsx

+ 1 - 0
downloaded_data/UNFCCC/France/CRF2023/FRK_2023_2001_29082023_173056.xlsx

@@ -0,0 +1 @@
+../../../../.git/annex/objects/73/6m/MD5E-s704199--ee810c81cfac3cb8ef89c0aa830c2c40.xlsx/MD5E-s704199--ee810c81cfac3cb8ef89c0aa830c2c40.xlsx

+ 1 - 0
downloaded_data/UNFCCC/France/CRF2023/FRK_2023_2002_29082023_173140.xlsx

@@ -0,0 +1 @@
+../../../../.git/annex/objects/77/9K/MD5E-s707534--a1b204ef95886d83de2031254acbb861.xlsx/MD5E-s707534--a1b204ef95886d83de2031254acbb861.xlsx

+ 1 - 0
downloaded_data/UNFCCC/France/CRF2023/FRK_2023_2003_29082023_173224.xlsx

@@ -0,0 +1 @@
+../../../../.git/annex/objects/K5/zW/MD5E-s710857--2a3ff5d9bc3b363b46a21f3b9222c43f.xlsx/MD5E-s710857--2a3ff5d9bc3b363b46a21f3b9222c43f.xlsx

+ 1 - 0
downloaded_data/UNFCCC/France/CRF2023/FRK_2023_2004_29082023_173308.xlsx

@@ -0,0 +1 @@
+../../../../.git/annex/objects/zw/7g/MD5E-s714061--25ba7086aea315fc26b617b31ab76784.xlsx/MD5E-s714061--25ba7086aea315fc26b617b31ab76784.xlsx

+ 1 - 0
downloaded_data/UNFCCC/France/CRF2023/FRK_2023_2005_29082023_173353.xlsx

@@ -0,0 +1 @@
+../../../../.git/annex/objects/8Z/2q/MD5E-s716989--2bed35a63701c0f2f7e16520594e6c4b.xlsx/MD5E-s716989--2bed35a63701c0f2f7e16520594e6c4b.xlsx

+ 1 - 0
downloaded_data/UNFCCC/France/CRF2023/FRK_2023_2006_29082023_173438.xlsx

@@ -0,0 +1 @@
+../../../../.git/annex/objects/2z/mv/MD5E-s719921--3b5eda1ac70722105f8aa5bf8e713ffd.xlsx/MD5E-s719921--3b5eda1ac70722105f8aa5bf8e713ffd.xlsx

+ 1 - 0
downloaded_data/UNFCCC/France/CRF2023/FRK_2023_2007_29082023_173522.xlsx

@@ -0,0 +1 @@
+../../../../.git/annex/objects/3w/wF/MD5E-s723249--975f9ba2a354e47b65e3ebed952ede67.xlsx/MD5E-s723249--975f9ba2a354e47b65e3ebed952ede67.xlsx

+ 1 - 0
downloaded_data/UNFCCC/France/CRF2023/FRK_2023_2008_29082023_173607.xlsx

@@ -0,0 +1 @@
+../../../../.git/annex/objects/4q/XJ/MD5E-s726597--4e8384ef2ac46479a6fa7f1a49708d1c.xlsx/MD5E-s726597--4e8384ef2ac46479a6fa7f1a49708d1c.xlsx

+ 1 - 0
downloaded_data/UNFCCC/France/CRF2023/FRK_2023_2009_29082023_173651.xlsx

@@ -0,0 +1 @@
+../../../../.git/annex/objects/qP/4P/MD5E-s729956--d2272a89b2eddc6537d1cf9c74c74adf.xlsx/MD5E-s729956--d2272a89b2eddc6537d1cf9c74c74adf.xlsx

+ 1 - 0
downloaded_data/UNFCCC/France/CRF2023/FRK_2023_2010_29082023_173735.xlsx

@@ -0,0 +1 @@
+../../../../.git/annex/objects/fp/F3/MD5E-s732623--ef6e5aca7879a20e01771b66e0ba558e.xlsx/MD5E-s732623--ef6e5aca7879a20e01771b66e0ba558e.xlsx

+ 1 - 0
downloaded_data/UNFCCC/France/CRF2023/FRK_2023_2011_29082023_173820.xlsx

@@ -0,0 +1 @@
+../../../../.git/annex/objects/f3/3k/MD5E-s736178--e3d51106d9a593d2e135c49037390adc.xlsx/MD5E-s736178--e3d51106d9a593d2e135c49037390adc.xlsx

+ 1 - 0
downloaded_data/UNFCCC/France/CRF2023/FRK_2023_2012_29082023_173905.xlsx

@@ -0,0 +1 @@
+../../../../.git/annex/objects/6m/92/MD5E-s739817--bfc4b644c26a7c8f0d86f0546096d0da.xlsx/MD5E-s739817--bfc4b644c26a7c8f0d86f0546096d0da.xlsx

+ 1 - 0
downloaded_data/UNFCCC/France/CRF2023/FRK_2023_2013_29082023_173949.xlsx

@@ -0,0 +1 @@
+../../../../.git/annex/objects/z9/mJ/MD5E-s942575--414950d897ab72b2ae5c93f12c68de11.xlsx/MD5E-s942575--414950d897ab72b2ae5c93f12c68de11.xlsx

+ 1 - 0
downloaded_data/UNFCCC/France/CRF2023/FRK_2023_2014_29082023_174034.xlsx

@@ -0,0 +1 @@
+../../../../.git/annex/objects/m5/6F/MD5E-s946269--96c8c79222e85e6983dc67c27c96fe9e.xlsx/MD5E-s946269--96c8c79222e85e6983dc67c27c96fe9e.xlsx

+ 1 - 0
downloaded_data/UNFCCC/France/CRF2023/FRK_2023_2015_29082023_174118.xlsx

@@ -0,0 +1 @@
+../../../../.git/annex/objects/Kf/4k/MD5E-s949615--f5d1a86e29756872054c794a3248f047.xlsx/MD5E-s949615--f5d1a86e29756872054c794a3248f047.xlsx

+ 1 - 0
downloaded_data/UNFCCC/France/CRF2023/FRK_2023_2016_29082023_174203.xlsx

@@ -0,0 +1 @@
+../../../../.git/annex/objects/02/4G/MD5E-s953395--b655440559fe1f9d41869e2472884540.xlsx/MD5E-s953395--b655440559fe1f9d41869e2472884540.xlsx

+ 1 - 0
downloaded_data/UNFCCC/France/CRF2023/FRK_2023_2017_29082023_174248.xlsx

@@ -0,0 +1 @@
+../../../../.git/annex/objects/wZ/8J/MD5E-s956935--af63815206c13c6dee9a78006ea33674.xlsx/MD5E-s956935--af63815206c13c6dee9a78006ea33674.xlsx

+ 1 - 0
downloaded_data/UNFCCC/France/CRF2023/FRK_2023_2018_29082023_174332.xlsx

@@ -0,0 +1 @@
+../../../../.git/annex/objects/Km/f1/MD5E-s959983--ef517e60ed707e4b397d12b0cf0b25c0.xlsx/MD5E-s959983--ef517e60ed707e4b397d12b0cf0b25c0.xlsx

+ 1 - 0
downloaded_data/UNFCCC/France/CRF2023/FRK_2023_2019_29082023_174417.xlsx

@@ -0,0 +1 @@
+../../../../.git/annex/objects/M0/ZP/MD5E-s963464--602830978d2669fa0b4491e0b395de8c.xlsx/MD5E-s963464--602830978d2669fa0b4491e0b395de8c.xlsx

+ 1 - 0
downloaded_data/UNFCCC/France/CRF2023/FRK_2023_2020_29082023_174502.xlsx

@@ -0,0 +1 @@
+../../../../.git/annex/objects/WG/Mv/MD5E-s967043--f7da272c0c185efa5fcade62f9fc704c.xlsx/MD5E-s967043--f7da272c0c185efa5fcade62f9fc704c.xlsx

+ 1 - 0
downloaded_data/UNFCCC/France/CRF2023/FRK_2023_2021_29082023_174547.xlsx

@@ -0,0 +1 @@
+../../../../.git/annex/objects/Fj/14/MD5E-s961924--5225ff575ee90feecb63d61f977147b8.xlsx/MD5E-s961924--5225ff575ee90feecb63d61f977147b8.xlsx

+ 1 - 0
downloaded_data/UNFCCC/France/CRF2023/frk-2023-crf-29aug23_AR5.zip

@@ -0,0 +1 @@
+../../../../.git/annex/objects/Q0/MX/MD5E-s20204974--3b6fb39a3cd82fd6d358cc5edda91e51.zip/MD5E-s20204974--3b6fb39a3cd82fd6d358cc5edda91e51.zip

+ 1 - 0
downloaded_data/UNFCCC/Guatemala/BUR1/2022_IIN_GT-v2.pdf

@@ -0,0 +1 @@
+../../../../.git/annex/objects/g1/wj/MD5E-s7059955--df9aa19b558f479e795e4400fb749be1.pdf/MD5E-s7059955--df9aa19b558f479e795e4400fb749be1.pdf

+ 0 - 1
downloaded_data/UNFCCC/Liechtenstein/CRF2023/LIE_2023_2022_12042023_174927.xlsx

@@ -1 +0,0 @@
-../../../../.git/annex/objects/xm/Zf/MD5E-s875287--f51e92880925b0495f2f35dc75579882.xlsx/MD5E-s875287--f51e92880925b0495f2f35dc75579882.xlsx

+ 1 - 0
downloaded_data/UNFCCC/Liechtenstein/CRF2023/ignore/LIE_2023_2022_12042023_174927.xlsx

@@ -0,0 +1 @@
+../../../../../.git/annex/objects/xm/Zf/MD5E-s875287--f51e92880925b0495f2f35dc75579882.xlsx/MD5E-s875287--f51e92880925b0495f2f35dc75579882.xlsx

+ 1 - 0
downloaded_data/UNFCCC/Russian_Federation/CRF2023/RUS_2023_1990_22082023_000303.xlsx

@@ -0,0 +1 @@
+../../../../.git/annex/objects/v9/P7/MD5E-s879738--e199ade9255a0160c9b4d2edf47a8e52.xlsx/MD5E-s879738--e199ade9255a0160c9b4d2edf47a8e52.xlsx

+ 1 - 0
downloaded_data/UNFCCC/Russian_Federation/CRF2023/RUS_2023_1991_22082023_000345.xlsx

@@ -0,0 +1 @@
+../../../../.git/annex/objects/Xk/gm/MD5E-s682760--258ec070f731b697f18c7d897b22d174.xlsx/MD5E-s682760--258ec070f731b697f18c7d897b22d174.xlsx

+ 1 - 0
downloaded_data/UNFCCC/Russian_Federation/CRF2023/RUS_2023_1992_22082023_000427.xlsx

@@ -0,0 +1 @@
+../../../../.git/annex/objects/28/X1/MD5E-s683338--e7307731a3191190e8a9855c325f19b3.xlsx/MD5E-s683338--e7307731a3191190e8a9855c325f19b3.xlsx

+ 1 - 0
downloaded_data/UNFCCC/Russian_Federation/CRF2023/RUS_2023_1993_22082023_000507.xlsx

@@ -0,0 +1 @@
+../../../../.git/annex/objects/x6/w7/MD5E-s686544--e3eb4a82e0417e0a826ee61f91bd4887.xlsx/MD5E-s686544--e3eb4a82e0417e0a826ee61f91bd4887.xlsx

+ 1 - 0
downloaded_data/UNFCCC/Russian_Federation/CRF2023/RUS_2023_1994_22082023_000549.xlsx

@@ -0,0 +1 @@
+../../../../.git/annex/objects/wV/mP/MD5E-s689790--f4dbf8e3d11bbd71c4aed60184d47b1f.xlsx/MD5E-s689790--f4dbf8e3d11bbd71c4aed60184d47b1f.xlsx

+ 1 - 0
downloaded_data/UNFCCC/Russian_Federation/CRF2023/RUS_2023_1995_22082023_000630.xlsx

@@ -0,0 +1 @@
+../../../../.git/annex/objects/40/xq/MD5E-s692925--a1a67ea4f2e457fa909d50ebfcf2721f.xlsx/MD5E-s692925--a1a67ea4f2e457fa909d50ebfcf2721f.xlsx

+ 1 - 0
downloaded_data/UNFCCC/Russian_Federation/CRF2023/RUS_2023_1996_22082023_000712.xlsx

@@ -0,0 +1 @@
+../../../../.git/annex/objects/KK/5w/MD5E-s698394--b7fa5bfef807ded5512323e83ecef822.xlsx/MD5E-s698394--b7fa5bfef807ded5512323e83ecef822.xlsx

+ 1 - 0
downloaded_data/UNFCCC/Russian_Federation/CRF2023/RUS_2023_1997_22082023_000754.xlsx

@@ -0,0 +1 @@
+../../../../.git/annex/objects/0g/xm/MD5E-s702194--40ccb825b1c1cca92a017d6a378d96c1.xlsx/MD5E-s702194--40ccb825b1c1cca92a017d6a378d96c1.xlsx

+ 1 - 0
downloaded_data/UNFCCC/Russian_Federation/CRF2023/RUS_2023_1998_22082023_000835.xlsx

@@ -0,0 +1 @@
+../../../../.git/annex/objects/g4/fZ/MD5E-s705083--48f24bc527f6fe966e3beed4e2817fec.xlsx/MD5E-s705083--48f24bc527f6fe966e3beed4e2817fec.xlsx

+ 1 - 0
downloaded_data/UNFCCC/Russian_Federation/CRF2023/RUS_2023_1999_22082023_000917.xlsx

@@ -0,0 +1 @@
+../../../../.git/annex/objects/f1/Wj/MD5E-s708240--11dfa74b84b46ba2b48770b99c97d39e.xlsx/MD5E-s708240--11dfa74b84b46ba2b48770b99c97d39e.xlsx

+ 1 - 0
downloaded_data/UNFCCC/Russian_Federation/CRF2023/RUS_2023_2000_22082023_000959.xlsx

@@ -0,0 +1 @@
+../../../../.git/annex/objects/m1/X9/MD5E-s713579--1706848b62e16ae1109bf0737434a20e.xlsx/MD5E-s713579--1706848b62e16ae1109bf0737434a20e.xlsx

+ 1 - 0
downloaded_data/UNFCCC/Russian_Federation/CRF2023/RUS_2023_2001_22082023_001041.xlsx

@@ -0,0 +1 @@
+../../../../.git/annex/objects/p5/3q/MD5E-s716835--b63f17ca3db55b98267f196e33f8919d.xlsx/MD5E-s716835--b63f17ca3db55b98267f196e33f8919d.xlsx

+ 1 - 0
downloaded_data/UNFCCC/Russian_Federation/CRF2023/RUS_2023_2002_22082023_001123.xlsx

@@ -0,0 +1 @@
+../../../../.git/annex/objects/wW/Pq/MD5E-s719969--c7a8e77d56d291f0966ffc3f0dfb8263.xlsx/MD5E-s719969--c7a8e77d56d291f0966ffc3f0dfb8263.xlsx

+ 1 - 0
downloaded_data/UNFCCC/Russian_Federation/CRF2023/RUS_2023_2003_22082023_001204.xlsx

@@ -0,0 +1 @@
+../../../../.git/annex/objects/jK/g2/MD5E-s722904--d6503e4cda27fbe25e1e43fbf7323377.xlsx/MD5E-s722904--d6503e4cda27fbe25e1e43fbf7323377.xlsx

+ 1 - 0
downloaded_data/UNFCCC/Russian_Federation/CRF2023/RUS_2023_2004_22082023_001246.xlsx

@@ -0,0 +1 @@
+../../../../.git/annex/objects/Fj/Vf/MD5E-s725983--6e012b8a4031e7b58cf8dd17b7928a8e.xlsx/MD5E-s725983--6e012b8a4031e7b58cf8dd17b7928a8e.xlsx

+ 1 - 0
downloaded_data/UNFCCC/Russian_Federation/CRF2023/RUS_2023_2005_22082023_001328.xlsx

@@ -0,0 +1 @@
+../../../../.git/annex/objects/3j/xM/MD5E-s727673--0ef4ba460dd1ec992ab5f47392a4bcba.xlsx/MD5E-s727673--0ef4ba460dd1ec992ab5f47392a4bcba.xlsx

+ 1 - 0
downloaded_data/UNFCCC/Russian_Federation/CRF2023/RUS_2023_2006_22082023_001410.xlsx

@@ -0,0 +1 @@
+../../../../.git/annex/objects/2K/9k/MD5E-s730631--a4edc159c4ee005d932b83a594d639cb.xlsx/MD5E-s730631--a4edc159c4ee005d932b83a594d639cb.xlsx

+ 1 - 0
downloaded_data/UNFCCC/Russian_Federation/CRF2023/RUS_2023_2007_22082023_001452.xlsx

@@ -0,0 +1 @@
+../../../../.git/annex/objects/WZ/7k/MD5E-s732984--15c0c9dc53c130cebc9a4b8aff000cf2.xlsx/MD5E-s732984--15c0c9dc53c130cebc9a4b8aff000cf2.xlsx

+ 1 - 0
downloaded_data/UNFCCC/Russian_Federation/CRF2023/RUS_2023_2008_22082023_001534.xlsx

@@ -0,0 +1 @@
+../../../../.git/annex/objects/Kz/zf/MD5E-s735709--86a3e8abff4b4b524daf9345a0d97fa2.xlsx/MD5E-s735709--86a3e8abff4b4b524daf9345a0d97fa2.xlsx

برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است