Revise source_id ICON-ESM-LR

CMIP6_activity_id.json

@@ -26,13 +26,13 @@
         "VolMIP":"Volcanic Forcings Model Intercomparison Project"
     },
     "version_metadata":{
-        "CV_collection_modified":"Thu Jul 22 11:35:33 2021 -0700",
-        "CV_collection_version":"6.2.56.3",
+        "CV_collection_modified":"Mon Jul 26 10:57:20 2021 -0700",
+        "CV_collection_version":"6.2.56.4",
         "activity_id_CV_modified":"Mon Mar  5 16:39:09 2018 -0800",
         "activity_id_CV_note":"Update activity_id to include CDRMIP and PAMIP",
         "author":"Paul J. Durack <durack1@llnl.gov>",
         "institution_id":"PCMDI",
-        "previous_commit":"66344226746627e0b6c12db974666126c343ce27",
+        "previous_commit":"5afeb3ffd3b98e23b9c2ff76015fc7c87a5dbd71",
         "specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)"
     }
 }

CMIP6_experiment_id.json

@@ -9456,13 +9456,13 @@
         }
     },
     "version_metadata":{
-        "CV_collection_modified":"Thu Jul 22 11:35:33 2021 -0700",
-        "CV_collection_version":"6.2.56.3",
+        "CV_collection_modified":"Mon Jul 26 10:57:20 2021 -0700",
+        "CV_collection_version":"6.2.56.4",
         "author":"Paul J. Durack <durack1@llnl.gov>",
         "experiment_id_CV_modified":"Tue Dec 15 12:25:59 2020 -0800",
         "experiment_id_CV_note":"Revise experiment_id historical parent experiments",
         "institution_id":"PCMDI",
-        "previous_commit":"66344226746627e0b6c12db974666126c343ce27",
+        "previous_commit":"5afeb3ffd3b98e23b9c2ff76015fc7c87a5dbd71",
         "specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)"
     }
 }

CMIP6_frequency.json

@@ -18,13 +18,13 @@
         "yrPt":"sampled yearly, at specified time point within the time period"
     },
     "version_metadata":{
-        "CV_collection_modified":"Thu Jul 22 11:35:33 2021 -0700",
-        "CV_collection_version":"6.2.56.3",
+        "CV_collection_modified":"Mon Jul 26 10:57:20 2021 -0700",
+        "CV_collection_version":"6.2.56.4",
         "author":"Paul J. Durack <durack1@llnl.gov>",
         "frequency_CV_modified":"Mon May 24 13:48:15 2021 00100",
         "frequency_CV_note":"Update description of 3hr and 6hr frequencies",
         "institution_id":"PCMDI",
-        "previous_commit":"66344226746627e0b6c12db974666126c343ce27",
+        "previous_commit":"5afeb3ffd3b98e23b9c2ff76015fc7c87a5dbd71",
         "specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)"
     }
 }

CMIP6_grid_label.json

@@ -47,13 +47,13 @@
         "grz":"regridded zonal mean data reported on the data provider's preferred latitude target grid"
     },
     "version_metadata":{
-        "CV_collection_modified":"Thu Jul 22 11:35:33 2021 -0700",
-        "CV_collection_version":"6.2.56.3",
+        "CV_collection_modified":"Mon Jul 26 10:57:20 2021 -0700",
+        "CV_collection_version":"6.2.56.4",
         "author":"Paul J. Durack <durack1@llnl.gov>",
         "grid_label_CV_modified":"Fri Sep 8 18:12:00 2017 -0700",
         "grid_label_CV_note":"Issue395 durack1 augment grid_label with description (#401)",
         "institution_id":"PCMDI",
-        "previous_commit":"66344226746627e0b6c12db974666126c343ce27",
+        "previous_commit":"5afeb3ffd3b98e23b9c2ff76015fc7c87a5dbd71",
         "specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)"
     }
 }

CMIP6_institution_id.json

