Merge branch 'esgvoc_dev' into add-geomip-entries

Author: ltroussellier

.github/workflows/export-cmor-cvs-table.yaml

@@ -26,7 +26,7 @@ jobs:
           ESGVOC_REVISION: "5145b8f6d8b1859c663e63fb7b0bad952e8bc7b5"
           # Modify these as needed
           UNIVERSE_CVS_FORK: "znichollscr"
-          UNIVERSE_CVS_BRANCH: "add-geomip-entries"
+          UNIVERSE_CVS_BRANCH: "cmip-description"
           CMIP7_CVS_FORK: ${{ github.event.pull_request.head.repo.owner.login }}
           CMIP7_CVS_BRANCH: ${{ github.head_ref || github.ref_name }}
         run: |

activity/cmip.json

@@ -2,7 +2,7 @@
     "@context": "000_context.jsonld",
     "id": "cmip",
     "type": "activity",
-    "description": "CMIP core common experiments i.e. the DECK (Diagnostic, Evaluation and Characterization of Klima) and historical.",
+    "description": "CMIP core common experiments i.e. the DECK (Diagnostic, Evaluation and Characterization of Klima).",
     "experiments": [
         "1pctco2",
         "abrupt-4xco2",

create-cmor-cvs-table-export-environment.sh

@@ -7,9 +7,9 @@ python3.13 -m venv venv
 ESGVOC_FORK="znichollscr"
 ESGVOC_REVISION="5145b8f6d8b1859c663e63fb7b0bad952e8bc7b5"
 UNIVERSE_CVS_FORK="znichollscr"
-UNIVERSE_CVS_BRANCH="add-geomip-entries"
+UNIVERSE_CVS_BRANCH="cmip-description"
 CMIP7_CVS_FORK="znichollscr"
-CMIP7_CVS_BRANCH="add-geomip-entries"
+CMIP7_CVS_BRANCH="cmip-description"
 
 venv/bin/pip install -r requirements-cmor-cvs-table.txt
 venv/bin/pip install --no-deps "git+https://github.com/$ESGVOC_FORK/esgf-vocab.git@$ESGVOC_REVISION"