Issue1148/1127 revise CanESM5-1, E3SM-2-0 source id license histories (…

…#1184)
WCRP-CMIP · Feb 22, 2023 · 94ce82a · 94ce82a
1 parent 1868f66
commit 94ce82a
Show file tree

Hide file tree

Showing 27 changed files with 77 additions and 68 deletions.
diff --git a/CMIP6_DRS.json b/CMIP6_DRS.json
@@ -8,13 +8,13 @@
         "filename_template":"<variable_id>_<table_id>_<source_id>_<experiment_id >_<member_id>_<grid_label>[_<time_range>].nc"
     },
     "version_metadata":{
-        "CV_collection_modified":"Tue Feb 21 21:11:09 2023 -0800",
-        "CV_collection_version":"6.2.58.50",
+        "CV_collection_modified":"Tue Feb 21 21:57:27 2023 -0800",
+        "CV_collection_version":"6.2.58.51",
         "DRS_CV_modified":"Tue Jun  7 14:29:45 2022 -0700",
         "DRS_CV_note":"Add CMIP6 Data Reference Syntax (DRS) templates",
         "author":"Paul J. Durack <[email protected]>",
         "institution_id":"PCMDI",
-        "previous_commit":"78ff933572976d588295c1383b4bc7f6f35f132f",
+        "previous_commit":"85240723e886662f9374779d01d48c019358fb78",
         "specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)"
     }
 }
diff --git a/CMIP6_activity_id.json b/CMIP6_activity_id.json
@@ -26,13 +26,13 @@
         "VolMIP":"Volcanic Forcings Model Intercomparison Project"
     },
     "version_metadata":{
-        "CV_collection_modified":"Tue Feb 21 21:11:09 2023 -0800",
-        "CV_collection_version":"6.2.58.50",
+        "CV_collection_modified":"Tue Feb 21 21:57:27 2023 -0800",
+        "CV_collection_version":"6.2.58.51",
         "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 <[email protected]>",
         "institution_id":"PCMDI",
-        "previous_commit":"78ff933572976d588295c1383b4bc7f6f35f132f",
+        "previous_commit":"85240723e886662f9374779d01d48c019358fb78",
         "specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)"
     }
 }
diff --git a/CMIP6_experiment_id.json b/CMIP6_experiment_id.json
@@ -9456,13 +9456,13 @@
         }
     },
     "version_metadata":{
-        "CV_collection_modified":"Tue Feb 21 21:11:09 2023 -0800",
-        "CV_collection_version":"6.2.58.50",
+        "CV_collection_modified":"Tue Feb 21 21:57:27 2023 -0800",
+        "CV_collection_version":"6.2.58.51",
         "author":"Paul J. Durack <[email protected]>",
         "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":"78ff933572976d588295c1383b4bc7f6f35f132f",
+        "previous_commit":"85240723e886662f9374779d01d48c019358fb78",
         "specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)"
     }
 }
diff --git a/CMIP6_frequency.json b/CMIP6_frequency.json
@@ -18,13 +18,13 @@
         "yrPt":"sampled yearly, at specified time point within the time period"
     },
     "version_metadata":{
-        "CV_collection_modified":"Tue Feb 21 21:11:09 2023 -0800",
-        "CV_collection_version":"6.2.58.50",
+        "CV_collection_modified":"Tue Feb 21 21:57:27 2023 -0800",
+        "CV_collection_version":"6.2.58.51",
         "author":"Paul J. Durack <[email protected]>",
         "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":"78ff933572976d588295c1383b4bc7f6f35f132f",
+        "previous_commit":"85240723e886662f9374779d01d48c019358fb78",
         "specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)"
     }
 }
diff --git a/CMIP6_grid_label.json b/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":"Tue Feb 21 21:11:09 2023 -0800",
-        "CV_collection_version":"6.2.58.50",
+        "CV_collection_modified":"Tue Feb 21 21:57:27 2023 -0800",
+        "CV_collection_version":"6.2.58.51",
         "author":"Paul J. Durack <[email protected]>",
         "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":"78ff933572976d588295c1383b4bc7f6f35f132f",
+        "previous_commit":"85240723e886662f9374779d01d48c019358fb78",
         "specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)"
     }
 }
diff --git a/CMIP6_institution_id.json b/CMIP6_institution_id.json
@@ -51,13 +51,13 @@
         "UHH":"Universitat Hamburg, Hamburg 20148, Germany"
     },
     "version_metadata":{
-        "CV_collection_modified":"Tue Feb 21 21:11:09 2023 -0800",
-        "CV_collection_version":"6.2.58.50",
+        "CV_collection_modified":"Tue Feb 21 21:57:27 2023 -0800",
+        "CV_collection_version":"6.2.58.51",
         "author":"Paul J. Durack <[email protected]>",
         "institution_id":"PCMDI",
         "institution_id_CV_modified":"Mon Aug 15 21:41:00 2022 -0700",
         "institution_id_CV_note":"Register institution_id UCSB for E3SM-1-0",
-        "previous_commit":"78ff933572976d588295c1383b4bc7f6f35f132f",
+        "previous_commit":"85240723e886662f9374779d01d48c019358fb78",
         "specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)"
     }
 }
