diff --git a/Tables/input4MIPs_A3hr.json b/Tables/input4MIPs_A3hr.json index 1dd80f6..3086339 100644 --- a/Tables/input4MIPs_A3hr.json +++ b/Tables/input4MIPs_A3hr.json @@ -3,14 +3,14 @@ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"0.125000", "cmor_version":"3.5", - "data_specs_version":"01.00.31", + "data_specs_version":"01.00.32", "generic_levels":"", "int_missing_value":"-999", "mip_era":"CMIP6", "missing_value":"1e20", "product":"input4MIPs", "realm":"atmos", - "table_date":"20 November 2019", + "table_date":"17 July 2020", "table_id":"Table input4MIPs_A3hr" }, "variable_entry":{ diff --git a/Tables/input4MIPs_A3hrPt.json b/Tables/input4MIPs_A3hrPt.json index dcd38ff..63a17e5 100644 --- a/Tables/input4MIPs_A3hrPt.json +++ b/Tables/input4MIPs_A3hrPt.json @@ -3,14 +3,14 @@ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"0.125000", "cmor_version":"3.5", - "data_specs_version":"01.00.31", + "data_specs_version":"01.00.32", "generic_levels":"", "int_missing_value":"-999", "mip_era":"CMIP6", "missing_value":"1e20", "product":"input4MIPs", "realm":"atmos", - "table_date":"20 November 2019", + "table_date":"17 July 2020", "table_id":"Table input4MIPs_A3hrPt" }, "variable_entry":{ diff --git a/Tables/input4MIPs_Afx.json b/Tables/input4MIPs_Afx.json index 5afc7a9..f9ec474 100644 --- a/Tables/input4MIPs_Afx.json +++ b/Tables/input4MIPs_Afx.json @@ -3,14 +3,14 @@ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"0.00000", "cmor_version":"3.5", - "data_specs_version":"01.00.31", + "data_specs_version":"01.00.32", "generic_levels":"alevel", "int_missing_value":"-999", "mip_era":"CMIP6", "missing_value":"1e20", "product":"input4MIPs", "realm":"atmos land", - "table_date":"20 November 2019", + "table_date":"17 July 2020", "table_id":"Table input4MIPs_Afx" }, "variable_entry":{ @@ -38,7 +38,7 @@ "comment":"Please express 'X_area_fraction' as the percentage of horizontal area occupied by X", "dimensions":"longitude latitude", "frequency":"fx", - "long_name":"Percentage of the grid cell occupied by land (including lakes)", + "long_name":"Percentage of the Grid Cell Occupied by Land (Including Lakes)", "modeling_realm":"atmos", "ok_max_mean_abs":"", "ok_min_mean_abs":"", diff --git a/Tables/input4MIPs_LIday.json b/Tables/input4MIPs_LIday.json index 2d93e46..80b495d 100644 --- a/Tables/input4MIPs_LIday.json +++ b/Tables/input4MIPs_LIday.json @@ -3,14 +3,14 @@ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"30.00000", "cmor_version":"3.5", - "data_specs_version":"01.00.31", + "data_specs_version":"01.00.32", "generic_levels":"olevel olevhalf", "int_missing_value":"-999", "mip_era":"CMIP6", "missing_value":"1e20", "product":"input4MIPs", "realm":"landIce", - "table_date":"20 November 2019", + "table_date":"17 July 2020", "table_id":"Table input4MIPs_LIday" }, "variable_entry":{ diff --git a/Tables/input4MIPs_LIfx.json b/Tables/input4MIPs_LIfx.json index a80667b..7391a38 100644 --- a/Tables/input4MIPs_LIfx.json +++ b/Tables/input4MIPs_LIfx.json @@ -3,14 +3,14 @@ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"", "cmor_version":"3.5", - "data_specs_version":"01.00.31", + "data_specs_version":"01.00.32", "generic_levels":"", "int_missing_value":"-999", "mip_era":"CMIP6", "missing_value":"1e20", "product":"input4MIPs", "realm":"landIce", - "table_date":"20 November 2019", + "table_date":"17 July 2020", "table_id":"Table input4MIPs_LIfx" }, "variable_entry":{ diff --git a/Tables/input4MIPs_LIyrC.json b/Tables/input4MIPs_LIyrC.json index ba3d167..a6ac1c5 100644 --- a/Tables/input4MIPs_LIyrC.json +++ b/Tables/input4MIPs_LIyrC.json @@ -3,14 +3,14 @@ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"30.00000", "cmor_version":"3.5", - "data_specs_version":"01.00.31", + "data_specs_version":"01.00.32", "generic_levels":"olevel olevhalf", "int_missing_value":"-999", "mip_era":"CMIP6", "missing_value":"1e20", "product":"input4MIPs", "realm":"landIce", - "table_date":"20 November 2019", + "table_date":"17 July 2020", "table_id":"Table input4MIPs_LIyrC" }, "variable_entry":{ diff --git a/Tables/input4MIPs_Lday.json b/Tables/input4MIPs_Lday.json index 1bc96ce..f5e4565 100644 --- a/Tables/input4MIPs_Lday.json +++ b/Tables/input4MIPs_Lday.json @@ -3,14 +3,14 @@ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"30.00000", "cmor_version":"3.5", - "data_specs_version":"01.00.31", + "data_specs_version":"01.00.32", "generic_levels":"", "int_missing_value":"-999", "mip_era":"CMIP6", "missing_value":"1e20", "product":"input4MIPs", "realm":"land", - "table_date":"20 November 2019", + "table_date":"17 July 2020", "table_id":"Table input4MIPs_Lday" }, "variable_entry":{ diff --git a/Tables/input4MIPs_Oday.json b/Tables/input4MIPs_Oday.json index ce7ca9b..56d8c86 100644 --- a/Tables/input4MIPs_Oday.json +++ b/Tables/input4MIPs_Oday.json @@ -3,14 +3,14 @@ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"30.00000", "cmor_version":"3.5", - "data_specs_version":"01.00.31", + "data_specs_version":"01.00.32", "generic_levels":"olevel olevhalf", "int_missing_value":"-999", "mip_era":"CMIP6", "missing_value":"1e20", "product":"input4MIPs", "realm":"ocean", - "table_date":"20 November 2019", + "table_date":"17 July 2020", "table_id":"Table input4MIPs_Oday" }, "variable_entry":{ diff --git a/Tables/input4MIPs_Ofx.json b/Tables/input4MIPs_Ofx.json index 473ba35..08e35d1 100644 --- a/Tables/input4MIPs_Ofx.json +++ b/Tables/input4MIPs_Ofx.json @@ -3,14 +3,14 @@ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"0.00000", "cmor_version":"3.5", - "data_specs_version":"01.00.31", + "data_specs_version":"01.00.32", "generic_levels":"olevel", "int_missing_value":"-999", "mip_era":"CMIP6", "missing_value":"1e20", "product":"input4MIPs", "realm":"ocean", - "table_date":"20 November 2019", + "table_date":"17 July 2020", "table_id":"Table input4MIPs_Ofx" }, "variable_entry":{ diff --git a/Tables/input4MIPs_Omon.json b/Tables/input4MIPs_Omon.json index 147ca91..9b3f9a8 100644 --- a/Tables/input4MIPs_Omon.json +++ b/Tables/input4MIPs_Omon.json @@ -3,14 +3,14 @@ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"30.00000", "cmor_version":"3.5", - "data_specs_version":"01.00.31", + "data_specs_version":"01.00.32", "generic_levels":"olevel olevhalf", "int_missing_value":"-999", "mip_era":"CMIP6", "missing_value":"1e20", "product":"input4MIPs", "realm":"ocean", - "table_date":"20 November 2019", + "table_date":"17 July 2020", "table_id":"Table input4MIPs_Omon" }, "variable_entry":{ diff --git a/Tables/input4MIPs_OmonC.json b/Tables/input4MIPs_OmonC.json index 4c39887..f1d80f7 100644 --- a/Tables/input4MIPs_OmonC.json +++ b/Tables/input4MIPs_OmonC.json @@ -3,14 +3,14 @@ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"30.00000", "cmor_version":"3.5", - "data_specs_version":"01.00.31", + "data_specs_version":"01.00.32", "generic_levels":"olevel olevhalf", "int_missing_value":"-999", "mip_era":"CMIP6", "missing_value":"1e20", "product":"input4MIPs", "realm":"ocean", - "table_date":"20 November 2019", + "table_date":"17 July 2020", "table_id":"Table input4MIPs_OmonC" }, "variable_entry":{ diff --git a/Tables/input4MIPs_OyrC.json b/Tables/input4MIPs_OyrC.json index 22de977..dc9f2ef 100644 --- a/Tables/input4MIPs_OyrC.json +++ b/Tables/input4MIPs_OyrC.json @@ -3,14 +3,14 @@ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"30.00000", "cmor_version":"3.5", - "data_specs_version":"01.00.31", + "data_specs_version":"01.00.32", "generic_levels":"olevel olevhalf", "int_missing_value":"-999", "mip_era":"CMIP6", "missing_value":"1e20", "product":"input4MIPs", "realm":"ocean", - "table_date":"20 November 2019", + "table_date":"17 July 2020", "table_id":"Table input4MIPs_OyrC" }, "variable_entry":{ diff --git a/Tables/input4MIPs_SI3hrPt.json b/Tables/input4MIPs_SI3hrPt.json index a894c81..bc747a1 100644 --- a/Tables/input4MIPs_SI3hrPt.json +++ b/Tables/input4MIPs_SI3hrPt.json @@ -3,14 +3,14 @@ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"0.125000", "cmor_version":"3.5", - "data_specs_version":"01.00.31", + "data_specs_version":"01.00.32", "generic_levels":"", "int_missing_value":"-999", "mip_era":"CMIP6", "missing_value":"1e20", "product":"input4MIPs", "realm":"seaIce", - "table_date":"20 November 2019", + "table_date":"17 July 2020", "table_id":"Table input4MIPs_SI3hrPt" }, "variable_entry":{ diff --git a/Tables/input4MIPs_SIday.json b/Tables/input4MIPs_SIday.json index f6766b9..1d33407 100644 --- a/Tables/input4MIPs_SIday.json +++ b/Tables/input4MIPs_SIday.json @@ -3,14 +3,14 @@ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"1.00000", "cmor_version":"3.5", - "data_specs_version":"01.00.31", + "data_specs_version":"01.00.32", "generic_levels":"", "int_missing_value":"-999", "mip_era":"CMIP6", "missing_value":"1e20", "product":"input4MIPs", "realm":"seaIce", - "table_date":"20 November 2019", + "table_date":"17 July 2020", "table_id":"Table input4MIPs_SIday" }, "variable_entry":{ diff --git a/Tables/input4MIPs_SImon.json b/Tables/input4MIPs_SImon.json index 89d278c..5c9bea7 100644 --- a/Tables/input4MIPs_SImon.json +++ b/Tables/input4MIPs_SImon.json @@ -3,14 +3,14 @@ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"30.00000", "cmor_version":"3.5", - "data_specs_version":"01.00.31", + "data_specs_version":"01.00.32", "generic_levels":"", "int_missing_value":"-999", "mip_era":"CMIP6", "missing_value":"1e20", "product":"input4MIPs", "realm":"seaIce", - "table_date":"20 November 2019", + "table_date":"17 July 2020", "table_id":"Table input4MIPs_SImon" }, "variable_entry":{ diff --git a/Tables/input4MIPs_coordinate.json b/Tables/input4MIPs_coordinate.json index 8e33bb3..6e36dda 100644 --- a/Tables/input4MIPs_coordinate.json +++ b/Tables/input4MIPs_coordinate.json @@ -554,7 +554,7 @@ "60.0", "90.0" ], - "standard_name":"effective_radius_of_convective_cloud_ice_particle", + "standard_name":"effective_radius_of_convective_cloud_ice_particles", "stored_direction":"", "tolerance":"", "type":"double", @@ -597,7 +597,7 @@ "20.0", "30.0" ], - "standard_name":"effective_radius_of_cloud_liquid_water_particle", + "standard_name":"effective_radius_of_cloud_liquid_water_particles", "stored_direction":"", "tolerance":"", "type":"double", @@ -843,29 +843,6 @@ "z_bounds_factors":"", "z_factors":"" }, - "location":{ - "axis":"", - "bounds_values":"", - "climatology":"", - "formula":"", - "generic_level_name":"", - "long_name":"location index", - "must_have_bounds":"no", - "out_name":"loc", - "positive":"", - "requested":"", - "requested_bounds":"", - "standard_name":"", - "stored_direction":"increasing", - "tolerance":"", - "type":"integer", - "units":"", - "valid_max":"", - "valid_min":"", - "value":"", - "z_bounds_factors":"", - "z_factors":"" - }, "longitude":{ "axis":"X", "bounds_values":"", @@ -1583,52 +1560,6 @@ "z_bounds_factors":"", "z_factors":"" }, - "plev7":{ - "axis":"Z", - "bounds_values":"", - "climatology":"", - "formula":"", - "generic_level_name":"", - "long_name":"pressure", - "must_have_bounds":"yes", - "out_name":"plev", - "positive":"down", - "requested":[ - "90000.", - "74000.", - "62000.", - "50000.", - "37500.", - "24500.", - "9000." - ], - "requested_bounds":[ - "100000.", - "80000.", - "80000.", - "68000.", - "68000.", - "56000.", - "56000.", - "44000.", - "44000.", - "31000.", - "31000.", - "18000.", - "18000.", - " 0." - ], - "standard_name":"air_pressure", - "stored_direction":"decreasing", - "tolerance":"0.001", - "type":"double", - "units":"Pa", - "valid_max":"", - "valid_min":"", - "value":"", - "z_bounds_factors":"", - "z_factors":"" - }, "plev7c":{ "axis":"Z", "bounds_values":"", @@ -1820,7 +1751,7 @@ "80.0", "100000.0" ], - "standard_name":"backscattering_ratio", + "standard_name":"backscattering_ratio_in_air", "stored_direction":"increasing", "tolerance":"", "type":"double", diff --git a/Tables/input4MIPs_formula_terms.json b/Tables/input4MIPs_formula_terms.json index 95052ac..7693529 100644 --- a/Tables/input4MIPs_formula_terms.json +++ b/Tables/input4MIPs_formula_terms.json @@ -128,6 +128,14 @@ "type":"real", "units":"m" }, + "orog2d":{ + "dimensions":"latitude", + "long_name":"Surface Altitude", + "out_name":"orog", + "standard_name":"", + "type":"real", + "units":"m" + }, "p0":{ "dimensions":"", "long_name":"vertical coordinate formula term: reference pressure", @@ -160,6 +168,14 @@ "type":"real", "units":"Pa" }, + "ps2d":{ + "dimensions":"latitude time1", + "long_name":"Surface Air Pressure", + "out_name":"ps", + "standard_name":"air_pressure", + "type":"real", + "units":"Pa" + }, "ptop":{ "dimensions":"", "long_name":"pressure at top of model", diff --git a/Tables/input4MIPs_grids.json b/Tables/input4MIPs_grids.json index 5e3cbed..10c8d1d 100644 --- a/Tables/input4MIPs_grids.json +++ b/Tables/input4MIPs_grids.json @@ -2,10 +2,10 @@ "Header":{ "Conventions":"CF-1.7 CMIP-6.2", "cmor_version":"3.5", - "data_specs_version":"01.00.31", + "data_specs_version":"01.00.32", "missing_value":"1e20", "product":"input4MIPs", - "table_date":"20 November 2019", + "table_date":"17 July 2020", "table_id":"Table input4MIPs_grids" }, "axis_entry":{ @@ -27,7 +27,7 @@ }, "i_index":{ "axis":"", - "long_name":"cell index along first dimension", + "long_name":"first spatial index for variables stored on an unstructured grid", "out_name":"i", "standard_name":"", "type":"integer", @@ -35,7 +35,7 @@ }, "j_index":{ "axis":"", - "long_name":"cell index along second dimension", + "long_name":"second spatial index for variables stored on an unstructured grid", "out_name":"j", "standard_name":"", "type":"integer", @@ -43,7 +43,7 @@ }, "k_index":{ "axis":"", - "long_name":"cell index along third dimension", + "long_name":"third spatial index for variables stored on an unstructured grid", "out_name":"k", "standard_name":"", "type":"integer", @@ -51,7 +51,7 @@ }, "l_index":{ "axis":"", - "long_name":"cell index along fourth dimension", + "long_name":"fourth spatial index for variables stored on an unstructured grid", "out_name":"l", "standard_name":"", "type":"integer", @@ -59,7 +59,7 @@ }, "m_index":{ "axis":"", - "long_name":"cell index along fifth dimension", + "long_name":"fifth spatial index for variables stored on an unstructured grid", "out_name":"m", "standard_name":"", "type":"integer", 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 1dd80f6..3086339 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 @@ -3,14 +3,14 @@ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"0.125000", "cmor_version":"3.5", - "data_specs_version":"01.00.31", + "data_specs_version":"01.00.32", "generic_levels":"", "int_missing_value":"-999", "mip_era":"CMIP6", "missing_value":"1e20", "product":"input4MIPs", "realm":"atmos", - "table_date":"20 November 2019", + "table_date":"17 July 2020", "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 dcd38ff..63a17e5 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 @@ -3,14 +3,14 @@ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"0.125000", "cmor_version":"3.5", - "data_specs_version":"01.00.31", + "data_specs_version":"01.00.32", "generic_levels":"", "int_missing_value":"-999", "mip_era":"CMIP6", "missing_value":"1e20", "product":"input4MIPs", "realm":"atmos", - "table_date":"20 November 2019", + "table_date":"17 July 2020", "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 5afc7a9..f9ec474 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 @@ -3,14 +3,14 @@ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"0.00000", "cmor_version":"3.5", - "data_specs_version":"01.00.31", + "data_specs_version":"01.00.32", "generic_levels":"alevel", "int_missing_value":"-999", "mip_era":"CMIP6", "missing_value":"1e20", "product":"input4MIPs", "realm":"atmos land", - "table_date":"20 November 2019", + "table_date":"17 July 2020", "table_id":"Table input4MIPs_Afx" }, "variable_entry":{ @@ -38,7 +38,7 @@ "comment":"Please express 'X_area_fraction' as the percentage of horizontal area occupied by X", "dimensions":"longitude latitude", "frequency":"fx", - "long_name":"Percentage of the grid cell occupied by land (including lakes)", + "long_name":"Percentage of the Grid Cell Occupied by Land (Including Lakes)", "modeling_realm":"atmos", "ok_max_mean_abs":"", "ok_min_mean_abs":"", 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 2d93e46..80b495d 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 @@ -3,14 +3,14 @@ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"30.00000", "cmor_version":"3.5", - "data_specs_version":"01.00.31", + "data_specs_version":"01.00.32", "generic_levels":"olevel olevhalf", "int_missing_value":"-999", "mip_era":"CMIP6", "missing_value":"1e20", "product":"input4MIPs", "realm":"landIce", - "table_date":"20 November 2019", + "table_date":"17 July 2020", "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 ba3d167..a6ac1c5 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 @@ -3,14 +3,14 @@ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"30.00000", "cmor_version":"3.5", - "data_specs_version":"01.00.31", + "data_specs_version":"01.00.32", "generic_levels":"olevel olevhalf", "int_missing_value":"-999", "mip_era":"CMIP6", "missing_value":"1e20", "product":"input4MIPs", "realm":"landIce", - "table_date":"20 November 2019", + "table_date":"17 July 2020", "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 1bc96ce..f5e4565 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 @@ -3,14 +3,14 @@ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"30.00000", "cmor_version":"3.5", - "data_specs_version":"01.00.31", + "data_specs_version":"01.00.32", "generic_levels":"", "int_missing_value":"-999", "mip_era":"CMIP6", "missing_value":"1e20", "product":"input4MIPs", "realm":"land", - "table_date":"20 November 2019", + "table_date":"17 July 2020", "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 ce7ca9b..56d8c86 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 @@ -3,14 +3,14 @@ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"30.00000", "cmor_version":"3.5", - "data_specs_version":"01.00.31", + "data_specs_version":"01.00.32", "generic_levels":"olevel olevhalf", "int_missing_value":"-999", "mip_era":"CMIP6", "missing_value":"1e20", "product":"input4MIPs", "realm":"ocean", - "table_date":"20 November 2019", + "table_date":"17 July 2020", "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 4c39887..f1d80f7 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 @@ -3,14 +3,14 @@ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"30.00000", "cmor_version":"3.5", - "data_specs_version":"01.00.31", + "data_specs_version":"01.00.32", "generic_levels":"olevel olevhalf", "int_missing_value":"-999", "mip_era":"CMIP6", "missing_value":"1e20", "product":"input4MIPs", "realm":"ocean", - "table_date":"20 November 2019", + "table_date":"17 July 2020", "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 22de977..dc9f2ef 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 @@ -3,14 +3,14 @@ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"30.00000", "cmor_version":"3.5", - "data_specs_version":"01.00.31", + "data_specs_version":"01.00.32", "generic_levels":"olevel olevhalf", "int_missing_value":"-999", "mip_era":"CMIP6", "missing_value":"1e20", "product":"input4MIPs", "realm":"ocean", - "table_date":"20 November 2019", + "table_date":"17 July 2020", "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 a894c81..bc747a1 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 @@ -3,14 +3,14 @@ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"0.125000", "cmor_version":"3.5", - "data_specs_version":"01.00.31", + "data_specs_version":"01.00.32", "generic_levels":"", "int_missing_value":"-999", "mip_era":"CMIP6", "missing_value":"1e20", "product":"input4MIPs", "realm":"seaIce", - "table_date":"20 November 2019", + "table_date":"17 July 2020", "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 f6766b9..1d33407 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 @@ -3,14 +3,14 @@ "Conventions":"CF-1.7 CMIP-6.2", "approx_interval":"1.00000", "cmor_version":"3.5", - "data_specs_version":"01.00.31", + "data_specs_version":"01.00.32", "generic_levels":"", "int_missing_value":"-999", "mip_era":"CMIP6", "missing_value":"1e20", "product":"input4MIPs", "realm":"seaIce", - "table_date":"20 November 2019", + "table_date":"17 July 2020", "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 8e33bb3..6e36dda 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 @@ -554,7 +554,7 @@ "60.0", "90.0" ], - "standard_name":"effective_radius_of_convective_cloud_ice_particle", + "standard_name":"effective_radius_of_convective_cloud_ice_particles", "stored_direction":"", "tolerance":"", "type":"double", @@ -597,7 +597,7 @@ "20.0", "30.0" ], - "standard_name":"effective_radius_of_cloud_liquid_water_particle", + "standard_name":"effective_radius_of_cloud_liquid_water_particles", "stored_direction":"", "tolerance":"", "type":"double", @@ -843,29 +843,6 @@ "z_bounds_factors":"", "z_factors":"" }, - "location":{ - "axis":"", - "bounds_values":"", - "climatology":"", - "formula":"", - "generic_level_name":"", - "long_name":"location index", - "must_have_bounds":"no", - "out_name":"loc", - "positive":"", - "requested":"", - "requested_bounds":"", - "standard_name":"", - "stored_direction":"increasing", - "tolerance":"", - "type":"integer", - "units":"", - "valid_max":"", - "valid_min":"", - "value":"", - "z_bounds_factors":"", - "z_factors":"" - }, "longitude":{ "axis":"X", "bounds_values":"", @@ -1583,52 +1560,6 @@ "z_bounds_factors":"", "z_factors":"" }, - "plev7":{ - "axis":"Z", - "bounds_values":"", - "climatology":"", - "formula":"", - "generic_level_name":"", - "long_name":"pressure", - "must_have_bounds":"yes", - "out_name":"plev", - "positive":"down", - "requested":[ - "90000.", - "74000.", - "62000.", - "50000.", - "37500.", - "24500.", - "9000." - ], - "requested_bounds":[ - "100000.", - "80000.", - "80000.", - "68000.", - "68000.", - "56000.", - "56000.", - "44000.", - "44000.", - "31000.", - "31000.", - "18000.", - "18000.", - " 0." - ], - "standard_name":"air_pressure", - "stored_direction":"decreasing", - "tolerance":"0.001", - "type":"double", - "units":"Pa", - "valid_max":"", - "valid_min":"", - "value":"", - "z_bounds_factors":"", - "z_factors":"" - }, "plev7c":{ "axis":"Z", "bounds_values":"", @@ -1820,7 +1751,7 @@ "80.0", "100000.0" ], - "standard_name":"backscattering_ratio", + "standard_name":"backscattering_ratio_in_air", "stored_direction":"increasing", "tolerance":"", "type":"double", 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 95052ac..7693529 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 @@ -128,6 +128,14 @@ "type":"real", "units":"m" }, + "orog2d":{ + "dimensions":"latitude", + "long_name":"Surface Altitude", + "out_name":"orog", + "standard_name":"", + "type":"real", + "units":"m" + }, "p0":{ "dimensions":"", "long_name":"vertical coordinate formula term: reference pressure", @@ -160,6 +168,14 @@ "type":"real", "units":"Pa" }, + "ps2d":{ + "dimensions":"latitude time1", + "long_name":"Surface Air Pressure", + "out_name":"ps", + "standard_name":"air_pressure", + "type":"real", + "units":"Pa" + }, "ptop":{ "dimensions":"", "long_name":"pressure at top of model", diff --git a/src/writeJson.py b/src/writeJson.py index ab0a151..79ef31a 100755 --- a/src/writeJson.py +++ b/src/writeJson.py @@ -77,6 +77,9 @@ PJD 20 Nov 2019 - Update institution_id to maintain cross-CV formatting https://github.com/PCMDI/input4MIPs-cmor-tables/issues/93 PJD 20 Nov 2019 - Register source_id PCMDI-AMIP-1-1-6 https://github.com/PCMDI/input4MIPs-cmor-tables/issues/94 PJD 20 Nov 2019 - Revise institution_id UCI https://github.com/PCMDI/input4MIPs-cmor-tables/issues/95 +PJD 17 Jul 2020 - Update upstreams +PJD 17 Jul 2020 - Register institution_id NASA-GSFC https://github.com/PCMDI/input4MIPs-cmor-tables/issues/101 + - TODO: Register multiple ISMIP6 source_id entries https://github.com/PCMDI/input4MIPs-cmor-tables/issues/103 - TODO: Deal with lab cert issue https://raw.githubusercontent.com -> http://rawgit.com (see requests library) @author: durack1 @@ -512,6 +515,7 @@ institution_id['MPI-B'] = 'Max Planck Institute for Biogeochemistry, Jena 07745, Germany' institution_id['MPI-M'] = 'Max Planck Institute for Meteorology, Hamburg 20146, Germany' institution_id['MRI'] = 'Meteorological Research Institute, Tsukuba, Ibaraki 305-0052, Japan' +#institution_id['NASA-GSFC'] = 'NASA Goddard Space Flight Center, Greenbelt, MD 20771, USA'] institution_id['NCAR'] = 'National Center for Atmospheric Research, Boulder, CO 80307, USA' institution_id['NCAS'] = 'National Centre for Atmospheric Science, University of Reading, Reading RG6 6BB, UK' institution_id['PCMDI'] = 'Program for Climate Model Diagnosis and Intercomparison, Lawrence Livermore National Laboratory, Livermore, CA 94550, USA'