Browse Source

More work on DI reader. Works but needs integration into datalad and doit

Johannes Gütschow 2 years ago
parent
commit
53ba58f844

+ 3 - 0
.gitignore

@@ -6,3 +6,6 @@ __pycache__
 .doit.db
 log
 code/datasets
+/code/UNFCCC_DI_reader/test_UNFCCC_DI_reader.ipynb
+/code/UNFCCC_DI_reader/.ipynb_checkpoints/
+/datasets/UNFCCC/DI_NAI/

+ 1 - 1
code/UNFCCC_DI_reader/UNFCCC_DI_reader_config.py

@@ -35,7 +35,7 @@ di_to_pm2if_template_nai = {
     # mapping of values e.g. gases to the primap2 format
     "coords_value_mapping": {
         "entity": {
-            "Aggregate GHGs (SARGWP100)": "KYOYOGHG (SARGWP100)",
+            "Aggregate GHGs (SARGWP100)": "KYOTOGHG (SARGWP100)",
             "Aggregate F-gases (SARGWP100)": "FGASES (SARGWP100)",
             "HFCs (SARGWP100)": "HFCS (SARGWP100)",
             "PFCs (SARGWP100)": "PFCS (SARGWP100)",

+ 5 - 1
code/UNFCCC_DI_reader/UNFCCC_DI_reader_core.py

@@ -20,6 +20,7 @@ def read_UNFCCC_DI_for_party(
         party_code: str,
         category_groups: Optional[Dict]=None,
         read_subsectors: bool=False,
+        save_data: Optional[bool]=True,
         date_str: Optional[str]=None,
         pm2if_specifications: Optional[dict]=None,
         default_gwp: Optional[str]=None,
@@ -42,7 +43,10 @@ def read_UNFCCC_DI_for_party(
         date_str = str(date.today())
 
     # determine filename
-    filename = determine_filename(party_code, date_str)
+    if save_data:
+        filename = determine_filename(party_code, date_str)
+    else:
+        filename = None
 
     # convert it to pm2 interchange format and save
     data_if = convert_DI_data_to_pm2_if(

+ 1 - 1
code/UNFCCC_DI_reader/read_UNFCCC_DI_for_country.py

@@ -37,7 +37,7 @@ country_name = get_country_name(country_code)
 
 # get current date to pass on to other functions in case reading is done over night
 # and the date changes
-date_str = str(date.today())
+date_str = date.today().strftime('%Y-%m-%d')
 
 
 # TODO: this function: get output files and run datalad.