diff --git a/CMIP6_license.json b/CMIP6_license.json
@@ -21,13 +21,13 @@
         }
     },
     "version_metadata":{
-        "CV_collection_modified":"Tue Feb 21 21:11:09 2023 -0800",
-        "CV_collection_version":"6.2.58.50",
+        "CV_collection_modified":"Tue Feb 21 21:57:27 2023 -0800",
+        "CV_collection_version":"6.2.58.51",
         "author":"Paul J. Durack <[email protected]>",
         "institution_id":"PCMDI",
         "license_CV_modified":"Tue May 24 11:20:06 2022 -0700",
         "license_CV_note":"Update published source_id entries with rights; augment license",
-        "previous_commit":"78ff933572976d588295c1383b4bc7f6f35f132f",
+        "previous_commit":"85240723e886662f9374779d01d48c019358fb78",
         "specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)"
     }
 }
diff --git a/CMIP6_nominal_resolution.json b/CMIP6_nominal_resolution.json
@@ -17,13 +17,13 @@
         "5000 km"
     ],
     "version_metadata":{
-        "CV_collection_modified":"Tue Feb 21 21:11:09 2023 -0800",
-        "CV_collection_version":"6.2.58.50",
+        "CV_collection_modified":"Tue Feb 21 21:57:27 2023 -0800",
+        "CV_collection_version":"6.2.58.51",
         "author":"Paul J. Durack <[email protected]>",
         "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":"78ff933572976d588295c1383b4bc7f6f35f132f",
+        "previous_commit":"85240723e886662f9374779d01d48c019358fb78",
         "specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)"
     }
 }
diff --git a/CMIP6_realm.json b/CMIP6_realm.json
@@ -10,11 +10,11 @@
         "seaIce":"Sea Ice"
     },
     "version_metadata":{
-        "CV_collection_modified":"Tue Feb 21 21:11:09 2023 -0800",
-        "CV_collection_version":"6.2.58.50",
+        "CV_collection_modified":"Tue Feb 21 21:57:27 2023 -0800",
+        "CV_collection_version":"6.2.58.51",
         "author":"Paul J. Durack <[email protected]>",
         "institution_id":"PCMDI",
-        "previous_commit":"78ff933572976d588295c1383b4bc7f6f35f132f",
+        "previous_commit":"85240723e886662f9374779d01d48c019358fb78",
         "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)"

diff --git a/CMIP6_required_global_attributes.json b/CMIP6_required_global_attributes.json
@@ -32,11 +32,11 @@
         "variant_label"
     ],
     "version_metadata":{
-        "CV_collection_modified":"Tue Feb 21 21:11:09 2023 -0800",
-        "CV_collection_version":"6.2.58.50",
+        "CV_collection_modified":"Tue Feb 21 21:57:27 2023 -0800",
+        "CV_collection_version":"6.2.58.51",
         "author":"Paul J. Durack <[email protected]>",
         "institution_id":"PCMDI",
-        "previous_commit":"78ff933572976d588295c1383b4bc7f6f35f132f",
+        "previous_commit":"85240723e886662f9374779d01d48c019358fb78",
         "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)"

diff --git a/CMIP6_source_id.json b/CMIP6_source_id.json
@@ -2180,6 +2180,7 @@
                 "history":"2022-12-02: initially published under CC BY 4.0",
                 "id":"CC BY 4.0",
                 "license":"Creative Commons Attribution 4.0 International (CC BY 4.0; https://creativecommons.org/licenses/by/4.0/)",
+                "source_specific_info":"",
                 "url":"https://creativecommons.org/licenses/by/4.0/"
             },
             "model_component":{
@@ -2486,6 +2487,7 @@
                 "history":"2022-08-23: initially published under CC BY 4.0",
                 "id":"CC BY 4.0",
                 "license":"Creative Commons Attribution 4.0 International (CC BY 4.0; https://creativecommons.org/licenses/by/4.0/)",
+                "source_specific_info":"",
                 "url":"https://creativecommons.org/licenses/by/4.0/"
             },
             "model_component":{
@@ -8062,12 +8064,12 @@
         }
     },
     "version_metadata":{
-        "CV_collection_modified":"Tue Feb 21 21:11:09 2023 -0800",
-        "CV_collection_version":"6.2.58.50",
+        "CV_collection_modified":"Tue Feb 21 21:57:27 2023 -0800",
+        "CV_collection_version":"6.2.58.51",
         "author":"Paul J. Durack <[email protected]>",
         "institution_id":"PCMDI",
-        "previous_commit":"78ff933572976d588295c1383b4bc7f6f35f132f",
-        "source_id_CV_modified":"Tue Nov  8 11:56:41 2022 -0700",
+        "previous_commit":"85240723e886662f9374779d01d48c019358fb78",
+        "source_id_CV_modified":"Tue Feb 21 21:11:09 2023 -0800",
         "source_id_CV_note":"Revised CanESM5-1 source_id license history",
         "specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)"
     }

