From 2594bae70d833cbc965c7f632d80e472457a7608 Mon Sep 17 00:00:00 2001 From: "Paul J. Durack" Date: Wed, 20 Nov 2019 15:36:45 -0800 Subject: [PATCH] Revise source_id PCMDI-AMIP-1-2-0 --- Tables/input4MIPs_A3hr.json | 6 +- Tables/input4MIPs_A3hrPt.json | 6 +- Tables/input4MIPs_Afx.json | 6 +- Tables/input4MIPs_CV.json | 4 +- Tables/input4MIPs_LIday.json | 6 +- Tables/input4MIPs_LIfx.json | 6 +- Tables/input4MIPs_LIyrC.json | 6 +- Tables/input4MIPs_Lday.json | 6 +- Tables/input4MIPs_Oday.json | 6 +- Tables/input4MIPs_Ofx.json | 6 +- Tables/input4MIPs_Omon.json | 8 +- Tables/input4MIPs_OmonC.json | 6 +- Tables/input4MIPs_OyrC.json | 6 +- Tables/input4MIPs_SI3hrPt.json | 6 +- Tables/input4MIPs_SIday.json | 6 +- Tables/input4MIPs_SImon.json | 6 +- Tables/input4MIPs_coordinate.json | 178 +++++------------- Tables/input4MIPs_formula_terms.json | 134 ++++--------- Tables/input4MIPs_grids.json | 6 +- .../Tables/input4MIPs_A3hr.json | 6 +- .../Tables/input4MIPs_A3hrPt.json | 6 +- .../Tables/input4MIPs_Afx.json | 6 +- .../Tables/input4MIPs_CV.json | 4 +- .../Tables/input4MIPs_LIday.json | 6 +- .../Tables/input4MIPs_LIyrC.json | 6 +- .../Tables/input4MIPs_Lday.json | 6 +- .../Tables/input4MIPs_Oday.json | 6 +- .../Tables/input4MIPs_OmonC.json | 6 +- .../Tables/input4MIPs_OyrC.json | 6 +- .../Tables/input4MIPs_SI3hrPt.json | 6 +- .../Tables/input4MIPs_SIday.json | 6 +- .../Tables/input4MIPs_coordinate.json | 178 +++++------------- .../Tables/input4MIPs_formula_terms.json | 134 ++++--------- input4MIPs_source_id.json | 4 +- src/writeJson.py | 5 +- 35 files changed, 243 insertions(+), 562 deletions(-) diff --git a/Tables/input4MIPs_A3hr.json b/Tables/input4MIPs_A3hr.json index 400805a..1dd80f6 100644 --- a/Tables/input4MIPs_A3hr.json +++ b/Tables/input4MIPs_A3hr.json @@ -2,15 +2,15 @@ "Header":{ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"0.125000", - "cmor_version":"3.4", - "data_specs_version":"01.00.30", + "cmor_version":"3.5", + "data_specs_version":"01.00.31", "generic_levels":"", "int_missing_value":"-999", "mip_era":"CMIP6", "missing_value":"1e20", "product":"input4MIPs", "realm":"atmos", - "table_date":"11 July 2019", + "table_date":"20 November 2019", "table_id":"Table input4MIPs_A3hr" }, "variable_entry":{ diff --git a/Tables/input4MIPs_A3hrPt.json b/Tables/input4MIPs_A3hrPt.json index 59d60c9..dcd38ff 100644 --- a/Tables/input4MIPs_A3hrPt.json +++ b/Tables/input4MIPs_A3hrPt.json @@ -2,15 +2,15 @@ "Header":{ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"0.125000", - "cmor_version":"3.4", - "data_specs_version":"01.00.30", + "cmor_version":"3.5", + "data_specs_version":"01.00.31", "generic_levels":"", "int_missing_value":"-999", "mip_era":"CMIP6", "missing_value":"1e20", "product":"input4MIPs", "realm":"atmos", - "table_date":"11 July 2019", + "table_date":"20 November 2019", "table_id":"Table input4MIPs_A3hrPt" }, "variable_entry":{ diff --git a/Tables/input4MIPs_Afx.json b/Tables/input4MIPs_Afx.json index b0406fa..5afc7a9 100644 --- a/Tables/input4MIPs_Afx.json +++ b/Tables/input4MIPs_Afx.json @@ -2,15 +2,15 @@ "Header":{ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"0.00000", - "cmor_version":"3.4", - "data_specs_version":"01.00.30", + "cmor_version":"3.5", + "data_specs_version":"01.00.31", "generic_levels":"alevel", "int_missing_value":"-999", "mip_era":"CMIP6", "missing_value":"1e20", "product":"input4MIPs", "realm":"atmos land", - "table_date":"11 July 2019", + "table_date":"20 November 2019", "table_id":"Table input4MIPs_Afx" }, "variable_entry":{ diff --git a/Tables/input4MIPs_CV.json b/Tables/input4MIPs_CV.json index 3922897..93d3d7f 100644 --- a/Tables/input4MIPs_CV.json +++ b/Tables/input4MIPs_CV.json @@ -395,7 +395,7 @@ "title":"PCMDI-AMIP 1.1.5 dataset prepared for input4MIPs" }, "PCMDI-AMIP-1-2-0":{ - "comment":"Based on Hurrell SST/sea ice consistency criteria applied to merged HadISST (1870-01 to 1981-10) & NCEP-0I2 (1981-11 to 2018-12)", + "comment":"Based on Hurrell SST/sea ice consistency criteria applied to merged HadISST (1870-01 to 1981-10) & NCEP-0I2 (1981-11 to 2019-06)", "contact":"PCMDI (pcmdi-cmip@llnl.gov)", "dataset_category":"SSTsAndSeaIce", "further_info_url":"https://pcmdi.llnl.gov/mips/amip", @@ -409,7 +409,7 @@ "region":[ "global_ocean" ], - "release_year":"2019", + "release_year":"2020", "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", diff --git a/Tables/input4MIPs_LIday.json b/Tables/input4MIPs_LIday.json index fe298e0..2d93e46 100644 --- a/Tables/input4MIPs_LIday.json +++ b/Tables/input4MIPs_LIday.json @@ -2,15 +2,15 @@ "Header":{ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"30.00000", - "cmor_version":"3.4", - "data_specs_version":"01.00.30", + "cmor_version":"3.5", + "data_specs_version":"01.00.31", "generic_levels":"olevel olevhalf", "int_missing_value":"-999", "mip_era":"CMIP6", "missing_value":"1e20", "product":"input4MIPs", "realm":"landIce", - "table_date":"11 July 2019", + "table_date":"20 November 2019", "table_id":"Table input4MIPs_LIday" }, "variable_entry":{ diff --git a/Tables/input4MIPs_LIfx.json b/Tables/input4MIPs_LIfx.json index 53ec5d1..a80667b 100644 --- a/Tables/input4MIPs_LIfx.json +++ b/Tables/input4MIPs_LIfx.json @@ -2,15 +2,15 @@ "Header":{ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"", - "cmor_version":"3.4", - "data_specs_version":"01.00.30", + "cmor_version":"3.5", + "data_specs_version":"01.00.31", "generic_levels":"", "int_missing_value":"-999", "mip_era":"CMIP6", "missing_value":"1e20", "product":"input4MIPs", "realm":"landIce", - "table_date":"11 July 2019", + "table_date":"20 November 2019", "table_id":"Table input4MIPs_LIfx" }, "variable_entry":{ diff --git a/Tables/input4MIPs_LIyrC.json b/Tables/input4MIPs_LIyrC.json index 1d73772..ba3d167 100644 --- a/Tables/input4MIPs_LIyrC.json +++ b/Tables/input4MIPs_LIyrC.json @@ -2,15 +2,15 @@ "Header":{ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"30.00000", - "cmor_version":"3.4", - "data_specs_version":"01.00.30", + "cmor_version":"3.5", + "data_specs_version":"01.00.31", "generic_levels":"olevel olevhalf", "int_missing_value":"-999", "mip_era":"CMIP6", "missing_value":"1e20", "product":"input4MIPs", "realm":"landIce", - "table_date":"11 July 2019", + "table_date":"20 November 2019", "table_id":"Table input4MIPs_LIyrC" }, "variable_entry":{ diff --git a/Tables/input4MIPs_Lday.json b/Tables/input4MIPs_Lday.json index 03d6fac..1bc96ce 100644 --- a/Tables/input4MIPs_Lday.json +++ b/Tables/input4MIPs_Lday.json @@ -2,15 +2,15 @@ "Header":{ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"30.00000", - "cmor_version":"3.4", - "data_specs_version":"01.00.30", + "cmor_version":"3.5", + "data_specs_version":"01.00.31", "generic_levels":"", "int_missing_value":"-999", "mip_era":"CMIP6", "missing_value":"1e20", "product":"input4MIPs", "realm":"land", - "table_date":"11 July 2019", + "table_date":"20 November 2019", "table_id":"Table input4MIPs_Lday" }, "variable_entry":{ diff --git a/Tables/input4MIPs_Oday.json b/Tables/input4MIPs_Oday.json index cabde6f..ce7ca9b 100644 --- a/Tables/input4MIPs_Oday.json +++ b/Tables/input4MIPs_Oday.json @@ -2,15 +2,15 @@ "Header":{ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"30.00000", - "cmor_version":"3.4", - "data_specs_version":"01.00.30", + "cmor_version":"3.5", + "data_specs_version":"01.00.31", "generic_levels":"olevel olevhalf", "int_missing_value":"-999", "mip_era":"CMIP6", "missing_value":"1e20", "product":"input4MIPs", "realm":"ocean", - "table_date":"11 July 2019", + "table_date":"20 November 2019", "table_id":"Table input4MIPs_Oday" }, "variable_entry":{ diff --git a/Tables/input4MIPs_Ofx.json b/Tables/input4MIPs_Ofx.json index 691012f..473ba35 100644 --- a/Tables/input4MIPs_Ofx.json +++ b/Tables/input4MIPs_Ofx.json @@ -2,15 +2,15 @@ "Header":{ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"0.00000", - "cmor_version":"3.4", - "data_specs_version":"01.00.30", + "cmor_version":"3.5", + "data_specs_version":"01.00.31", "generic_levels":"olevel", "int_missing_value":"-999", "mip_era":"CMIP6", "missing_value":"1e20", "product":"input4MIPs", "realm":"ocean", - "table_date":"11 July 2019", + "table_date":"20 November 2019", "table_id":"Table input4MIPs_Ofx" }, "variable_entry":{ diff --git a/Tables/input4MIPs_Omon.json b/Tables/input4MIPs_Omon.json index 222f0e7..147ca91 100644 --- a/Tables/input4MIPs_Omon.json +++ b/Tables/input4MIPs_Omon.json @@ -2,15 +2,15 @@ "Header":{ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"30.00000", - "cmor_version":"3.4", - "data_specs_version":"01.00.30", + "cmor_version":"3.5", + "data_specs_version":"01.00.31", "generic_levels":"olevel olevhalf", "int_missing_value":"-999", "mip_era":"CMIP6", "missing_value":"1e20", "product":"input4MIPs", "realm":"ocean", - "table_date":"11 July 2019", + "table_date":"20 November 2019", "table_id":"Table input4MIPs_Omon" }, "variable_entry":{ @@ -52,7 +52,7 @@ }, "volcello":{ "cell_measures":"area: areacello volume: volcello", - "cell_methods":"area: mean where sea time: mean", + "cell_methods":"area: sum where sea time: mean", "comment":"grid-cell volume ca. 2000.", "dimensions":"longitude latitude olevel time", "frequency":"mon", diff --git a/Tables/input4MIPs_OmonC.json b/Tables/input4MIPs_OmonC.json index fbc2f0e..4c39887 100644 --- a/Tables/input4MIPs_OmonC.json +++ b/Tables/input4MIPs_OmonC.json @@ -2,15 +2,15 @@ "Header":{ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"30.00000", - "cmor_version":"3.4", - "data_specs_version":"01.00.30", + "cmor_version":"3.5", + "data_specs_version":"01.00.31", "generic_levels":"olevel olevhalf", "int_missing_value":"-999", "mip_era":"CMIP6", "missing_value":"1e20", "product":"input4MIPs", "realm":"ocean", - "table_date":"11 July 2019", + "table_date":"20 November 2019", "table_id":"Table input4MIPs_OmonC" }, "variable_entry":{ diff --git a/Tables/input4MIPs_OyrC.json b/Tables/input4MIPs_OyrC.json index a3a4f38..22de977 100644 --- a/Tables/input4MIPs_OyrC.json +++ b/Tables/input4MIPs_OyrC.json @@ -2,15 +2,15 @@ "Header":{ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"30.00000", - "cmor_version":"3.4", - "data_specs_version":"01.00.30", + "cmor_version":"3.5", + "data_specs_version":"01.00.31", "generic_levels":"olevel olevhalf", "int_missing_value":"-999", "mip_era":"CMIP6", "missing_value":"1e20", "product":"input4MIPs", "realm":"ocean", - "table_date":"11 July 2019", + "table_date":"20 November 2019", "table_id":"Table input4MIPs_OyrC" }, "variable_entry":{ diff --git a/Tables/input4MIPs_SI3hrPt.json b/Tables/input4MIPs_SI3hrPt.json index bc71d7a..a894c81 100644 --- a/Tables/input4MIPs_SI3hrPt.json +++ b/Tables/input4MIPs_SI3hrPt.json @@ -2,15 +2,15 @@ "Header":{ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"0.125000", - "cmor_version":"3.4", - "data_specs_version":"01.00.30", + "cmor_version":"3.5", + "data_specs_version":"01.00.31", "generic_levels":"", "int_missing_value":"-999", "mip_era":"CMIP6", "missing_value":"1e20", "product":"input4MIPs", "realm":"seaIce", - "table_date":"11 July 2019", + "table_date":"20 November 2019", "table_id":"Table input4MIPs_SI3hrPt" }, "variable_entry":{ diff --git a/Tables/input4MIPs_SIday.json b/Tables/input4MIPs_SIday.json index 7a3b0e9..f6766b9 100644 --- a/Tables/input4MIPs_SIday.json +++ b/Tables/input4MIPs_SIday.json @@ -2,15 +2,15 @@ "Header":{ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"1.00000", - "cmor_version":"3.4", - "data_specs_version":"01.00.30", + "cmor_version":"3.5", + "data_specs_version":"01.00.31", "generic_levels":"", "int_missing_value":"-999", "mip_era":"CMIP6", "missing_value":"1e20", "product":"input4MIPs", "realm":"seaIce", - "table_date":"11 July 2019", + "table_date":"20 November 2019", "table_id":"Table input4MIPs_SIday" }, "variable_entry":{ diff --git a/Tables/input4MIPs_SImon.json b/Tables/input4MIPs_SImon.json index ea6d85e..89d278c 100644 --- a/Tables/input4MIPs_SImon.json +++ b/Tables/input4MIPs_SImon.json @@ -2,15 +2,15 @@ "Header":{ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"30.00000", - "cmor_version":"3.4", - "data_specs_version":"01.00.30", + "cmor_version":"3.5", + "data_specs_version":"01.00.31", "generic_levels":"", "int_missing_value":"-999", "mip_era":"CMIP6", "missing_value":"1e20", "product":"input4MIPs", "realm":"seaIce", - "table_date":"11 July 2019", + "table_date":"20 November 2019", "table_id":"Table input4MIPs_SImon" }, "variable_entry":{ diff --git a/Tables/input4MIPs_coordinate.json b/Tables/input4MIPs_coordinate.json index 66f2f5a..8e33bb3 100644 --- a/Tables/input4MIPs_coordinate.json +++ b/Tables/input4MIPs_coordinate.json @@ -261,7 +261,7 @@ "valid_max":"1.0", "valid_min":"0.0", "value":"", - "z_bounds_factors":"ap: ap_bnds b: b_bnds ps: ps", + "z_bounds_factors":"", "z_factors":"ap: ap b: b ps: ps" }, "basin":{ @@ -529,7 +529,7 @@ "formula":"", "generic_level_name":"", "long_name":"Effective Radius [Values to be specified]", - "must_have_bounds":"", + "must_have_bounds":"yes", "out_name":"effectRadIc", "positive":"", "requested":[ @@ -554,7 +554,7 @@ "60.0", "90.0" ], - "standard_name":"", + "standard_name":"effective_radius_of_convective_cloud_ice_particle", "stored_direction":"", "tolerance":"", "type":"double", @@ -572,7 +572,7 @@ "formula":"", "generic_level_name":"", "long_name":"Effective Radius [Values to be specified]", - "must_have_bounds":"", + "must_have_bounds":"yes", "out_name":"effectRadLi", "positive":"", "requested":[ @@ -597,7 +597,7 @@ "20.0", "30.0" ], - "standard_name":"", + "standard_name":"effective_radius_of_cloud_liquid_water_particle", "stored_direction":"", "tolerance":"", "type":"double", @@ -743,7 +743,7 @@ "valid_max":"", "valid_min":"0.0", "value":"", - "z_bounds_factors":"a: lev_bnds b: b_bnds orog: orog", + "z_bounds_factors":"", "z_factors":"a: lev b: b orog: orog" }, "iceband":{ @@ -776,7 +776,7 @@ "formula":"", "generic_level_name":"", "long_name":"Radiation Wavelength 550 nanometers", - "must_have_bounds":"", + "must_have_bounds":"no", "out_name":"wavelength", "positive":"", "requested":"", @@ -889,65 +889,65 @@ "z_bounds_factors":"", "z_factors":"" }, - "natural_log_pressure":{ + "ocean_sigma":{ "axis":"Z", "bounds_values":"", "climatology":"", - "formula":"p = p0 * exp(-lev)", - "generic_level_name":"alevel", - "long_name":"atmosphere natural log pressure coordinate", + "formula":"z(n,k,j,i) = eta(n,j,i) + sigma(k)*(depth(j,i)+eta(n,j,i))", + "generic_level_name":"olevel", + "long_name":"ocean sigma coordinate", "must_have_bounds":"yes", "out_name":"lev", - "positive":"down", + "positive":"up", "requested":"", "requested_bounds":"", - "standard_name":"atmosphere_ln_pressure_coordinate", + "standard_name":"ocean_sigma_coordinate", "stored_direction":"decreasing", "tolerance":"", "type":"", "units":"", - "valid_max":"20.0", + "valid_max":"0.0", "valid_min":"-1.0", "value":"", - "z_bounds_factors":"p0: p0 lev: lev_bnds", - "z_factors":"p0: p0 lev: lev" + "z_bounds_factors":"sigma: lev_bnds eta: eta depth: depth", + "z_factors":"sigma: lev eta: eta depth: depth" }, - "natural_log_pressure_half":{ + "ocean_sigma_half":{ "axis":"Z", "bounds_values":"", "climatology":"", - "formula":"p = p0 * exp(-lev)", - "generic_level_name":"alevhalf", - "long_name":"atmosphere natural log pressure coordinate", + "formula":"z(n,k,j,i) = eta(n,j,i) + sigma(k)*(depth(j,i)+eta(n,j,i))", + "generic_level_name":"olevhalf", + "long_name":"ocean sigma coordinate", "must_have_bounds":"no", "out_name":"lev", - "positive":"down", + "positive":"up", "requested":"", "requested_bounds":"", - "standard_name":"atmosphere_ln_pressure_coordinate", + "standard_name":"ocean_sigma_coordinate", "stored_direction":"decreasing", "tolerance":"", "type":"", "units":"", - "valid_max":"20.0", + "valid_max":"0.0", "valid_min":"-1.0", "value":"", - "z_bounds_factors":"p0: p0 lev: lev_bnds", - "z_factors":"p0: p0 lev: lev" + "z_bounds_factors":"", + "z_factors":"sigma: lev eta: eta depth: depth" }, - "ocean_double_sigma":{ + "ocean_sigma_z":{ "axis":"Z", "bounds_values":"", "climatology":"", - "formula":"for k <= k_c:\n z(k,j,i)= sigma(k)*f(j,i) \n for k > k_c:\n z(k,j,i)= f(j,i) + (sigma(k)-1)*(depth(j,i)-f(j,i)) \n f(j,i)= 0.5*(z1+ z2) + 0.5*(z1-z2)* tanh(2*a/(z1-z2)*(depth(j,i)-href))", + "formula":"for k <= nsigma: z(n,k,j,i) = eta(n,j,i) + sigma(k)*(min(depth_c,depth(j,i))+eta(n,j,i)) ; for k > nsigma: z(n,k,j,i) = zlev(k)", "generic_level_name":"olevel", - "long_name":"ocean double sigma coordinate", + "long_name":"ocean sigma over z coordinate", "must_have_bounds":"yes", "out_name":"lev", - "positive":"up", + "positive":"", "requested":"", "requested_bounds":"", - "standard_name":"ocean_double_sigma", + "standard_name":"ocean_sigma_z_coordinate", "stored_direction":"", "tolerance":"", "type":"", @@ -955,63 +955,17 @@ "valid_max":"", "valid_min":"", "value":"", - "z_bounds_factors":"sigma: sigma_bnds depth: depth z1: z1 z2: z2 a: a href: href k_c: k_c", - "z_factors":"sigma: sigma depth: depth z1: z1 z2: z2 a: a_coeff href: href k_c: k_c" - }, - "ocean_s":{ - "axis":"Z", - "bounds_values":"", - "climatology":"", - "formula":"z(n,k,j,i) = eta(n,j,i)*(1+s(k)) + depth_c*s(k) + (depth(j,i)-depth_c)*C(k) \n where \n C(k)=(1-b)*sinh(a*s(k))/sinh(a) +\n b*(tanh(a*(s(k)+0.5))/(2*tanh(0.5*a)) - 0.5)", - "generic_level_name":"olevel", - "long_name":"ocean s-coordinate", - "must_have_bounds":"yes", - "out_name":"lev", - "positive":"up", - "requested":"", - "requested_bounds":"", - "standard_name":"ocean_s_coordinate", - "stored_direction":"decreasing", - "tolerance":"", - "type":"", - "units":"", - "valid_max":"0.0", - "valid_min":"-1.0", - "value":"", - "z_bounds_factors":"s: lev_bnds eta: eta depth: depth a: a b: b depth_c: depth_c", - "z_factors":"s: lev eta: eta depth: depth a: a_coeff b: b_coeff depth_c: depth_c" - }, - "ocean_sigma":{ - "axis":"Z", - "bounds_values":"", - "climatology":"", - "formula":"z(n,k,j,i) = eta(n,j,i) + sigma(k)*(depth(j,i)+eta(n,j,i))", - "generic_level_name":"olevel", - "long_name":"ocean sigma coordinate", - "must_have_bounds":"yes", - "out_name":"lev", - "positive":"up", - "requested":"", - "requested_bounds":"", - "standard_name":"ocean_sigma_coordinate", - "stored_direction":"decreasing", - "tolerance":"", - "type":"", - "units":"", - "valid_max":"0.0", - "valid_min":"-1.0", - "value":"", - "z_bounds_factors":"sigma: lev_bnds eta: eta depth: depth", - "z_factors":"sigma: lev eta: eta depth: depth" + "z_bounds_factors":"sigma: lev_bnds eta: eta depth: depth depth_c: depth_c nsigma: nsigma zlev: zlev_bnds", + "z_factors":"sigma: lev eta: eta depth: depth depth_c: depth_c nsigma: nsigma zlev: zlev" }, - "ocean_sigma_z":{ + "ocean_sigma_z_half":{ "axis":"Z", "bounds_values":"", "climatology":"", "formula":"for k <= nsigma: z(n,k,j,i) = eta(n,j,i) + sigma(k)*(min(depth_c,depth(j,i))+eta(n,j,i)) ; for k > nsigma: z(n,k,j,i) = zlev(k)", - "generic_level_name":"olevel", + "generic_level_name":"olevhalf", "long_name":"ocean sigma over z coordinate", - "must_have_bounds":"yes", + "must_have_bounds":"no", "out_name":"lev", "positive":"", "requested":"", @@ -1024,8 +978,8 @@ "valid_max":"", "valid_min":"", "value":"", - "z_bounds_factors":"sigma: sigma_bnds eta: eta depth: depth depth_c: depth_c nsigma: nsigma zlev: zlev_bnds", - "z_factors":"sigma: sigma eta: eta depth: depth depth_c: depth_c nsigma: nsigma zlev: zlev" + "z_bounds_factors":"", + "z_factors":"sigma: lev eta: eta depth: depth depth_c: depth_c nsigma: nsigma zlev: zlev" }, "olayer100m":{ "axis":"Z", @@ -2043,52 +1997,6 @@ "z_bounds_factors":"", "z_factors":"" }, - "smooth_level":{ - "axis":"Z", - "bounds_values":"", - "climatology":"", - "formula":"z = a*ztop + b1*zsurf1 + b2*zsurf2", - "generic_level_name":"alevel", - "long_name":"atmosphere smooth level vertical (SLEVE) coordinate", - "must_have_bounds":"yes", - "out_name":"lev", - "positive":"up", - "requested":"", - "requested_bounds":"", - "standard_name":"atmosphere_sleve_coordinate", - "stored_direction":"increasing", - "tolerance":"", - "type":"", - "units":"m", - "valid_max":"800000.0", - "valid_min":"-200.0", - "value":"", - "z_bounds_factors":"a: a_bnds b1: b1_bnds b2: b2_bnds ztop: ztop zsurf1: zsurf1 zsurf2: zsurf2", - "z_factors":"a: a b1: b1 b2: b2 ztop: ztop zsurf1: zsurf1 zsurf2: zsurf2" - }, - "smooth_level_half":{ - "axis":"Z", - "bounds_values":"", - "climatology":"", - "formula":"z = a*ztop + b1*zsurf1 + b2*zsurf2", - "generic_level_name":"alevhalf", - "long_name":"atmosphere smooth level vertical (SLEVE) coordinate", - "must_have_bounds":"no", - "out_name":"lev", - "positive":"up", - "requested":"", - "requested_bounds":"", - "standard_name":"atmosphere_sleve_coordinate", - "stored_direction":"increasing", - "tolerance":"", - "type":"", - "units":"m", - "valid_max":"800000.0", - "valid_min":"-200.0", - "value":"", - "z_bounds_factors":"a: a_bnds b1: b1_bnds b2: b2_bnds ztop: ztop zsurf1: zsurf1 zsurf2: zsurf2", - "z_factors":"a: a b1: b1 b2: b2 ztop: ztop zsurf1: zsurf1 zsurf2: zsurf2" - }, "snowband":{ "axis":"", "bounds_values":"", @@ -2201,7 +2109,7 @@ "valid_max":"1.0", "valid_min":"0.0", "value":"", - "z_bounds_factors":"p0: p0 a: a_bnds b: b_bnds ps: ps", + "z_bounds_factors":"", "z_factors":"p0: p0 a: a b: b ps: ps" }, "standard_sigma":{ @@ -2247,7 +2155,7 @@ "valid_max":"1.0", "valid_min":"0.0", "value":"", - "z_bounds_factors":"ptop: ptop sigma: lev_bnds ps: ps", + "z_bounds_factors":"", "z_factors":"ptop: ptop sigma: lev ps: ps" }, "stempzero":{ @@ -3298,7 +3206,7 @@ "formula":"", "generic_level_name":"", "long_name":"X-coordinate of Antarctic grid", - "must_have_bounds":"", + "must_have_bounds":"no", "out_name":"xant", "positive":"", "requested":"", @@ -3321,7 +3229,7 @@ "formula":"", "generic_level_name":"", "long_name":"X-coordinate of Greenland grid", - "must_have_bounds":"", + "must_have_bounds":"no", "out_name":"xgre", "positive":"", "requested":"", @@ -3344,7 +3252,7 @@ "formula":"", "generic_level_name":"", "long_name":"Y-coordinate of Antarctic grid", - "must_have_bounds":"", + "must_have_bounds":"no", "out_name":"yant", "positive":"", "requested":"", @@ -3367,7 +3275,7 @@ "formula":"", "generic_level_name":"", "long_name":"Y-coordinate of Greenland grid", - "must_have_bounds":"", + "must_have_bounds":"no", "out_name":"ygre", "positive":"", "requested":"", diff --git a/Tables/input4MIPs_formula_terms.json b/Tables/input4MIPs_formula_terms.json index 2c4018a..95052ac 100644 --- a/Tables/input4MIPs_formula_terms.json +++ b/Tables/input4MIPs_formula_terms.json @@ -2,8 +2,9 @@ "formula_entry":{ "a":{ "dimensions":"alevel", - "long_name":"vertical coordinate formula term: a(k)", + "long_name":"vertical coordinate formula term: a", "out_name":"a", + "standard_name":"", "type":"double", "units":"" }, @@ -11,6 +12,7 @@ "dimensions":"alevel", "long_name":"vertical coordinate formula term: a(k+1/2)", "out_name":"a_bnds", + "standard_name":"", "type":"double", "units":"" }, @@ -18,20 +20,15 @@ "dimensions":"alevhalf", "long_name":"vertical coordinate formula term: a(k)", "out_name":"a", - "type":"double", - "units":"" - }, - "a_half_bnds":{ - "dimensions":"alevhalf", - "long_name":"vertical coordinate formula term: a(k+1/2)", - "out_name":"a_bnds", + "standard_name":"", "type":"double", "units":"" }, "ap":{ "dimensions":"alevel", - "long_name":"vertical coordinate formula term: ap(k)", + "long_name":"vertical coordinate formula term: ap", "out_name":"ap", + "standard_name":"", "type":"double", "units":"Pa" }, @@ -39,6 +36,7 @@ "dimensions":"alevel", "long_name":"vertical coordinate formula term: ap(k+1/2)", "out_name":"ap_bnds", + "standard_name":"", "type":"double", "units":"Pa" }, @@ -46,48 +44,15 @@ "dimensions":"alevhalf", "long_name":"vertical coordinate formula term: ap(k)", "out_name":"ap", - "type":"double", - "units":"Pa" - }, - "ap_half_bnds":{ - "dimensions":"alevel", - "long_name":"vertical coordinate formula term: ap(k+1/2)", - "out_name":"ap_bnds", + "standard_name":"", "type":"double", "units":"Pa" }, "b":{ "dimensions":"alevel", - "long_name":"vertical coordinate formula term: b(k)", + "long_name":"vertical coordinate formula term: b", "out_name":"b", - "type":"double", - "units":"" - }, - "b1":{ - "dimensions":"alevel", - "long_name":"vertical coordinate formula term: b1(k)", - "out_name":"b1", - "type":"double", - "units":"" - }, - "b1_half":{ - "dimensions":"alevhalf", - "long_name":"vertical coordinate formula term: b1(k)", - "out_name":"b1", - "type":"double", - "units":"" - }, - "b2":{ - "dimensions":"alevel", - "long_name":"vertical coordinate formula term: b2(k)", - "out_name":"b2", - "type":"double", - "units":"" - }, - "b2_half":{ - "dimensions":"alevhalf", - "long_name":"vertical coordinate formula term: b2(k)", - "out_name":"b2", + "standard_name":"", "type":"double", "units":"" }, @@ -95,6 +60,7 @@ "dimensions":"alevel", "long_name":"vertical coordinate formula term: b(k+1/2)", "out_name":"b_bnds", + "standard_name":"", "type":"double", "units":"" }, @@ -102,20 +68,15 @@ "dimensions":"alevhalf", "long_name":"vertical coordinate formula term: b(k)", "out_name":"b", - "type":"double", - "units":"" - }, - "b_half_bnds":{ - "dimensions":"alevhalf", - "long_name":"vertical coordinate formula term: b(k+1/2)", - "out_name":"b_bnds", + "standard_name":"", "type":"double", "units":"" }, "depth":{ "dimensions":"longitude latitude", - "long_name":"Sea Floor Depth: formula term: thetao", + "long_name":"Sea Floor Depth", "out_name":"depth", + "standard_name":"", "type":"real", "units":"m" }, @@ -123,34 +84,31 @@ "dimensions":"", "long_name":"vertical coordinate formula term: depth_c", "out_name":"depth_c", + "standard_name":"", "type":"double", - "units":"" + "units":"m" }, "eta":{ "dimensions":"longitude latitude time", - "long_name":"Sea Surface Height formula term: thetao", + "long_name":"Sea Surface Height", "out_name":"eta", + "standard_name":"", "type":"real", "units":"m" }, "eta2":{ "dimensions":"longitude latitude time2", - "long_name":"Sea Surface Height formula term: thetao", + "long_name":"Sea Surface Height", "out_name":"eta", + "standard_name":"", "type":"real", "units":"m" }, - "href":{ - "dimensions":"", - "long_name":"vertical coordinate formula term: href", - "out_name":"href", - "type":"double", - "units":"" - }, "k_c":{ "dimensions":"", "long_name":"vertical coordinate formula term: k_c", "out_name":"k_c", + "standard_name":"", "type":"integer", "units":"" }, @@ -158,6 +116,7 @@ "dimensions":"", "long_name":"vertical coordinate formula term: nsigma", "out_name":"nsigma", + "standard_name":"", "type":"integer", "units":"" }, @@ -165,6 +124,7 @@ "dimensions":"longitude latitude", "long_name":"Surface Altitude", "out_name":"orog", + "standard_name":"", "type":"real", "units":"m" }, @@ -172,6 +132,7 @@ "dimensions":"", "long_name":"vertical coordinate formula term: reference pressure", "out_name":"p0", + "standard_name":"reference_air_pressure_for_atmosphere_vertical_coordinate", "type":"double", "units":"Pa" }, @@ -179,20 +140,23 @@ "dimensions":"longitude latitude time", "long_name":"Surface Air Pressure", "out_name":"ps", + "standard_name":"air_pressure", "type":"real", "units":"Pa" }, "ps1":{ "dimensions":"longitude latitude time1", - "long_name":"vertical coordinate formula term: ps", + "long_name":"Surface Air Pressure", "out_name":"ps", + "standard_name":"air_pressure", "type":"real", "units":"Pa" }, "ps2":{ "dimensions":"longitude latitude time2", - "long_name":"vertical coordinate formula term: ps", + "long_name":"Surface Air Pressure", "out_name":"ps", + "standard_name":"air_pressure", "type":"real", "units":"Pa" }, @@ -200,55 +164,23 @@ "dimensions":"", "long_name":"pressure at top of model", "out_name":"ptop", + "standard_name":"air_pressure_at_top_of_atmosphere", "type":"double", "units":"Pa" }, - "sigma":{ - "dimensions":"olevel", - "long_name":"vertical coordinate formula term: sigma(k)", - "out_name":"sigma", - "type":"double", - "units":"" - }, - "sigma_bnds":{ - "dimensions":"olevel", - "long_name":"vertical coordinate formula term: sigma(k+1/2)", - "out_name":"sigma_bnds", - "type":"double", - "units":"" - }, - "z1":{ - "dimensions":"", - "long_name":"vertical coordinate formula term: z1", - "out_name":"z1", - "type":"double", - "units":"" - }, - "z2":{ - "dimensions":"", - "long_name":"vertical coordinate formula term: z2", - "out_name":"z2", - "type":"double", - "units":"" - }, "zlev":{ "dimensions":"olevel", "long_name":"vertical coordinate formula term: zlev(k)", "out_name":"zlev", + "standard_name":"", "type":"double", - "units":"" + "units":"m" }, "zlev_bnds":{ "dimensions":"olevel", "long_name":"vertical coordinate formula term: zlev(k+1/2)", "out_name":"zlev_bnds", - "type":"double", - "units":"" - }, - "ztop":{ - "dimensions":"", - "long_name":"height of top of model", - "out_name":"ztop", + "standard_name":"", "type":"double", "units":"m" } diff --git a/Tables/input4MIPs_grids.json b/Tables/input4MIPs_grids.json index 591699f..5e3cbed 100644 --- a/Tables/input4MIPs_grids.json +++ b/Tables/input4MIPs_grids.json @@ -1,11 +1,11 @@ { "Header":{ "Conventions":"CF-1.7 CMIP-6.2", - "cmor_version":"3.4", - "data_specs_version":"01.00.30", + "cmor_version":"3.5", + "data_specs_version":"01.00.31", "missing_value":"1e20", "product":"input4MIPs", - "table_date":"11 July 2019", + "table_date":"20 November 2019", "table_id":"Table input4MIPs_grids" }, "axis_entry":{ diff --git a/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_A3hr.json b/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_A3hr.json index 400805a..1dd80f6 100644 --- a/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_A3hr.json +++ b/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_A3hr.json @@ -2,15 +2,15 @@ "Header":{ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"0.125000", - "cmor_version":"3.4", - "data_specs_version":"01.00.30", + "cmor_version":"3.5", + "data_specs_version":"01.00.31", "generic_levels":"", "int_missing_value":"-999", "mip_era":"CMIP6", "missing_value":"1e20", "product":"input4MIPs", "realm":"atmos", - "table_date":"11 July 2019", + "table_date":"20 November 2019", "table_id":"Table input4MIPs_A3hr" }, "variable_entry":{ diff --git a/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_A3hrPt.json b/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_A3hrPt.json index 59d60c9..dcd38ff 100644 --- a/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_A3hrPt.json +++ b/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_A3hrPt.json @@ -2,15 +2,15 @@ "Header":{ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"0.125000", - "cmor_version":"3.4", - "data_specs_version":"01.00.30", + "cmor_version":"3.5", + "data_specs_version":"01.00.31", "generic_levels":"", "int_missing_value":"-999", "mip_era":"CMIP6", "missing_value":"1e20", "product":"input4MIPs", "realm":"atmos", - "table_date":"11 July 2019", + "table_date":"20 November 2019", "table_id":"Table input4MIPs_A3hrPt" }, "variable_entry":{ diff --git a/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_Afx.json b/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_Afx.json index b0406fa..5afc7a9 100644 --- a/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_Afx.json +++ b/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_Afx.json @@ -2,15 +2,15 @@ "Header":{ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"0.00000", - "cmor_version":"3.4", - "data_specs_version":"01.00.30", + "cmor_version":"3.5", + "data_specs_version":"01.00.31", "generic_levels":"alevel", "int_missing_value":"-999", "mip_era":"CMIP6", "missing_value":"1e20", "product":"input4MIPs", "realm":"atmos land", - "table_date":"11 July 2019", + "table_date":"20 November 2019", "table_id":"Table input4MIPs_Afx" }, "variable_entry":{ diff --git a/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_CV.json b/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_CV.json index 3922897..93d3d7f 100644 --- a/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_CV.json +++ b/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_CV.json @@ -395,7 +395,7 @@ "title":"PCMDI-AMIP 1.1.5 dataset prepared for input4MIPs" }, "PCMDI-AMIP-1-2-0":{ - "comment":"Based on Hurrell SST/sea ice consistency criteria applied to merged HadISST (1870-01 to 1981-10) & NCEP-0I2 (1981-11 to 2018-12)", + "comment":"Based on Hurrell SST/sea ice consistency criteria applied to merged HadISST (1870-01 to 1981-10) & NCEP-0I2 (1981-11 to 2019-06)", "contact":"PCMDI (pcmdi-cmip@llnl.gov)", "dataset_category":"SSTsAndSeaIce", "further_info_url":"https://pcmdi.llnl.gov/mips/amip", @@ -409,7 +409,7 @@ "region":[ "global_ocean" ], - "release_year":"2019", + "release_year":"2020", "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", diff --git a/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_LIday.json b/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_LIday.json index fe298e0..2d93e46 100644 --- a/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_LIday.json +++ b/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_LIday.json @@ -2,15 +2,15 @@ "Header":{ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"30.00000", - "cmor_version":"3.4", - "data_specs_version":"01.00.30", + "cmor_version":"3.5", + "data_specs_version":"01.00.31", "generic_levels":"olevel olevhalf", "int_missing_value":"-999", "mip_era":"CMIP6", "missing_value":"1e20", "product":"input4MIPs", "realm":"landIce", - "table_date":"11 July 2019", + "table_date":"20 November 2019", "table_id":"Table input4MIPs_LIday" }, "variable_entry":{ diff --git a/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_LIyrC.json b/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_LIyrC.json index 1d73772..ba3d167 100644 --- a/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_LIyrC.json +++ b/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_LIyrC.json @@ -2,15 +2,15 @@ "Header":{ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"30.00000", - "cmor_version":"3.4", - "data_specs_version":"01.00.30", + "cmor_version":"3.5", + "data_specs_version":"01.00.31", "generic_levels":"olevel olevhalf", "int_missing_value":"-999", "mip_era":"CMIP6", "missing_value":"1e20", "product":"input4MIPs", "realm":"landIce", - "table_date":"11 July 2019", + "table_date":"20 November 2019", "table_id":"Table input4MIPs_LIyrC" }, "variable_entry":{ diff --git a/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_Lday.json b/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_Lday.json index 03d6fac..1bc96ce 100644 --- a/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_Lday.json +++ b/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_Lday.json @@ -2,15 +2,15 @@ "Header":{ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"30.00000", - "cmor_version":"3.4", - "data_specs_version":"01.00.30", + "cmor_version":"3.5", + "data_specs_version":"01.00.31", "generic_levels":"", "int_missing_value":"-999", "mip_era":"CMIP6", "missing_value":"1e20", "product":"input4MIPs", "realm":"land", - "table_date":"11 July 2019", + "table_date":"20 November 2019", "table_id":"Table input4MIPs_Lday" }, "variable_entry":{ diff --git a/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_Oday.json b/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_Oday.json index cabde6f..ce7ca9b 100644 --- a/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_Oday.json +++ b/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_Oday.json @@ -2,15 +2,15 @@ "Header":{ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"30.00000", - "cmor_version":"3.4", - "data_specs_version":"01.00.30", + "cmor_version":"3.5", + "data_specs_version":"01.00.31", "generic_levels":"olevel olevhalf", "int_missing_value":"-999", "mip_era":"CMIP6", "missing_value":"1e20", "product":"input4MIPs", "realm":"ocean", - "table_date":"11 July 2019", + "table_date":"20 November 2019", "table_id":"Table input4MIPs_Oday" }, "variable_entry":{ diff --git a/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_OmonC.json b/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_OmonC.json index fbc2f0e..4c39887 100644 --- a/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_OmonC.json +++ b/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_OmonC.json @@ -2,15 +2,15 @@ "Header":{ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"30.00000", - "cmor_version":"3.4", - "data_specs_version":"01.00.30", + "cmor_version":"3.5", + "data_specs_version":"01.00.31", "generic_levels":"olevel olevhalf", "int_missing_value":"-999", "mip_era":"CMIP6", "missing_value":"1e20", "product":"input4MIPs", "realm":"ocean", - "table_date":"11 July 2019", + "table_date":"20 November 2019", "table_id":"Table input4MIPs_OmonC" }, "variable_entry":{ diff --git a/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_OyrC.json b/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_OyrC.json index a3a4f38..22de977 100644 --- a/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_OyrC.json +++ b/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_OyrC.json @@ -2,15 +2,15 @@ "Header":{ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"30.00000", - "cmor_version":"3.4", - "data_specs_version":"01.00.30", + "cmor_version":"3.5", + "data_specs_version":"01.00.31", "generic_levels":"olevel olevhalf", "int_missing_value":"-999", "mip_era":"CMIP6", "missing_value":"1e20", "product":"input4MIPs", "realm":"ocean", - "table_date":"11 July 2019", + "table_date":"20 November 2019", "table_id":"Table input4MIPs_OyrC" }, "variable_entry":{ diff --git a/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_SI3hrPt.json b/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_SI3hrPt.json index bc71d7a..a894c81 100644 --- a/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_SI3hrPt.json +++ b/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_SI3hrPt.json @@ -2,15 +2,15 @@ "Header":{ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"0.125000", - "cmor_version":"3.4", - "data_specs_version":"01.00.30", + "cmor_version":"3.5", + "data_specs_version":"01.00.31", "generic_levels":"", "int_missing_value":"-999", "mip_era":"CMIP6", "missing_value":"1e20", "product":"input4MIPs", "realm":"seaIce", - "table_date":"11 July 2019", + "table_date":"20 November 2019", "table_id":"Table input4MIPs_SI3hrPt" }, "variable_entry":{ diff --git a/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_SIday.json b/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_SIday.json index 7a3b0e9..f6766b9 100644 --- a/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_SIday.json +++ b/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_SIday.json @@ -2,15 +2,15 @@ "Header":{ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"1.00000", - "cmor_version":"3.4", - "data_specs_version":"01.00.30", + "cmor_version":"3.5", + "data_specs_version":"01.00.31", "generic_levels":"", "int_missing_value":"-999", "mip_era":"CMIP6", "missing_value":"1e20", "product":"input4MIPs", "realm":"seaIce", - "table_date":"11 July 2019", + "table_date":"20 November 2019", "table_id":"Table input4MIPs_SIday" }, "variable_entry":{ diff --git a/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_coordinate.json b/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_coordinate.json index 66f2f5a..8e33bb3 100644 --- a/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_coordinate.json +++ b/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_coordinate.json @@ -261,7 +261,7 @@ "valid_max":"1.0", "valid_min":"0.0", "value":"", - "z_bounds_factors":"ap: ap_bnds b: b_bnds ps: ps", + "z_bounds_factors":"", "z_factors":"ap: ap b: b ps: ps" }, "basin":{ @@ -529,7 +529,7 @@ "formula":"", "generic_level_name":"", "long_name":"Effective Radius [Values to be specified]", - "must_have_bounds":"", + "must_have_bounds":"yes", "out_name":"effectRadIc", "positive":"", "requested":[ @@ -554,7 +554,7 @@ "60.0", "90.0" ], - "standard_name":"", + "standard_name":"effective_radius_of_convective_cloud_ice_particle", "stored_direction":"", "tolerance":"", "type":"double", @@ -572,7 +572,7 @@ "formula":"", "generic_level_name":"", "long_name":"Effective Radius [Values to be specified]", - "must_have_bounds":"", + "must_have_bounds":"yes", "out_name":"effectRadLi", "positive":"", "requested":[ @@ -597,7 +597,7 @@ "20.0", "30.0" ], - "standard_name":"", + "standard_name":"effective_radius_of_cloud_liquid_water_particle", "stored_direction":"", "tolerance":"", "type":"double", @@ -743,7 +743,7 @@ "valid_max":"", "valid_min":"0.0", "value":"", - "z_bounds_factors":"a: lev_bnds b: b_bnds orog: orog", + "z_bounds_factors":"", "z_factors":"a: lev b: b orog: orog" }, "iceband":{ @@ -776,7 +776,7 @@ "formula":"", "generic_level_name":"", "long_name":"Radiation Wavelength 550 nanometers", - "must_have_bounds":"", + "must_have_bounds":"no", "out_name":"wavelength", "positive":"", "requested":"", @@ -889,65 +889,65 @@ "z_bounds_factors":"", "z_factors":"" }, - "natural_log_pressure":{ + "ocean_sigma":{ "axis":"Z", "bounds_values":"", "climatology":"", - "formula":"p = p0 * exp(-lev)", - "generic_level_name":"alevel", - "long_name":"atmosphere natural log pressure coordinate", + "formula":"z(n,k,j,i) = eta(n,j,i) + sigma(k)*(depth(j,i)+eta(n,j,i))", + "generic_level_name":"olevel", + "long_name":"ocean sigma coordinate", "must_have_bounds":"yes", "out_name":"lev", - "positive":"down", + "positive":"up", "requested":"", "requested_bounds":"", - "standard_name":"atmosphere_ln_pressure_coordinate", + "standard_name":"ocean_sigma_coordinate", "stored_direction":"decreasing", "tolerance":"", "type":"", "units":"", - "valid_max":"20.0", + "valid_max":"0.0", "valid_min":"-1.0", "value":"", - "z_bounds_factors":"p0: p0 lev: lev_bnds", - "z_factors":"p0: p0 lev: lev" + "z_bounds_factors":"sigma: lev_bnds eta: eta depth: depth", + "z_factors":"sigma: lev eta: eta depth: depth" }, - "natural_log_pressure_half":{ + "ocean_sigma_half":{ "axis":"Z", "bounds_values":"", "climatology":"", - "formula":"p = p0 * exp(-lev)", - "generic_level_name":"alevhalf", - "long_name":"atmosphere natural log pressure coordinate", + "formula":"z(n,k,j,i) = eta(n,j,i) + sigma(k)*(depth(j,i)+eta(n,j,i))", + "generic_level_name":"olevhalf", + "long_name":"ocean sigma coordinate", "must_have_bounds":"no", "out_name":"lev", - "positive":"down", + "positive":"up", "requested":"", "requested_bounds":"", - "standard_name":"atmosphere_ln_pressure_coordinate", + "standard_name":"ocean_sigma_coordinate", "stored_direction":"decreasing", "tolerance":"", "type":"", "units":"", - "valid_max":"20.0", + "valid_max":"0.0", "valid_min":"-1.0", "value":"", - "z_bounds_factors":"p0: p0 lev: lev_bnds", - "z_factors":"p0: p0 lev: lev" + "z_bounds_factors":"", + "z_factors":"sigma: lev eta: eta depth: depth" }, - "ocean_double_sigma":{ + "ocean_sigma_z":{ "axis":"Z", "bounds_values":"", "climatology":"", - "formula":"for k <= k_c:\n z(k,j,i)= sigma(k)*f(j,i) \n for k > k_c:\n z(k,j,i)= f(j,i) + (sigma(k)-1)*(depth(j,i)-f(j,i)) \n f(j,i)= 0.5*(z1+ z2) + 0.5*(z1-z2)* tanh(2*a/(z1-z2)*(depth(j,i)-href))", + "formula":"for k <= nsigma: z(n,k,j,i) = eta(n,j,i) + sigma(k)*(min(depth_c,depth(j,i))+eta(n,j,i)) ; for k > nsigma: z(n,k,j,i) = zlev(k)", "generic_level_name":"olevel", - "long_name":"ocean double sigma coordinate", + "long_name":"ocean sigma over z coordinate", "must_have_bounds":"yes", "out_name":"lev", - "positive":"up", + "positive":"", "requested":"", "requested_bounds":"", - "standard_name":"ocean_double_sigma", + "standard_name":"ocean_sigma_z_coordinate", "stored_direction":"", "tolerance":"", "type":"", @@ -955,63 +955,17 @@ "valid_max":"", "valid_min":"", "value":"", - "z_bounds_factors":"sigma: sigma_bnds depth: depth z1: z1 z2: z2 a: a href: href k_c: k_c", - "z_factors":"sigma: sigma depth: depth z1: z1 z2: z2 a: a_coeff href: href k_c: k_c" - }, - "ocean_s":{ - "axis":"Z", - "bounds_values":"", - "climatology":"", - "formula":"z(n,k,j,i) = eta(n,j,i)*(1+s(k)) + depth_c*s(k) + (depth(j,i)-depth_c)*C(k) \n where \n C(k)=(1-b)*sinh(a*s(k))/sinh(a) +\n b*(tanh(a*(s(k)+0.5))/(2*tanh(0.5*a)) - 0.5)", - "generic_level_name":"olevel", - "long_name":"ocean s-coordinate", - "must_have_bounds":"yes", - "out_name":"lev", - "positive":"up", - "requested":"", - "requested_bounds":"", - "standard_name":"ocean_s_coordinate", - "stored_direction":"decreasing", - "tolerance":"", - "type":"", - "units":"", - "valid_max":"0.0", - "valid_min":"-1.0", - "value":"", - "z_bounds_factors":"s: lev_bnds eta: eta depth: depth a: a b: b depth_c: depth_c", - "z_factors":"s: lev eta: eta depth: depth a: a_coeff b: b_coeff depth_c: depth_c" - }, - "ocean_sigma":{ - "axis":"Z", - "bounds_values":"", - "climatology":"", - "formula":"z(n,k,j,i) = eta(n,j,i) + sigma(k)*(depth(j,i)+eta(n,j,i))", - "generic_level_name":"olevel", - "long_name":"ocean sigma coordinate", - "must_have_bounds":"yes", - "out_name":"lev", - "positive":"up", - "requested":"", - "requested_bounds":"", - "standard_name":"ocean_sigma_coordinate", - "stored_direction":"decreasing", - "tolerance":"", - "type":"", - "units":"", - "valid_max":"0.0", - "valid_min":"-1.0", - "value":"", - "z_bounds_factors":"sigma: lev_bnds eta: eta depth: depth", - "z_factors":"sigma: lev eta: eta depth: depth" + "z_bounds_factors":"sigma: lev_bnds eta: eta depth: depth depth_c: depth_c nsigma: nsigma zlev: zlev_bnds", + "z_factors":"sigma: lev eta: eta depth: depth depth_c: depth_c nsigma: nsigma zlev: zlev" }, - "ocean_sigma_z":{ + "ocean_sigma_z_half":{ "axis":"Z", "bounds_values":"", "climatology":"", "formula":"for k <= nsigma: z(n,k,j,i) = eta(n,j,i) + sigma(k)*(min(depth_c,depth(j,i))+eta(n,j,i)) ; for k > nsigma: z(n,k,j,i) = zlev(k)", - "generic_level_name":"olevel", + "generic_level_name":"olevhalf", "long_name":"ocean sigma over z coordinate", - "must_have_bounds":"yes", + "must_have_bounds":"no", "out_name":"lev", "positive":"", "requested":"", @@ -1024,8 +978,8 @@ "valid_max":"", "valid_min":"", "value":"", - "z_bounds_factors":"sigma: sigma_bnds eta: eta depth: depth depth_c: depth_c nsigma: nsigma zlev: zlev_bnds", - "z_factors":"sigma: sigma eta: eta depth: depth depth_c: depth_c nsigma: nsigma zlev: zlev" + "z_bounds_factors":"", + "z_factors":"sigma: lev eta: eta depth: depth depth_c: depth_c nsigma: nsigma zlev: zlev" }, "olayer100m":{ "axis":"Z", @@ -2043,52 +1997,6 @@ "z_bounds_factors":"", "z_factors":"" }, - "smooth_level":{ - "axis":"Z", - "bounds_values":"", - "climatology":"", - "formula":"z = a*ztop + b1*zsurf1 + b2*zsurf2", - "generic_level_name":"alevel", - "long_name":"atmosphere smooth level vertical (SLEVE) coordinate", - "must_have_bounds":"yes", - "out_name":"lev", - "positive":"up", - "requested":"", - "requested_bounds":"", - "standard_name":"atmosphere_sleve_coordinate", - "stored_direction":"increasing", - "tolerance":"", - "type":"", - "units":"m", - "valid_max":"800000.0", - "valid_min":"-200.0", - "value":"", - "z_bounds_factors":"a: a_bnds b1: b1_bnds b2: b2_bnds ztop: ztop zsurf1: zsurf1 zsurf2: zsurf2", - "z_factors":"a: a b1: b1 b2: b2 ztop: ztop zsurf1: zsurf1 zsurf2: zsurf2" - }, - "smooth_level_half":{ - "axis":"Z", - "bounds_values":"", - "climatology":"", - "formula":"z = a*ztop + b1*zsurf1 + b2*zsurf2", - "generic_level_name":"alevhalf", - "long_name":"atmosphere smooth level vertical (SLEVE) coordinate", - "must_have_bounds":"no", - "out_name":"lev", - "positive":"up", - "requested":"", - "requested_bounds":"", - "standard_name":"atmosphere_sleve_coordinate", - "stored_direction":"increasing", - "tolerance":"", - "type":"", - "units":"m", - "valid_max":"800000.0", - "valid_min":"-200.0", - "value":"", - "z_bounds_factors":"a: a_bnds b1: b1_bnds b2: b2_bnds ztop: ztop zsurf1: zsurf1 zsurf2: zsurf2", - "z_factors":"a: a b1: b1 b2: b2 ztop: ztop zsurf1: zsurf1 zsurf2: zsurf2" - }, "snowband":{ "axis":"", "bounds_values":"", @@ -2201,7 +2109,7 @@ "valid_max":"1.0", "valid_min":"0.0", "value":"", - "z_bounds_factors":"p0: p0 a: a_bnds b: b_bnds ps: ps", + "z_bounds_factors":"", "z_factors":"p0: p0 a: a b: b ps: ps" }, "standard_sigma":{ @@ -2247,7 +2155,7 @@ "valid_max":"1.0", "valid_min":"0.0", "value":"", - "z_bounds_factors":"ptop: ptop sigma: lev_bnds ps: ps", + "z_bounds_factors":"", "z_factors":"ptop: ptop sigma: lev ps: ps" }, "stempzero":{ @@ -3298,7 +3206,7 @@ "formula":"", "generic_level_name":"", "long_name":"X-coordinate of Antarctic grid", - "must_have_bounds":"", + "must_have_bounds":"no", "out_name":"xant", "positive":"", "requested":"", @@ -3321,7 +3229,7 @@ "formula":"", "generic_level_name":"", "long_name":"X-coordinate of Greenland grid", - "must_have_bounds":"", + "must_have_bounds":"no", "out_name":"xgre", "positive":"", "requested":"", @@ -3344,7 +3252,7 @@ "formula":"", "generic_level_name":"", "long_name":"Y-coordinate of Antarctic grid", - "must_have_bounds":"", + "must_have_bounds":"no", "out_name":"yant", "positive":"", "requested":"", @@ -3367,7 +3275,7 @@ "formula":"", "generic_level_name":"", "long_name":"Y-coordinate of Greenland grid", - "must_have_bounds":"", + "must_have_bounds":"no", "out_name":"ygre", "positive":"", "requested":"", diff --git a/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_formula_terms.json b/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_formula_terms.json index 2c4018a..95052ac 100644 --- a/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_formula_terms.json +++ b/demo/MRI-JMA-JRA55-do-1-4-0/Tables/input4MIPs_formula_terms.json @@ -2,8 +2,9 @@ "formula_entry":{ "a":{ "dimensions":"alevel", - "long_name":"vertical coordinate formula term: a(k)", + "long_name":"vertical coordinate formula term: a", "out_name":"a", + "standard_name":"", "type":"double", "units":"" }, @@ -11,6 +12,7 @@ "dimensions":"alevel", "long_name":"vertical coordinate formula term: a(k+1/2)", "out_name":"a_bnds", + "standard_name":"", "type":"double", "units":"" }, @@ -18,20 +20,15 @@ "dimensions":"alevhalf", "long_name":"vertical coordinate formula term: a(k)", "out_name":"a", - "type":"double", - "units":"" - }, - "a_half_bnds":{ - "dimensions":"alevhalf", - "long_name":"vertical coordinate formula term: a(k+1/2)", - "out_name":"a_bnds", + "standard_name":"", "type":"double", "units":"" }, "ap":{ "dimensions":"alevel", - "long_name":"vertical coordinate formula term: ap(k)", + "long_name":"vertical coordinate formula term: ap", "out_name":"ap", + "standard_name":"", "type":"double", "units":"Pa" }, @@ -39,6 +36,7 @@ "dimensions":"alevel", "long_name":"vertical coordinate formula term: ap(k+1/2)", "out_name":"ap_bnds", + "standard_name":"", "type":"double", "units":"Pa" }, @@ -46,48 +44,15 @@ "dimensions":"alevhalf", "long_name":"vertical coordinate formula term: ap(k)", "out_name":"ap", - "type":"double", - "units":"Pa" - }, - "ap_half_bnds":{ - "dimensions":"alevel", - "long_name":"vertical coordinate formula term: ap(k+1/2)", - "out_name":"ap_bnds", + "standard_name":"", "type":"double", "units":"Pa" }, "b":{ "dimensions":"alevel", - "long_name":"vertical coordinate formula term: b(k)", + "long_name":"vertical coordinate formula term: b", "out_name":"b", - "type":"double", - "units":"" - }, - "b1":{ - "dimensions":"alevel", - "long_name":"vertical coordinate formula term: b1(k)", - "out_name":"b1", - "type":"double", - "units":"" - }, - "b1_half":{ - "dimensions":"alevhalf", - "long_name":"vertical coordinate formula term: b1(k)", - "out_name":"b1", - "type":"double", - "units":"" - }, - "b2":{ - "dimensions":"alevel", - "long_name":"vertical coordinate formula term: b2(k)", - "out_name":"b2", - "type":"double", - "units":"" - }, - "b2_half":{ - "dimensions":"alevhalf", - "long_name":"vertical coordinate formula term: b2(k)", - "out_name":"b2", + "standard_name":"", "type":"double", "units":"" }, @@ -95,6 +60,7 @@ "dimensions":"alevel", "long_name":"vertical coordinate formula term: b(k+1/2)", "out_name":"b_bnds", + "standard_name":"", "type":"double", "units":"" }, @@ -102,20 +68,15 @@ "dimensions":"alevhalf", "long_name":"vertical coordinate formula term: b(k)", "out_name":"b", - "type":"double", - "units":"" - }, - "b_half_bnds":{ - "dimensions":"alevhalf", - "long_name":"vertical coordinate formula term: b(k+1/2)", - "out_name":"b_bnds", + "standard_name":"", "type":"double", "units":"" }, "depth":{ "dimensions":"longitude latitude", - "long_name":"Sea Floor Depth: formula term: thetao", + "long_name":"Sea Floor Depth", "out_name":"depth", + "standard_name":"", "type":"real", "units":"m" }, @@ -123,34 +84,31 @@ "dimensions":"", "long_name":"vertical coordinate formula term: depth_c", "out_name":"depth_c", + "standard_name":"", "type":"double", - "units":"" + "units":"m" }, "eta":{ "dimensions":"longitude latitude time", - "long_name":"Sea Surface Height formula term: thetao", + "long_name":"Sea Surface Height", "out_name":"eta", + "standard_name":"", "type":"real", "units":"m" }, "eta2":{ "dimensions":"longitude latitude time2", - "long_name":"Sea Surface Height formula term: thetao", + "long_name":"Sea Surface Height", "out_name":"eta", + "standard_name":"", "type":"real", "units":"m" }, - "href":{ - "dimensions":"", - "long_name":"vertical coordinate formula term: href", - "out_name":"href", - "type":"double", - "units":"" - }, "k_c":{ "dimensions":"", "long_name":"vertical coordinate formula term: k_c", "out_name":"k_c", + "standard_name":"", "type":"integer", "units":"" }, @@ -158,6 +116,7 @@ "dimensions":"", "long_name":"vertical coordinate formula term: nsigma", "out_name":"nsigma", + "standard_name":"", "type":"integer", "units":"" }, @@ -165,6 +124,7 @@ "dimensions":"longitude latitude", "long_name":"Surface Altitude", "out_name":"orog", + "standard_name":"", "type":"real", "units":"m" }, @@ -172,6 +132,7 @@ "dimensions":"", "long_name":"vertical coordinate formula term: reference pressure", "out_name":"p0", + "standard_name":"reference_air_pressure_for_atmosphere_vertical_coordinate", "type":"double", "units":"Pa" }, @@ -179,20 +140,23 @@ "dimensions":"longitude latitude time", "long_name":"Surface Air Pressure", "out_name":"ps", + "standard_name":"air_pressure", "type":"real", "units":"Pa" }, "ps1":{ "dimensions":"longitude latitude time1", - "long_name":"vertical coordinate formula term: ps", + "long_name":"Surface Air Pressure", "out_name":"ps", + "standard_name":"air_pressure", "type":"real", "units":"Pa" }, "ps2":{ "dimensions":"longitude latitude time2", - "long_name":"vertical coordinate formula term: ps", + "long_name":"Surface Air Pressure", "out_name":"ps", + "standard_name":"air_pressure", "type":"real", "units":"Pa" }, @@ -200,55 +164,23 @@ "dimensions":"", "long_name":"pressure at top of model", "out_name":"ptop", + "standard_name":"air_pressure_at_top_of_atmosphere", "type":"double", "units":"Pa" }, - "sigma":{ - "dimensions":"olevel", - "long_name":"vertical coordinate formula term: sigma(k)", - "out_name":"sigma", - "type":"double", - "units":"" - }, - "sigma_bnds":{ - "dimensions":"olevel", - "long_name":"vertical coordinate formula term: sigma(k+1/2)", - "out_name":"sigma_bnds", - "type":"double", - "units":"" - }, - "z1":{ - "dimensions":"", - "long_name":"vertical coordinate formula term: z1", - "out_name":"z1", - "type":"double", - "units":"" - }, - "z2":{ - "dimensions":"", - "long_name":"vertical coordinate formula term: z2", - "out_name":"z2", - "type":"double", - "units":"" - }, "zlev":{ "dimensions":"olevel", "long_name":"vertical coordinate formula term: zlev(k)", "out_name":"zlev", + "standard_name":"", "type":"double", - "units":"" + "units":"m" }, "zlev_bnds":{ "dimensions":"olevel", "long_name":"vertical coordinate formula term: zlev(k+1/2)", "out_name":"zlev_bnds", - "type":"double", - "units":"" - }, - "ztop":{ - "dimensions":"", - "long_name":"height of top of model", - "out_name":"ztop", + "standard_name":"", "type":"double", "units":"m" } diff --git a/input4MIPs_source_id.json b/input4MIPs_source_id.json index 072e23e..524dd12 100644 --- a/input4MIPs_source_id.json +++ b/input4MIPs_source_id.json @@ -155,7 +155,7 @@ "title":"PCMDI-AMIP 1.1.5 dataset prepared for input4MIPs" }, "PCMDI-AMIP-1-2-0":{ - "comment":"Based on Hurrell SST/sea ice consistency criteria applied to merged HadISST (1870-01 to 1981-10) & NCEP-0I2 (1981-11 to 2018-12)", + "comment":"Based on Hurrell SST/sea ice consistency criteria applied to merged HadISST (1870-01 to 1981-10) & NCEP-0I2 (1981-11 to 2019-06)", "contact":"PCMDI (pcmdi-cmip@llnl.gov)", "dataset_category":"SSTsAndSeaIce", "further_info_url":"https://pcmdi.llnl.gov/mips/amip", @@ -169,7 +169,7 @@ "region":[ "global_ocean" ], - "release_year":"2019", + "release_year":"2020", "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", diff --git a/src/writeJson.py b/src/writeJson.py index 037eb01..db7b0e7 100755 --- a/src/writeJson.py +++ b/src/writeJson.py @@ -73,6 +73,7 @@ PJD 6 Mar 2019 - Updated homePath PJD 11 Jul 2019 - Register source_id PCMDI-AMIP-1-2-0 https://github.com/PCMDI/input4MIPs-cmor-tables/issues/87 PJD 11 Jul 2019 - Add MacOS path to durolib +PJD 20 Nov 2019 - Update registration of 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) @author: durack1 @@ -596,7 +597,7 @@ # Fix issues key = 'PCMDI-AMIP-1-2-0' source_id[key] = {} -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 2018-12)' +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 2019-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' @@ -614,7 +615,7 @@ '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'] = '2019' +source_id[key]['release_year'] = '2020' 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