@@ -55,13 +55,13 @@
         "UofT":"Department of Physics, University of Toronto, 60 St George Street, Toronto, ON M5S1A7, Canada"
     },
     "version_metadata":{
-        "CV_collection_modified":"Thu Jul 22 11:35:33 2021 -0700",
-        "CV_collection_version":"6.2.56.3",
+        "CV_collection_modified":"Mon Jul 26 10:57:20 2021 -0700",
+        "CV_collection_version":"6.2.56.4",
         "author":"Paul J. Durack <durack1@llnl.gov>",
         "institution_id":"PCMDI",
         "institution_id_CV_modified":"Mon Nov 16 11:16:39 2020 -0800",
         "institution_id_CV_note":"Register institution_id LLNL; Py3 cleanup",
-        "previous_commit":"66344226746627e0b6c12db974666126c343ce27",
+        "previous_commit":"5afeb3ffd3b98e23b9c2ff76015fc7c87a5dbd71",
         "specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)"
     }
 }

CMIP6_license.json

@@ -3,13 +3,13 @@
         "CMIP6 model data produced by <Your Centre Name> is licensed under a Creative Commons Attribution-[NonCommercial-]ShareAlike 4.0 International License (https://creativecommons.org/licenses). Consult https://pcmdi.llnl.gov/CMIP6/TermsOfUse for terms of use governing CMIP6 output, including citation requirements and proper acknowledgment. Further information about this data, including some limitations, can be found via the further_info_url (recorded as a global attribute in this file)[ and at <some URL maintained by modeling group>]. The data producers and data providers make no warranty, either express or implied, including, but not limited to, warranties of merchantability and fitness for a particular purpose. All liabilities arising from the supply of the information (including any liability arising in negligence) are excluded to the fullest extent permitted by law."
     ],
     "version_metadata":{
-        "CV_collection_modified":"Thu Jul 22 11:35:33 2021 -0700",
-        "CV_collection_version":"6.2.56.3",
+        "CV_collection_modified":"Mon Jul 26 10:57:20 2021 -0700",
+        "CV_collection_version":"6.2.56.4",
         "author":"Paul J. Durack <durack1@llnl.gov>",
         "institution_id":"PCMDI",
         "license_CV_modified":"Mon Feb 27 10:30:00 2017 -0700",
         "license_CV_note":"Issue225 durack1 add institution_id THU (#232)",
-        "previous_commit":"66344226746627e0b6c12db974666126c343ce27",
+        "previous_commit":"5afeb3ffd3b98e23b9c2ff76015fc7c87a5dbd71",
         "specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)"
     }
 }

CMIP6_nominal_resolution.json

@@ -17,13 +17,13 @@
         "5000 km"
     ],
     "version_metadata":{
-        "CV_collection_modified":"Thu Jul 22 11:35:33 2021 -0700",
-        "CV_collection_version":"6.2.56.3",
+        "CV_collection_modified":"Mon Jul 26 10:57:20 2021 -0700",
+        "CV_collection_version":"6.2.56.4",
         "author":"Paul J. Durack <durack1@llnl.gov>",
         "institution_id":"PCMDI",
         "nominal_resolution_CV_modified":"Tues Nov 15 16:04:00 2016 -0700",
         "nominal_resolution_CV_note":"Issue141 durack1 update grid_resolution to nominal_resolution (#143)",
-        "previous_commit":"66344226746627e0b6c12db974666126c343ce27",
+        "previous_commit":"5afeb3ffd3b98e23b9c2ff76015fc7c87a5dbd71",
         "specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)"
     }
 }

CMIP6_realm.json

