diff --git a/Tables/input4MIPs_A3hr.json b/Tables/input4MIPs_A3hr.json index fe77198..b356411 100644 --- a/Tables/input4MIPs_A3hr.json +++ b/Tables/input4MIPs_A3hr.json @@ -10,7 +10,7 @@ "missing_value":"1e20", "product":"input4MIPs", "realm":"atmos", - "table_date":"26 January 2022", + "table_date":"08 March 2022", "table_id":"Table input4MIPs_A3hr" }, "variable_entry":{ diff --git a/Tables/input4MIPs_A3hrPt.json b/Tables/input4MIPs_A3hrPt.json index 3ef5b7a..060845f 100644 --- a/Tables/input4MIPs_A3hrPt.json +++ b/Tables/input4MIPs_A3hrPt.json @@ -10,7 +10,7 @@ "missing_value":"1e20", "product":"input4MIPs", "realm":"atmos", - "table_date":"26 January 2022", + "table_date":"08 March 2022", "table_id":"Table input4MIPs_A3hrPt" }, "variable_entry":{ diff --git a/Tables/input4MIPs_Afx.json b/Tables/input4MIPs_Afx.json index 933ca60..a044435 100644 --- a/Tables/input4MIPs_Afx.json +++ b/Tables/input4MIPs_Afx.json @@ -10,7 +10,7 @@ "missing_value":"1e20", "product":"input4MIPs", "realm":"atmos land", - "table_date":"26 January 2022", + "table_date":"08 March 2022", "table_id":"Table input4MIPs_Afx" }, "variable_entry":{ diff --git a/Tables/input4MIPs_Ayr.json b/Tables/input4MIPs_Ayr.json index c7c36f8..e72c74c 100644 --- a/Tables/input4MIPs_Ayr.json +++ b/Tables/input4MIPs_Ayr.json @@ -10,7 +10,7 @@ "missing_value":"1e20", "product":"input4MIPs", "realm":"atmos atmosChem", - "table_date":"26 January 2022", + "table_date":"08 March 2022", "table_id":"Table input4MIPs_Ayr" }, "variable_entry":{ diff --git a/Tables/input4MIPs_CV.json b/Tables/input4MIPs_CV.json index b233d6c..06e51ce 100644 --- a/Tables/input4MIPs_CV.json +++ b/Tables/input4MIPs_CV.json @@ -1005,6 +1005,40 @@ "target_mip":"CMIP", "title":"PCMDI-AMIP 1.1.7 dataset prepared for input4MIPs" }, + "PCMDI-AMIP-1-2-0":{ + "calendar":"gregorian", + "comment":"Based on Hurrell SST/sea ice consistency criteria applied to merged HadISST (1870-01 to 1981-10) & NCEP-0I2 (1981-11 to 2021-12)", + "contact":"PCMDI (pcmdi-cmip@llnl.gov)", + "dataset_category":"SSTsAndSeaIce", + "further_info_url":"https://pcmdi.llnl.gov/mips/amip", + "grid":"1x1 degree longitude x latitude", + "grid_label":"gn", + "institution":"Program for Climate Model Diagnosis and Intercomparison, Lawrence Livermore National Laboratory, Livermore, CA 94550, USA", + "institution_id":"PCMDI", + "mip_era":"CMIP6Plus", + "nominal_resolution":"1x1 degree", + "product":"observations", + "references":"Taylor, K.E., D. Williamson and F. Zwiers, 2000: The sea surface temperature and sea ice concentration boundary conditions for AMIP II simulations. PCMDI Report 60, Program for Climate Model Diagnosis and Intercomparison, Lawrence Livermore National Laboratory, 25 pp. Available online: https://pcmdi.llnl.gov/report/pdf/60.pdf", + "region":[ + "global_ocean" + ], + "release_year":"2022", + "source":"PCMDI-AMIP 1.2.0: Merged SST based on UK MetOffice HadISST and NCEP OI2", + "source_description":"Sea surface temperature and sea-ice datasets produced by PCMDI (LLNL) for the AMIP (DECK) experiment of CMIP6", + "source_id":"PCMDI-AMIP-1-2-0", + "source_type":"satellite_blended", + "source_variables":[ + "areacello", + "sftof", + "siconc", + "siconcbcs", + "tos", + "tosbcs" + ], + "source_version":"1.2.0", + "target_mip":"CMIP", + "title":"PCMDI-AMIP 1.2.0 dataset prepared for input4MIPs" + }, "UKESM1-0-LL-ssp585-1-0":{ "comment":"Prepared using CMIP6 model UKESM1-0-LL as input. A combination of historical and ssp585 datasets were used to create this ISMIP6 forcing dataset", "contact":"ISMIP6 Steering Team (ismip6@gmail.com)", diff --git a/Tables/input4MIPs_LIday.json b/Tables/input4MIPs_LIday.json index 14800ec..ebd8015 100644 --- a/Tables/input4MIPs_LIday.json +++ b/Tables/input4MIPs_LIday.json @@ -10,7 +10,7 @@ "missing_value":"1e20", "product":"input4MIPs", "realm":"landIce", - "table_date":"26 January 2022", + "table_date":"08 March 2022", "table_id":"Table input4MIPs_LIday" }, "variable_entry":{ diff --git a/Tables/input4MIPs_LIfx.json b/Tables/input4MIPs_LIfx.json index 2618834..3e84e85 100644 --- a/Tables/input4MIPs_LIfx.json +++ b/Tables/input4MIPs_LIfx.json @@ -10,7 +10,7 @@ "missing_value":"1e20", "product":"input4MIPs", "realm":"landIce", - "table_date":"26 January 2022", + "table_date":"08 March 2022", "table_id":"Table input4MIPs_LIfx" }, "variable_entry":{ diff --git a/Tables/input4MIPs_LIyr.json b/Tables/input4MIPs_LIyr.json index b0505ec..f9bc0ed 100644 --- a/Tables/input4MIPs_LIyr.json +++ b/Tables/input4MIPs_LIyr.json @@ -10,7 +10,7 @@ "missing_value":"1e20", "product":"input4MIPs", "realm":"landIce land", - "table_date":"26 January 2022", + "table_date":"08 March 2022", "table_id":"Table input4MIPs_LIyr" }, "variable_entry":{ diff --git a/Tables/input4MIPs_LIyrAnt.json b/Tables/input4MIPs_LIyrAnt.json index 2c9758c..8e281f6 100644 --- a/Tables/input4MIPs_LIyrAnt.json +++ b/Tables/input4MIPs_LIyrAnt.json @@ -10,7 +10,7 @@ "missing_value":"1e20", "product":"input4MIPs", "realm":"landIce", - "table_date":"26 January 2022", + "table_date":"08 March 2022", "table_id":"Table input4MIPs_LIyrAnt" }, "variable_entry":{ diff --git a/Tables/input4MIPs_LIyrC.json b/Tables/input4MIPs_LIyrC.json index cb76908..d1ad3ca 100644 --- a/Tables/input4MIPs_LIyrC.json +++ b/Tables/input4MIPs_LIyrC.json @@ -10,7 +10,7 @@ "missing_value":"1e20", "product":"input4MIPs", "realm":"landIce", - "table_date":"26 January 2022", + "table_date":"08 March 2022", "table_id":"Table input4MIPs_LIyrC" }, "variable_entry":{ diff --git a/Tables/input4MIPs_LIyrGre.json b/Tables/input4MIPs_LIyrGre.json index 8989485..16ccf06 100644 --- a/Tables/input4MIPs_LIyrGre.json +++ b/Tables/input4MIPs_LIyrGre.json @@ -10,7 +10,7 @@ "missing_value":"1e20", "product":"input4MIPs", "realm":"landIce", - "table_date":"26 January 2022", + "table_date":"08 March 2022", "table_id":"Table input4MIPs_LIyrGre" }, "variable_entry":{ diff --git a/Tables/input4MIPs_Lday.json b/Tables/input4MIPs_Lday.json index 95b61a8..08da6c9 100644 --- a/Tables/input4MIPs_Lday.json +++ b/Tables/input4MIPs_Lday.json @@ -10,7 +10,7 @@ "missing_value":"1e20", "product":"input4MIPs", "realm":"land", - "table_date":"26 January 2022", + "table_date":"08 March 2022", "table_id":"Table input4MIPs_Lday" }, "variable_entry":{ diff --git a/Tables/input4MIPs_Lyr.json b/Tables/input4MIPs_Lyr.json index a17d7a1..b972a64 100644 --- a/Tables/input4MIPs_Lyr.json +++ b/Tables/input4MIPs_Lyr.json @@ -10,7 +10,7 @@ "missing_value":"1e20", "product":"input4MIPs", "realm":"land", - "table_date":"26 January 2022", + "table_date":"08 March 2022", "table_id":"Table input4MIPs_Lyr" }, "variable_entry":{ diff --git a/Tables/input4MIPs_Oday.json b/Tables/input4MIPs_Oday.json index 8f90c1c..879001e 100644 --- a/Tables/input4MIPs_Oday.json +++ b/Tables/input4MIPs_Oday.json @@ -10,7 +10,7 @@ "missing_value":"1e20", "product":"input4MIPs", "realm":"ocean", - "table_date":"26 January 2022", + "table_date":"08 March 2022", "table_id":"Table input4MIPs_Oday" }, "variable_entry":{ diff --git a/Tables/input4MIPs_Ofx.json b/Tables/input4MIPs_Ofx.json index 61b7f28..145a681 100644 --- a/Tables/input4MIPs_Ofx.json +++ b/Tables/input4MIPs_Ofx.json @@ -10,7 +10,7 @@ "missing_value":"1e20", "product":"input4MIPs", "realm":"ocean", - "table_date":"26 January 2022", + "table_date":"08 March 2022", "table_id":"Table input4MIPs_Ofx" }, "variable_entry":{ diff --git a/Tables/input4MIPs_Omon.json b/Tables/input4MIPs_Omon.json index e0c60d8..585116f 100644 --- a/Tables/input4MIPs_Omon.json +++ b/Tables/input4MIPs_Omon.json @@ -10,7 +10,7 @@ "missing_value":"1e20", "product":"input4MIPs", "realm":"ocean", - "table_date":"26 January 2022", + "table_date":"08 March 2022", "table_id":"Table input4MIPs_Omon" }, "variable_entry":{ diff --git a/Tables/input4MIPs_OmonC.json b/Tables/input4MIPs_OmonC.json index 07e1e54..5cb3994 100644 --- a/Tables/input4MIPs_OmonC.json +++ b/Tables/input4MIPs_OmonC.json @@ -10,7 +10,7 @@ "missing_value":"1e20", "product":"input4MIPs", "realm":"ocean", - "table_date":"26 January 2022", + "table_date":"08 March 2022", "table_id":"Table input4MIPs_OmonC" }, "variable_entry":{ diff --git a/Tables/input4MIPs_Oyr.json b/Tables/input4MIPs_Oyr.json index b16f795..b53c480 100644 --- a/Tables/input4MIPs_Oyr.json +++ b/Tables/input4MIPs_Oyr.json @@ -10,7 +10,7 @@ "missing_value":"1e20", "product":"input4MIPs", "realm":"ocean", - "table_date":"26 January 2022", + "table_date":"08 March 2022", "table_id":"Table input4MIPs_Oyr" }, "variable_entry":{ diff --git a/Tables/input4MIPs_OyrC.json b/Tables/input4MIPs_OyrC.json index 863f966..71bd01c 100644 --- a/Tables/input4MIPs_OyrC.json +++ b/Tables/input4MIPs_OyrC.json @@ -10,7 +10,7 @@ "missing_value":"1e20", "product":"input4MIPs", "realm":"ocean", - "table_date":"26 January 2022", + "table_date":"08 March 2022", "table_id":"Table input4MIPs_OyrC" }, "variable_entry":{ diff --git a/Tables/input4MIPs_SI3hrPt.json b/Tables/input4MIPs_SI3hrPt.json index 98847be..be1ce53 100644 --- a/Tables/input4MIPs_SI3hrPt.json +++ b/Tables/input4MIPs_SI3hrPt.json @@ -10,7 +10,7 @@ "missing_value":"1e20", "product":"input4MIPs", "realm":"seaIce", - "table_date":"26 January 2022", + "table_date":"08 March 2022", "table_id":"Table input4MIPs_SI3hrPt" }, "variable_entry":{ diff --git a/Tables/input4MIPs_SIday.json b/Tables/input4MIPs_SIday.json index f806990..dfd250e 100644 --- a/Tables/input4MIPs_SIday.json +++ b/Tables/input4MIPs_SIday.json @@ -10,7 +10,7 @@ "missing_value":"1e20", "product":"input4MIPs", "realm":"seaIce", - "table_date":"26 January 2022", + "table_date":"08 March 2022", "table_id":"Table input4MIPs_SIday" }, "variable_entry":{ diff --git a/Tables/input4MIPs_SImon.json b/Tables/input4MIPs_SImon.json index 4f3c9c0..d6738af 100644 --- a/Tables/input4MIPs_SImon.json +++ b/Tables/input4MIPs_SImon.json @@ -10,7 +10,7 @@ "missing_value":"1e20", "product":"input4MIPs", "realm":"seaIce", - "table_date":"26 January 2022", + "table_date":"08 March 2022", "table_id":"Table input4MIPs_SImon" }, "variable_entry":{ diff --git a/Tables/input4MIPs_grids.json b/Tables/input4MIPs_grids.json index 27e215b..18f0d7e 100644 --- a/Tables/input4MIPs_grids.json +++ b/Tables/input4MIPs_grids.json @@ -6,7 +6,7 @@ "mip_era":"CMIP6", "missing_value":"1e20", "product":"input4MIPs", - "table_date":"26 January 2022", + "table_date":"08 March 2022", "table_id":"Table input4MIPs_grids" }, "axis_entry":{ diff --git a/input4MIPs_source_id.json b/input4MIPs_source_id.json index 285a844..7b900c3 100644 --- a/input4MIPs_source_id.json +++ b/input4MIPs_source_id.json @@ -763,6 +763,40 @@ "target_mip":"CMIP", "title":"PCMDI-AMIP 1.1.7 dataset prepared for input4MIPs" }, + "PCMDI-AMIP-1-2-0":{ + "calendar":"gregorian", + "comment":"Based on Hurrell SST/sea ice consistency criteria applied to merged HadISST (1870-01 to 1981-10) & NCEP-0I2 (1981-11 to 2021-12)", + "contact":"PCMDI (pcmdi-cmip@llnl.gov)", + "dataset_category":"SSTsAndSeaIce", + "further_info_url":"https://pcmdi.llnl.gov/mips/amip", + "grid":"1x1 degree longitude x latitude", + "grid_label":"gn", + "institution":"Program for Climate Model Diagnosis and Intercomparison, Lawrence Livermore National Laboratory, Livermore, CA 94550, USA", + "institution_id":"PCMDI", + "mip_era":"CMIP6Plus", + "nominal_resolution":"1x1 degree", + "product":"observations", + "references":"Taylor, K.E., D. Williamson and F. Zwiers, 2000: The sea surface temperature and sea ice concentration boundary conditions for AMIP II simulations. PCMDI Report 60, Program for Climate Model Diagnosis and Intercomparison, Lawrence Livermore National Laboratory, 25 pp. Available online: https://pcmdi.llnl.gov/report/pdf/60.pdf", + "region":[ + "global_ocean" + ], + "release_year":"2022", + "source":"PCMDI-AMIP 1.2.0: Merged SST based on UK MetOffice HadISST and NCEP OI2", + "source_description":"Sea surface temperature and sea-ice datasets produced by PCMDI (LLNL) for the AMIP (DECK) experiment of CMIP6", + "source_id":"PCMDI-AMIP-1-2-0", + "source_type":"satellite_blended", + "source_variables":[ + "areacello", + "sftof", + "siconc", + "siconcbcs", + "tos", + "tosbcs" + ], + "source_version":"1.2.0", + "target_mip":"CMIP", + "title":"PCMDI-AMIP 1.2.0 dataset prepared for input4MIPs" + }, "UKESM1-0-LL-ssp585-1-0":{ "comment":"Prepared using CMIP6 model UKESM1-0-LL as input. A combination of historical and ssp585 datasets were used to create this ISMIP6 forcing dataset", "contact":"ISMIP6 Steering Team (ismip6@gmail.com)", diff --git a/src/writeJson.py b/src/writeJson.py index 2b14a56..9b84db4 100755 --- a/src/writeJson.py +++ b/src/writeJson.py @@ -97,6 +97,7 @@ PJD 24 Jul 2020 - Updated call to readJsonCreateDict(tableSource, rawGit) - added argument PJD 8 Sep 2020 - Register source_id MRI-JRA55-do-1-5-0 https://github.com/PCMDI/input4MIPs-cmor-tables/issues/109 PJD 26 Jan 2022 - Update home path +PJD 8 Mar 2022 - Register PCMDI-AMIP-1-2-0 https://github.com/PCMDI/input4MIPs-cmor-tables/issues/87 - TODO: Deal with lab cert issue https://raw.githubusercontent.com -> http://rawgit.com (see requests library) @@ -873,15 +874,15 @@ print(count, key) source_id[key]['mip_era'] = 'CMIP6' -# Add PCMDI-AMIP-1-1-7 -key = 'PCMDI-AMIP-1-1-7' +# Add PCMDI-AMIP-1-2-0 +key = 'PCMDI-AMIP-1-2-0' source_id.pop(key, None) # Cleanup and start again source_id[key] = {} source_id[key]['calendar'] = 'gregorian' source_id[key]['comment'] = ' '.join(['Based on Hurrell SST/sea ice consistency', 'criteria applied to merged HadISST', '(1870-01 to 1981-10) & NCEP-0I2 (1981-11', - 'to 2021-06)']) + 'to 2021-12)']) source_id[key]['contact'] = 'PCMDI (pcmdi-cmip@llnl.gov)' source_id[key]['dataset_category'] = 'SSTsAndSeaIce' source_id[key]['grid'] = '1x1 degree longitude x latitude' @@ -894,7 +895,7 @@ 'Livermore National Laboratory,', 'Livermore, CA 94550, USA']) source_id[key]['nominal_resolution'] = '1x1 degree' -source_id[key]['mip_era'] = 'CMIP6' +source_id[key]['mip_era'] = 'CMIP6Plus' source_id[key]['product'] = 'observations' source_id[key]['references'] = ''.join(['Taylor, K.E., D. Williamson and F. Zwiers, ', '2000: The sea surface temperature and sea ice ', @@ -909,55 +910,14 @@ 'sea-ice datasets produced by', 'PCMDI (LLNL) for the AMIP', '(DECK) experiment of CMIP6']) -source_id[key]['source'] = 'PCMDI-AMIP 1.1.7: Merged SST based on UK MetOffice HadISST and NCEP OI2' +source_id[key]['source'] = 'PCMDI-AMIP 1.2.0: Merged SST based on UK MetOffice HadISST and NCEP OI2' source_id[key]['source_id'] = key source_id[key]['source_type'] = 'satellite_blended' source_id[key]['source_variables'] = ['areacello', 'sftof', 'siconc', 'siconcbcs', 'tos', 'tosbcs'] -source_id[key]['source_version'] = '1.1.7' -source_id[key]['target_mip'] = 'CMIP' -source_id[key]['title'] = 'PCMDI-AMIP 1.1.7 dataset prepared for input4MIPs' - -# Remove PCMDI-AMIP-1-2-0 -key = 'PCMDI-AMIP-1-2-0' -source_id.pop(key, None) # Cleanup and start again -# Add PCMDI-AMIP-1-2-0 - placeholder -""" -key = 'PCMDI-AMIP-1-2-0' -source_id.pop(key, None) # Cleanup and start again -source_id[key] = {} -source_id[key]['calendar'] = 'gregorian' -source_id[key]['comment'] = 'Based on Hurrell SST/sea ice consistency criteria applied to merged HadISST (1870-01 to 1981-10) & NCEP-0I2 (1981-11 to 2021-06)' -source_id[key]['contact'] = 'PCMDI (pcmdi-cmip@llnl.gov)' -source_id[key]['dataset_category'] = 'SSTsAndSeaIce' -source_id[key]['grid'] = '1x1 degree longitude x latitude' -source_id[key]['grid_label'] = 'gn' -#source_id[key]['frequency'] = 'mon' # See https://github.com/PCMDI/cmor/issues/628#issuecomment-912101615 -source_id[key]['further_info_url'] = 'https://pcmdi.llnl.gov/mips/amip' -source_id[key]['institution_id'] = 'PCMDI' -source_id[key]['institution'] = 'Program for Climate Model Diagnosis and Intercomparison, Lawrence Livermore National Laboratory, Livermore, CA 94550, USA' -source_id[key]['nominal_resolution'] = '1x1 degree' -source_id[key]['mip_era'] = 'CMIP6Plus' -source_id[key]['product'] = 'observations' -source_id[key]['references'] = ''.join(['Taylor, K.E., D. Williamson and F. Zwiers, ', - '2000: The sea surface temperature and sea ice ', - 'concentration boundary conditions for AMIP II ', - 'simulations. PCMDI Report 60, Program for ', - 'Climate Model Diagnosis and Intercomparison, ', - 'Lawrence Livermore National Laboratory, 25 pp. ', - 'Available online: https://pcmdi.llnl.gov/report/pdf/60.pdf']) -source_id[key]['region'] = ['global_ocean'] -source_id[key]['release_year'] = '2022' -source_id[key]['source_description'] = 'Sea surface temperature and sea-ice datasets produced by PCMDI (LLNL) for the AMIP (DECK) experiment of CMIP6' -source_id[key]['source'] = 'PCMDI-AMIP 1.2.0: Merged SST based on UK MetOffice HadISST and NCEP OI2' -source_id[key]['source_id'] = key -source_id[key]['source_type'] = 'satellite_blended' -source_id[key]['source_variables'] = ['areacello','sftof','siconc','siconcbcs', - 'tos','tosbcs'] source_id[key]['source_version'] = '1.2.0' source_id[key]['target_mip'] = 'CMIP' source_id[key]['title'] = 'PCMDI-AMIP 1.2.0 dataset prepared for input4MIPs' -""" # %% Create CV master CV = {}