6 Commitit 2cf94c6181 ... 5ed894bf18

Tekijä SHA1 Viesti Päivämäärä
  Zebedee Nicholls 5ed894bf18 [DATALAD RUNCMD] Read data for v231016. 1 vuosi sitten
  Zebedee Nicholls 0a54318e2f [DATALAD RUNCMD] Download data for v231016. 1 vuosi sitten
  Zebedee Nicholls 39ab00cd65 Add new version metadata 1 vuosi sitten
  Zebedee Nicholls 005c416dc1 [DATALAD RUNCMD] Read data for v230913. 1 vuosi sitten
  Zebedee Nicholls 5712a6c2eb Fix up weird break in source 1 vuosi sitten
  Zebedee Nicholls cb59ac5d18 Update gitignore 1 vuosi sitten

+ 2 - 0
.gitignore

@@ -1,6 +1,8 @@
 __pycache__
 venv
 .doit.db
+# No idea why some computers make .db.db, anyway
+*.db
 .idea
 *.ipynb
 .ipynb_checkpoints

+ 1 - 0
downloaded_data/v231016/0. GCP-CEM.csv

@@ -0,0 +1 @@
+../../.git/annex/objects/2x/7z/MD5E-s124474--6454715368cdc14800c715f673eb8d70.csv/MD5E-s124474--6454715368cdc14800c715f673eb8d70.csv

+ 1 - 0
downloaded_data/v231016/0. GCP-CEM_sources.csv

@@ -0,0 +1 @@
+../../.git/annex/objects/P9/4X/MD5E-s218450--14dd7776b8f12a6f7af861ce4b6f69e5.csv/MD5E-s218450--14dd7776b8f12a6f7af861ce4b6f69e5.csv

+ 1 - 0
downloaded_data/v231016/1. annual_cement_production.csv

@@ -0,0 +1 @@
+../../.git/annex/objects/Kx/v9/MD5E-s138007--f5b8d403aa2c346431fb596116ee69d8.csv/MD5E-s138007--f5b8d403aa2c346431fb596116ee69d8.csv

+ 1 - 0
downloaded_data/v231016/1. annual_cement_production_source.csv

@@ -0,0 +1 @@
+../../.git/annex/objects/Pz/p2/MD5E-s480943--5cb89415b25c953235459a8c4acec202.csv/MD5E-s480943--5cb89415b25c953235459a8c4acec202.csv

+ 1 - 0
downloaded_data/v231016/2. annual_clinker_production.csv

@@ -0,0 +1 @@
+../../.git/annex/objects/9v/Fj/MD5E-s27997--1c3a077541fea2e16dd668a27c61c127.csv/MD5E-s27997--1c3a077541fea2e16dd668a27c61c127.csv

+ 1 - 0
downloaded_data/v231016/2. annual_clinker_production_source.csv

@@ -0,0 +1 @@
+../../.git/annex/objects/MM/43/MD5E-s98557--23aaa0cb2669cc8522b9321a551105fa.csv/MD5E-s98557--23aaa0cb2669cc8522b9321a551105fa.csv

+ 1 - 0
downloaded_data/v231016/2. zero_before_after.csv

@@ -0,0 +1 @@
+../../.git/annex/objects/MM/k5/MD5E-s2067--e7cc19a8e01dadda60fd72a497ab6e1d.csv/MD5E-s2067--e7cc19a8e01dadda60fd72a497ab6e1d.csv

+ 1 - 0
downloaded_data/v231016/3. country_specific.zip

@@ -0,0 +1 @@
+../../.git/annex/objects/5z/fz/MD5E-s906713--b5595e827f2d09a5d01b9ed722e90c39.zip/MD5E-s906713--b5595e827f2d09a5d01b9ed722e90c39.zip

+ 1 - 0
downloaded_data/v231016/4. combined_cement_data.xlsx

@@ -0,0 +1 @@
+../../.git/annex/objects/V6/P7/MD5E-s68025--d57d33c2d86ab023fe8f0a713b50295c.xlsx/MD5E-s68025--d57d33c2d86ab023fe8f0a713b50295c.xlsx

+ 1 - 1
extracted_data/v230913/Robbie_Andrew_Cement_Production_CO2_230913.nc