@@ -10,11 +10,11 @@
         "seaIce":"Sea Ice"
     },
     "version_metadata":{
-        "CV_collection_modified":"Thu Jul 22 11:35:33 2021 -0700",
-        "CV_collection_version":"6.2.56.3",
+        "CV_collection_modified":"Mon Jul 26 10:57:20 2021 -0700",
+        "CV_collection_version":"6.2.56.4",
         "author":"Paul J. Durack <durack1@llnl.gov>",
         "institution_id":"PCMDI",
-        "previous_commit":"66344226746627e0b6c12db974666126c343ce27",
+        "previous_commit":"5afeb3ffd3b98e23b9c2ff76015fc7c87a5dbd71",
         "realm_CV_modified":"Tues Apr 18 12:03:00 2017 -0700",
         "realm_CV_note":"Issue285 durack1 update realm format (#290)",
         "specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)"

CMIP6_required_global_attributes.json

@@ -32,11 +32,11 @@
         "variant_label"
     ],
     "version_metadata":{
-        "CV_collection_modified":"Thu Jul 22 11:35:33 2021 -0700",
-        "CV_collection_version":"6.2.56.3",
+        "CV_collection_modified":"Mon Jul 26 10:57:20 2021 -0700",
+        "CV_collection_version":"6.2.56.4",
         "author":"Paul J. Durack <durack1@llnl.gov>",
         "institution_id":"PCMDI",
-        "previous_commit":"66344226746627e0b6c12db974666126c343ce27",
+        "previous_commit":"5afeb3ffd3b98e23b9c2ff76015fc7c87a5dbd71",
         "required_global_attributes_CV_modified":"Thu Dec 19 15:32:17 2019 -0800",
         "required_global_attributes_CV_note":"Reverting addition of external_variables to required_global_attributes",
         "specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)"

CMIP6_source_id.json

@@ -4639,7 +4639,7 @@
                 },
                 "atmos":{
                     "description":"ICON-A (icosahedral/triangles; 160 km; 47 levels; top level 80 km)",
-                    "native_nominal_resolution":"100 km"
+                    "native_nominal_resolution":"250 km"
                 },
                 "atmosChem":{
                     "description":"none",
@@ -7422,13 +7422,13 @@
         }
     },
     "version_metadata":{
-        "CV_collection_modified":"Thu Jul 22 11:35:33 2021 -0700",
-        "CV_collection_version":"6.2.56.3",
+        "CV_collection_modified":"Mon Jul 26 10:57:20 2021 -0700",
+        "CV_collection_version":"6.2.56.4",
         "author":"Paul J. Durack <durack1@llnl.gov>",
         "institution_id":"PCMDI",
-        "previous_commit":"66344226746627e0b6c12db974666126c343ce27",
-        "source_id_CV_modified":"Mon Jun 21 11:22:45 2021 -0700",
-        "source_id_CV_note":"Revise source_id E3SM-1-0 add PAMIP",
+        "previous_commit":"5afeb3ffd3b98e23b9c2ff76015fc7c87a5dbd71",
+        "source_id_CV_modified":"Thu Jul 22 11:35:33 2021 -0700",
+        "source_id_CV_note":"Revise source_id ICON-ESM-LR",
         "specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)"
     }
 }

CMIP6_source_type.json