diff --git a/CMIP6_source_type.json b/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":"Tue Feb 21 21:11:09 2023 -0800",
-        "CV_collection_version":"6.2.58.50",
+        "CV_collection_modified":"Tue Feb 21 21:57:27 2023 -0800",
+        "CV_collection_version":"6.2.58.51",
         "author":"Paul J. Durack <[email protected]>",
         "institution_id":"PCMDI",
-        "previous_commit":"78ff933572976d588295c1383b4bc7f6f35f132f",
+        "previous_commit":"85240723e886662f9374779d01d48c019358fb78",
         "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)"

diff --git a/CMIP6_sub_experiment_id.json b/CMIP6_sub_experiment_id.json
@@ -76,11 +76,11 @@
         "s2029":"initialized near end of year 2029"
     },
     "version_metadata":{
-        "CV_collection_modified":"Tue Feb 21 21:11:09 2023 -0800",
-        "CV_collection_version":"6.2.58.50",
+        "CV_collection_modified":"Tue Feb 21 21:57:27 2023 -0800",
+        "CV_collection_version":"6.2.58.51",
         "author":"Paul J. Durack <[email protected]>",
         "institution_id":"PCMDI",
-        "previous_commit":"78ff933572976d588295c1383b4bc7f6f35f132f",
+        "previous_commit":"85240723e886662f9374779d01d48c019358fb78",
         "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"

diff --git a/CMIP6_table_id.json b/CMIP6_table_id.json
@@ -45,11 +45,11 @@
         "fx"
     ],
     "version_metadata":{
-        "CV_collection_modified":"Tue Feb 21 21:11:09 2023 -0800",
-        "CV_collection_version":"6.2.58.50",
+        "CV_collection_modified":"Tue Feb 21 21:57:27 2023 -0800",
+        "CV_collection_version":"6.2.58.51",
         "author":"Paul J. Durack <[email protected]>",
         "institution_id":"PCMDI",
-        "previous_commit":"78ff933572976d588295c1383b4bc7f6f35f132f",
+        "previous_commit":"85240723e886662f9374779d01d48c019358fb78",
         "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)"

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

diff --git a/docs/CMIP6_experiment_id.html b/docs/CMIP6_experiment_id.html
@@ -20,7 +20,7 @@
 </script>
 <title>CMIP6 experiment_id values</title>
 </head>
-<body><p><h1>WCRP-CMIP CMIP6_CVs version: 6.2.58.50</h1></p>
+<body><p><h1>WCRP-CMIP CMIP6_CVs version: 6.2.58.51</h1></p>
 <h4>
 <a href='CMIP6_experiment_id.html'>Experiment IDs</a> |
 <a href='CMIP6_institution_id.html'>Institution IDs</a> |

diff --git a/docs/CMIP6_institution_id.html b/docs/CMIP6_institution_id.html
@@ -19,7 +19,7 @@
 //]]>
 </script><title>CMIP6 institution_id values</title>
 </head>
-<body><p><h1>WCRP-CMIP CMIP6_CVs version: 6.2.58.50</h1></p>
+<body><p><h1>WCRP-CMIP CMIP6_CVs version: 6.2.58.51</h1></p>
 <h4>
 <a href='CMIP6_experiment_id.html'>Experiment IDs</a> |
 <a href='CMIP6_institution_id.html'>Institution IDs</a> |

diff --git a/docs/CMIP6_source_id.html b/docs/CMIP6_source_id.html
@@ -19,7 +19,7 @@
 //]]>
 </script><title>CMIP6 source_id values</title>
 </head>
-<body><p><h1>WCRP-CMIP CMIP6_CVs version: 6.2.58.50</h1></p>
+<body><p><h1>WCRP-CMIP CMIP6_CVs version: 6.2.58.51</h1></p>
 <h4>
 <a href='CMIP6_experiment_id.html'>Experiment IDs</a> |
 <a href='CMIP6_institution_id.html'>Institution IDs</a> |

diff --git a/docs/CMIP6_source_id_citation.html b/docs/CMIP6_source_id_citation.html
@@ -21,7 +21,7 @@
         <title>CMIP6 Source ID Citation details details</title>
 </head>
 <body>
-        <p><h1>WCRP-CMIP CMIP6_CVs version: 6.2.58.50</h1></p>
+        <p><h1>WCRP-CMIP CMIP6_CVs version: 6.2.58.51</h1></p>
 
 <h4>
 <a href='CMIP6_experiment_id.html'>Experiment IDs</a> |

diff --git a/docs/CMIP6_source_id_experiment_citation.html b/docs/CMIP6_source_id_experiment_citation.html
@@ -21,7 +21,7 @@
         <title>CMIP6 Source ID Citation details by experiment details</title>
 </head>
 <body>
-        <p><h1>WCRP-CMIP CMIP6_CVs version: 6.2.58.50</h1></p>
+        <p><h1>WCRP-CMIP CMIP6_CVs version: 6.2.58.51</h1></p>
 
 <h4>
 <a href='CMIP6_experiment_id.html'>Experiment IDs</a> |

diff --git a/docs/CMIP6_source_id_licenses.html b/docs/CMIP6_source_id_licenses.html
@@ -21,7 +21,7 @@
         <title>CMIP6 source_id license details</title>
 </head>
 <body>
-        <p><h1>WCRP-CMIP CMIP6_CVs version: 6.2.58.50</h1></p>
+        <p><h1>WCRP-CMIP CMIP6_CVs version: 6.2.58.51</h1></p>
 
 <h4>
 <a href='CMIP6_experiment_id.html'>Experiment IDs</a> |
@@ -485,9 +485,9 @@ <h4>
 <td>Published</td>
 <td>CanESM5.1</td>
 <td>CanESM5.1</td>
-<td></td>
-<td></td>
-<td></td>
+<td><a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a></td>
+<td>@ec.gc.ca <- f.cccma.info-info.ccmac.f</td>
+<td>2022-12-02: initially published under CC BY 4.0</td>
 <td></td>
 </tr>
 <tr>
@@ -545,9 +545,9 @@ <h4>
 <td>Published</td>
 <td>E3SM 2.0</td>
 <td>E3SM 2.0 (Energy Exascale Earth System Model)</td>
-<td></td>
-<td></td>
-<td></td>
+<td><a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a></td>
+<td>@llnl.gov <- e3sm-data-support</td>
+<td>2022-08-23: initially published under CC BY 4.0</td>
 <td></td>
 </tr>
 <tr>

diff --git a/mip_era.json b/mip_era.json
@@ -7,13 +7,13 @@
         "CMIP6"
     ],
     "version_metadata":{
-        "CV_collection_modified":"Tue Feb 21 21:11:09 2023 -0800",
-        "CV_collection_version":"6.2.58.50",
+        "CV_collection_modified":"Tue Feb 21 21:57:27 2023 -0800",
+        "CV_collection_version":"6.2.58.51",
         "author":"Paul J. Durack <[email protected]>",
         "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":"78ff933572976d588295c1383b4bc7f6f35f132f",
+        "previous_commit":"85240723e886662f9374779d01d48c019358fb78",
         "specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)"
     }
 }