@@ -1 +1 @@
-../../.git/annex/objects/kv/xQ/MD5E-s68988--5f4dc572d99ffc40b9e356501a5c3c22.nc/MD5E-s68988--5f4dc572d99ffc40b9e356501a5c3c22.nc
+../../.git/annex/objects/gf/wk/MD5E-s68988--19f5401b50c306c796dee0ad703a2d3b.nc/MD5E-s68988--19f5401b50c306c796dee0ad703a2d3b.nc

+ 2 - 2
extracted_data/v230913/Robbie_Andrew_Cement_Production_CO2_230913.yaml

@@ -12,11 +12,11 @@ time_format: '%Y'
 dimensions:
   '*':
   - time
+  - source
   - provenance
+  - scenario (PRIMAP)
   - category (IPCC2006)
   - area (ISO3)
-  - source
-  - scenario (PRIMAP)
   - entity
   - unit
 data_file: Robbie_Andrew_Cement_Production_CO2_230913.csv

+ 1 - 0
extracted_data/v231016/Robbie_Andrew_Cement_Production_CO2_231016.csv

@@ -0,0 +1 @@
+../../.git/annex/objects/wx/MG/MD5E-s151351--2b145bdafd7e6772fd9b9aae1020ed8a.csv/MD5E-s151351--2b145bdafd7e6772fd9b9aae1020ed8a.csv

+ 1 - 0
extracted_data/v231016/Robbie_Andrew_Cement_Production_CO2_231016.nc

@@ -0,0 +1 @@
+../../.git/annex/objects/ZP/83/MD5E-s69011--484c022835029a71f0e2db6c63ff31bd.nc/MD5E-s69011--484c022835029a71f0e2db6c63ff31bd.nc

+ 22 - 0
extracted_data/v231016/Robbie_Andrew_Cement_Production_CO2_231016.yaml

@@ -0,0 +1,22 @@
+attrs:
+  references: 10.5281/zenodo.10008931, 10.5194/essd-11-1675-2019
+  rights: Creative Commons Attribution 4.0 International
+  contact: johannes.guetschow@climate-resource.com
+  title: Global CO2 emissions from cement production - version 231016
+  comment: Published by Robbie Andrew, converted to PRIMAP2 format by Johannes Gütschow
+  institution: CICERO - Center for International Climate Research
+  area: area (ISO3)
+  cat: category (IPCC2006)
+  scen: scenario (PRIMAP)
+time_format: '%Y'
+dimensions:
+  '*':
+  - time
+  - area (ISO3)
+  - provenance
+  - source
+  - scenario (PRIMAP)
+  - category (IPCC2006)
+  - entity
+  - unit
+data_file: Robbie_Andrew_Cement_Production_CO2_231016.csv

+ 5 - 1
src/download_version_datalad.py

@@ -24,6 +24,10 @@ if output_folder.exists():
 else:
     output_files = []
 
+# No idea what has broken to make this necessary
+root_path = str(root_path)
+output_files = [str(v) for v in output_files]
+
 datalad.api.run(
     cmd=f"./venv/bin/python3 src/download_version.py --version {version}",
     dataset=root_path,
@@ -32,4 +36,4 @@ datalad.api.run(
     outputs=output_files,
     dry_run=None,
     explicit=False,
-)
+)

+ 20 - 1
src/versions.py

@@ -1,6 +1,25 @@
 # configurations for the different versions. mainly metadata
 
 versions = {
+    "v231016": {
+        'date': '10-Oct-2023',
+        'ver_str_long': 'version 231016',
+        'ver_str_short': '231016',
+        "folder": "v231016",
+        "transpose": False,
+        "filename": "0. GCP-CEM.csv",
+        'ref': '10.5281/zenodo.10008931',
+        'ref2': '10.5194/essd-11-1675-2019',
+        'title': 'Global CO2 emissions from cement production',
+        'institution': "CICERO - Center for International Climate Research",
+        'filter_keep': {},
+        'filter_remove': {},
+        'contact': "johannes.guetschow@climate-resource.com",
+        'comment': ("Published by Robbie Andrew, converted to PRIMAP2 format by "
+                    "Johannes Gütschow"),
+        'unit': 'kt * CO2 / year',
+        'country_code': True,
+    },
     "v230913": {
         'date': '13-Sep-2023',
         'ver_str_long': 'version 230913',
@@ -77,4 +96,4 @@ versions = {
         'unit': 'kt * CO2 / year',
         'country_code': False,
     }
-}
+}