diff --git a/CMIP6_activity_id.json b/CMIP6_activity_id.json index 2855fe108..25a849b8d 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":"Mon Jan 27 12:42:00 2020 -0800", - "CV_collection_version":"6.2.46.1", + "CV_collection_modified":"Tue Jan 28 06:46:57 2020 -0800", + "CV_collection_version":"6.2.47.0", "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":"f7a6da0cc8c0f450e5da94b0a9dd1d851a8e9ea9", + "previous_commit":"3f8f9c42d91fe3c0127de948730f03132c0922ef", "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 d369dd046..22d52b63f 100644 --- a/CMIP6_experiment_id.json +++ b/CMIP6_experiment_id.json @@ -8298,10 +8298,10 @@ "BGC" ], "description":"Future SSP3-7.0 with reduced NTCF emissions", - "end_year":"2055", + "end_year":"2100", "experiment":"SSP3-7.0, with low NTCF emissions", "experiment_id":"ssp370-lowNTCF", - "min_number_yrs_per_sim":"41", + "min_number_yrs_per_sim":"86", "parent_activity_id":[ "CMIP" ], @@ -8385,10 +8385,10 @@ "BGC" ], "description":"Future SSP3-7.0 with reduced aerosol emissions (from ssp370-lowNTCF), prescribed SSTs", - "end_year":"2055", + "end_year":"2100", "experiment":"SSP3-7.0, prescribed SSTs, with low aerosol emissions", "experiment_id":"ssp370SST-lowAer", - "min_number_yrs_per_sim":"41", + "min_number_yrs_per_sim":"86", "parent_activity_id":[ "CMIP" ], @@ -8414,10 +8414,10 @@ "BGC" ], "description":"Future SSP3-7.0 with reduced black carbon emissions, prescribed SSTs", - "end_year":"2055", + "end_year":"2100", "experiment":"SSP3-7.0, prescribed SSTs, with low black carbon emissions", "experiment_id":"ssp370SST-lowBC", - "min_number_yrs_per_sim":"41", + "min_number_yrs_per_sim":"86", "parent_activity_id":[ "CMIP" ], @@ -8442,10 +8442,10 @@ "BGC" ], "description":"Future SSP3-7.0 with reduced CH4 concentrations, prescribed SSTs", - "end_year":"2055", + "end_year":"2100", "experiment":"SSP3-7.0, prescribed SSTs, with low methane concentrations", "experiment_id":"ssp370SST-lowCH4", - "min_number_yrs_per_sim":"41", + "min_number_yrs_per_sim":"86", "parent_activity_id":[ "CMIP" ], @@ -8472,10 +8472,10 @@ "BGC" ], "description":"Future SSP3-7.0 with reduced NTCF emissions, prescribed SSTs", - "end_year":"2055", + "end_year":"2100", "experiment":"SSP3-7.0, prescribed SSTs, with low NTCF emissions", "experiment_id":"ssp370SST-lowNTCF", - "min_number_yrs_per_sim":"41", + "min_number_yrs_per_sim":"86", "parent_activity_id":[ "CMIP" ], @@ -8500,10 +8500,10 @@ "BGC" ], "description":"Future SSP3-7.0 with reduced ozone precursor emissions (from ssp370-lowNTCF), prescribed SSTs", - "end_year":"2055", + "end_year":"2100", "experiment":"SSP3-7.0, prescribed SSTs, with low ozone precursor emissions", "experiment_id":"ssp370SST-lowO3", - "min_number_yrs_per_sim":"41", + "min_number_yrs_per_sim":"86", "parent_activity_id":[ "CMIP" ], @@ -8530,10 +8530,10 @@ "BGC" ], "description":"Future SSP3-7.0 with low land use change (from ssp126), prescribed SSTs", - "end_year":"2055", + "end_year":"2100", "experiment":"SSP3-7.0, prescribed SSTs, with SSP1-2.6 land use", "experiment_id":"ssp370SST-ssp126Lu", - "min_number_yrs_per_sim":"41", + "min_number_yrs_per_sim":"86", "parent_activity_id":[ "CMIP" ], @@ -9105,13 +9105,13 @@ } }, "version_metadata":{ - "CV_collection_modified":"Mon Jan 27 12:42:00 2020 -0800", - "CV_collection_version":"6.2.46.1", + "CV_collection_modified":"Tue Jan 28 06:46:57 2020 -0800", + "CV_collection_version":"6.2.47.0", "author":"Paul J. Durack ", "experiment_id_CV_modified":"Fri Jan 24 19:31:16 2020 -0800", - "experiment_id_CV_note":"Revise experiment_id histSST-noLu", + "experiment_id_CV_note":"Revise multiple ssp370SST-low* experiment_id values", "institution_id":"PCMDI", - "previous_commit":"f7a6da0cc8c0f450e5da94b0a9dd1d851a8e9ea9", + "previous_commit":"3f8f9c42d91fe3c0127de948730f03132c0922ef", "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 9f545cacb..fdf764524 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":"Mon Jan 27 12:42:00 2020 -0800", - "CV_collection_version":"6.2.46.1", + "CV_collection_modified":"Tue Jan 28 06:46:57 2020 -0800", + "CV_collection_version":"6.2.47.0", "author":"Paul J. Durack ", "frequency_CV_modified":"Fri Oct 27 14:03:00 2017 -0700", "frequency_CV_note":"Issue414 durack1 revise frequency 1hrCM definition (#418)", "institution_id":"PCMDI", - "previous_commit":"f7a6da0cc8c0f450e5da94b0a9dd1d851a8e9ea9", + "previous_commit":"3f8f9c42d91fe3c0127de948730f03132c0922ef", "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 9ede94727..d5a3e4ef8 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":"Mon Jan 27 12:42:00 2020 -0800", - "CV_collection_version":"6.2.46.1", + "CV_collection_modified":"Tue Jan 28 06:46:57 2020 -0800", + "CV_collection_version":"6.2.47.0", "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":"f7a6da0cc8c0f450e5da94b0a9dd1d851a8e9ea9", + "previous_commit":"3f8f9c42d91fe3c0127de948730f03132c0922ef", "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 e52aefd4e..684adcd87 100644 --- a/CMIP6_institution_id.json +++ b/CMIP6_institution_id.json @@ -51,13 +51,13 @@ "UofT":"Department of Physics, University of Toronto, 60 St George Street, Toronto, ON M5S1A7, Canada" }, "version_metadata":{ - "CV_collection_modified":"Mon Jan 27 12:42:00 2020 -0800", - "CV_collection_version":"6.2.46.1", + "CV_collection_modified":"Tue Jan 28 06:46:57 2020 -0800", + "CV_collection_version":"6.2.47.0", "author":"Paul J. Durack ", "institution_id":"PCMDI", "institution_id_CV_modified":"Thu Nov 14 11:18:04 2019 -0800", "institution_id_CV_note":"Register institution_id UCI", - "previous_commit":"f7a6da0cc8c0f450e5da94b0a9dd1d851a8e9ea9", + "previous_commit":"3f8f9c42d91fe3c0127de948730f03132c0922ef", "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 623080a69..e4b78fc0b 100644 --- a/CMIP6_license.json +++ b/CMIP6_license.json @@ -3,13 +3,13 @@ "CMIP6 model data produced by 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 ]. 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":"Mon Jan 27 12:42:00 2020 -0800", - "CV_collection_version":"6.2.46.1", + "CV_collection_modified":"Tue Jan 28 06:46:57 2020 -0800", + "CV_collection_version":"6.2.47.0", "author":"Paul J. Durack ", "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":"f7a6da0cc8c0f450e5da94b0a9dd1d851a8e9ea9", + "previous_commit":"3f8f9c42d91fe3c0127de948730f03132c0922ef", "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 2417a6387..c6165ea86 100644 --- a/CMIP6_nominal_resolution.json +++ b/CMIP6_nominal_resolution.json @@ -17,13 +17,13 @@ "5000 km" ], "version_metadata":{ - "CV_collection_modified":"Mon Jan 27 12:42:00 2020 -0800", - "CV_collection_version":"6.2.46.1", + "CV_collection_modified":"Tue Jan 28 06:46:57 2020 -0800", + "CV_collection_version":"6.2.47.0", "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":"f7a6da0cc8c0f450e5da94b0a9dd1d851a8e9ea9", + "previous_commit":"3f8f9c42d91fe3c0127de948730f03132c0922ef", "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 5d656699d..68ad80c05 100644 --- a/CMIP6_realm.json +++ b/CMIP6_realm.json @@ -10,11 +10,11 @@ "seaIce":"Sea Ice" }, "version_metadata":{ - "CV_collection_modified":"Mon Jan 27 12:42:00 2020 -0800", - "CV_collection_version":"6.2.46.1", + "CV_collection_modified":"Tue Jan 28 06:46:57 2020 -0800", + "CV_collection_version":"6.2.47.0", "author":"Paul J. Durack ", "institution_id":"PCMDI", - "previous_commit":"f7a6da0cc8c0f450e5da94b0a9dd1d851a8e9ea9", + "previous_commit":"3f8f9c42d91fe3c0127de948730f03132c0922ef", "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 a38f9ea11..6af1cec3d 100644 --- a/CMIP6_required_global_attributes.json +++ b/CMIP6_required_global_attributes.json @@ -32,11 +32,11 @@ "variant_label" ], "version_metadata":{ - "CV_collection_modified":"Mon Jan 27 12:42:00 2020 -0800", - "CV_collection_version":"6.2.46.1", + "CV_collection_modified":"Tue Jan 28 06:46:57 2020 -0800", + "CV_collection_version":"6.2.47.0", "author":"Paul J. Durack ", "institution_id":"PCMDI", - "previous_commit":"f7a6da0cc8c0f450e5da94b0a9dd1d851a8e9ea9", + "previous_commit":"3f8f9c42d91fe3c0127de948730f03132c0922ef", "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 f0a90ef10..ee77d6139 100644 --- a/CMIP6_source_id.json +++ b/CMIP6_source_id.json @@ -6777,12 +6777,12 @@ } }, "version_metadata":{ - "CV_collection_modified":"Mon Jan 27 12:42:00 2020 -0800", - "CV_collection_version":"6.2.46.1", + "CV_collection_modified":"Tue Jan 28 06:46:57 2020 -0800", + "CV_collection_version":"6.2.47.0", "author":"Paul J. Durack ", "institution_id":"PCMDI", - "previous_commit":"f7a6da0cc8c0f450e5da94b0a9dd1d851a8e9ea9", - "source_id_CV_modified":"Wed Jan 15 16:44:36 2020 -0800", + "previous_commit":"3f8f9c42d91fe3c0127de948730f03132c0922ef", + "source_id_CV_modified":"Mon Jan 27 12:42:00 2020 -0800", "source_id_CV_note":"Register source_id UKESM1-ice-LL", "specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)" } diff --git a/CMIP6_source_type.json b/CMIP6_source_type.json index 706422512..db3cc7aff 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":"Mon Jan 27 12:42:00 2020 -0800", - "CV_collection_version":"6.2.46.1", + "CV_collection_modified":"Tue Jan 28 06:46:57 2020 -0800", + "CV_collection_version":"6.2.47.0", "author":"Paul J. Durack ", "institution_id":"PCMDI", - "previous_commit":"f7a6da0cc8c0f450e5da94b0a9dd1d851a8e9ea9", + "previous_commit":"3f8f9c42d91fe3c0127de948730f03132c0922ef", "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 0db011b8c..083d8b924 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":"Mon Jan 27 12:42:00 2020 -0800", - "CV_collection_version":"6.2.46.1", + "CV_collection_modified":"Tue Jan 28 06:46:57 2020 -0800", + "CV_collection_version":"6.2.47.0", "author":"Paul J. Durack ", "institution_id":"PCMDI", - "previous_commit":"f7a6da0cc8c0f450e5da94b0a9dd1d851a8e9ea9", + "previous_commit":"3f8f9c42d91fe3c0127de948730f03132c0922ef", "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 4c46bc230..5fe75faef 100644 --- a/CMIP6_table_id.json +++ b/CMIP6_table_id.json @@ -45,11 +45,11 @@ "fx" ], "version_metadata":{ - "CV_collection_modified":"Mon Jan 27 12:42:00 2020 -0800", - "CV_collection_version":"6.2.46.1", + "CV_collection_modified":"Tue Jan 28 06:46:57 2020 -0800", + "CV_collection_version":"6.2.47.0", "author":"Paul J. Durack ", "institution_id":"PCMDI", - "previous_commit":"f7a6da0cc8c0f450e5da94b0a9dd1d851a8e9ea9", + "previous_commit":"3f8f9c42d91fe3c0127de948730f03132c0922ef", "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 fe57de56e..9945f3718 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# CMIP6_CVs [![stable version](https://img.shields.io/badge/Current%20version-6.2.46.1-brightgreen.svg)](https://github.com/WCRP-CMIP/CMIP6_CVs/releases/tag/6.2.46.1) +# CMIP6_CVs [![stable version](https://img.shields.io/badge/Current%20version-6.2.47.0-brightgreen.svg)](https://github.com/WCRP-CMIP/CMIP6_CVs/releases/tag/6.2.47.0) Core Controlled Vocabularies (CVs) for use in CMIP6 diff --git a/docs/CMIP6_experiment_id.html b/docs/CMIP6_experiment_id.html index 3254761b2..342136f60 100644 --- a/docs/CMIP6_experiment_id.html +++ b/docs/CMIP6_experiment_id.html @@ -18,7 +18,7 @@ CMIP6 experiment_id values -

WCRP-CMIP CMIP6_CVs version: 6.2.46.1

+

WCRP-CMIP CMIP6_CVs version: 6.2.47.0

@@ -715,8 +715,8 @@ - - + + @@ -1485,8 +1485,8 @@ - - + + @@ -1737,8 +1737,8 @@ - - + + @@ -2997,8 +2997,8 @@ - - + + @@ -3305,8 +3305,8 @@ - - + + @@ -3949,8 +3949,8 @@ - - + + @@ -4299,8 +4299,8 @@ - - + + diff --git a/docs/CMIP6_institution_id.html b/docs/CMIP6_institution_id.html index dcaa6a2a9..7e94f3d90 100644 --- a/docs/CMIP6_institution_id.html +++ b/docs/CMIP6_institution_id.html @@ -18,7 +18,7 @@ CMIP6 institution_id values -

WCRP-CMIP CMIP6_CVs version: 6.2.46.1

+

WCRP-CMIP CMIP6_CVs version: 6.2.47.0

experiment_id activity idAOGCM AER CHEM BGC 2015205541210086 CMIP Future SSP3-7.0 with reduced NTCF emissions
AGCM AER CHEM BGC 2015205541210086 CMIP Future SSP3-7.0 with reduced black carbon emissions, prescribed SSTs
AGCM AER CHEM BGC 2015205541210086 CMIP Future SSP3-7.0 with low land use change (from ssp126), prescribed SSTs
AGCM AER CHEM BGC 2015205541210086 CMIP Future SSP3-7.0 with reduced NTCF emissions, prescribed SSTs
AGCM AER CHEM BGC 2015205541210086 CMIP Future SSP3-7.0 with reduced aerosol emissions (from ssp370-lowNTCF), prescribed SSTs
AGCM AER CHEM BGC 2015205541210086 CMIP Future SSP3-7.0 with reduced CH4 concentrations, prescribed SSTs
AGCM AER CHEM BGC 2015205541210086 CMIP Future SSP3-7.0 with reduced ozone precursor emissions (from ssp370-lowNTCF), prescribed SSTs
diff --git a/docs/CMIP6_source_id.html b/docs/CMIP6_source_id.html index a6bcaac30..f22313dc5 100644 --- a/docs/CMIP6_source_id.html +++ b/docs/CMIP6_source_id.html @@ -18,7 +18,7 @@ CMIP6 source_id values -

WCRP-CMIP CMIP6_CVs version: 6.2.46.1

+

WCRP-CMIP CMIP6_CVs version: 6.2.47.0

institution_id Description
diff --git a/mip_era.json b/mip_era.json index 228021ce4..660499382 100644 --- a/mip_era.json +++ b/mip_era.json @@ -7,13 +7,13 @@ "CMIP6" ], "version_metadata":{ - "CV_collection_modified":"Mon Jan 27 12:42:00 2020 -0800", - "CV_collection_version":"6.2.46.1", + "CV_collection_modified":"Tue Jan 28 06:46:57 2020 -0800", + "CV_collection_version":"6.2.47.0", "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":"f7a6da0cc8c0f450e5da94b0a9dd1d851a8e9ea9", + "previous_commit":"3f8f9c42d91fe3c0127de948730f03132c0922ef", "specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)" } } \ No newline at end of file diff --git a/src/versionHistory.json b/src/versionHistory.json index cd4d34910..3698262c6 100644 --- a/src/versionHistory.json +++ b/src/versionHistory.json @@ -7,10 +7,10 @@ "timeStamp":"Mon Mar 5 16:39:09 2018 -0800" }, "experiment_id":{ - "MD5":"608c23e85eb211d7c02946a0f1e981076bdda24a", - "URL":"https://github.com/WCRP-CMIP/CMIP6_CVs/commit/608c23e85eb211d7c02946a0f1e981076bdda24a", - "commitMessage":"Revise experiment_id histSST-noLu", - "timeStamp":"Fri Jan 24 19:31:16 2020 -0800" + "MD5":"3f8f9c42d91fe3c0127de948730f03132c0922ef", + "URL":"https://github.com/WCRP-CMIP/CMIP6_CVs/commit/3f8f9c42d91fe3c0127de948730f03132c0922ef", + "commitMessage":"Revise multiple ssp370SST-low* experiment_id values", + "timeStamp":"Tue Jan 28 06:46:57 2020 -0800" }, "frequency":{ "MD5":"62129c480e970cf22a5ca31b169bca2e21cb2b9d", @@ -85,8 +85,8 @@ "timeStamp":"Fri Jan 13 09:27:00 2017 -0700" }, "versions":{ - "versionCVCommit":1, - "versionCVContent":46, + "versionCVCommit":0, + "versionCVContent":47, "versionCVStructure":2, "versionMIPEra":6 } diff --git a/src/writeJson.py b/src/writeJson.py index 4937f213b..4162d1771 100755 --- a/src/writeJson.py +++ b/src/writeJson.py @@ -448,6 +448,7 @@ PJD 15 Jan 2020 - Revise multiple IPSL-CM* source_ids https://github.com/WCRP-CMIP/CMIP6_CVs/issues/860 PJD 24 Jan 2020 - Revise experiment_id histSST-noLu https://github.com/WCRP-CMIP/CMIP6_CVs/issues/868 PJD 27 Jan 2020 - Register source_id UKESM1-ice-LL https://github.com/WCRP-CMIP/CMIP6_CVs/issues/868 +PJD 28 Jan 2020 - Revise multiple ssp370SST-low* experiment_id values https://github.com/WCRP-CMIP/CMIP6_CVs/issues/867 - TODO" Revise multiple ssp370SST-low* entries - 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 @@ -475,7 +476,7 @@ #from unidecode import unidecode #%% Set commit message -commitMessage = '\"Register source_id UKESM1-ice-LL\"' +commitMessage = '\"Revise multiple ssp370SST-low* experiment_id values\"' #%% List target controlled vocabularies (CVs) masterTargets = [ @@ -616,9 +617,14 @@ del(inFile,data,headers,count,row,key,entry,value) ; gc.collect() ''' # Fix issues -key = 'histSST-noLu' -experiment_id[key]['additional_allowed_model_components'] = ['CHEM','BGC'] -experiment_id[key]['required_model_components'] = ['AGCM','AER'] +exps = ['ssp370-lowNTCF','ssp370SST-lowAer','ssp370SST-lowBC', + 'ssp370SST-lowCH4','ssp370SST-lowNTCF', 'ssp370SST-lowO3', + 'ssp370SST-ssp126Lu'] +for key in exps: + experiment_id[key]['end_year'] = '2100' + experiment_id[key]['min_number_yrs_per_sim'] = '86' + experiment_id[key]['start_year'] = '2015' + #============================================================================== # Example new experiment_id entry #key = 'ssp119' @@ -898,47 +904,6 @@ del(tmp) # Fix issues -key = 'UKESM1-ice-LL' -source_id[key] = {} -source_id[key]['activity_participation'] = [ -'ISMIP6' -] -source_id[key]['cohort'] = [ -'Registered' -] -source_id[key]['institution_id'] = [ -'MOHC', -'NERC' -] -source_id[key]['label'] = 'UKESM1.ice-LL' -source_id[key]['label_extended'] = 'UKESM1.ice-N96ORCA1' -source_id[key]['model_component'] = {} -source_id[key]['model_component']['aerosol'] = {} -source_id[key]['model_component']['aerosol']['description'] = 'UKCA-GLOMAP-mode' -source_id[key]['model_component']['aerosol']['native_nominal_resolution'] = '250 km' -source_id[key]['model_component']['atmos'] = {} -source_id[key]['model_component']['atmos']['description'] = 'MetUM-HadGEM3-GA7.1 (N96; 192 x 144 longitude/latitude; 85 levels; top level 85 km)' -source_id[key]['model_component']['atmos']['native_nominal_resolution'] = '250 km' -source_id[key]['model_component']['atmosChem'] = {} -source_id[key]['model_component']['atmosChem']['description'] = 'none' -source_id[key]['model_component']['atmosChem']['native_nominal_resolution'] = 'none' -source_id[key]['model_component']['land'] = {} -source_id[key]['model_component']['land']['description'] = 'JULES-ISMIP6-1.0' -source_id[key]['model_component']['land']['native_nominal_resolution'] = '250 km' -source_id[key]['model_component']['landIce'] = {} -source_id[key]['model_component']['landIce']['description'] = 'BISICLES-UKESM-ISMIP6-1.0' -source_id[key]['model_component']['landIce']['native_nominal_resolution'] = '5 km' -source_id[key]['model_component']['ocean'] = {} -source_id[key]['model_component']['ocean']['description'] = 'NEMO-HadGEM3-GO6.0 (eORCA1 tripolar primarily 1 deg with meridional refinement down to 1/3 degree in the tropics; 360 x 330 longitude/latitude; 75 levels; top grid cell 0-1 m)' -source_id[key]['model_component']['ocean']['native_nominal_resolution'] = '100 km' -source_id[key]['model_component']['ocnBgchem'] = {} -source_id[key]['model_component']['ocnBgchem']['description'] = 'none' -source_id[key]['model_component']['ocnBgchem']['native_nominal_resolution'] = 'none' -source_id[key]['model_component']['seaIce'] = {} -source_id[key]['model_component']['seaIce']['description'] = 'CICE-HadGEM3-GSI8 (eORCA1 tripolar primarily 1 deg; 360 x 330 longitude/latitude)' -source_id[key]['model_component']['seaIce']['native_nominal_resolution'] = '100 km' -source_id[key]['release_year'] = '2019' -source_id[key]['source_id'] = key #============================================ #key = 'AWI-ESM-1-1-LR'
source_id institution id