no parent id correction

WCRP-CMIP · Aug 2, 2024 · b7a939e · b7a939e
1 parent 399492f
commit b7a939e
Show file tree

Hide file tree

Showing 15 changed files with 1,097 additions and 1,133 deletions.
diff --git a/JSONLD/core/graph.jsonld b/JSONLD/core/graph.jsonld
@@ -6,38 +6,6 @@
     },
     "ldroot": "/./JSONLD/core",
     "@graph": [
-        {
-            "@id": "cmip6plus:core/drs",
-            "@type": "mip:drs",
-            "core:directory-path-example": "CMIP6Plus/CMIP/MOHC/HadGEM3-GC31-MM/historical/r1i1p1f3/Amon/tas/gn/v20191207/",
-            "core:directory-path-sub-experiment-example": "CMIP6Plus/DCPP/MOHC/HadGEM3-GC31-MM/dcppA-hindcast/s1960-r1i1p1f2/Amon/tas/gn/v20200417/",
-            "core:directory-path-template": "<mip_era>/<activity_id>/<institution_id>/<source_id>/<experiment_id>/<member_id>/<table_id>/<variable_id>/<grid_label>/<version>",
-            "core:filename-example": "tas_Amon_HadGEM3-GC31-MM_historical_r1i1p1f3_gn_185001-186912.nc",
-            "core:filename-sub-experiment-example": "tas_Amon_HadGEM3-GC31-MM_dcppA-hindcast_s1960-r1i1p1f2_gn_196011-196012.nc",
-            "core:filename-template": "<variable_id>_<table_id>_<source_id>_<experiment_id >_<member_id>_<grid_label>[_<time_range>].nc"
-        },
-        {
-            "@id": "cmip6plus:core/index",
-            "@type": "mip:index",
-            "core:conventions": [
-                "^CF-1.7 CMIP-6.[0-2,5]\\( UGRID-1.0\\)\\{0,\\}$"
-            ],
-            "core:forcing-index": [
-                "^\\[\\{0,\\}[[:digit:]]\\{1,\\}\\]\\{0,\\}$"
-            ],
-            "core:initialization-index": [
-                "^\\[\\{0,\\}[[:digit:]]\\{1,\\}\\]\\{0,\\}$"
-            ],
-            "core:physics-index": [
-                "^\\[\\{0,\\}[[:digit:]]\\{1,\\}\\]\\{0,\\}$"
-            ],
-            "core:realization-index": [
-                "^\\[\\{0,\\}[[:digit:]]\\{1,\\}\\]\\{0,\\}$"
-            ],
-            "core:variant-label": [
-                "r[[:digit:]]\\{1,\\}i[[:digit:]]\\{1,\\}p[[:digit:]]\\{1,\\}f[[:digit:]]\\{1,\\}$"
-            ]
-        },
         {
             "@id": "cmip6plus:core/descriptors",
             "@type": "mip:core-descriptors",
@@ -168,6 +136,38 @@
                 "SImon",
                 "SImonPt"
             ]
+        },
+        {
+            "@id": "cmip6plus:core/index",
+            "@type": "mip:index",
+            "core:conventions": [
+                "^CF-1.7 CMIP-6.[0-2,5]\\( UGRID-1.0\\)\\{0,\\}$"
+            ],
+            "core:forcing-index": [
+                "^\\[\\{0,\\}[[:digit:]]\\{1,\\}\\]\\{0,\\}$"
+            ],
+            "core:initialization-index": [
+                "^\\[\\{0,\\}[[:digit:]]\\{1,\\}\\]\\{0,\\}$"
+            ],
+            "core:physics-index": [
+                "^\\[\\{0,\\}[[:digit:]]\\{1,\\}\\]\\{0,\\}$"
+            ],
+            "core:realization-index": [
+                "^\\[\\{0,\\}[[:digit:]]\\{1,\\}\\]\\{0,\\}$"
+            ],
+            "core:variant-label": [
+                "r[[:digit:]]\\{1,\\}i[[:digit:]]\\{1,\\}p[[:digit:]]\\{1,\\}f[[:digit:]]\\{1,\\}$"
+            ]
+        },
+        {
+            "@id": "cmip6plus:core/drs",
+            "@type": "mip:drs",
+            "core:directory-path-example": "CMIP6Plus/CMIP/MOHC/HadGEM3-GC31-MM/historical/r1i1p1f3/Amon/tas/gn/v20191207/",
+            "core:directory-path-sub-experiment-example": "CMIP6Plus/DCPP/MOHC/HadGEM3-GC31-MM/dcppA-hindcast/s1960-r1i1p1f2/Amon/tas/gn/v20200417/",
+            "core:directory-path-template": "<mip_era>/<activity_id>/<institution_id>/<source_id>/<experiment_id>/<member_id>/<table_id>/<variable_id>/<grid_label>/<version>",
+            "core:filename-example": "tas_Amon_HadGEM3-GC31-MM_historical_r1i1p1f3_gn_185001-186912.nc",
+            "core:filename-sub-experiment-example": "tas_Amon_HadGEM3-GC31-MM_dcppA-hindcast_s1960-r1i1p1f2_gn_196011-196012.nc",
+            "core:filename-template": "<variable_id>_<table_id>_<source_id>_<experiment_id >_<member_id>_<grid_label>[_<time_range>].nc"
         }
     ],
     "files": [

diff --git a/JSONLD/core/version.jsonld b/JSONLD/core/version.jsonld
@@ -1,24 +1,24 @@
 [
     {
-        "@id": "././https://github.com/WCRP-CMIP/CMIP6Plus_CVs/blob/main/JSONLD/core/drs.json",
+        "@id": "././https://github.com/WCRP-CMIP/CMIP6Plus_CVs/blob/main/JSONLD/core/descriptors.json",
         "@type": "version",
-        "version:file": "././JSONLD/core/drs.json",
+        "version:file": "././JSONLD/core/descriptors.json",
         "version:release": {
             "mip-cmor-tables": "v6.5.0.2",
             "cmip6plus": "v6.5.1.4"
         },
-        "version:previous_updates": 1,
-        "version:date": "2024-07-26T17:40:49+01:00",
+        "version:previous_updates": 4,
+        "version:date": "2024-08-01T13:41:07+01:00",
         "version:commit": {
-            "hash": "8b9b9c3a48ab487d2d1659f9e372c969a07cf143",
-            "message": "Converting CMIKP6Plus contents into JSONLD",
+            "hash": "69a2e07188ff46de7fa1e88c5bdda0642792a550",
+            "message": "cv updates",
             "author": {
                 "name": "Daniel Ellis",
                 "email": "[email protected]"
             }
         },
         "version:data": {
-            "@id": "././mip-cmor-tables:core/drs"
+            "@id": "././mip-cmor-tables:core/descriptors"
         }
     },
     {
@@ -44,25 +44,25 @@
         }
     },
     {
-        "@id": "././https://github.com/WCRP-CMIP/CMIP6Plus_CVs/blob/main/JSONLD/core/descriptors.json",
+        "@id": "././https://github.com/WCRP-CMIP/CMIP6Plus_CVs/blob/main/JSONLD/core/drs.json",
         "@type": "version",
-        "version:file": "././JSONLD/core/descriptors.json",
+        "version:file": "././JSONLD/core/drs.json",
         "version:release": {
             "mip-cmor-tables": "v6.5.0.2",
             "cmip6plus": "v6.5.1.4"
         },
-        "version:previous_updates": 3,
-        "version:date": "2024-07-29T20:45:05+01:00",
+        "version:previous_updates": 1,
+        "version:date": "2024-07-26T17:40:49+01:00",
         "version:commit": {
-            "hash": "ceb68da856e8af17148f03f905307571462f0cbc",
-            "message": "cv update",
+            "hash": "8b9b9c3a48ab487d2d1659f9e372c969a07cf143",
+            "message": "Converting CMIKP6Plus contents into JSONLD",
             "author": {
                 "name": "Daniel Ellis",
                 "email": "[email protected]"
             }
         },
         "version:data": {
-            "@id": "././mip-cmor-tables:core/descriptors"
+            "@id": "././mip-cmor-tables:core/drs"
         }
     }
 ]
diff --git a/JSONLD/experiment/id/amip.json b/JSONLD/experiment/id/amip.json
@@ -34,14 +34,10 @@
   },
   "parent": {
     "activity-id": [
-      {
-        "@id": "cmip6plus:activity/no parent"
-      }
+      "no parent"
     ],
     "experiment-id": [
-      {
-        "@id": "cmip6plus:experiment/id/no parent"
-      }
+      "no parent"
     ]
   },
   "sub-experiment-id": {

diff --git a/JSONLD/experiment/id/esm-picontrol-spinup.json b/JSONLD/experiment/id/esm-picontrol-spinup.json
@@ -34,14 +34,10 @@
   },
   "parent": {
     "activity-id": [
-      {
-        "@id": "cmip6plus:activity/no parent"
-      }
+      "no parent"
     ],
     "experiment-id": [
-      {
-        "@id": "cmip6plus:experiment/id/no parent"
-      }
+      "no parent"
     ]
   },
   "sub-experiment-id": {