more fixes to AUS CRF/CRT specification

UNFCCC_GHG_data/UNFCCC_CRF_reader/UNFCCC_CRF_reader_prod.py

@@ -159,18 +159,24 @@ def read_crf_for_country(
 
             # if individual data for emissions and removals / recovery exist combine
             # them
-            if 'CO2 removals' in ds_table_pm2.data_vars:
-                # we can just sum to CO2 as in a table either net CO2 exists,
-                # or separate removals and emissions
+            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:
-                # we can just sum to CO2 as in a table either net CO2 exists,
-                # or separate removals and emissions
+            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

UNFCCC_GHG_data/UNFCCC_CRF_reader/crf_specifications/CRF2023_AUS_specification.py

@@ -784,8 +784,8 @@ CRF2023_AUS = {
             ["NA", ["\IGNORE"], 1],
         ],
         "entity_mapping": {
-            "EMISSIONS (1) CH4": "CH4 emissions",
-            "EMISSIONS (1) CO2": "CO2 emissions",
+            "EMISSIONS (1) CH4": "CH4", # emissions",
+            "EMISSIONS (1) CO2": "CO2", # emissions",
             "RECOVERY/FLARING (2) CH4": "CH4 removals",
             "RECOVERY/FLARING (2) CO2": "CO2 removals",
         },
@@ -852,7 +852,7 @@ CRF2023_AUS = {
         ],
         "entity_mapping": {
             "EMISSIONS CH4 (5)": "CH4",
-            "EMISSIONS CO2 (4)": "CO2 emissions",
+            "EMISSIONS CO2 (4)": "CO2", #"CO2 emissions",
             "EMISSIONS N2O": "N2O",
             "RECOVERY (2) CO2": "CO2 removals",
         },

datasets/UNFCCC/CRF2023/CRF2023_raw_2023-09-17.csv

@@ -1 +1 @@
-../../../.git/annex/objects/qZ/gg/MD5E-s35724014--61b05b625eb4062e4447f991d0715d77.csv/MD5E-s35724014--61b05b625eb4062e4447f991d0715d77.csv
+../../../.git/annex/objects/q2/X5/MD5E-s35406349--1a1f1743bdac1497ee9fcb881053cd10.csv/MD5E-s35406349--1a1f1743bdac1497ee9fcb881053cd10.csv

datasets/UNFCCC/CRF2023/CRF2023_raw_2023-09-17.nc

@@ -1 +1 @@
-../../../.git/annex/objects/Kq/VP/MD5E-s65519347--322a62f553a3c2e2a68a898ae88a858f.nc/MD5E-s65519347--322a62f553a3c2e2a68a898ae88a858f.nc
+../../../.git/annex/objects/3X/Kv/MD5E-s66048798--ce75304b714bb85ff8a7ce5f7155dffd.nc/MD5E-s66048798--ce75304b714bb85ff8a7ce5f7155dffd.nc

datasets/UNFCCC/CRF2023/CRF2023_raw_2023-09-17.yaml

@@ -19,12 +19,12 @@ time_format: '%Y'
 dimensions:
   '*':
   - time
-  - class
   - provenance
-  - category (CRF2013_2023)
-  - area (ISO3)
   - scenario (PRIMAP)
+  - class
+  - area (ISO3)
   - source
+  - category (CRF2013_2023)
   - entity
   - unit
 data_file: CRF2023_raw_2023-09-17.csv