@@ -12,11 +12,11 @@
         "SLAB":"slab-ocean used with an AGCM in representing the atmosphere-ocean coupled system"
     },
     "version_metadata":{
-        "CV_collection_modified":"Thu Jul 22 11:35:33 2021 -0700",
-        "CV_collection_version":"6.2.56.3",
+        "CV_collection_modified":"Mon Jul 26 10:57:20 2021 -0700",
+        "CV_collection_version":"6.2.56.4",
         "author":"Paul J. Durack <durack1@llnl.gov>",
         "institution_id":"PCMDI",
-        "previous_commit":"66344226746627e0b6c12db974666126c343ce27",
+        "previous_commit":"5afeb3ffd3b98e23b9c2ff76015fc7c87a5dbd71",
         "source_type_CV_modified":"Fri Sep 8 17:57:00 2017 -0700",
         "source_type_CV_note":"Issue396 durack1 augment source_type with description (#399)",
         "specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)"

CMIP6_sub_experiment_id.json

@@ -76,11 +76,11 @@
         "s2029":"initialized near end of year 2029"
     },
     "version_metadata":{
-        "CV_collection_modified":"Thu Jul 22 11:35:33 2021 -0700",
-        "CV_collection_version":"6.2.56.3",
+        "CV_collection_modified":"Mon Jul 26 10:57:20 2021 -0700",
+        "CV_collection_version":"6.2.56.4",
         "author":"Paul J. Durack <durack1@llnl.gov>",
         "institution_id":"PCMDI",
-        "previous_commit":"66344226746627e0b6c12db974666126c343ce27",
+        "previous_commit":"5afeb3ffd3b98e23b9c2ff76015fc7c87a5dbd71",
         "specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)",
         "sub_experiment_id_CV_modified":"Mon Jun 17 11:01:51 2019 -0700",
         "sub_experiment_id_CV_note":"Revise sub_experiment_id values"

CMIP6_table_id.json

@@ -45,11 +45,11 @@
         "fx"
     ],
     "version_metadata":{
-        "CV_collection_modified":"Thu Jul 22 11:35:33 2021 -0700",
-        "CV_collection_version":"6.2.56.3",
+        "CV_collection_modified":"Mon Jul 26 10:57:20 2021 -0700",
+        "CV_collection_version":"6.2.56.4",
         "author":"Paul J. Durack <durack1@llnl.gov>",
         "institution_id":"PCMDI",
-        "previous_commit":"66344226746627e0b6c12db974666126c343ce27",
+        "previous_commit":"5afeb3ffd3b98e23b9c2ff76015fc7c87a5dbd71",
         "specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)",
         "table_id_CV_modified":"Fri Jan 13 09:27:00 2017 -0700",
         "table_id_CV_note":"Issue199 durack1 update table_id to Data Request v1.0 (#200)"

README.md

@@ -1,4 +1,4 @@
-# CMIP6_CVs [![stable version](https://img.shields.io/badge/Current%20version-6.2.56.3-brightgreen.svg)](https://github.com/WCRP-CMIP/CMIP6_CVs/releases/tag/6.2.56.3)
+# CMIP6_CVs [![stable version](https://img.shields.io/badge/Current%20version-6.2.56.4-brightgreen.svg)](https://github.com/WCRP-CMIP/CMIP6_CVs/releases/tag/6.2.56.4)
 
 Core Controlled Vocabularies (CVs) for use in CMIP6
 

docs/CMIP6_experiment_id.html

@@ -19,7 +19,7 @@
 <title>CMIP6 experiment_id values</title>
 </head>
 <body>
-<p>WCRP-CMIP CMIP6_CVs version: 6.2.56.3</p>
+<p>WCRP-CMIP CMIP6_CVs version: 6.2.56.4</p>
 <table id="table_id" class="display">
 <thead>
 <tr>

docs/CMIP6_institution_id.html

@@ -19,7 +19,7 @@
 <title>CMIP6 institution_id values</title>
 </head>
 <body>
-<p>WCRP-CMIP CMIP6_CVs version: 6.2.56.3</p>
+<p>WCRP-CMIP CMIP6_CVs version: 6.2.56.4</p>
 <table id="table_id" class="display">
 <thead>
 <tr>

docs/CMIP6_source_id.html

@@ -19,7 +19,7 @@
 <title>CMIP6 source_id values</title>
 </head>
 <body>
-<p>WCRP-CMIP CMIP6_CVs version: 6.2.56.3</p>
+<p>WCRP-CMIP CMIP6_CVs version: 6.2.56.4</p>
 <table id="table_id" class="display">
 <thead>
 <tr>
@@ -1814,7 +1814,7 @@
 <td>ICON-ESM-LR</td>
 <td>ICON-ESM-LR</td>
 <td>ICON-A (icosahedral/triangles; 160 km; 47 levels; top level 80 km)</td>
-<td>100 km</td>
+<td>250 km</td>
 <td>ICON-O (icosahedral/triangles; 40 km; 40 levels; top grid cell 0-12 m)</td>
 <td>50 km</td>
 <td>none/prescribed</td>

mip_era.json

@@ -7,13 +7,13 @@
         "CMIP6"
     ],
     "version_metadata":{
-        "CV_collection_modified":"Thu Jul 22 11:35:33 2021 -0700",
-        "CV_collection_version":"6.2.56.3",
+        "CV_collection_modified":"Mon Jul 26 10:57:20 2021 -0700",
+        "CV_collection_version":"6.2.56.4",
         "author":"Paul J. Durack <durack1@llnl.gov>",
         "institution_id":"PCMDI",
         "mip_era_CV_modified":"Thu Aug 25 17:21:00 2016 -0700",
         "mip_era_CV_note":"Fix #36 - Add CV name to json structure",
-        "previous_commit":"66344226746627e0b6c12db974666126c343ce27",
+        "previous_commit":"5afeb3ffd3b98e23b9c2ff76015fc7c87a5dbd71",
         "specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)"
     }
 }

