More Fgas work on DI data

UNFCCC_GHG_data/UNFCCC_DI_reader/UNFCCC_DI_reader_config.py

@@ -340,7 +340,35 @@ di_processing_templates = {
                 'entities': ["UnspMixOfHFCs", "UnspMixOfPFCs"],
                 'source_GWP': gwp_to_use,
             },
-        }
+        },
+        'copyUnspHFC': {
+            'basket_copy': {
+                'GWPs_to_add': ["AR4GWP100", "AR5GWP100", "AR6GWP100"],
+                'entities': ["UnspMixOfHFCs"],
+                'source_GWP': gwp_to_use,
+            },
+        },
+        'copyHFCPFC': {
+            'basket_copy': {
+                'GWPs_to_add': ["AR4GWP100", "AR5GWP100", "AR6GWP100"],
+                'entities': ["HFCS", "PFCS"],
+                'source_GWP': gwp_to_use,
+            },
+        },
+        'copyPFC': {
+            'basket_copy': {
+                'GWPs_to_add': ["AR4GWP100", "AR5GWP100", "AR6GWP100"],
+                'entities': ["PFCS"],
+                'source_GWP': gwp_to_use,
+            },
+        },
+        'copyFGASES': {
+            'basket_copy': {
+                'GWPs_to_add': ["AR4GWP100", "AR5GWP100", "AR6GWP100"],
+                'entities': ["FGASES"],
+                'source_GWP': gwp_to_use,
+            },
+        },
     },
     # country templates
     #AFG: not needed (newer data in BUR1), 2005, 2013 only
@@ -351,18 +379,18 @@ di_processing_templates = {
             'remove_ts': {
                 '2.A_H': { # looks wrong in 2005
                     'category': ['2.A', '2.B', '2.C', '2.D', '2.G'],
-                    'entities': ['CO2', 'KYOTOGHG (SARGWP100)'],
+                    'entities': ['CO2', f'KYOTOGHG ({gwp_to_use})'],
                         'time': ['2005'],
                 },
                 'Bunkers': { # Aviation and marine swappen in 2005
                     'category': ['14423', '14424'],
-                    'entities': ['KYOTOGHG (SARGWP100)'],
+                    'entities': [f'KYOTOGHG ({gwp_to_use})'],
                         'time': ['2005'],
                 },
                 'Bunkers_CH4': { # 2005 looks all wrong (swap in activity data not
                     # result?)
                     'category': ['14423', '14424', '14637'],
-                    'entities': ['CH4', 'KYOTOGHG (SARGWP100)', 'N2O'],
+                    'entities': ['CH4', f'KYOTOGHG ({gwp_to_use})', 'N2O'],
                         'time': ['2005'],
                 },
             },
@@ -471,9 +499,13 @@ di_processing_templates = {
             'remove_ts': {
                 '1.A.1': { #contains data for all subsectors
                     'category': ['1.A.1'],
-                    'entities': ['CH4', 'KYOTOGHG (SARGWP100)'],
-                        'time': ['1990', '2000', '2005', '2006', '2007', '2008', '2009',
-                                 '2010', '2011', '2012'],
+                    'entities': ['CH4', f'KYOTOGHG ({gwp_to_use})'],
+                    'time': ['1990', '2000', '2005', '2006', '2007', '2008', '2009',
+                             '2010', '2011', '2012'],
+                },
+                'pfcs': { # only HFCs in other years, likely wrong
+                    'entities': [f'PFCS ({gwp_to_use})'],
+                    'time': ['1991', '1992', '1993', '1994'],
                 },
             },
             'downscale': { # needed for 1990, 2000, 2005-2012
@@ -488,8 +520,29 @@ di_processing_templates = {
                         'skipna': True,
                     },
                 },
+                'entities': {
+                    'FGASES': {
+                        'basket': f'FGASES ({gwp_to_use})',
+                        'basket_contents': [f'HFCS ({gwp_to_use})'],
+                        'sel': {'time': ['1990', '1991', '1992', '1993', '1994',
+                                         '1995']},
+                    },
+                    'HFC': {
+                        'basket': f'HFCS ({gwp_to_use})',
+                        'basket_contents': [f'UnspMixOfHFCs ({gwp_to_use})'],
+                        'sel': {'time': ['1990', '1991', '1992', '1993', '1994',
+                                         '1995', '2000', '2001', '2002', '2003',
+                                         '2004', '2005', '2006', '2007', '2008',
+                                         '2009', '2010', '2012']},
+                    },
+                },
             },
-        }
+            'basket_copy': {
+                'GWPs_to_add': ["AR4GWP100", "AR5GWP100", "AR6GWP100"],
+                'entities': ["UnspMixOfHFCs"],
+                'source_GWP': gwp_to_use,
+            },
+        },
     },
     # BDI 1998, 2005, 2010, 2015 # data coverage is a bit inconsistent
     # BEN 1995, 2000 # data coverage a bit inconsistent
