Updated era5

esm-collections/cloud-access/dkrz_catalog.yaml

@@ -3,44 +3,44 @@ metadata:
   parameters:
     additional_cmip5_columns:
       default:
-      - ensemble_member
-      - institute
+      - model
+      - temporal_subset
       - product_id
+      - modeling_realm
+      - variable
       - mip_table
-      - temporal_subset
       - experiment
-      - variable
-      - modeling_realm
-      - model
+      - institute
+      - ensemble_member
       type: list[str]
     additional_cmip6_columns:
       default:
-      - long_name
+      - opendap_url
       - units
       - path
-      - opendap_url
+      - long_name
       type: list[str]
     additional_cordex_columns:
       default:
-      - institute_id
       - model_id
       - member
+      - institute_id
       - driving_model_id
       - CORDEX_domain
       - rcm_version_id
       type: list[str]
     additional_era5_columns:
       default:
-      - era_id
-      - validation_date
-      - initialization_date
       - units
-      - long_name
       - code
       - short_name
+      - validation_date
       - step
+      - era_id
       - dataType
+      - initialization_date
       - stepType
+      - long_name
       - path
       type: list[str]
     cataloonie_columns:
@@ -130,17 +130,17 @@ sources:
     args:
       csv_kwargs:
         usecols:
-        - table_id
-        - variable_id
-        - source_id
-        - format
-        - uri
+        - experiment_id
         - member_id
-        - grid_label
         - activity_id
         - version
-        - experiment_id
+        - grid_label
+        - variable_id
+        - format
+        - source_id
+        - uri
         - institution_id
+        - table_id
       esmcol_obj: https://gitlab.dkrz.de/data-infrastructure-services/intake-esm/-/raw/master/esm-collections/cloud-access/dkrz_cmip6_cloud.json
     description: This is an ESM collection for CMIP6 data accessible on DKRZ's swift
       cloud store
@@ -243,11 +243,13 @@ sources:
         - initialization_date
         - step
         - path
+        - project
         - format
         - uri
+        - table_id
       esmcol_obj: https://gitlab.dkrz.de/data-infrastructure-services/intake-esm/-/raw/master/esm-collections/cloud-access/dkrz_era5_disk.json
     description: This is an ESM collection for ERA5 data accessible on the DKRZ's
-      MISTRAL disk storage system in /mnt/lustre02/work/bk1099/data/
+      disk storage system in /work/bk1099/data/
     driver:
     - intake.open_esm_datastore
   dkrz_nextgems_disk:

esm-collections/cloud-access/dkrz_era5_disk.json

 {
     "esmcat_version": "0.1.0",
     "id": "dkrz_era5_disk",
-    "description": "This is an ESM collection for ERA5 data accessible on the DKRZ's disk storage system in /mnt/lustre/work/bk1099/data/ which will be loaded from a source file which is in the cloud (see catalog_file)",
+    "description": "This is an ESM collection for ERA5 data accessible on the DKRZ's disk storage system in /work/bk1099/data/ which will be loaded from a source file which is in the cloud (see catalog_file)",
     "catalog_file": "https://swift.dkrz.de/v1/dkrz_a44962e3ba914c309a7421573a6949a6/intake-esm/dkrz_era5_disk.csv.gz",
     "attributes": [
         {
@@ -66,7 +66,7 @@
             "column_name": "uri"
         },
         {
-            "column_name": "variable_id"
+            "column_name": "table_id"
         }
     ],
     "assets": {
@@ -76,6 +76,7 @@
     "aggregation_control": {
         "variable_column_name": "code",
         "groupby_attrs": [
+            "table_id",
             "stepType",
             "level_type",
             "frequency"

esm-collections/disk-access/dkrz_era5_disk.json

@@ -62,7 +62,6 @@
       {"column_name": "project"},
       {"column_name": "format"},
       {"column_name": "uri"},
-      {"column_name": "variable_id"},
       {"column_name": "table_id"}],
     "assets": {"format_column_name": "format", "column_name": "uri"},
   "aggregation_control": {