Merge pull request #21 from WCRP-CORDEX/rename

change table prefix to CORDEX-CMIP6
WCRP-CORDEX · Oct 23, 2023 · 765ed8e · 765ed8e
2 parents 0d7d883 + e7a8165
commit 765ed8e
Show file tree

Hide file tree

Showing 27 changed files with 54 additions and 340 deletions.
diff --git a/.github/workflows/update-cv.yaml b/.github/workflows/update-cv.yaml
@@ -42,23 +42,11 @@ jobs:
         python -m pip install --upgrade pip
         if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
         pip install pre-commit
-        #pre-commit install
 
     - name: Update controlled vocabulary
       run: |
-        python scripts/createCORDEXCV.py
-        mv CORDEX_CV.json tables/Tables
-
-   # - name: Commit CORDEX_CV.json
-   #   run: |
-   #     cd tables
-   #     git config --global user.name "github-actions[bot]"
-   #     (pre-commit run --all-files) || true
-   #     git pull origin main
-        #git config --global user.email 'your-username@users.noreply.github.com'
-        #git commit Tables/CORDEX_CV.json -m "automated CV update"
-        #git status
-        #git push
+        python scripts/create-cv.py
+        mv CORDEX-CMIP6_CV.json tables/Tables
 
     - name: Check if there are any changes
       id: verify_diff
@@ -73,6 +61,6 @@ jobs:
         git config --local user.email "github-actions[bot]@users.noreply.github.com"
         git config --local user.name "github-actions[bot]"
         (pre-commit run --all-files) || true
-        git commit Tables/CORDEX_CV.json -m "automated CV update"
+        git commit Tables/CORDEX_CV.json -m "CV update"
         git status
         git push
diff --git a/CORDEX_DRS.json → CORDEX-CMIP6_DRS.json b/CORDEX_DRS.json → CORDEX-CMIP6_DRS.json
diff --git a/CORDEX_activity_id.json → CORDEX-CMIP6_activity_id.json b/CORDEX_activity_id.json → CORDEX-CMIP6_activity_id.json
diff --git a/CORDEX_domain.json → CORDEX-CMIP6_domain.json b/CORDEX_domain.json → CORDEX-CMIP6_domain.json
diff --git a/CORDEX_domain_id.json → CORDEX-CMIP6_domain_id.json b/CORDEX_domain_id.json → CORDEX-CMIP6_domain_id.json
diff --git a/CORDEX_driving_institution_id.json → CORDEX-CMIP6_driving_institution_id.json b/CORDEX_driving_institution_id.json → CORDEX-CMIP6_driving_institution_id.json
diff --git a/CORDEX_driving_source_id.json → CORDEX-CMIP6_driving_source_id.json b/CORDEX_driving_source_id.json → CORDEX-CMIP6_driving_source_id.json
@@ -680,13 +680,6 @@
             "driving_source_id": "IPSL-CM6A-LR-INCA",
             "driving_source": "IPSL-CM6A-LR-INCA (2019): \naerosol: INCA v6 AER\natmos: LMDZ (NPv6 ; 144 x 143 longitude/latitude; 79 levels; top level 80000 m)\natmosChem: none\nland: ORCHIDEE (v2.0, Water/Carbon/Energy mode)\nlandIce: none\nocean: NEMO-OPA (eORCA1.3, tripolar primarily 1deg; 362 x 332 longitude/latitude; 75 levels; top grid cell 0-2 m)\nocnBgchem: NEMO-PISCES\nseaIce: NEMO-LIM3"
         },
-        "IPSL-CM6A-MR025": {
-            "driving_institution_id": [
-                "IPSL"
-            ],
-            "driving_source_id": "IPSL-CM6A-MR025",
-            "driving_source": "IPSL-CM6A-MR025 (2021): \naerosol: none\natmos: LMDZ (NPv6; 256 x 256 longitude/latitude; 79 levels; top level 80000 m)\natmosChem: none\nland: ORCHIDEE (v2.2, Water/Carbon/Energy mode; same grid as atmos)\nlandIce: none\nocean: NEMO-OPA (eORCA025, tripolar primarily 0.25deg; 1442 x 1207 longitude/latitude; 75 levels; top grid cell 0-2 m)\nocnBgchem: none\nseaIce: NEMO-LIM3 (same grid as ocean)"
-        },
         "IPSL-CM6A-MR1": {
             "driving_institution_id": [
                 "IPSL"

diff --git a/CORDEX_experiment_id.json → CORDEX-CMIP6_experiment_id.json b/CORDEX_experiment_id.json → CORDEX-CMIP6_experiment_id.json
diff --git a/CORDEX_frequency.json → CORDEX-CMIP6_frequency.json b/CORDEX_frequency.json → CORDEX-CMIP6_frequency.json
diff --git a/CORDEX_institution_id.json → CORDEX-CMIP6_institution_id.json b/CORDEX_institution_id.json → CORDEX-CMIP6_institution_id.json
diff --git a/CORDEX_license.json → CORDEX-CMIP6_license.json b/CORDEX_license.json → CORDEX-CMIP6_license.json
diff --git a/CORDEX_native_resolution.json → CORDEX-CMIP6_native_resolution.json b/CORDEX_native_resolution.json → CORDEX-CMIP6_native_resolution.json
diff --git a/CORDEX_project_id.json → CORDEX-CMIP6_project_id.json b/CORDEX_project_id.json → CORDEX-CMIP6_project_id.json
diff --git a/CORDEX_realm.json → CORDEX-CMIP6_realm.json b/CORDEX_realm.json → CORDEX-CMIP6_realm.json
diff --git a/CORDEX_required_global_attributes.json → CORDEX-CMIP6_required_global_attributes.json b/CORDEX_required_global_attributes.json → CORDEX-CMIP6_required_global_attributes.json
diff --git a/CORDEX_source_id.json → CORDEX-CMIP6_source_id.json b/CORDEX_source_id.json → CORDEX-CMIP6_source_id.json
diff --git a/CORDEX_source_type.json → CORDEX-CMIP6_source_type.json b/CORDEX_source_type.json → CORDEX-CMIP6_source_type.json
diff --git a/CORDEX_table_id.json → CORDEX-CMIP6_table_id.json b/CORDEX_table_id.json → CORDEX-CMIP6_table_id.json
diff --git a/CORDEX_grid_label.json b/CORDEX_grid_label.json
diff --git a/docs/CORDEX_institution_id.html b/docs/CORDEX_institution_id.html
diff --git a/docs/CORDEX_source_id.html b/docs/CORDEX_source_id.html
diff --git a/docs/CORDEX_source_id_components.html b/docs/CORDEX_source_id_components.html
diff --git a/scripts/common.py b/scripts/common.py
@@ -12,7 +12,7 @@
 
 table_dir = op.join(op.dirname(op.dirname(__file__)), "Tables")
 
-table_prefix = "CORDEX"
+table_prefix = "CORDEX-CMIP6"
 
 
 def read_json_url(url):