@@ -498,6 +551,11 @@ di_processing_templates = {
             # and missing sectors (e.g. 1,2 for CH4, N2O), Agri. burning (4.E,
             # 4.F) missing for 2008-2017
             'remove_years': ['2007'],
+            'basket_copy': {
+                'GWPs_to_add': ["AR4GWP100", "AR5GWP100", "AR6GWP100"],
+                'entities': ["UnspMixOfHFCs"],
+                'source_GWP': gwp_to_use,
+            },
         },
     },
     # BGD 1994, 2001, 2005; coverage mostly consistent but not fully
@@ -510,7 +568,7 @@ di_processing_templates = {
                     '4': { # 1994
                         'basket': '4',
                         'basket_contents': ['4.A', '4.B', '4.D', '4.G'],
-                        'entities': ['CH4', 'CO2', 'KYOTOGHG (SARGWP100)'], # no N2O but
+                        'entities': ['CH4', 'CO2', f'KYOTOGHG ({gwp_to_use})'], # no N2O but
                         # CO2 is unusual
                         'dim': 'category (BURDI)',
                         'skipna_evaluation_dims': None,
@@ -598,7 +656,7 @@ di_processing_templates = {
                 },
                 'entities': {  # 2002-2014
                     'KYOTO': {
-                        'basket': 'KYOTOGHG (SARGWP100)',
+                        'basket': f'KYOTOGHG ({gwp_to_use})',
                         'basket_contents': ['CH4', 'CO2', 'N2O'],
                         'sel': {'category (BURDI)':
                                     ['1', '1.A', '1.A.1', '1.A.2', '1.A.3', '1.A.4',
@@ -647,7 +705,7 @@ di_processing_templates = {
                     '5_2000': {
                         'basket': '5',
                         'basket_contents': ['5.A', '5.B', '5.C', '5.D'],
-                        'entities': ['KYOTOGHG (SARGWP100)'],
+                        'entities': [f'KYOTOGHG ({gwp_to_use})'],
                         'dim': 'category (BURDI)',
                         'sel': {'time': ['2000', '2001', '2002', '2003', '2004',
                                          '2005', '2006', '2007', '2009', '2010']},
@@ -657,7 +715,7 @@ di_processing_templates = {
                 },
                 'entities': {  # 2000-2010 (1997 as key)
                     'KYOTO': {
-                        'basket': 'KYOTOGHG (SARGWP100)',
+                        'basket': f'KYOTOGHG ({gwp_to_use})',
                         'basket_contents': ['CO2', 'CH4', 'N2O'],
                         'sel': {'category (BURDI)':
                                     ['1', '1.A', '1.A.1', '1.A.2', '1.A.3', '1.A.4',
@@ -751,8 +809,27 @@ di_processing_templates = {
                         'skipna': True,
                     },
                 },
+                'entities': {
+                    'HFC': {
+                        'basket': f'HFCS ({gwp_to_use})',
+                        'basket_contents': ['HFC125', 'HFC134a', 'HFC143a', 'HFC152a',
+                                            'HFC227ea', 'HFC23', 'HFC236fa', 'HFC32',
+                                            f'UnspMixOfHFCs ({gwp_to_use})'],
+                        'sel': {'time': ['2005', '2010']},
+                    },
+                    'PFC': {
+                        'basket': f'PFCS ({gwp_to_use})',
+                        'basket_contents': ['C2F6', 'CF4'],
+                        'sel': {'time': ['2005', '2010']},
+                    },
+                },
             },
-        }
+            'basket_copy': {
+                'GWPs_to_add': ["AR4GWP100", "AR5GWP100", "AR6GWP100"],
+                'entities': ["UnspMixOfHFCs"],
+                'source_GWP': gwp_to_use,
+            },
+        },
     },
     'CIV' :{
         'DI2023-05-24': { #1994 (needs some downscaling), 2000
@@ -761,13 +838,18 @@ di_processing_templates = {
                     '1.A': { # 2005
                         'basket': '1.A',
                         'basket_contents': ['1.A.1', '1.A.2', '1.A.3', '1.A.4'],
-                        'entities': ['CO2', 'CH4', 'N2O', 'KYOTOGHG (SARGWP100)'],
+                        'entities': ['CO2', 'CH4', 'N2O', f'KYOTOGHG ({gwp_to_use})'],
                         'dim': 'category (BURDI)',
                         'skipna_evaluation_dims': None,
                         'skipna': True,
                     },
                 },
             },
+            'basket_copy': {
+                'GWPs_to_add': ["AR4GWP100", "AR5GWP100", "AR6GWP100"],
+                'entities': ["FGASES"],
+                'source_GWP': gwp_to_use,
+            },
         },
     },
     # CMR: 1994, 2000, not fully consistent
@@ -880,7 +962,7 @@ di_processing_templates = {
                     '2': {
                         'basket': '2',
                         'basket_contents': ['2.A', '2.F'],
-                        'entities': ['CO2', 'HFCS (SARGWP100)'],
+                        'entities': ['CO2', f'HFCS ({gwp_to_use})'],
                         'dim': 'category (BURDI)',
                     },
                     'bunkers': {
@@ -891,6 +973,11 @@ di_processing_templates = {
                     },
                 },
             },
+            'basket_copy': {
+                'GWPs_to_add': ["AR4GWP100", "AR5GWP100", "AR6GWP100"],
+                'entities': ["UnspMixOfHFCs"],
+                'source_GWP': gwp_to_use,
+            },
         },
     },
     # DOM: # 1990, 1994, 1998, 2000, 2010
@@ -903,51 +990,51 @@ di_processing_templates = {
                     '1': {
                         'basket': '1',
                         'basket_contents': ['1.A', '1.B'],
-                        'entities': ['KYOTOGHG (SARGWP100)'],
+                        'entities': [f'KYOTOGHG ({gwp_to_use})'],
                         'dim': 'category (BURDI)',
                     },
                     '1.A': {
                         'basket': '1.A',
                         'basket_contents': ['1.A.1', '1.A.2', '1.A.3', '1.A.4',
                                             '1.A.5'],
-                        'entities': ['KYOTOGHG (SARGWP100)'],
+                        'entities': [f'KYOTOGHG ({gwp_to_use})'],
                         'dim': 'category (BURDI)',
                     },
                     '1.B': {
                         'basket': '1.B',
                         'basket_contents': ['1.B.1', '1.B.2'],
-                        'entities': ['KYOTOGHG (SARGWP100)'],
+                        'entities': [f'KYOTOGHG ({gwp_to_use})'],
                         'dim': 'category (BURDI)',
                     },
                     '2': {
                         'basket': '2',
                         'basket_contents': ['2.A', '2.B', '2.C', '2.D', '2.G'],
-                        'entities': ['KYOTOGHG (SARGWP100)'],
+                        'entities': [f'KYOTOGHG ({gwp_to_use})'],
                         'dim': 'category (BURDI)',
                     },
                     '4': {
                         'basket': '4',
                         'basket_contents': ['4.A', '4.B', '4.C', '4.D', '4.E',
                                             '4.F', '4.G'],
-                        'entities': ['KYOTOGHG (SARGWP100)'],
+                        'entities': [f'KYOTOGHG ({gwp_to_use})'],
                         'dim': 'category (BURDI)',
                     },
                     '5': {
                         'basket': '5',
                         'basket_contents': ['5.A', '5.B', '5.C', '5.D'],
-                        'entities': ['KYOTOGHG (SARGWP100)'],
+                        'entities': [f'KYOTOGHG ({gwp_to_use})'],
                         'dim': 'category (BURDI)',
                     },
                     '6': {
                         'basket': '6',
                         'basket_contents': ['6.A', '6.B', '6.D'],
-                        'entities': ['KYOTOGHG (SARGWP100)'],
+                        'entities': [f'KYOTOGHG ({gwp_to_use})'],
                         'dim': 'category (BURDI)',
                     },
                 },
                 'entities': {
                     'KYOTO': {
-                        'basket': 'KYOTOGHG (SARGWP100)',
+                        'basket': f'KYOTOGHG ({gwp_to_use})',
                         'basket_contents': ['CH4', 'CO2', 'N2O'],
                         'sel': {'category (BURDI)':
                                     ['15163', '24540',
@@ -967,13 +1054,9 @@ di_processing_templates = {
         'DI2023-05-24': { # 1990, 2000, 2005
             #omit aerosols / GHG precursosrs in downscaling
             'remove_ts': {
-                '2.H': { # all in 2.H in 1990
-                        'category': ['2.H'],
-                        'entities': ['KYOTOGHG (AR4GWP100)', 'CH4', 'CO2', 'N2O'],
-                    },
-                '2': { # all in 2.H in 1990
-                        'category': ['2.H'],
-                        'entities': ['KYOTOGHG (AR4GWP100)', 'CH4'],
+                '2.G': { # all in 2.G in 1990
+                        'category': ['2.G'],
+                        'entities': [f'KYOTOGHG ({gwp_to_use})', 'CO2', 'N2O'],
                     },
             },
             'downscale': {
@@ -986,9 +1069,13 @@ di_processing_templates = {
                     },
                 },
             },
+            'basket_copy': {
+                'GWPs_to_add': ["AR4GWP100", "AR5GWP100", "AR6GWP100"],
+                'entities': ["UnspMixOfHFCs"],
+                'source_GWP': gwp_to_use,
+            },
         },
     },
-    # EGY:  TODO: downscale 2 in 1990, remove
     # 'ERI' #1994 1995-1999 (partial coverage, KYOTOGHG and total are incomplete), 2000
     'ETH': {
         'DI2023-05-24': { # 1990-1993 (downscaling needed), 1994-2013
@@ -1022,13 +1109,13 @@ di_processing_templates = {
                     'bunkers': {
                         'basket': '14637',
                         'basket_contents': ['14424'],
-                        'entities': ['CO2', 'KYOTOGHG (SARGWP100)'],
+                        'entities': ['CO2', f'KYOTOGHG ({gwp_to_use})'],
                         'dim': 'category (BURDI)',
                     },
                 },
                 'entities': {
                     'bunkers': {
-                        'basket': 'KYOTOGHG (SARGWP100)',
+                        'basket': f'KYOTOGHG ({gwp_to_use})',
                         'basket_contents': ['CH4', 'CO2', 'N2O'],
                         'sel': {'category (BURDI)': ['14637', '14424']}
                     },
@@ -1182,10 +1269,15 @@ di_processing_templates = {
             'remove_ts': {
                 'waste': { # very high in 1994
                     'category': ['6', '6.A', '6.B', '6.D'],
-                    'entities': ['CH4', 'N2O', 'KYOTOGHG (SARGWP100)'],
+                    'entities': ['CH4', 'N2O', f'KYOTOGHG ({gwp_to_use})'],
                         'time': ['1994'],
                 },
             },
+            'basket_copy': {
+                'GWPs_to_add': ["AR4GWP100", "AR5GWP100", "AR6GWP100"],
+                'entities': ["UnspMixOfHFCs"],
+                'source_GWP': gwp_to_use,
+            },
         },
     },
     # LKA: 1994, 2000. a bit inconsisten in subsectrs (all emissions in "other in
@@ -1235,20 +1327,20 @@ di_processing_templates = {
                     '1.B': {
                         'basket': '1.B',
                         'basket_contents': ['1.B.1', '1.B.2'],
-                        'entities': ['KYOTOGHG (SARGWP100)'],
+                        'entities': [f'KYOTOGHG ({gwp_to_use})'],
                         'dim': 'category (BURDI)',
                     },
                     '5': {
                         'basket': '5',
                         'basket_contents': ['5.A', '5.B'],
-                        'entities': ['KYOTOGHG (SARGWP100)'],
+                        'entities': [f'KYOTOGHG ({gwp_to_use})'],
                         'dim': 'category (BURDI)',
                         'tolerance' : 0.018, # LULUCF data inconstent in 2012
                     },
                 },
                 'entities': {
                     'all': {
-                        'basket': 'KYOTOGHG (SARGWP100)',
+                        'basket': f'KYOTOGHG ({gwp_to_use})',
                         'basket_contents': ['CH4', 'CO2', 'N2O'],
                         'sel': {'category (BURDI)': [
                             '1', '2', '4', '5', '6', '15163', '24540',
@@ -1290,7 +1382,7 @@ di_processing_templates = {
                     'kyotoghg_4': { # in general similar problem to 1.A, but most sectors have
                         # only one gas and we need the data for PRIMAP-hist,
                         # so we have to do it anyway
-                        'basket': 'KYOTOGHG (SARGWP100)',
+                        'basket': f'KYOTOGHG ({gwp_to_use})',
                         'basket_contents': ['CH4', 'N2O'],
                         'sel': {
                             'category (BURDI)': [
@@ -1306,7 +1398,28 @@ di_processing_templates = {
     # MDV: 1994 (only few sectors), 2011-2015
     # MEX: more data in BURs 2 and 3
     # MHL: 2000, 2005, 2010
-    # MKD: 1990-2009
+    # MKD:
+    'MKD': {
+        'DI2023-05-24': {  # 1990-2009
+            'downscale': {
+                'entities': {
+                    'FGASES': {
+                        'basket': f'FGASES ({gwp_to_use})',
+                        'basket_contents': [f'HFCS ({gwp_to_use})'],
+                    },
+                    'HFC': {
+                        'basket': f'HFCS ({gwp_to_use})',
+                        'basket_contents': [f'UnspMixOfHFCs ({gwp_to_use})'],
+                    },
+                },
+            },
+            'basket_copy': {
+                'GWPs_to_add': ["AR4GWP100", "AR5GWP100", "AR6GWP100"],
+                'entities': ["UnspMixOfHFCs"],
+                'source_GWP': gwp_to_use,
+            },
+        },
+    },
     'MLI': {
         'DI2023-05-24': {  # 1995,2000, 2005
             'downscale': {
@@ -1319,6 +1432,21 @@ di_processing_templates = {
                         'sel': {'time': ['1995', '2000']},
                     },
                 },
+                'entities': {
+                    'FGASES': {
+                        'basket': f'FGASES ({gwp_to_use})',
+                        'basket_contents': [f'HFCS ({gwp_to_use})'],
+                    },
+                    'HFC': {
+                        'basket': f'HFCS ({gwp_to_use})',
+                        'basket_contents': [f'UnspMixOfHFCs ({gwp_to_use})'],
+                    },
+                },
+            },
+            'basket_copy': {
+                'GWPs_to_add': ["AR4GWP100", "AR5GWP100", "AR6GWP100"],
+                'entities': ["UnspMixOfHFCs"],
+                'source_GWP': gwp_to_use,
             },
         },
     },
@@ -1335,7 +1463,7 @@ di_processing_templates = {
                 },
                 'entities': {
                     'kyotoghg_5': {
-                        'basket': 'KYOTOGHG (SARGWP100)',
+                        'basket': f'KYOTOGHG ({gwp_to_use})',
                         'basket_contents': ['CO2', 'CH4', 'N2O'],
                         'sel': {
                             'category (BURDI)': [
@@ -1344,6 +1472,11 @@ di_processing_templates = {
                     },
                 },
             },
+            'basket_copy': {
+                'GWPs_to_add': ["AR4GWP100", "AR5GWP100", "AR6GWP100"],
+                'entities': ["UnspMixOfHFCs"],
+                'source_GWP': gwp_to_use,
+            },
         },
     },
     # MNE: more data in BUR3
@@ -1356,10 +1489,15 @@ di_processing_templates = {
             'remove_ts': {
                 'waste': { # 1994 inconsistent
                     'category': ['6', '6.A', '6.B', '6.C', '6.D'],
-                    'entities': ['CO2', 'CH4', 'N2O', 'KYOTOGHG (SARGWP100)'],
+                    'entities': ['CO2', 'CH4', 'N2O', f'KYOTOGHG ({gwp_to_use})'],
                         'time': ['1994'],
                 },
             },
+            'basket_copy': {
+                'GWPs_to_add': ["AR4GWP100", "AR5GWP100", "AR6GWP100"],
+                'entities': ["UnspMixOfHFCs"],
+                'source_GWP': gwp_to_use,
+            },
         },
     },
     # MWI: 1990, 1994. inconsistency in 1.B.1: 1994: CO2, 1990: CH4
@@ -1383,13 +1521,13 @@ di_processing_templates = {
                     '6': {
                         'basket': '6',
                         'basket_contents': ['6.A', '6.B'],
-                        'entities': ['KYOTOGHG (SARGWP100)'],
+                        'entities': [f'KYOTOGHG ({gwp_to_use})'],
                         'dim': 'category (BURDI)',
                     },
                 },
                 'entities': {
                     'kyotoghg_56': {
-                        'basket': 'KYOTOGHG (SARGWP100)',
+                        'basket': f'KYOTOGHG ({gwp_to_use})',
                         'basket_contents': ['CH4', 'N2O'],
                         'sel': {
                             'category (BURDI)': ['6', '6.A', '6.B'],
@@ -1428,7 +1566,7 @@ di_processing_templates = {
             'downscale': {
                 'entities': {
                     'kyotoghg': {
-                        'basket': 'KYOTOGHG (SARGWP100)',
+                        'basket': f'KYOTOGHG ({gwp_to_use})',
                         'basket_contents': ['CO2', 'CH4', 'N2O'],
                         'sel': {
                             'category (BURDI)': [
@@ -1454,7 +1592,7 @@ di_processing_templates = {
             'downscale': {
                 'entities': {
                     'kyotoghg': {
-                        'basket': 'KYOTOGHG (SARGWP100)',
+                        'basket': f'KYOTOGHG ({gwp_to_use})',
                         'basket_contents': ['CO2', 'CH4', 'N2O'],
                         'sel': {
                             'category (BURDI)': [
@@ -1507,7 +1645,7 @@ di_processing_templates = {
                     '1': {
                         'basket': '1',
                         'basket_contents': ['1.A', '1.B'],
-                        'entities': ['KYOTOGHG (SARGWP100)'],
+                        'entities': [f'KYOTOGHG ({gwp_to_use})'],
                         'dim': 'category (BURDI)',
                         'sel': {'time': ['2000', '2001', '2002', '2003', '2004',
                                          '2005', '2006', '2007', '2008', '2009',
@@ -1516,7 +1654,7 @@ di_processing_templates = {
                     '1.A': {
                         'basket': '1.A',
                         'basket_contents': ['1.A.1', '1.A.2', '1.A.3', '1.A.4'],
-                        'entities': ['KYOTOGHG (SARGWP100)'],
+                        'entities': [f'KYOTOGHG ({gwp_to_use})'],
                         'dim': 'category (BURDI)',
                         'sel': {'time': ['2000', '2001', '2002', '2003', '2004',
                                          '2005', '2006', '2007', '2008', '2009',
@@ -1525,7 +1663,7 @@ di_processing_templates = {
                     '1.B': {
                         'basket': '1.B',
                         'basket_contents': ['1.B.1', '1.B.2'],
-                        'entities': ['KYOTOGHG (SARGWP100)'],
+                        'entities': [f'KYOTOGHG ({gwp_to_use})'],
                         'dim': 'category (BURDI)',
                         'sel': {'time': ['2000', '2001', '2002', '2003', '2004',
                                          '2005', '2006', '2007', '2008', '2009',
@@ -1534,7 +1672,7 @@ di_processing_templates = {
                     '2': {
                         'basket': '2',
                         'basket_contents': ['2.A', '2.B', '2.C', '2.D'],
-                        'entities': ['KYOTOGHG (SARGWP100)'],
+                        'entities': [f'KYOTOGHG ({gwp_to_use})'],
                         'dim': 'category (BURDI)',
                         'sel': {'time': ['2000', '2001', '2002', '2003', '2004',
                                          '2005', '2006', '2007', '2008', '2009',
@@ -1544,7 +1682,7 @@ di_processing_templates = {
                         'basket': '4',
                         'basket_contents': ['4.A', '4.B', '4.C', '4.D', '4.E',
                                             '4.F'],
-                        'entities': ['KYOTOGHG (SARGWP100)'],
+                        'entities': [f'KYOTOGHG ({gwp_to_use})'],
                         'dim': 'category (BURDI)',
                         'sel': {'time': ['2000', '2001', '2002', '2003', '2004',
                                          '2005', '2006', '2007', '2008', '2009',
@@ -1553,7 +1691,7 @@ di_processing_templates = {
                     '5': {
                         'basket': '5',
                         'basket_contents': ['5.A', '5.B', '5.C'],
-                        'entities': ['KYOTOGHG (SARGWP100)'],
+                        'entities': [f'KYOTOGHG ({gwp_to_use})'],
                         'dim': 'category (BURDI)',
                         'sel': {'time': ['2000', '2001', '2002', '2003', '2004',
                                          '2005', '2006', '2007', '2008', '2009',
@@ -1562,7 +1700,7 @@ di_processing_templates = {
                     '6': {
                         'basket': '6',
                         'basket_contents': ['6.A', '6.B', '6.C'],
-                        'entities': ['KYOTOGHG (SARGWP100)'],
+                        'entities': [f'KYOTOGHG ({gwp_to_use})'],
                         'dim': 'category (BURDI)',
                         'sel': {'time': ['2000', '2001', '2002', '2003', '2004',
                                          '2005', '2006', '2007', '2008', '2009',
@@ -1571,7 +1709,7 @@ di_processing_templates = {
                 },
                 'entities': {
                     'KYOTO': {
-                        'basket': 'KYOTOGHG (SARGWP100)',
+                        'basket': f'KYOTOGHG ({gwp_to_use})',
                         'basket_contents': ['CH4', 'CO2', 'N2O'],
                         'sel': {
                             'category (BURDI)': [
@@ -1658,6 +1796,11 @@ di_processing_templates = {
                     },
                 },
             },
+            'basket_copy': {
+                'GWPs_to_add': ["AR4GWP100", "AR5GWP100", "AR6GWP100"],
+                'entities': ["UnspMixOfPFCs"],
+                'source_GWP': gwp_to_use,
+            },
         },
     },
     # UZB: 1990-2012
@@ -1688,6 +1831,11 @@ di_processing_templates = {
                     },
                 },
             },
+            'basket_copy': {
+                'GWPs_to_add': ["AR4GWP100", "AR5GWP100", "AR6GWP100"],
+                'entities': ["UnspMixOfHFCs"],
+                'source_GWP': gwp_to_use,
+            },
         },
     },
     # ZWE: 1994, 2000, 2006 consistency of sectors and coverage does not look good,
@@ -1736,6 +1884,14 @@ di_processing_info = {
         'default': di_processing_templates['BRB']['DI2023-05-24'],
         'DI2023-05-24': di_processing_templates['BRB']['DI2023-05-24'],
     },
+    'BRN': {
+        'default': di_processing_templates['general']['copyUnspHFC'],
+        'DI2023-05-24': di_processing_templates['general']['copyUnspHFC'],
+    },
+    'CHL': {
+        'default': di_processing_templates['general']['copyUnspHFC'],
+        'DI2023-05-24': di_processing_templates['general']['copyUnspHFC'],
+    },
     'CHN': {
         'default': di_processing_templates['CHN']['DI2023-05-24'],
         'DI2023-05-24': di_processing_templates['CHN']['DI2023-05-24'],
@@ -1768,6 +1924,10 @@ di_processing_info = {
         'default': di_processing_templates['GEO']['DI2023-05-24'],
         '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'],
+    },
     'GNB': {
         'default': di_processing_templates['GNB']['DI2023-05-24'],
         'DI2023-05-24': di_processing_templates['GNB']['DI2023-05-24'],
@@ -1780,14 +1940,26 @@ di_processing_info = {
         'default': di_processing_templates['IND']['DI2023-05-24'],
         'DI2023-05-24': di_processing_templates['IND']['DI2023-05-24'],
     },
+    'ISR': {
+        'default': di_processing_templates['general']['copyHFCPFC'],
+        'DI2023-05-24': di_processing_templates['general']['copyHFCPFC'],
+    },
     'JAM': {
         'default': di_processing_templates['general']['copyUnspHFCUnspPFC'],
         'DI2023-05-24': di_processing_templates['general']['copyUnspHFCUnspPFC'],
     },
+    'JOR': {
+        'default': di_processing_templates['general']['copyUnspHFC'],
+        'DI2023-05-24': di_processing_templates['general']['copyUnspHFC'],
+    },
     'KEN': {
         'default': di_processing_templates['KEN']['DI2023-05-24'],
         'DI2023-05-24': di_processing_templates['KEN']['DI2023-05-24'],
     },
+    'KGZ': {
+        'default': di_processing_templates['general']['copyUnspHFC'],
+        'DI2023-05-24': di_processing_templates['general']['copyUnspHFC'],
+    },
     'KOR': {
         'default': di_processing_templates['general']['copyUnspHFCUnspPFC'],
         'DI2023-05-24': di_processing_templates['general']['copyUnspHFCUnspPFC'],
@@ -1796,6 +1968,10 @@ di_processing_info = {
         'default': di_processing_templates['LCA']['DI2023-05-24'],
         'DI2023-05-24': di_processing_templates['LCA']['DI2023-05-24'],
     },
+    'LKA': {
+        'default': di_processing_templates['general']['copyFGASES'],
+        'DI2023-05-24': di_processing_templates['general']['copyFGASES'],
+    },
     'LSO': {
         'default': di_processing_templates['LSO']['DI2023-05-24'],
         'DI2023-05-24': di_processing_templates['LSO']['DI2023-05-24'],
@@ -1816,6 +1992,10 @@ di_processing_info = {
         'default': di_processing_templates['general']['copyUnspHFCUnspPFC'],
         'DI2023-05-24': di_processing_templates['general']['copyUnspHFCUnspPFC'],
     },
+    'MEX': {
+        'default': di_processing_templates['general']['copyHFCPFC'],
+        'DI2023-05-24': di_processing_templates['general']['copyHFCPFC'],
+    },
     'MHL': {
         'default': di_processing_templates['general']['copyUnspHFCUnspPFC'],
         'DI2023-05-24': di_processing_templates['general']['copyUnspHFCUnspPFC'],
@@ -1828,6 +2008,18 @@ di_processing_info = {
         'default': di_processing_templates['MMR']['DI2023-05-24'],
         'DI2023-05-24': di_processing_templates['MMR']['DI2023-05-24'],
     },
+    'MNE': {
+        'default': di_processing_templates['general']['copyUnspHFC'],
+        'DI2023-05-24': di_processing_templates['general']['copyUnspHFC'],
+    },
+    'MNG': {
+        'default': di_processing_templates['general']['copyUnspHFC'],
+        'DI2023-05-24': di_processing_templates['general']['copyUnspHFC'],
+    },
+    'MOZ': {
+        'default': di_processing_templates['general']['copyPFC'],
+        'DI2023-05-24': di_processing_templates['general']['copyPFC'],
+    },
     'MUS': {
         'default': di_processing_templates['MUS']['DI2023-05-24'],
         'DI2023-05-24': di_processing_templates['MUS']['DI2023-05-24'],
@@ -1848,6 +2040,10 @@ di_processing_info = {
         'default': di_processing_templates['RWA']['DI2023-05-24'],
         'DI2023-05-24': di_processing_templates['RWA']['DI2023-05-24'],
     },
+    'SEN': {
+        'default': di_processing_templates['general']['copyHFCPFC'],
+        'DI2023-05-24': di_processing_templates['general']['copyHFCPFC'],
+    },
     'SGP': {
         'default': di_processing_templates['general']['copyUnspHFCUnspPFC'],
         'DI2023-05-24': di_processing_templates['general']['copyUnspHFCUnspPFC'],
@@ -1864,6 +2060,10 @@ di_processing_info = {
         'default': di_processing_templates['STP']['DI2023-05-24'],
         'DI2023-05-24': di_processing_templates['STP']['DI2023-05-24'],
     },
+    'SWZ': {
+        'default': di_processing_templates['general']['copyUnspHFC'],
+        'DI2023-05-24': di_processing_templates['general']['copyUnspHFC'],
+    },
     'TCD': {
         'default': di_processing_templates['TCD']['DI2023-05-24'],
         'DI2023-05-24': di_processing_templates['TCD']['DI2023-05-24'],
@@ -1876,6 +2076,10 @@ di_processing_info = {
         'default': di_processing_templates['URY']['DI2023-05-24'],
         'DI2023-05-24': di_processing_templates['URY']['DI2023-05-24'],
     },
+    'UZB': {
+        'default': di_processing_templates['general']['copyUnspHFCUnspPFC'],
+        'DI2023-05-24': di_processing_templates['general']['copyUnspHFCUnspPFC'],
+    },
     'ZMB': {
         'default': di_processing_templates['ZMB']['DI2023-05-24'],
         'DI2023-05-24': di_processing_templates['ZMB']['DI2023-05-24'],

UNFCCC_GHG_data/UNFCCC_DI_reader/process_UNFCCC_DI_for_country_group_datalad.py

@@ -11,7 +11,7 @@ import argparse
 parser = argparse.ArgumentParser()
 parser.add_argument('--annexI', help='read for AnnexI countries (default is for '
                                      'non-AnnexI)', action='store_true')
-parser.add_argument('--date', help='date of inout data to use (default is None '
+parser.add_argument('--date', help='date of input data to use (default is None '
                                        'to read latest data)', default=None)
 args = parser.parse_args()
 annexI = args.annexI

UNFCCC_GHG_data/helper/definitions.py

@@ -53,37 +53,43 @@ GWP_factors = {
         'HFCS': 1.1,
         'PFCS': 1.1,
         'UnspMixOfHFCs': 1.1,
-        'PFCS': 1.1,
+        'UnspMixOfPFCs': 1.1,
+        'FGASES': 1.1,
     },
     'SARGWP100_to_AR5GWP100': {
         'HFCS': 1.2,
         'PFCS': 1.2,
         'UnspMixOfHFCs': 1.2,
         'UnspMixOfPFCs': 1.2,
+        'FGASES': 1.2,
     },
     'SARGWP100_to_AR6GWP100': {
         'HFCS': 1.4,
         'PFCS': 1.3,
         'UnspMixOfHFCs': 1.4,
         'UnspMixOfPFCs': 1.3,
+        'FGASES': 1.35,
     },
     'AR4GWP100_to_SARGWP100': {
         'HFCS': 0.91,
         'PFCS': 0.91,
         'UnspMixOfHFCs': 0.91,
         'UnspMixOfPFCs': 0.91,
+        'FGASES': 0.91,
     },
     'AR4GWP100_to_AR5GWP100': {
         'HFCS': 1.1,
         'PFCS': 1.1,
         'UnspMixOfHFCs': 1.1,
         'UnspMixOfPFCs': 1.1,
+        'FGASES': 1.1,
     },
     'AR4GWP100_to_AR6GWP100': {
         'HFCS': 1.27,
         'PFCS': 1.18,
         'UnspMixOfHFCs': 1.27,
         'UnspMixOfPFCs': 1.18,
+        'FGASES': 1.23,
     },
 }