src/versionHistory.json

@@ -61,10 +61,10 @@
             "timeStamp":"Thu Dec 19 15:32:17 2019 -0800"
         },
         "source_id":{
-            "MD5":"66344226746627e0b6c12db974666126c343ce27",
-            "URL":"https://github.com/WCRP-CMIP/CMIP6_CVs/commit/66344226746627e0b6c12db974666126c343ce27",
-            "commitMessage":"Revise source_id E3SM-1-0 add PAMIP",
-            "timeStamp":"Thu Jul 22 11:35:33 2021 -0700"
+            "MD5":"5afeb3ffd3b98e23b9c2ff76015fc7c87a5dbd71",
+            "URL":"https://github.com/WCRP-CMIP/CMIP6_CVs/commit/5afeb3ffd3b98e23b9c2ff76015fc7c87a5dbd71",
+            "commitMessage":"Revise source_id ICON-ESM-LR",
+            "timeStamp":"Mon Jul 26 10:57:20 2021 -0700"
         },
         "source_type":{
             "MD5":"fa3f07e9c215b35e0a54737acba2c2a9f6b8901f",
@@ -85,7 +85,7 @@
             "timeStamp":"Fri Jan 13 09:27:00 2017 -0700"
         },
         "versions":{
-            "versionCVCommit":3,
+            "versionCVCommit":4,
             "versionCVContent":56,
             "versionCVStructure":2,
             "versionMIPEra":6

src/writeJson.py

@@ -534,6 +534,7 @@
 PJD 21 Jun 2021    - Register source_id IPSL-CM6A-MR1 https://github.com/WCRP-CMIP/CMIP6_CVs/issues/1023
 PJD 21 Jun 2021    - Register source_id IPSL-CM6A-MR025 https://github.com/WCRP-CMIP/CMIP6_CVs/issues/1024
 PJD 22 Jul 2021    - Revise source_id E3SM-1-0 add PAMIP https://github.com/WCRP-CMIP/CMIP6_CVs/issues/1030
+PJD 26 Jul 2021    - Revise source_id ICON-ESM-LR https://github.com/WCRP-CMIP/CMIP6_CVs/issues/1034
                      - TODO: Review all start/end_year pairs for experiments https://github.com/WCRP-CMIP/CMIP6_CVs/issues/845
                      - TODO: Generate table_id from dataRequest https://github.com/WCRP-CMIP/CMIP6_CVs/issues/166
 @author: durack1
@@ -563,7 +564,7 @@
 #from unidecode import unidecode
 
 #%% Set commit message and author info
-commitMessage = '\"Revise source_id E3SM-1-0 add PAMIP\"'
+commitMessage = '\"Revise source_id ICON-ESM-LR\"'
 #author = 'Matthew Mizielinski <matthew.mizielinski@metoffice.gov.uk>'
 #author_institution_id = 'MOHC'
 author = 'Paul J. Durack <durack1@llnl.gov>'
@@ -1002,13 +1003,8 @@
 source_id = source_id.get('source_id')  # Fudge to extract duplicate level
 del(tmp)
 
-key = 'E3SM-1-0'
-source_id[key]['activity_participation'] = [
-    'CFMIP',
-    'CMIP',
-    'PAMIP',
-    'ScenarioMIP'
-]
+key = 'ICON-ESM-LR'
+source_id[key]['model_component']['atmos']['native_nominal_resolution'] = '250 km'
 
 # Fix issues
 # key = 'GISS-E2-2-H'