diff --git a/src/citation.json.gz b/src/citation.json.gz
diff --git a/src/citation_expts.json.gz b/src/citation_expts.json.gz
diff --git a/src/jsonToHtml.py b/src/jsonToHtml.py
@@ -495,13 +495,13 @@ def retrieve_citation_data_expts(source_ids, regen=False):
         # try to get license header, otherwise leave blanks
         try:
             license_data = source_id_data['license_info']
-            license = '<a href="{url}">{id}</a>'.format(**license_data)
+            license1 = '<a href="{url}">{id}</a>'.format(**license_data)
             contact = license_data['exceptions_contact']
             history = license_data['history']
             specific_info = license_data['source_specific_info']
             if specific_info.startswith('http'):
                 specific_info = '<a href="{0}">{0}</a>'.format(specific_info)
-            row += [license, contact, history, specific_info]
+            row += [license1, contact, history, specific_info]
 
         except KeyError:
             row += [''] * len(license_headings)
@@ -518,7 +518,7 @@ def retrieve_citation_data_expts(source_ids, regen=False):
 
     fh_license.write('</table>\n</body>\n</html>\n')
 
-
+# %% Process source_id citation
 html_file = 'CMIP6_source_id_citation.html'
 heading = 'CMIP6 Source ID Citation details'
 first_row = [
@@ -562,7 +562,7 @@ def retrieve_citation_data_expts(source_ids, regen=False):
 
     fh_citation.write('</table>\n</body>\n</html>\n')
 
-
+# %% Process source_id per experiment citation
 html_file = 'CMIP6_source_id_experiment_citation.html'
 heading = 'CMIP6 Source ID Citation details by experiment'
 first_row = [