diff --git a/CITATION.cff b/CITATION.cff index be4e46b2..d71a67ed 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -22,7 +22,7 @@ authors: given-names: "Martin" orcid: "https://orcid.org/0000-0003-1770-2132" title: "CMIP6 Controlled Vocabularies (CVs)" -version: 6.2.58.68 +version: 6.2.58.69 doi: 10.5281/zenodo.12197150 -date-released: 2024-06-20 +date-released: 2024-08-02 url: "https://github.com/WCRP-CMIP/CMIP6_CVs" diff --git a/CMIP6_DRS.json b/CMIP6_DRS.json index 7535e152..649a4ed7 100644 --- a/CMIP6_DRS.json +++ b/CMIP6_DRS.json @@ -8,13 +8,13 @@ "filename_template":"_____[_].nc" }, "version_metadata":{ - "CV_collection_modified":"Wed May 1 16:23:31 2024 -0700", - "CV_collection_version":"6.2.58.68", + "CV_collection_modified":"Fri Aug 2 12:57:50 2024 -0700", + "CV_collection_version":"6.2.58.69", "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 ", "institution_id":"PCMDI", - "previous_commit":"2c9cf667546f31a495cb2e3b8d9d5892bc7abaa2", + "previous_commit":"d1f30d0a9359ffdc1bff31be00d0c5f01fa840dd", "specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)" } } \ No newline at end of file diff --git a/CMIP6_activity_id.json b/CMIP6_activity_id.json index eef2f4e7..2104be3a 100644 --- 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":"Wed May 1 16:23:31 2024 -0700", - "CV_collection_version":"6.2.58.68", + "CV_collection_modified":"Fri Aug 2 12:57:50 2024 -0700", + "CV_collection_version":"6.2.58.69", "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 ", "institution_id":"PCMDI", - "previous_commit":"2c9cf667546f31a495cb2e3b8d9d5892bc7abaa2", + "previous_commit":"d1f30d0a9359ffdc1bff31be00d0c5f01fa840dd", "specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)" } } \ No newline at end of file diff --git a/CMIP6_experiment_id.json b/CMIP6_experiment_id.json index 4be0be7c..368f7bbc 100644 --- a/CMIP6_experiment_id.json +++ b/CMIP6_experiment_id.json @@ -9456,13 +9456,13 @@ } }, "version_metadata":{ - "CV_collection_modified":"Wed May 1 16:23:31 2024 -0700", - "CV_collection_version":"6.2.58.68", + "CV_collection_modified":"Fri Aug 2 12:57:50 2024 -0700", + "CV_collection_version":"6.2.58.69", "author":"Paul J. Durack ", "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":"2c9cf667546f31a495cb2e3b8d9d5892bc7abaa2", + "previous_commit":"d1f30d0a9359ffdc1bff31be00d0c5f01fa840dd", "specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)" } } \ No newline at end of file diff --git a/CMIP6_frequency.json b/CMIP6_frequency.json index 8da0d3a9..d3d01c74 100644 --- 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":"Wed May 1 16:23:31 2024 -0700", - "CV_collection_version":"6.2.58.68", + "CV_collection_modified":"Fri Aug 2 12:57:50 2024 -0700", + "CV_collection_version":"6.2.58.69", "author":"Paul J. Durack ", "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":"2c9cf667546f31a495cb2e3b8d9d5892bc7abaa2", + "previous_commit":"d1f30d0a9359ffdc1bff31be00d0c5f01fa840dd", "specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)" } } \ No newline at end of file diff --git a/CMIP6_grid_label.json b/CMIP6_grid_label.json index b34b18fc..642d1333 100644 --- 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":"Wed May 1 16:23:31 2024 -0700", - "CV_collection_version":"6.2.58.68", + "CV_collection_modified":"Fri Aug 2 12:57:50 2024 -0700", + "CV_collection_version":"6.2.58.69", "author":"Paul J. Durack ", "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":"2c9cf667546f31a495cb2e3b8d9d5892bc7abaa2", + "previous_commit":"d1f30d0a9359ffdc1bff31be00d0c5f01fa840dd", "specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)" } } \ No newline at end of file diff --git a/CMIP6_institution_id.json b/CMIP6_institution_id.json index c69089a0..12596a11 100644 --- 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":"Wed May 1 16:23:31 2024 -0700", - "CV_collection_version":"6.2.58.68", + "CV_collection_modified":"Fri Aug 2 12:57:50 2024 -0700", + "CV_collection_version":"6.2.58.69", "author":"Paul J. Durack ", "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":"2c9cf667546f31a495cb2e3b8d9d5892bc7abaa2", + "previous_commit":"d1f30d0a9359ffdc1bff31be00d0c5f01fa840dd", "specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)" } } \ No newline at end of file diff --git a/CMIP6_license.json b/CMIP6_license.json index 295f5358..072f9370 100644 --- a/CMIP6_license.json +++ b/CMIP6_license.json @@ -21,13 +21,13 @@ } }, "version_metadata":{ - "CV_collection_modified":"Wed May 1 16:23:31 2024 -0700", - "CV_collection_version":"6.2.58.68", + "CV_collection_modified":"Fri Aug 2 12:57:50 2024 -0700", + "CV_collection_version":"6.2.58.69", "author":"Paul J. Durack ", "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":"2c9cf667546f31a495cb2e3b8d9d5892bc7abaa2", + "previous_commit":"d1f30d0a9359ffdc1bff31be00d0c5f01fa840dd", "specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)" } } \ No newline at end of file diff --git a/CMIP6_nominal_resolution.json b/CMIP6_nominal_resolution.json index cfe62ddc..cd39ffe9 100644 --- a/CMIP6_nominal_resolution.json +++ b/CMIP6_nominal_resolution.json @@ -17,13 +17,13 @@ "5000 km" ], "version_metadata":{ - "CV_collection_modified":"Wed May 1 16:23:31 2024 -0700", - "CV_collection_version":"6.2.58.68", + "CV_collection_modified":"Fri Aug 2 12:57:50 2024 -0700", + "CV_collection_version":"6.2.58.69", "author":"Paul J. Durack ", "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":"2c9cf667546f31a495cb2e3b8d9d5892bc7abaa2", + "previous_commit":"d1f30d0a9359ffdc1bff31be00d0c5f01fa840dd", "specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)" } } \ No newline at end of file diff --git a/CMIP6_realm.json b/CMIP6_realm.json index 2dfff0dc..a86a4918 100644 --- a/CMIP6_realm.json +++ b/CMIP6_realm.json @@ -10,11 +10,11 @@ "seaIce":"Sea Ice" }, "version_metadata":{ - "CV_collection_modified":"Wed May 1 16:23:31 2024 -0700", - "CV_collection_version":"6.2.58.68", + "CV_collection_modified":"Fri Aug 2 12:57:50 2024 -0700", + "CV_collection_version":"6.2.58.69", "author":"Paul J. Durack ", "institution_id":"PCMDI", - "previous_commit":"2c9cf667546f31a495cb2e3b8d9d5892bc7abaa2", + "previous_commit":"d1f30d0a9359ffdc1bff31be00d0c5f01fa840dd", "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 index f7f3553f..01ca0490 100644 --- a/CMIP6_required_global_attributes.json +++ b/CMIP6_required_global_attributes.json @@ -32,11 +32,11 @@ "variant_label" ], "version_metadata":{ - "CV_collection_modified":"Wed May 1 16:23:31 2024 -0700", - "CV_collection_version":"6.2.58.68", + "CV_collection_modified":"Fri Aug 2 12:57:50 2024 -0700", + "CV_collection_version":"6.2.58.69", "author":"Paul J. Durack ", "institution_id":"PCMDI", - "previous_commit":"2c9cf667546f31a495cb2e3b8d9d5892bc7abaa2", + "previous_commit":"d1f30d0a9359ffdc1bff31be00d0c5f01fa840dd", "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 index f4311983..cbdbc521 100644 --- a/CMIP6_source_id.json +++ b/CMIP6_source_id.json @@ -605,11 +605,12 @@ "AWI-ESM-1-REcoM":{ "activity_participation":[ "C4MIP", + "CDRMIP", "CMIP", "ScenarioMIP" ], "cohort":[ - "Registered" + "Published" ], "institution_id":[ "AWI" @@ -618,7 +619,7 @@ "label_extended":"AWI-ESM 1 REcoM", "license_info":{ "exceptions_contact":"@awi.de <- mip-contact", - "history":"2024-01-25: initially published under CC BY 4.0", + "history":"2024-07-04: 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":"", @@ -661,64 +662,6 @@ "release_year":"2024", "source_id":"AWI-ESM-1-REcoM" }, - "AWI-ESM-2-1-LR":{ - "activity_participation":[ - "CMIP", - "PMIP" - ], - "cohort":[ - "Registered" - ], - "institution_id":[ - "AWI" - ], - "label":"AWI-ESM 2.1 LR", - "label_extended":"AWI-ESM 2.1 LR", - "license_info":{ - "exceptions_contact":"@awi.de <- mip-contact", - "history":"", - "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":{ - "aerosol":{ - "description":"none", - "native_nominal_resolution":"none" - }, - "atmos":{ - "description":"ECHAM6.3.04p1 (T63L47 native atmosphere T63 gaussian grid; 192 x 96 longitude/latitude; 47 levels; top level 80 km)", - "native_nominal_resolution":"250 km" - }, - "atmosChem":{ - "description":"none", - "native_nominal_resolution":"none" - }, - "land":{ - "description":"JSBACH 3.20 with dynamic vegetation", - "native_nominal_resolution":"250 km" - }, - "landIce":{ - "description":"none", - "native_nominal_resolution":"none" - }, - "ocean":{ - "description":"FESOM 2 (unstructured grid in the horizontal with 126858 wet nodes; 48 levels; top grid cell 0-5 m)", - "native_nominal_resolution":"50 km" - }, - "ocnBgchem":{ - "description":"none", - "native_nominal_resolution":"none" - }, - "seaIce":{ - "description":"FESOM 2", - "native_nominal_resolution":"50 km" - } - }, - "release_year":"2019", - "source_id":"AWI-ESM-2-1-LR" - }, "BCC-CSM2-HR":{ "activity_participation":[ "CMIP", @@ -8187,13 +8130,13 @@ } }, "version_metadata":{ - "CV_collection_modified":"Wed May 1 16:23:31 2024 -0700", - "CV_collection_version":"6.2.58.68", + "CV_collection_modified":"Fri Aug 2 12:57:50 2024 -0700", + "CV_collection_version":"6.2.58.69", "author":"Paul J. Durack ", "institution_id":"PCMDI", - "previous_commit":"2c9cf667546f31a495cb2e3b8d9d5892bc7abaa2", - "source_id_CV_modified":"Thu Mar 28 15:37:58 2024 -0700", - "source_id_CV_note":"Revised source_id IPSL-CM6A-MR1", + "previous_commit":"d1f30d0a9359ffdc1bff31be00d0c5f01fa840dd", + "source_id_CV_modified":"Wed May 1 16:23:31 2024 -0700", + "source_id_CV_note":"Deregistered source_id AWI-ESM-2-1-LR", "specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)" } } \ No newline at end of file diff --git a/CMIP6_source_type.json b/CMIP6_source_type.json index ffff577f..efeccb63 100644 --- 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":"Wed May 1 16:23:31 2024 -0700", - "CV_collection_version":"6.2.58.68", + "CV_collection_modified":"Fri Aug 2 12:57:50 2024 -0700", + "CV_collection_version":"6.2.58.69", "author":"Paul J. Durack ", "institution_id":"PCMDI", - "previous_commit":"2c9cf667546f31a495cb2e3b8d9d5892bc7abaa2", + "previous_commit":"d1f30d0a9359ffdc1bff31be00d0c5f01fa840dd", "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 index d3692954..9ea1a8f7 100644 --- 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":"Wed May 1 16:23:31 2024 -0700", - "CV_collection_version":"6.2.58.68", + "CV_collection_modified":"Fri Aug 2 12:57:50 2024 -0700", + "CV_collection_version":"6.2.58.69", "author":"Paul J. Durack ", "institution_id":"PCMDI", - "previous_commit":"2c9cf667546f31a495cb2e3b8d9d5892bc7abaa2", + "previous_commit":"d1f30d0a9359ffdc1bff31be00d0c5f01fa840dd", "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 index 641fec06..9b9bc79b 100644 --- a/CMIP6_table_id.json +++ b/CMIP6_table_id.json @@ -45,11 +45,11 @@ "fx" ], "version_metadata":{ - "CV_collection_modified":"Wed May 1 16:23:31 2024 -0700", - "CV_collection_version":"6.2.58.68", + "CV_collection_modified":"Fri Aug 2 12:57:50 2024 -0700", + "CV_collection_version":"6.2.58.69", "author":"Paul J. Durack ", "institution_id":"PCMDI", - "previous_commit":"2c9cf667546f31a495cb2e3b8d9d5892bc7abaa2", + "previous_commit":"d1f30d0a9359ffdc1bff31be00d0c5f01fa840dd", "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 index e0fd29c7..411b109b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# CMIP6_CVs [![stable version](https://img.shields.io/badge/Current%20version-6.2.58.68-brightgreen.svg)](https://github.com/WCRP-CMIP/CMIP6_CVs/releases/tag/6.2.58.68) [![DOI](https://zenodo.org/badge/62754800.svg)](https://zenodo.org/doi/10.5281/zenodo.12197150) +# CMIP6_CVs [![stable version](https://img.shields.io/badge/Current%20version-6.2.58.69-brightgreen.svg)](https://github.com/WCRP-CMIP/CMIP6_CVs/releases/tag/6.2.58.69) [![DOI](https://zenodo.org/badge/62754800.svg)](https://zenodo.org/doi/10.5281/zenodo.12197150) Core Controlled Vocabularies (CVs) for use in CMIP6 diff --git a/docs/CMIP6_experiment_id.html b/docs/CMIP6_experiment_id.html index 39fdb25e..909b2d58 100644 --- a/docs/CMIP6_experiment_id.html +++ b/docs/CMIP6_experiment_id.html @@ -21,7 +21,7 @@ CMIP6 experiment_id values -

WCRP-CMIP CMIP6_CVs version: 6.2.58.68

+

WCRP-CMIP CMIP6_CVs version: 6.2.58.69

Experiment IDs | Institution IDs | diff --git a/docs/CMIP6_institution_id.html b/docs/CMIP6_institution_id.html index 91fda6d7..6416b094 100644 --- a/docs/CMIP6_institution_id.html +++ b/docs/CMIP6_institution_id.html @@ -20,7 +20,7 @@ CMIP6 institution_id values -

WCRP-CMIP CMIP6_CVs version: 6.2.58.68

+

WCRP-CMIP CMIP6_CVs version: 6.2.58.69

Experiment IDs | Institution IDs | diff --git a/docs/CMIP6_source_id.html b/docs/CMIP6_source_id.html index 0f7570cf..02172622 100644 --- a/docs/CMIP6_source_id.html +++ b/docs/CMIP6_source_id.html @@ -20,7 +20,7 @@ CMIP6 source_id values -

WCRP-CMIP CMIP6_CVs version: 6.2.58.68

+

WCRP-CMIP CMIP6_CVs version: 6.2.58.69

Experiment IDs | Institution IDs | @@ -278,8 +278,8 @@

AWI-ESM-1-REcoM AWI 2024 -C4MIP CMIP ScenarioMIP -Registered +C4MIP CDRMIP CMIP ScenarioMIP +Published AWI-ESM 1 REcoM AWI-ESM 1 REcoM ECHAM6.3.04p1 (T63L47 native atmosphere T63 gaussian grid; 192 x 96 longitude/latitude; 47 levels; top level 80 km) @@ -295,26 +295,6 @@

FESOM 1.4 (same grid as ocean component) -AWI-ESM-2-1-LR -AWI -2019 -CMIP PMIP -Registered -AWI-ESM 2.1 LR -AWI-ESM 2.1 LR -ECHAM6.3.04p1 (T63L47 native atmosphere T63 gaussian grid; 192 x 96 longitude/latitude; 47 levels; top level 80 km) -250 km -FESOM 2 (unstructured grid in the horizontal with 126858 wet nodes; 48 levels; top grid cell 0-5 m) -50 km -none -none -none -none -JSBACH 3.20 with dynamic vegetation -none -FESOM 2 - - BCC-CSM2-HR BCC 2017 diff --git a/docs/CMIP6_source_id_citation.html b/docs/CMIP6_source_id_citation.html index 4c86259f..08d89a46 100644 --- a/docs/CMIP6_source_id_citation.html +++ b/docs/CMIP6_source_id_citation.html @@ -22,7 +22,7 @@ CMIP6 Source ID Citation details details -

WCRP-CMIP CMIP6_CVs version: 6.2.58.68

+

WCRP-CMIP CMIP6_CVs version: 6.2.58.69

Experiment IDs | @@ -2942,6 +2942,14 @@

MPI-ESM1-2-LR MPI-M +CDRMIP +Brovkin, Victor et al. (2019). MPI-M MPI-ESM1.2-LR model output prepared for CMIP6 CDRMIP. Earth System Grid Federation. doi:https://doi.org/10.22033/ESGF/CMIP6.2142 +CC BY 4.0 +https://doi.org/10.22033/ESGF/CMIP6.2142 + + +MPI-ESM1-2-LR +MPI-M CMIP Wieners, Karl-Hermann et al. (2019). MPI-M MPIESM1.2-LR model output prepared for CMIP6 CMIP. Earth System Grid Federation. doi:https://doi.org/10.22033/ESGF/CMIP6.742 CC BY 4.0 diff --git a/docs/CMIP6_source_id_experiment_citation.html b/docs/CMIP6_source_id_experiment_citation.html index fb253735..dba19228 100644 --- a/docs/CMIP6_source_id_experiment_citation.html +++ b/docs/CMIP6_source_id_experiment_citation.html @@ -22,7 +22,7 @@ CMIP6 Source ID Citation details by experiment details -

WCRP-CMIP CMIP6_CVs version: 6.2.58.68

+

WCRP-CMIP CMIP6_CVs version: 6.2.58.69

Experiment IDs | @@ -16166,6 +16166,15 @@

MPI-ESM1-2-LR MPI-M +CDRMIP +esm-ssp534-over +Brovkin, Victor et al. (2019). MPI-M MPI-ESM1.2-LR model output prepared for CMIP6 CDRMIP esm-ssp534-over esm-ssp534-over. Earth System Grid Federation. doi:https://doi.org/10.22033/ESGF/CMIP6.6557 +CC BY 4.0 +https://doi.org/10.22033/ESGF/CMIP6.6557 + + +MPI-ESM1-2-LR +MPI-M CMIP 1pctCO2 Wieners, Karl-Hermann et al. (2019). MPI-M MPI-ESM1.2-LR model output prepared for CMIP6 CMIP 1pctCO2 1pctCO2. Earth System Grid Federation. doi:https://doi.org/10.22033/ESGF/CMIP6.6435 @@ -16248,6 +16257,15 @@

MPI-ESM1-2-LR MPI-M DAMIP +hist-nat +Müller, Wolfgang et al. (2019). MPI-M MPI-ESM1.2-LR model output prepared for CMIP6 DAMIP hist-nat hist-nat. Earth System Grid Federation. doi:https://doi.org/10.22033/ESGF/CMIP6.15028 +CC BY 4.0 +https://doi.org/10.22033/ESGF/CMIP6.15028 + + +MPI-ESM1-2-LR +MPI-M +DAMIP hist-sol Müller, Wolfgang et al. (2019). MPI-M MPI-ESM1.2-LR model output prepared for CMIP6 DAMIP hist-sol hist-sol. Earth System Grid Federation. doi:https://doi.org/10.22033/ESGF/CMIP6.15030 CC BY 4.0 diff --git a/docs/CMIP6_source_id_licenses.html b/docs/CMIP6_source_id_licenses.html index 4c3e565f..51d1ca17 100644 --- a/docs/CMIP6_source_id_licenses.html +++ b/docs/CMIP6_source_id_licenses.html @@ -22,7 +22,7 @@ CMIP6 source_id license details -

WCRP-CMIP CMIP6_CVs version: 6.2.58.68

+

WCRP-CMIP CMIP6_CVs version: 6.2.58.69

Experiment IDs | @@ -183,24 +183,12 @@

AWI-ESM-1-REcoM AWI 2024 -Registered +Published AWI-ESM 1 REcoM AWI-ESM 1 REcoM CC BY 4.0 @awi.de <- mip-contact -2024-01-25: initially published under CC BY 4.0 - - - -AWI-ESM-2-1-LR -AWI -2019 -Registered -AWI-ESM 2.1 LR -AWI-ESM 2.1 LR -CC BY 4.0 -@awi.de <- mip-contact - +2024-07-04: initially published under CC BY 4.0 diff --git a/mip_era.json b/mip_era.json index 5b2e41a9..801906e5 100644 --- a/mip_era.json +++ b/mip_era.json @@ -7,13 +7,13 @@ "CMIP6" ], "version_metadata":{ - "CV_collection_modified":"Wed May 1 16:23:31 2024 -0700", - "CV_collection_version":"6.2.58.68", + "CV_collection_modified":"Fri Aug 2 12:57:50 2024 -0700", + "CV_collection_version":"6.2.58.69", "author":"Paul J. Durack ", "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":"2c9cf667546f31a495cb2e3b8d9d5892bc7abaa2", + "previous_commit":"d1f30d0a9359ffdc1bff31be00d0c5f01fa840dd", "specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)" } } \ No newline at end of file diff --git a/src/citation.json.gz b/src/citation.json.gz index 5978d3ff..4f0a7c46 100644 Binary files a/src/citation.json.gz and b/src/citation.json.gz differ diff --git a/src/citation_expts.json.gz b/src/citation_expts.json.gz index 68b69416..22270c1d 100644 Binary files a/src/citation_expts.json.gz and b/src/citation_expts.json.gz differ diff --git a/src/versionHistory.json b/src/versionHistory.json index 1c4085c2..660e6340 100644 --- a/src/versionHistory.json +++ b/src/versionHistory.json @@ -67,10 +67,10 @@ "timeStamp":"Thu Dec 19 15:32:17 2019 -0800" }, "source_id":{ - "MD5":"2c9cf667546f31a495cb2e3b8d9d5892bc7abaa2", - "URL":"https://github.com/WCRP-CMIP/CMIP6_CVs/commit/2c9cf667546f31a495cb2e3b8d9d5892bc7abaa2", - "commitMessage":"Revised source_id IPSL-CM6A-MR1", - "timeStamp":"Wed May 1 16:23:31 2024 -0700" + "MD5":"d1f30d0a9359ffdc1bff31be00d0c5f01fa840dd", + "URL":"https://github.com/WCRP-CMIP/CMIP6_CVs/commit/d1f30d0a9359ffdc1bff31be00d0c5f01fa840dd", + "commitMessage":"Deregistered source_id AWI-ESM-2-1-LR", + "timeStamp":"Fri Aug 2 12:57:50 2024 -0700" }, "source_type":{ "MD5":"fa3f07e9c215b35e0a54737acba2c2a9f6b8901f", @@ -91,7 +91,7 @@ "timeStamp":"Fri Jan 13 09:27:00 2017 -0700" }, "versions":{ - "versionCVCommit":68, + "versionCVCommit":69, "versionCVContent":58, "versionCVStructure":2, "versionMIPEra":6 diff --git a/src/writeJson.py b/src/writeJson.py index 930cf30e..4890eb03 100644 --- a/src/writeJson.py +++ b/src/writeJson.py @@ -13,17 +13,19 @@ versionHistoryUpdate, ) from durolib import readJsonCreateDict -import time -import sys -import subprocess -import shlex -import platform +import calendar +import datetime +import gc +import json import os import pdb -import json -import gc -import datetime -import calendar +import platform +import re +import shlex +import sys +import subprocess +import time + # %% additional import statements try: @@ -36,7 +38,8 @@ Paul J. Durack 11th July 2016 -This script generates all controlled vocabulary (CV) json files residing this this subdirectory +This script generates all controlled vocabulary (CV) json files +residing in this subdirectory """ """2016-2021 https://github.com/WCRP-CMIP/CMIP6_CVs/blob/0048ecd216d31fc52afd0177788eeb0707a2289e/src/writeJson.py#L33-L560 @@ -67,6 +70,8 @@ PJD 28 Mar 2024 - Revised source_id GISS-E2-2-H https://github.com/WCRP-CMIP/CMIP6_CVs/issues/1018 PJD 1 May 2024 - Revised source_id IPSL-CM6A-MR1 https://github.com/WCRP-CMIP/CMIP6_CVs/issues/1078 PJD 3 Jul 2024 - Added CITATION.cff version management +PJD 29 Jul 2024 - Revised source_id AWI-ESM-1-REcoM https://github.com/WCRP-CMIP/CMIP6_CVs/issues/1220 +PJD 2 Aug 2024 - Deregistered source_id AWI-ESM-2-1-LR https://github.com/WCRP-CMIP/CMIP6_CVs/issues/1220#issuecomment-2265990964 - 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 @@ -74,7 +79,7 @@ """ # %% Set commit message and author info -commitMessage = '"Revised source_id IPSL-CM6A-MR1"' +commitMessage = '"Deregistered source_id AWI-ESM-2-1-LR"' # author = 'Matthew Mizielinski ' # author_institution_id = 'MOHC' author = "Paul J. Durack " @@ -631,15 +636,15 @@ del tmp # Fix issues - -key = "IPSL-CM6A-MR1" +# License +key = "AWI-ESM-1-REcoM" print("processing:", key) licenseId = "CC BY 4.0" source_id[key]["cohort"] = ["Published"] -source_id[key]["license_info"]["exceptions_contact"] = "@listes.ipsl.fr <- ipsl-cmip6" +source_id[key]["license_info"]["exceptions_contact"] = "@awi.de <- mip-contact" source_id[key]["license_info"][ "history" -] = "2024-03-26: initially published under CC BY 4.0" +] = "2024-07-04: initially published under CC BY 4.0" source_id[key]["license_info"]["id"] = licenseId licenseStr = license["license_options"][licenseId]["license_id"] licenseUrl = license["license_options"][licenseId]["license_url"] @@ -648,6 +653,17 @@ ) source_id[key]["license_info"]["source_specific_info"] = "" source_id[key]["license_info"]["url"] = licenseUrl +# activity_participation +source_id[key]["activity_participation"] = [ + "C4MIP", + "CDRMIP", + "CMIP", + "ScenarioMIP", +] + +# deregister AWI-ESM-2-1-LR +key = "AWI-ESM-2-1-LR" +source_id.pop(key) # Example fresh publication, no previous data