From e67f5b946483a7b28a31320a3f8206edc7961dc2 Mon Sep 17 00:00:00 2001 From: Manuel Schlund <32543114+schlunma@users.noreply.github.com> Date: Thu, 9 Jul 2020 12:27:54 +0200 Subject: [PATCH 1/2] Fixed bug in time weights calculation (#695) * Fixed calculation of time weights * Fixed failing FLAKE8 test * Added more test for time weighting and fixed cube dimensions in test --- esmvalcore/preprocessor/_time.py | 9 +- tests/unit/preprocessor/_time/test_time.py | 167 ++++++++++++++------- 2 files changed, 118 insertions(+), 58 deletions(-) diff --git a/esmvalcore/preprocessor/_time.py b/esmvalcore/preprocessor/_time.py index c9cdfd98d3..888266c578 100644 --- a/esmvalcore/preprocessor/_time.py +++ b/esmvalcore/preprocessor/_time.py @@ -172,8 +172,13 @@ def get_time_weights(cube): Array of time weights for averaging. """ time = cube.coord('time') - time_thickness = time.bounds[..., 1] - time.bounds[..., 0] - time_weights = time_thickness * da.ones_like(cube.data) + time_weights = time.bounds[..., 1] - time.bounds[..., 0] + time_weights = time_weights.squeeze() + if time_weights.shape == (): + time_weights = da.broadcast_to(time_weights, cube.shape) + else: + time_weights = iris.util.broadcast_to_shape(time_weights, cube.shape, + cube.coord_dims('time')) return time_weights diff --git a/tests/unit/preprocessor/_time/test_time.py b/tests/unit/preprocessor/_time/test_time.py index d0b7e89982..bffe806e9f 100644 --- a/tests/unit/preprocessor/_time/test_time.py +++ b/tests/unit/preprocessor/_time/test_time.py @@ -3,7 +3,6 @@ import copy import unittest -import dask.array as da import iris import iris.coord_categorisation import iris.coords @@ -985,10 +984,10 @@ def make_map_data(number_years=2): range(2), standard_name='longitude', ) - data = np.array([[[0], [1], ], [[1], [0], ]]) * times + data = np.array([[0, 1], [1, 0]]) * times[:, None, None] cube = iris.cube.Cube( data, - dim_coords_and_dims=[(lon, 0), (lat, 1), (time, 2)] + dim_coords_and_dims=[(time, 0), (lat, 1), (lon, 2)], ) return cube @@ -1017,13 +1016,13 @@ def test_standardized_anomalies(period, standardize=True): cube = make_map_data(number_years=2) result = anomalies(cube, period, standardize=standardize) if period == 'full': - expected_anomalies = (cube.data - np.mean(cube.data, axis=2, + expected_anomalies = (cube.data - np.mean(cube.data, axis=0, keepdims=True)) if standardize: # NB: default behaviour for np.std is ddof=0, whereas # default behaviour for iris.analysis.STD_DEV is ddof=1 expected_stdanomalies = expected_anomalies / np.std( - expected_anomalies, axis=2, keepdims=True, ddof=1) + expected_anomalies, axis=0, keepdims=True, ddof=1) expected = np.ma.masked_invalid(expected_stdanomalies) assert_array_equal( result.data, @@ -1099,83 +1098,139 @@ def test_anomalies(period, reference, standardize=False): np.arange(315.5, 405), np.arange(315.5, 345), )) - zeros = np.zeros_like(anom) - print(anom) - print(result.data[0, 1, ...]) - assert_array_equal( - result.data, - np.array([[zeros, anom], [anom, zeros]]) - ) + expected = anom[:, None, None] * [[0, 1], [1, 0]] + assert_array_equal(result.data, expected) assert_array_equal(result.coord('time').points, cube.coord('time').points) -def _make_cube(): - """Make a test cube.""" - coord_sys = iris.coord_systems.GeogCS(iris.fileformats.pp.EARTH_RADIUS) - data2 = np.ma.ones((2, 3, 2, 2)) - data3 = np.ma.ones((4, 3, 2, 2)) - mask3 = np.full((4, 3, 2, 2), False) - mask3[0, 0, 0, 0] = True - data3 = np.ma.array(data3, mask=mask3) +def get_0d_time(): + """Get 0D time coordinate.""" + time = iris.coords.AuxCoord(15.0, bounds=[0.0, 30.0], + standard_name='time', + units='days since 1850-01-01 00:00:00') + return time + - time = iris.coords.DimCoord([15, 45], +def get_1d_time(): + """Get 1D time coordinate.""" + time = iris.coords.DimCoord([20., 45.], standard_name='time', - bounds=[[1., 30.], [30., 60.]], + bounds=[[15., 30.], [30., 60.]], units=Unit( 'days since 1950-01-01', calendar='gregorian')) - zcoord = iris.coords.DimCoord([0.5, 5., 50.], + return time + + +def get_lon_coord(): + """Get longitude coordinate.""" + lons = iris.coords.DimCoord([1.5, 2.5, 3.5], + standard_name='longitude', + long_name='longitude', + bounds=[[1., 2.], [2., 3.], [3., 4.]], + units='degrees_east') + return lons + + +def _make_cube(): + """Make a test cube.""" + coord_sys = iris.coord_systems.GeogCS(iris.fileformats.pp.EARTH_RADIUS) + data2 = np.ma.ones((2, 1, 1, 3)) + + time = get_1d_time() + zcoord = iris.coords.DimCoord([0.5], standard_name='air_pressure', long_name='air_pressure', - bounds=[[0., 2.5], [2.5, 25.], - [25., 250.]], - units='m', + bounds=[[0., 2.5]], + units='Pa', attributes={'positive': 'down'}) - lons = iris.coords.DimCoord([1.5, 2.5], - standard_name='longitude', - long_name='longitude', - bounds=[[1., 2.], [2., 3.]], - units='degrees_east', - coord_system=coord_sys) - lats = iris.coords.DimCoord([1.5, 2.5], + lats = iris.coords.DimCoord([1.5], standard_name='latitude', long_name='latitude', - bounds=[[1., 2.], [2., 3.]], + bounds=[[1., 2.]], units='degrees_north', coord_system=coord_sys) + lons = get_lon_coord() coords_spec4 = [(time, 0), (zcoord, 1), (lats, 2), (lons, 3)] cube1 = iris.cube.Cube(data2, dim_coords_and_dims=coords_spec4) return cube1 def test_get_time_weights(): - """Test instance dask.array for get_time_weights.""" + """Test ``get_time_weights`` for complex cube.""" cube = _make_cube() weights = get_time_weights(cube) - assert isinstance(weights, da.core.Array) - assert_array_equal(weights.shape, (2, 3, 2, 2)) + assert weights.shape == cube.shape + np.testing.assert_allclose(weights, [[[[15.0, 15.0, 15.0]]], + [[[30.0, 30.0, 30.0]]]]) + + +def test_get_time_weights_0d_time(): + """Test ``get_time_weights`` for 0D time coordinate.""" + time = get_0d_time() + cube = iris.cube.Cube(0.0, var_name='x', units='K', + aux_coords_and_dims=[(time, ())]) + weights = get_time_weights(cube) + assert weights.shape == cube.shape + np.testing.assert_allclose(weights, 30.0) + + +def test_get_time_weights_0d_time_1d_lon(): + """Test ``get_time_weights`` for 0D time and 1D longitude coordinate.""" + time = get_0d_time() + lons = get_lon_coord() + cube = iris.cube.Cube([0.0, 0.0, 0.0], var_name='x', units='K', + aux_coords_and_dims=[(time, ())], + dim_coords_and_dims=[(lons, 0)]) + weights = get_time_weights(cube) + assert weights.shape == cube.shape + np.testing.assert_allclose(weights, [30.0, 30.0, 30.0]) + + +def test_get_time_weights_1d_time(): + """Test ``get_time_weights`` for 1D time coordinate.""" + time = get_1d_time() + cube = iris.cube.Cube([0.0, 1.0], var_name='x', units='K', + dim_coords_and_dims=[(time, 0)]) + weights = get_time_weights(cube) + assert weights.shape == cube.shape + np.testing.assert_allclose(weights, [15.0, 30.0]) -def test_time_weights(): - """Test time weights vs an old fixed implementation.""" +def test_get_time_weights_1d_time_1d_lon(): + """Test ``get_time_weights`` for 1D time and 1D longitude coordinate.""" + time = get_1d_time() + lons = get_lon_coord() + cube = iris.cube.Cube([[0.0, 0.0, 0.0], [1.0, 1.0, 1.0]], var_name='x', + units='K', + dim_coords_and_dims=[(time, 0), (lons, 1)]) + weights = get_time_weights(cube) + assert weights.shape == cube.shape + np.testing.assert_allclose(weights, [[15.0, 15.0, 15.0], + [30.0, 30.0, 30.0]]) + + +def test_climate_statistics_0d_time_1d_lon(): + """Test climate statistics.""" + time = iris.coords.DimCoord([1.0], bounds=[[0.0, 2.0]], var_name='time', + standard_name='time', + units='days since 1850-01-01 00:00:00') + lons = get_lon_coord() + cube = iris.cube.Cube([[1.0, -1.0, 42.0]], var_name='x', units='K', + dim_coords_and_dims=[(time, 0), (lons, 1)]) + new_cube = climate_statistics(cube, operator='sum', period='full') + assert cube.shape == (1, 3) + assert new_cube.shape == (3,) + np.testing.assert_allclose(new_cube.data, [1.0, -1.0, 42.0]) + + +def test_climate_statistics_complex_cube(): + """Test climate statistics.""" cube = _make_cube() - time = cube.coord('time') - time_thickness = time.bounds[..., 1] - time.bounds[..., 0] - - # The weights need to match the dimensionality of the cube. - slices = [None for i in cube.shape] - coord_dim = cube.coord_dims('time')[0] - slices[coord_dim] = slice(None) - time_thickness = np.abs(time_thickness[tuple(slices)]) - ones = np.ones_like(cube.data) - time_weights = time_thickness * ones - operator_method = getattr(iris.analysis, "MEAN") - expected_cube = cube.collapsed('time', - operator_method, - weights=time_weights) - computed_cube = climate_statistics(cube, operator='mean', period='full') - assert expected_cube.data.shape == computed_cube.data.shape - assert_array_equal(expected_cube.data, computed_cube.data) + new_cube = climate_statistics(cube, operator='sum', period='full') + assert cube.shape == (2, 1, 1, 3) + assert new_cube.shape == (1, 1, 3) + np.testing.assert_allclose(new_cube.data, [[[45.0, 45.0, 45.0]]]) if __name__ == '__main__': From 2bd652bd24b23191442984eedb79257ece1561e1 Mon Sep 17 00:00:00 2001 From: Javier Vegas-Regidor Date: Fri, 10 Jul 2020 09:31:26 +0200 Subject: [PATCH 2/2] Update CMIP6 tables to 6.9.32 --- .../cmor/tables/cmip6/Tables/CMIP6_3hr.json | 4 +- .../tables/cmip6/Tables/CMIP6_6hrLev.json | 8 +- .../tables/cmip6/Tables/CMIP6_6hrPlev.json | 4 +- .../tables/cmip6/Tables/CMIP6_6hrPlevPt.json | 8 +- .../tables/cmip6/Tables/CMIP6_AERday.json | 4 +- .../cmor/tables/cmip6/Tables/CMIP6_AERhr.json | 4 +- .../tables/cmip6/Tables/CMIP6_AERmon.json | 32 +- .../tables/cmip6/Tables/CMIP6_AERmonZ.json | 4 +- .../cmor/tables/cmip6/Tables/CMIP6_Amon.json | 4 +- .../cmor/tables/cmip6/Tables/CMIP6_CF3hr.json | 22 +- .../cmor/tables/cmip6/Tables/CMIP6_CFday.json | 4 +- .../cmor/tables/cmip6/Tables/CMIP6_CFmon.json | 4 +- .../tables/cmip6/Tables/CMIP6_CFsubhr.json | 4 +- .../cmor/tables/cmip6/Tables/CMIP6_CV.json | 956 ++++++++++++++++-- .../cmor/tables/cmip6/Tables/CMIP6_E1hr.json | 4 +- .../cmip6/Tables/CMIP6_E1hrClimMon.json | 4 +- .../cmor/tables/cmip6/Tables/CMIP6_E3hr.json | 4 +- .../tables/cmip6/Tables/CMIP6_E3hrPt.json | 6 +- .../cmor/tables/cmip6/Tables/CMIP6_E6hrZ.json | 22 +- .../cmor/tables/cmip6/Tables/CMIP6_Eday.json | 16 +- .../cmor/tables/cmip6/Tables/CMIP6_EdayZ.json | 4 +- .../cmor/tables/cmip6/Tables/CMIP6_Efx.json | 4 +- .../cmor/tables/cmip6/Tables/CMIP6_Emon.json | 48 +- .../cmor/tables/cmip6/Tables/CMIP6_EmonZ.json | 4 +- .../tables/cmip6/Tables/CMIP6_Esubhr.json | 12 +- .../cmor/tables/cmip6/Tables/CMIP6_Eyr.json | 8 +- .../tables/cmip6/Tables/CMIP6_IfxAnt.json | 6 +- .../tables/cmip6/Tables/CMIP6_IfxGre.json | 6 +- .../tables/cmip6/Tables/CMIP6_ImonAnt.json | 4 +- .../tables/cmip6/Tables/CMIP6_ImonGre.json | 4 +- .../tables/cmip6/Tables/CMIP6_IyrAnt.json | 6 +- .../tables/cmip6/Tables/CMIP6_IyrGre.json | 6 +- .../cmor/tables/cmip6/Tables/CMIP6_LImon.json | 4 +- .../cmor/tables/cmip6/Tables/CMIP6_Lmon.json | 6 +- .../cmor/tables/cmip6/Tables/CMIP6_Oclim.json | 4 +- .../cmor/tables/cmip6/Tables/CMIP6_Oday.json | 4 +- .../cmor/tables/cmip6/Tables/CMIP6_Odec.json | 4 +- .../cmor/tables/cmip6/Tables/CMIP6_Ofx.json | 4 +- .../cmor/tables/cmip6/Tables/CMIP6_Omon.json | 26 +- .../cmor/tables/cmip6/Tables/CMIP6_Oyr.json | 22 +- .../cmor/tables/cmip6/Tables/CMIP6_SIday.json | 4 +- .../cmor/tables/cmip6/Tables/CMIP6_SImon.json | 4 +- .../tables/cmip6/Tables/CMIP6_coordinate.json | 235 +---- .../cmor/tables/cmip6/Tables/CMIP6_day.json | 4 +- .../cmip6/Tables/CMIP6_formula_terms.json | 292 +++--- .../cmor/tables/cmip6/Tables/CMIP6_fx.json | 6 +- .../cmor/tables/cmip6/Tables/CMIP6_grids.json | 202 ++-- .../cmip6/Tables/CMIP6_input_example.json | 74 ++ esmvalcore/cmor/tables/cmip6/VERSION | 2 +- .../cmip6/ci-support/checkout_merge_commit.sh | 29 + .../cmip6/scripts/CMIP6_CV_cron_github.sh | 12 + .../cmor/tables/cmip6/scripts/README.md | 22 + .../tables/cmip6/scripts/createCMIP6CV.py | 109 ++ tests/integration/cmor/test_table.py | 2 +- tests/integration/test_recipe.py | 2 +- 55 files changed, 1559 insertions(+), 744 deletions(-) create mode 100644 esmvalcore/cmor/tables/cmip6/Tables/CMIP6_input_example.json create mode 100755 esmvalcore/cmor/tables/cmip6/ci-support/checkout_merge_commit.sh create mode 100755 esmvalcore/cmor/tables/cmip6/scripts/CMIP6_CV_cron_github.sh create mode 100644 esmvalcore/cmor/tables/cmip6/scripts/README.md create mode 100644 esmvalcore/cmor/tables/cmip6/scripts/createCMIP6CV.py diff --git a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_3hr.json b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_3hr.json index 2714511126..b1af790407 100644 --- a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_3hr.json +++ b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_3hr.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.31", + "data_specs_version": "01.00.32", "cmor_version": "3.5", "table_id": "Table 3hr", "realm": "atmos", - "table_date": "24 July 2019", + "table_date": "28 May 2020", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", diff --git a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_6hrLev.json b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_6hrLev.json index de2555e1b4..362a2ffaae 100644 --- a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_6hrLev.json +++ b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_6hrLev.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.31", + "data_specs_version": "01.00.32", "cmor_version": "3.5", "table_id": "Table 6hrLev", "realm": "atmos", - "table_date": "24 July 2019", + "table_date": "28 May 2020", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", @@ -23,7 +23,7 @@ "cell_measures": "area: areacella", "long_name": "Aerosol Backscatter Coefficient", "comment": "Aerosol Backscatter at 550nm and 180 degrees, computed from extinction and lidar ratio", - "dimensions": "longitude latitude time1 lambda550nm scatter180", + "dimensions": "longitude latitude alevel time1 lambda550nm", "out_name": "bs550aer", "type": "real", "positive": "", @@ -40,7 +40,7 @@ "cell_methods": "area: mean time: point", "cell_measures": "area: areacella", "long_name": "Aerosol Extinction Coefficient", - "comment": "Aerosol Extinction at 550nm", + "comment": "Aerosol volume extinction coefficient at 550nm wavelength.", "dimensions": "longitude latitude alevel time1 lambda550nm", "out_name": "ec550aer", "type": "real", diff --git a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_6hrPlev.json b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_6hrPlev.json index f1bcae5b79..0698529cdd 100644 --- a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_6hrPlev.json +++ b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_6hrPlev.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.31", + "data_specs_version": "01.00.32", "cmor_version": "3.5", "table_id": "Table 6hrPlev", "realm": "atmos", - "table_date": "24 July 2019", + "table_date": "28 May 2020", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", diff --git a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_6hrPlevPt.json b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_6hrPlevPt.json index eacd4bde98..d736f42489 100644 --- a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_6hrPlevPt.json +++ b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_6hrPlevPt.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.31", + "data_specs_version": "01.00.32", "cmor_version": "3.5", "table_id": "Table 6hrPlevPt", "realm": "atmos", - "table_date": "24 July 2019", + "table_date": "28 May 2020", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", @@ -165,7 +165,7 @@ "units": "W m-2", "cell_methods": "area: mean time: point", "cell_measures": "area: areacella", - "long_name": "Longwave flux due to volcanic aerosols at the surface", + "long_name": "Longwave Flux Due to Volcanic Aerosols at the Surface", "comment": "downwelling longwave flux due to volcanic aerosols at the surface to be diagnosed through double radiation call", "dimensions": "longitude latitude time1", "out_name": "lwsffluxaero", @@ -251,7 +251,7 @@ "rainmxrat27": { "frequency": "6hrPt", "modeling_realm": "atmos", - "standard_name": "mass_fraction_of_rain_in_air", + "standard_name": "mass_fraction_of_liquid_precipitation_in_air", "units": "1", "cell_methods": "area: mean time: point", "cell_measures": "area: areacella", diff --git a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_AERday.json b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_AERday.json index 7d86e63708..9a8383e56b 100644 --- a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_AERday.json +++ b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_AERday.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.31", + "data_specs_version": "01.00.32", "cmor_version": "3.5", "table_id": "Table AERday", "realm": "aerosol", - "table_date": "24 July 2019", + "table_date": "28 May 2020", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", diff --git a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_AERhr.json b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_AERhr.json index 3cbc377783..578ef12914 100644 --- a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_AERhr.json +++ b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_AERhr.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.31", + "data_specs_version": "01.00.32", "cmor_version": "3.5", "table_id": "Table AERhr", "realm": "aerosol", - "table_date": "24 July 2019", + "table_date": "28 May 2020", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", diff --git a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_AERmon.json b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_AERmon.json index 2c4827f671..ad9cd851df 100644 --- a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_AERmon.json +++ b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_AERmon.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.31", + "data_specs_version": "01.00.32", "cmor_version": "3.5", "table_id": "Table AERmon", "realm": "aerosol", - "table_date": "24 July 2019", + "table_date": "28 May 2020", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", @@ -129,7 +129,7 @@ "units": "mol mol-1", "cell_methods": "area: time: mean", "cell_measures": "area: areacella", - "long_name": "C3H6 volume mixing ratio", + "long_name": "C3H6 Volume Mixing Ratio", "comment": "Mole fraction is used in the construction mole_fraction_of_X_in_Y, where X is a material constituent of Y.", "dimensions": "longitude latitude alevel time", "out_name": "c3h6", @@ -147,7 +147,7 @@ "units": "mol mol-1", "cell_methods": "area: time: mean", "cell_measures": "area: areacella", - "long_name": "C3H8 volume mixing ratio", + "long_name": "C3H8 Volume Mixing Ratio", "comment": "Mole fraction is used in the construction mole_fraction_of_X_in_Y, where X is a material constituent of Y.", "dimensions": "longitude latitude alevel time", "out_name": "c3h8", @@ -201,7 +201,7 @@ "units": "mol mol-1", "cell_methods": "area: time: mean", "cell_measures": "area: areacella", - "long_name": "CH3COCH3 volume mixing ratio", + "long_name": "CH3COCH3 Volume Mixing Ratio", "comment": "Mole fraction is used in the construction 'mole_fraction_of_X_in_Y', where X is a material constituent of Y. A chemical species denoted by X may be described by a single term such as 'nitrogen' or a phrase such as 'nox_expressed_as_nitrogen'. Acetone is an organic molecule with the chemical formula CH3CH3CO. The IUPAC name for acetone is propan-2-one. Acetone is a member of the group of organic compounds known as ketones. There are standard names for the ketone group as well as for some of the individual species.", "dimensions": "longitude latitude alevel time", "out_name": "ch3coch3", @@ -400,7 +400,7 @@ "cell_methods": "area: time: mean", "cell_measures": "area: areacella", "long_name": "Dry Deposition Rate of Black Carbon Aerosol Mass", - "comment": "Dry deposition includes gravitational settling, impact scavenging, and turbulent deposition.", + "comment": "Dry deposition includes gravitational settling and turbulent deposition.", "dimensions": "longitude latitude time", "out_name": "drybc", "type": "real", @@ -418,7 +418,7 @@ "cell_methods": "area: time: mean", "cell_measures": "area: areacella", "long_name": "Dry Deposition Rate of Dust", - "comment": "Dry deposition includes gravitational settling, impact scavenging, and turbulent deposition.", + "comment": "Dry deposition includes gravitational settling and turbulent deposition.", "dimensions": "longitude latitude time", "out_name": "drydust", "type": "real", @@ -436,7 +436,7 @@ "cell_methods": "area: time: mean", "cell_measures": "area: areacella", "long_name": "Dry Deposition Rate of NH3", - "comment": "dry deposition includes gravitational settling, impact scavenging, and turbulent deposition", + "comment": "Dry Deposition includes gravitational settling and turbulent deposition", "dimensions": "longitude latitude time", "out_name": "drynh3", "type": "real", @@ -454,7 +454,7 @@ "cell_methods": "area: time: mean", "cell_measures": "area: areacella", "long_name": "Dry Deposition Rate of NH4", - "comment": "dry deposition includes gravitational settling, impact scavenging, and turbulent deposition", + "comment": "Dry Deposition includes gravitational settling and turbulent deposition", "dimensions": "longitude latitude time", "out_name": "drynh4", "type": "real", @@ -472,7 +472,7 @@ "cell_methods": "area: time: mean", "cell_measures": "area: areacella", "long_name": "Dry Deposition Rate of NOy", - "comment": "NOy is the sum of all simulated oxidized nitrogen species out of NO, NO2, HNO3, HNO4, NO3 aerosol, NO3(radical), N2O5, PAN, other organic nitrates. Dry deposition includes gravitational settling, impact scavenging, and turbulent deposition.", + "comment": "NOy is the sum of all simulated oxidized nitrogen species out of NO, NO2, HNO3, HNO4, NO3 aerosol, NO3(radical), N2O5, PAN, other organic nitrates. Dry deposition includes gravitational settling and turbulent deposition.", "dimensions": "longitude latitude time", "out_name": "drynoy", "type": "real", @@ -490,7 +490,7 @@ "cell_methods": "area: time: mean", "cell_measures": "area: areacella", "long_name": "Dry Deposition Rate of O3", - "comment": "dry deposition includes gravitational settling, impact scavenging, and turbulent deposition.", + "comment": "Dry Deposition includes gravitational settling and turbulent deposition.", "dimensions": "longitude latitude time", "out_name": "dryo3", "type": "real", @@ -508,7 +508,7 @@ "cell_methods": "area: time: mean", "cell_measures": "area: areacella", "long_name": "Dry Deposition Rate of Dry Aerosol Total Organic Matter", - "comment": "Tendency of atmosphere mass content of organic dry aerosol due to dry deposition: This is the sum of dry deposition of primary organic aerosol (POA) and dry deposition of secondary organic aerosol (SOA). Here, mass refers to the mass of organic matter, not mass of organic carbon alone. We recommend a scale factor of POM=1.4*OC, unless your model has more detailed info available. Was called dry_pom in old ACCMIP Excel table. Dry deposition includes gravitational settling, impact scavenging, and turbulent deposition.", + "comment": "Tendency of atmosphere mass content of organic dry aerosol due to dry deposition: This is the sum of dry deposition of primary organic aerosol (POA) and dry deposition of secondary organic aerosol (SOA). Here, mass refers to the mass of organic matter, not mass of organic carbon alone. We recommend a scale factor of POM=1.4*OC, unless your model has more detailed info available. Was called dry_pom in old ACCMIP Excel table. Dry deposition includes gravitational settling and turbulent deposition.", "dimensions": "longitude latitude time", "out_name": "dryoa", "type": "real", @@ -526,7 +526,7 @@ "cell_methods": "area: time: mean", "cell_measures": "area: areacella", "long_name": "Dry Deposition Rate of SO2", - "comment": "dry deposition includes gravitational settling, impact scavenging, and turbulent deposition", + "comment": "Dry Deposition includes gravitational settling and turbulent deposition", "dimensions": "longitude latitude time", "out_name": "dryso2", "type": "real", @@ -544,7 +544,7 @@ "cell_methods": "area: time: mean", "cell_measures": "area: areacella", "long_name": "Dry Deposition Rate of SO4", - "comment": "dry deposition includes gravitational settling, impact scavenging, and turbulent deposition", + "comment": "Dry Deposition includes gravitational settling and turbulent deposition", "dimensions": "longitude latitude time", "out_name": "dryso4", "type": "real", @@ -562,7 +562,7 @@ "cell_methods": "area: time: mean", "cell_measures": "area: areacella", "long_name": "Dry Deposition Rate of Sea-Salt Aerosol", - "comment": "Dry deposition includes gravitational settling, impact scavenging, and turbulent deposition.", + "comment": "Dry deposition includes gravitational settling and turbulent deposition.", "dimensions": "longitude latitude time", "out_name": "dryss", "type": "real", @@ -1817,7 +1817,7 @@ "reffclwtop": { "frequency": "mon", "modeling_realm": "aerosol", - "standard_name": "effective_radius_of_cloud_liquid_water_particle_at_liquid_water_cloud_top", + "standard_name": "effective_radius_of_cloud_liquid_water_particles_at_liquid_water_cloud_top", "units": "m", "cell_methods": "area: time: mean", "cell_measures": "area: areacella", diff --git a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_AERmonZ.json b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_AERmonZ.json index aa08746774..821c36b97c 100644 --- a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_AERmonZ.json +++ b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_AERmonZ.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.31", + "data_specs_version": "01.00.32", "cmor_version": "3.5", "table_id": "Table AERmonZ", "realm": "aerosol", - "table_date": "24 July 2019", + "table_date": "28 May 2020", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", diff --git a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_Amon.json b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_Amon.json index c8883c1c77..a98ed7fcf1 100644 --- a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_Amon.json +++ b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_Amon.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.31", + "data_specs_version": "01.00.32", "cmor_version": "3.5", "table_id": "Table Amon", "realm": "atmos atmosChem", - "table_date": "24 July 2019", + "table_date": "28 May 2020", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", diff --git a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_CF3hr.json b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_CF3hr.json index 014072b49a..243e093b11 100644 --- a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_CF3hr.json +++ b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_CF3hr.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.31", + "data_specs_version": "01.00.32", "cmor_version": "3.5", "table_id": "Table CF3hr", "realm": "atmos", - "table_date": "24 July 2019", + "table_date": "28 May 2020", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", @@ -611,7 +611,7 @@ "reffclic": { "frequency": "3hrPt", "modeling_realm": "atmos", - "standard_name": "effective_radius_of_convective_cloud_ice_particle", + "standard_name": "effective_radius_of_convective_cloud_ice_particles", "units": "m", "cell_methods": "area: mean time: point", "cell_measures": "area: areacella", @@ -629,7 +629,7 @@ "reffclis": { "frequency": "3hrPt", "modeling_realm": "atmos", - "standard_name": "effective_radius_of_stratiform_cloud_ice_particle", + "standard_name": "effective_radius_of_stratiform_cloud_ice_particles", "units": "m", "cell_methods": "area: mean time: point", "cell_measures": "area: areacella", @@ -647,7 +647,7 @@ "reffclwc": { "frequency": "3hrPt", "modeling_realm": "atmos", - "standard_name": "effective_radius_of_convective_cloud_liquid_water_particle", + "standard_name": "effective_radius_of_convective_cloud_liquid_water_particles", "units": "m", "cell_methods": "area: mean time: point", "cell_measures": "area: areacella", @@ -665,7 +665,7 @@ "reffclws": { "frequency": "3hrPt", "modeling_realm": "atmos", - "standard_name": "effective_radius_of_stratiform_cloud_liquid_water_particle", + "standard_name": "effective_radius_of_stratiform_cloud_liquid_water_particles", "units": "m", "cell_methods": "area: mean time: point", "cell_measures": "area: areacella", @@ -683,7 +683,7 @@ "reffgrpls": { "frequency": "3hrPt", "modeling_realm": "atmos", - "standard_name": "effective_radius_of_stratiform_cloud_graupel_particle", + "standard_name": "effective_radius_of_stratiform_cloud_graupel_particles", "units": "m", "cell_methods": "area: mean time: point", "cell_measures": "area: areacella", @@ -701,7 +701,7 @@ "reffrainc": { "frequency": "3hrPt", "modeling_realm": "atmos", - "standard_name": "effective_radius_of_convective_cloud_rain_particle", + "standard_name": "effective_radius_of_convective_cloud_rain_particles", "units": "m", "cell_methods": "area: mean time: point", "cell_measures": "area: areacella", @@ -719,7 +719,7 @@ "reffrains": { "frequency": "3hrPt", "modeling_realm": "atmos", - "standard_name": "effective_radius_of_stratiform_cloud_rain_particle", + "standard_name": "effective_radius_of_stratiform_cloud_rain_particles", "units": "m", "cell_methods": "area: mean time: point", "cell_measures": "area: areacella", @@ -737,7 +737,7 @@ "reffsnowc": { "frequency": "3hrPt", "modeling_realm": "atmos", - "standard_name": "effective_radius_of_convective_cloud_snow_particle", + "standard_name": "effective_radius_of_convective_cloud_snow_particles", "units": "m", "cell_methods": "area: mean time: point", "cell_measures": "area: areacella", @@ -755,7 +755,7 @@ "reffsnows": { "frequency": "3hrPt", "modeling_realm": "atmos", - "standard_name": "effective_radius_of_stratiform_cloud_snow_particle", + "standard_name": "effective_radius_of_stratiform_cloud_snow_particles", "units": "m", "cell_methods": "area: mean time: point", "cell_measures": "area: areacella", diff --git a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_CFday.json b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_CFday.json index bf9b145a33..ef1af654aa 100644 --- a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_CFday.json +++ b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_CFday.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.31", + "data_specs_version": "01.00.32", "cmor_version": "3.5", "table_id": "Table CFday", "realm": "atmos", - "table_date": "24 July 2019", + "table_date": "28 May 2020", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", diff --git a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_CFmon.json b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_CFmon.json index 4bf02c11e9..4c4fd28cbf 100644 --- a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_CFmon.json +++ b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_CFmon.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.31", + "data_specs_version": "01.00.32", "cmor_version": "3.5", "table_id": "Table CFmon", "realm": "atmos", - "table_date": "24 July 2019", + "table_date": "28 May 2020", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", diff --git a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_CFsubhr.json b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_CFsubhr.json index 6af06c8b65..6498505e0f 100644 --- a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_CFsubhr.json +++ b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_CFsubhr.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.31", + "data_specs_version": "01.00.32", "cmor_version": "3.5", "table_id": "Table CFsubhr", "realm": "atmos", - "table_date": "24 July 2019", + "table_date": "28 May 2020", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", diff --git a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_CV.json b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_CV.json index 5335b33eda..5dd1f8fc2d 100644 --- a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_CV.json +++ b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_CV.json @@ -33,13 +33,13 @@ "variant_label" ], "version_metadata":{ - "CV_collection_modified":"Mon Jul 29 14:43:08 2019 -0700", - "CV_collection_version":"6.2.35.3", + "CV_collection_modified":"Wed May 20 16:39:54 2020 -0700", + "CV_collection_version":"6.2.53.0", "author":"Paul J. Durack ", - "experiment_id_CV_modified":"Mon Jul 22 11:09:12 2019 -0700", - "experiment_id_CV_note":"Revise experiment_id esm-hist-ext", + "experiment_id_CV_modified":"Thu May 7 09:08:24 2020 -0700", + "experiment_id_CV_note":"Revise experiment_id ssp370-lowNTCFCH4", "institution_id":"PCMDI", - "previous_commit":"a613682c14fa76d0e7e845139bd182123c913e17", + "previous_commit":"284fc5e798e19f44d3c81682f1719c5fa462ad86", "specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)" }, "activity_id":{ @@ -82,13 +82,13 @@ "CNRM-CERFACS":"CNRM (Centre National de Recherches Meteorologiques, Toulouse 31057, France), CERFACS (Centre Europeen de Recherche et de Formation Avancee en Calcul Scientifique, Toulouse 31057, France)", "CSIR-Wits-CSIRO":"CSIR (Council for Scientific and Industrial Research - Natural Resources and the Environment, Pretoria, 0001, South Africa), Wits (University of the Witwatersrand - Global Change Institute, Johannesburg 2050, South Africa), CSIRO (Commonwealth Scientific and Industrial Research Organisation, Aspendale, Victoria 3195, Australia)Mailing address: Wits, Global Change Institute, Johannesburg 2050, South Africa", "CSIRO":"Commonwealth Scientific and Industrial Research Organisation, Aspendale, Victoria 3195, Australia", - "CSIRO-ARCCSS-BoM":"Commonwealth Scientific and Industrial Research Organisation, Australian Research Council Centre of Excellence for Climate System Science, and Bureau of Meteorology, Aspendale, Victoria 3195, Australia", + "CSIRO-ARCCSS":"CSIRO (Commonwealth Scientific and Industrial Research Organisation, Aspendale, Victoria 3195, Australia), ARCCSS (Australian Research Council Centre of Excellence for Climate System Science)", "DKRZ":"Deutsches Klimarechenzentrum, Hamburg 20146, Germany", "DWD":"Deutscher Wetterdienst, Offenbach am Main 63067, Germany", "E3SM-Project":"LLNL (Lawrence Livermore National Laboratory, Livermore, CA 94550, USA); ANL (Argonne National Laboratory, Argonne, IL 60439, USA); BNL (Brookhaven National Laboratory, Upton, NY 11973, USA); LANL (Los Alamos National Laboratory, Los Alamos, NM 87545, USA); LBNL (Lawrence Berkeley National Laboratory, Berkeley, CA 94720, USA); ORNL (Oak Ridge National Laboratory, Oak Ridge, TN 37831, USA); PNNL (Pacific Northwest National Laboratory, Richland, WA 99352, USA); SNL (Sandia National Laboratories, Albuquerque, NM 87185, USA). Mailing address: LLNL Climate Program, c/o David C. Bader, Principal Investigator, L-103, 7000 East Avenue, Livermore, CA 94550, USA", "EC-Earth-Consortium":"AEMET, Spain; BSC, Spain; CNR-ISAC, Italy; DMI, Denmark; ENEA, Italy; FMI, Finland; Geomar, Germany; ICHEC, Ireland; ICTP, Italy; IDL, Portugal; IMAU, The Netherlands; IPMA, Portugal; KIT, Karlsruhe, Germany; KNMI, The Netherlands; Lund University, Sweden; Met Eireann, Ireland; NLeSC, The Netherlands; NTNU, Norway; Oxford University, UK; surfSARA, The Netherlands; SMHI, Sweden; Stockholm University, Sweden; Unite ASTR, Belgium; University College Dublin, Ireland; University of Bergen, Norway; University of Copenhagen, Denmark; University of Helsinki, Finland; University of Santiago de Compostela, Spain; Uppsala University, Sweden; Utrecht University, The Netherlands; Vrije Universiteit Amsterdam, the Netherlands; Wageningen University, The Netherlands. Mailing address: EC-Earth consortium, Rossby Center, Swedish Meteorological and Hydrological Institute/SMHI, SE-601 76 Norrkoping, Sweden", "ECMWF":"European Centre for Medium-Range Weather Forecasts, Reading RG2 9AX, UK", - "FIO-QLNM":"FIO (First Institute of Oceanography, State Oceanic Administration, Qingdao 266061, China), QNLM (Qingdao National Laboratory for Marine Science and Technology, Qingdao 266237, China)", + "FIO-QLNM":"FIO (First Institute of Oceanography, Ministry of Natural Resources, Qingdao 266061, China), QNLM (Qingdao National Laboratory for Marine Science and Technology, Qingdao 266237, China)", "HAMMOZ-Consortium":"ETH Zurich, Switzerland; Max Planck Institut fur Meteorologie, Germany; Forschungszentrum Julich, Germany; University of Oxford, UK; Finnish Meteorological Institute, Finland; Leibniz Institute for Tropospheric Research, Germany; Center for Climate Systems Modeling (C2SM) at ETH Zurich, Switzerland", "INM":"Institute for Numerical Mathematics, Russian Academy of Science, Moscow 119991, Russia", "INPE":"National Institute for Space Research, Cachoeira Paulista, SP 12630-000, Brazil", @@ -109,31 +109,48 @@ "NOAA-GFDL":"National Oceanic and Atmospheric Administration, Geophysical Fluid Dynamics Laboratory, Princeton, NJ 08540, USA", "NUIST":"Nanjing University of Information Science and Technology, Nanjing, 210044, China", "PCMDI":"Program for Climate Model Diagnosis and Intercomparison, Lawrence Livermore National Laboratory, Livermore, CA 94550, USA", + "PNNL-WACCEM":"PNNL (Pacific Northwest National Laboratory), Richland, WA 99352, USA", "RTE-RRTMGP-Consortium":"AER (Atmospheric and Environmental Research, Lexington, MA 02421, USA); UColorado (University of Colorado, Boulder, CO 80309, USA). Mailing address: AER c/o Eli Mlawer, 131 Hartwell Avenue, Lexington, MA 02421, USA", + "RUBISCO":"ORNL (Oak Ridge National Laboratory, Oak Ridge, TN 37831, USA); ANL (Argonne National Laboratory, Argonne, IL 60439, USA); BNL (Brookhaven National Laboratory, Upton, NY 11973, USA); LANL (Los Alamos National Laboratory, Los Alamos, NM 87545); LBNL (Lawrence Berkeley National Laboratory, Berkeley, CA 94720, USA); NAU (Northern Arizona University, Flagstaff, AZ 86011, USA); NCAR (National Center for Atmospheric Research, Boulder, CO 80305, USA); UCI (University of California Irvine, Irvine, CA 92697, USA); UM (University of Michigan, Ann Arbor, MI 48109, USA). Mailing address: ORNL Climate Change Science Institute, c/o Forrest M. Hoffman, Laboratory Research Manager, Building 4500N Room F106, 1 Bethel Valley Road, Oak Ridge, TN 37831-6301, USA", "SNU":"Seoul National University, Seoul 08826, Republic of Korea", "THU":"Department of Earth System Science, Tsinghua University, Beijing 100084, China", "UA":"Department of Geosciences, University of Arizona, Tucson, AZ 85721, USA", + "UCI":"Department of Earth System Science, University of California Irvine, Irvine, CA 92697, USA", "UHH":"Universitat Hamburg, Hamburg 20148, Germany", "UTAS":"Institute for Marine and Antarctic Studies, University of Tasmania, Hobart, Tasmania 7001, Australia", "UofT":"Department of Physics, University of Toronto, 60 St George Street, Toronto, ON M5S1A7, Canada" }, "source_id":{ + "4AOP-v1-5":{ + "activity_participation":[ + "RFMIP" + ], + "cohort":[ + "Registered" + ], + "institution_id":[ + "IPSL" + ], + "source_id":"4AOP-v1-5", + "source":"4AOP-v1-5 (2019): \naerosol: none\natmos: none\natmosChem: none\nland: none\nlandIce: none\nocean: none\nocnBgchem: none\nseaIce: none" + }, "ACCESS-CM2":{ "activity_participation":[ "CMIP", "FAFMIP", "OMIP", "RFMIP", + "SIMIP", "ScenarioMIP" ], "cohort":[ "Registered" ], "institution_id":[ - "CSIRO-ARCCSS-BoM" + "CSIRO-ARCCSS" ], "source_id":"ACCESS-CM2", - "source":"ACCESS-CM2 (2018): \naerosol: UKCA-GLOMAP-mode\natmos: MetUM-HadGEM3-GA7.1 (N96; 192 x 144 longitude/latitude; 85 levels; top level 85 km)\natmosChem: none\nland: CABLE2.3.5\nlandIce: none\nocean: ACCESS-OM2 (GFDL-MOM5, tripolar primarily 1deg; 360 x 300 longitude/latitude; 50 levels; top grid cell 0-10 m)\nocnBgchem: none\nseaIce: CICE5.1 (same grid as ocean)" + "source":"ACCESS-CM2 (2019): \naerosol: UKCA-GLOMAP-mode\natmos: MetUM-HadGEM3-GA7.1 (N96; 192 x 144 longitude/latitude; 85 levels; top level 85 km)\natmosChem: none\nland: CABLE2.5\nlandIce: none\nocean: ACCESS-OM2 (GFDL-MOM5, tripolar primarily 1deg; 360 x 300 longitude/latitude; 50 levels; top grid cell 0-10 m)\nocnBgchem: none\nseaIce: CICE5.1.2 (same grid as ocean)" }, "ACCESS-ESM1-5":{ "activity_participation":[ @@ -141,6 +158,7 @@ "CDRMIP", "CMIP", "OMIP", + "PMIP", "RFMIP", "ScenarioMIP" ], @@ -151,7 +169,7 @@ "CSIRO" ], "source_id":"ACCESS-ESM1-5", - "source":"ACCESS-ESM1.5 (2018): \naerosol: CLASSIC (v1.0)\natmos: HadGAM2 (r1.1, N96; 192 x 145 longitude/latitude; 38 levels; top level 39255 m)\natmosChem: none\nland: CABLE2.2.3\nlandIce: none\nocean: ACCESS-OM2 (MOM5, tripolar primarily 1deg; 360 x 300 longitude/latitude; 50 levels; top grid cell 0-10 m)\nocnBgchem: WOMBAT1.0 (same grid as ocean)\nseaIce: CICE5.1 (same grid as ocean)" + "source":"ACCESS-ESM1.5 (2019): \naerosol: CLASSIC (v1.0)\natmos: HadGAM2 (r1.1, N96; 192 x 145 longitude/latitude; 38 levels; top level 39255 m)\natmosChem: none\nland: CABLE2.4\nlandIce: none\nocean: ACCESS-OM2 (MOM5, tripolar primarily 1deg; 360 x 300 longitude/latitude; 50 levels; top grid cell 0-10 m)\nocnBgchem: WOMBAT (same grid as ocean)\nseaIce: CICE4.1 (same grid as ocean)" }, "ARTS-2-3":{ "activity_participation":[ @@ -208,6 +226,7 @@ "CMIP", "CORDEX", "OMIP", + "PAMIP", "SIMIP", "ScenarioMIP", "VIACSAB" @@ -335,6 +354,19 @@ "source_id":"BNU-ESM-1-1", "source":"BNU-ESM 1.1 (2016): \naerosol: CAM-chem; semi-interactive\natmos: CAM4 (2deg; 144 x 96 longitude/latitude; 26 levels; top level 2.194 mb)\natmosChem: none\nland: CoLM version 2014 with carbon-nitrogen interactions\nlandIce: none\nocean: MOM4p1 (tripolar, primarily 1deg latitude/longitude, down to 1/3deg within 30deg of the equatorial tropics; 360 x 200 longitude/latitude; 50 levels; top grid cell 0-10 m)\nocnBgchem: Dynamic ecosystem-carbon model version 1\nseaIce: CICE4.1" }, + "CAM-MPAS-HR":{ + "activity_participation":[ + "HighResMIP" + ], + "cohort":[ + "Registered" + ], + "institution_id":[ + "PNNL-WACCEM" + ], + "source_id":"CAM-MPAS-HR", + "source":"CAM-MPAS-HR (2018): \naerosol: none, prescribed MACv2-SP\natmos: CAM-MPAS (CAMv5.4 with Grell-Freitas deep convection; MPASv4, C-grid staggered centroidal Voronoi tesselation atmosphere 30 km mesh with 655362 cells and 1966080 edges; 32 levels, top level 40363 m)\natmosChem: none\nland: CLM (v4.0, same grid as atmos), River Transport Model (v1.0)\nlandIce: none\nocean: none\nocnBgchem: none\nseaIce: none" + }, "CAMS-CSM1-0":{ "activity_participation":[ "CFMIP", @@ -352,7 +384,7 @@ "source_id":"CAMS-CSM1-0", "source":"CAMS-CSM 1.0 (2016): \naerosol: none\natmos: ECHAM5_CAMS (T106; 320 x 160 longitude/latitude; 31 levels; top level 10 mb)\natmosChem: none\nland: CoLM 1.0\nlandIce: none\nocean: MOM4 (tripolar; 360 x 200 longitude/latitude, primarily 1deg latitude/longitude, down to 1/3deg within 30deg of the equatorial tropics; 50 levels; top grid cell 0-10 m)\nocnBgchem: none\nseaIce: SIS 1.0" }, - "CAS-ESM1-0":{ + "CAS-ESM2-0":{ "activity_participation":[ "AerChemMIP", "C4MIP", @@ -380,8 +412,61 @@ "institution_id":[ "CAS" ], - "source_id":"CAS-ESM1-0", - "source":"CAS-ESM 1.0 (2015): \naerosol: IAP AACM\natmos: IAP AGCM4.1 (Finite difference dynamical core; 256 x 128 longitude/latitude; 30 levels; top level 2.2 hPa)\natmosChem: IAP AACM\nland: CoLM\nlandIce: none\nocean: LICOM2.0 (LICOM2.0, primarily 1deg; 362 x 196 longitude/latitude; 30 levels; top grid cell 0-10 m)\nocnBgchem: IAP OBGCM\nseaIce: CICE4" + "source_id":"CAS-ESM2-0", + "source":"CAS-ESM 2.0 (2019): \naerosol: IAP AACM\natmos: IAP AGCM 5.0 (Finite difference dynamical core; 256 x 128 longitude/latitude; 35 levels; top level 2.2 hPa)\natmosChem: IAP AACM\nland: CoLM\nlandIce: none\nocean: LICOM2.0 (LICOM2.0, primarily 1deg; 362 x 196 longitude/latitude; 30 levels; top grid cell 0-10 m)\nocnBgchem: IAP OBGCM\nseaIce: CICE4" + }, + "CESM1-1-CAM5-CMIP5":{ + "activity_participation":[ + "CMIP", + "DCPP" + ], + "cohort":[ + "Registered" + ], + "institution_id":[ + "NCAR" + ], + "source_id":"CESM1-1-CAM5-CMIP5", + "source":"CESM1-1-CAM5-CMIP5 (2011): \naerosol: MAM3 (same grid as atmos)\natmos: CAM5.2 (0.9x1.25 finite volume grid; 288 x 192 longitude/latitude; 32 levels; top level 2.25 mb)\natmosChem: MAM3 (same grid as atmos)\nland: CLM4 (same grid as atmos)\nlandIce: none\nocean: POP2 (320x384 longitude/latitude; 60 levels; top grid cell 0-10 m)\nocnBgchem: BEC (same grid as ocean)\nseaIce: CICE4 (same grid as ocean)" + }, + "CESM1-CAM5-SE-HR":{ + "activity_participation":[ + "HighResMIP" + ], + "cohort":[ + "Registered" + ], + "institution_id":[ + "NCAR" + ], + "source_id":"CESM1-CAM5-SE-HR", + "source":"CESM1-CAM5-SE-HR (2012): \naerosol: MAM3 (same grid as atmos)\natmos: CAM5.2 (0.25 degree spectral element; 777602 cells; 30 levels; top level 2.25 mb)\natmosChem: MAM3 (same grid as atmos)\nland: CLM4 (same grid as atmos)\nlandIce: none\nocean: POP2 (3600x2400 longitude/latitude; 62 levels; top grid cell 0-10 m)\nocnBgchem: \"BEC (same grid as ocean)\nseaIce: CICE4 (same grid as ocean)" + }, + "CESM1-CAM5-SE-LR":{ + "activity_participation":[ + "HighResMIP" + ], + "cohort":[ + "Registered" + ], + "institution_id":[ + "NCAR" + ], + "source_id":"CESM1-CAM5-SE-LR", + "source":"CESM1-CAM5-SE-LR (2012): \naerosol: MAM3 (same grid as atmos)\natmos: CAM5.2 (1 degree spectral element; 48602 cells; 30 levels; top level 2.25 mb)\natmosChem: MAM3 (same grid as atmos)\nland: CLM4 (same grid as atmos)\nlandIce: none\nocean: POP2 (320x384 longitude/latitude; 60 levels; top grid cell 0-10 m)\nocnBgchem: \"BEC (same grid as ocean)\nseaIce: CICE4 (same grid as ocean)" + }, + "CESM1-WACCM-SC":{ + "activity_participation":[ + "PAMIP" + ], + "cohort":[ + "Registered" + ], + "institution_id":[ + "UCI" + ], + "source_id":"CESM1-WACCM-SC", + "source":"CESM1-WACCM-SC (2011): \naerosol: MOZART-specified (same grid as atmos)\natmos: WACCM4 (1.9x2.5 finite volume grid; 144 x 96 longitude/latitude; 66 levels; top level 5.9e-06 mb)\natmosChem: MOZART-specified (same grid as atmos)\nland: CLM4.0\nlandIce: none\nocean: POP2 (320 x 384 longitude/latitude; 60 levels; top grid cell 0-10 m)\nocnBgchem: BEC (same grid as ocean)\nseaIce: CICE4 (same as grid as ocean)" }, "CESM2":{ "activity_participation":[ @@ -394,6 +479,7 @@ "DAMIP", "DCPP", "DynVarMIP", + "FAFMIP", "GMMIP", "GeoMIP", "HighResMIP", @@ -404,6 +490,7 @@ "PAMIP", "PMIP", "RFMIP", + "RFMIP", "SIMIP", "ScenarioMIP", "VIACSAB", @@ -418,6 +505,19 @@ "source_id":"CESM2", "source":"CESM2 (2018): \naerosol: MAM4 (same grid as atmos)\natmos: CAM6 (0.9x1.25 finite volume grid; 288 x 192 longitude/latitude; 32 levels; top level 2.25 mb)\natmosChem: MAM4 (same grid as atmos)\nland: CLM5 (same grid as atmos)\nlandIce: CISM2.1\nocean: POP2 (320x384 longitude/latitude; 60 levels; top grid cell 0-10 m)\nocnBgchem: MARBL (same grid as ocean)\nseaIce: CICE5.1 (same grid as ocean)" }, + "CESM2-FV2":{ + "activity_participation":[ + "CMIP" + ], + "cohort":[ + "Registered" + ], + "institution_id":[ + "NCAR" + ], + "source_id":"CESM2-FV2", + "source":"CESM2-FV2 (2019): \naerosol: MAM4 (same grid as atmos)\natmos: CAM6 (1.9x2.5 finite volume grid; 144 x 96 longitude/latitude; 32 levels; top level 2.25 mb)\natmosChem: MAM4 (same grid as atmos)\nland: CLM5 (same grid as atmos)\nlandIce: CISM2.1\nocean: POP2 (320x384 longitude/latitude; 60 levels; top grid cell 0-10 m)\nocnBgchem: MARBL (same grid as ocean)\nseaIce: CICE5.1 (same grid as ocean)" + }, "CESM2-SE":{ "activity_participation":[ "CMIP", @@ -437,6 +537,7 @@ "AerChemMIP", "CMIP", "GeoMIP", + "RFMIP", "ScenarioMIP" ], "cohort":[ @@ -448,6 +549,19 @@ "source_id":"CESM2-WACCM", "source":"CESM2-WACCM (2018): \naerosol: MAM4 (same grid as atmos)\natmos: WACCM6 (0.9x1.25 finite volume grid; 288 x 192 longitude/latitude; 70 levels; top level 4.5e-06 mb)\natmosChem: MAM4 (same grid as atmos)\nland: CLM5 (same grid as atmos)\nlandIce: CISM2.1\nocean: POP2 (320 x 384 longitude/latitude; 60 levels; top grid cell 0-10 m)\nocnBgchem: MARBL (same grid as ocean)\nseaIce: CICE5.1 (same grid as ocean)" }, + "CESM2-WACCM-FV2":{ + "activity_participation":[ + "CMIP" + ], + "cohort":[ + "Registered" + ], + "institution_id":[ + "NCAR" + ], + "source_id":"CESM2-WACCM-FV2", + "source":"CESM2-WACCM-FV2 (2019): \naerosol: MAM4 (same grid as atmos)\natmos: WACCM6 (1.9x2.5 finite volume grid; 144 x 96 longitude/latitude; 70 levels; top level 4.5e-06 mb)\natmosChem: MAM4 (same grid as atmos)\nland: CLM5 (same grid as atmos)\nlandIce: CISM2.1\nocean: POP2 (320x384 longitude/latitude; 60 levels; top grid cell 0-10 m)\nocnBgchem: MARBL (same grid as ocean)\nseaIce: CICE5.1 (same grid as ocean)" + }, "CIESM":{ "activity_participation":[ "CFMIP", @@ -471,7 +585,8 @@ "CMCC-CM2-HR4":{ "activity_participation":[ "CMIP", - "HighResMIP" + "HighResMIP", + "OMIP" ], "cohort":[ "Registered" @@ -482,25 +597,12 @@ "source_id":"CMCC-CM2-HR4", "source":"CMCC-CM2-HR4 (2016): \naerosol: prescribed MACv2-SP\natmos: CAM4 (1deg; 288 x 192 longitude/latitude; 26 levels; top at ~2 hPa)\natmosChem: none\nland: CLM4.5 (SP mode)\nlandIce: none\nocean: NEMO3.6 (ORCA0.25 1/4 deg from the Equator degrading at the poles; 1442 x 1051 longitude/latitude; 50 vertical levels; top grid cell 0-1 m)\nocnBgchem: none\nseaIce: CICE4.0" }, - "CMCC-CM2-HR5":{ - "activity_participation":[ - "CMIP", - "OMIP" - ], - "cohort":[ - "Registered" - ], - "institution_id":[ - "CMCC" - ], - "source_id":"CMCC-CM2-HR5", - "source":"CMCC-CM2-HR5 (2017): \naerosol: MAM3\natmos: CAM5.3 (1deg; 288 x 192 longitude/latitude; 30 levels; top at ~2 hPa)\natmosChem: none\nland: CLM4.5 (BGC mode)\nlandIce: none\nocean: NEMO3.6 (ORCA0.25 1/4 deg from the Equator degrading at the poles; 1442 x 1051 longitude/latitude; 50 vertical levels; top grid cell 0-1 m)\nocnBgchem: none\nseaIce: CICE4.0" - }, "CMCC-CM2-SR5":{ "activity_participation":[ "CMIP", "DCPP", "GMMIP", + "OMIP", "ScenarioMIP" ], "cohort":[ @@ -526,26 +628,14 @@ "source_id":"CMCC-CM2-VHR4", "source":"CMCC-CM2-VHR4 (2017): \naerosol: prescribed MACv2-SP\natmos: CAM4 (1/4deg; 1152 x 768 longitude/latitude; 26 levels; top at ~2 hPa)\natmosChem: none\nland: CLM4.5 (SP mode)\nlandIce: none\nocean: NEMO3.6 (ORCA0.25 1/4 deg from the Equator degrading at the poles; 1442 x 1051 longitude/latitude; 50 vertical levels; top grid cell 0-1 m)\nocnBgchem: none\nseaIce: CICE4.0" }, - "CMCC-ESM2-HR5":{ - "activity_participation":[ - "CMIP", - "OMIP" - ], - "cohort":[ - "Registered" - ], - "institution_id":[ - "CMCC" - ], - "source_id":"CMCC-ESM2-HR5", - "source":"CMCC-ESM2-HR5 (2017): \naerosol: MAM3\natmos: CAM5.3 (1deg; 288 x 192 longitude/latitude; 30 levels; top at ~2 hPa)\natmosChem: none\nland: CLM4.5 (BGC mode)\nlandIce: none\nocean: NEMO3.6 (ORCA0.25 1/4 deg from the Equator degrading at the poles; 1442 x 1051 longitude/latitude; 50 vertical levels; top grid cell 0-1 m)\nocnBgchem: BFM5.1\nseaIce: CICE4.0" - }, - "CMCC-ESM2-SR5":{ + "CMCC-ESM2":{ "activity_participation":[ "C4MIP", "CMIP", "LS3MIP", - "LUMIP" + "LUMIP", + "OMIP", + "ScenarioMIP" ], "cohort":[ "Registered" @@ -553,8 +643,8 @@ "institution_id":[ "CMCC" ], - "source_id":"CMCC-ESM2-SR5", - "source":"CMCC-ESM2-SR5 (2017): \naerosol: MAM3\natmos: CAM5.3 (1deg; 288 x 192 longitude/latitude; 30 levels; top at ~2 hPa)\natmosChem: none\nland: CLM4.5 (BGC mode)\nlandIce: none\nocean: NEMO3.6 (ORCA1 tripolar primarly 1 deg lat/lon with meridional refinement down to 1/3 degree in the tropics; 362 x 292 longitude/latitude; 50 vertical levels; top grid cell 0-1 m)\nocnBgchem: BFM5.1\nseaIce: CICE4.0" + "source_id":"CMCC-ESM2", + "source":"CMCC-ESM2 (2017): \naerosol: MAM3\natmos: CAM5.3 (1deg; 288 x 192 longitude/latitude; 30 levels; top at ~2 hPa)\natmosChem: none\nland: CLM4.5 (BGC mode)\nlandIce: none\nocean: NEMO3.6 (ORCA1 tripolar primarly 1 deg lat/lon with meridional refinement down to 1/3 degree in the tropics; 362 x 292 longitude/latitude; 50 vertical levels; top grid cell 0-1 m)\nocnBgchem: BFM5.1\nseaIce: CICE4.0" }, "CNRM-CM6-1":{ "activity_participation":[ @@ -586,6 +676,7 @@ "activity_participation":[ "CMIP", "DCPP", + "GMMIP", "HighResMIP", "OMIP", "ScenarioMIP" @@ -606,6 +697,7 @@ "CDRMIP", "CMIP", "CORDEX", + "GMMIP", "GeoMIP", "LS3MIP", "LUMIP", @@ -668,6 +760,7 @@ "LS3MIP", "LUMIP", "OMIP", + "PAMIP", "RFMIP", "SIMIP", "ScenarioMIP", @@ -713,6 +806,36 @@ "source_id":"E3SM-1-0", "source":"E3SM 1.0 (2018): \naerosol: MAM4 with resuspension, marine organics, and secondary organics (same grid as atmos)\natmos: EAM (v1.0, cubed sphere spectral-element grid; 5400 elements with p=3; 1 deg average grid spacing; 90 x 90 x 6 longitude/latitude/cubeface; 72 levels; top level 0.1 hPa)\natmosChem: Troposphere specified oxidants for aerosols. Stratosphere linearized interactive ozone (LINOZ v2) (same grid as atmos)\nland: ELM (v1.0, cubed sphere spectral-element grid; 5400 elements with p=3; 1 deg average grid spacing; 90 x 90 x 6 longitude/latitude/cubeface; satellite phenology mode), MOSART (v1.0, 0.5 degree latitude/longitude grid)\nlandIce: none\nocean: MPAS-Ocean (v6.0, oEC60to30 unstructured SVTs mesh with 235160 cells and 714274 edges, variable resolution 60 km to 30 km; 60 levels; top grid cell 0-10 m)\nocnBgchem: none\nseaIce: MPAS-Seaice (v6.0, same grid as ocean)" }, + "E3SM-1-1":{ + "activity_participation":[ + "C4MIP", + "CMIP", + "LS3MIP" + ], + "cohort":[ + "Registered" + ], + "institution_id":[ + "E3SM-Project", + "RUBISCO" + ], + "source_id":"E3SM-1-1", + "source":"E3SM 1.1 (2019): \naerosol: MAM4 with resuspension, marine organics, and secondary organics (same grid as atmos)\natmos: EAM (v1.1, cubed sphere spectral-element grid; 5400 elements with p=3; 1 deg average grid spacing; 90 x 90 x 6 longitude/latitude/cubeface; 72 levels; top level 0.1 hPa)\natmosChem: Troposphere specified oxidants for aerosols. Stratosphere linearized interactive ozone (LINOZ v2) (same grid as atmos)\nland: ELM (v1.1, same grid as atmos; active biogeochemistry using the Converging Trophic Cascade plant and soil carbon and nutrient mechanisms to represent carbon, nitrogen and phosphorus cycles), MOSART (v1.1, 0.5 degree latitude/longitude grid)\nlandIce: none\nocean: MPAS-Ocean (v6.0, oEC60to30 unstructured SVTs mesh with 235160 cells and 714274 edges, variable resolution 60 km to 30 km; 60 levels; top grid cell 0-10 m)\nocnBgchem: BEC (Biogeochemical Elemental Cycling model, NPZD-type with C/N/P/Fe/Si/O; same grid as ocean)\nseaIce: MPAS-Seaice (v6.0; same grid as ocean)" + }, + "E3SM-1-1-ECA":{ + "activity_participation":[ + "C4MIP", + "CMIP" + ], + "cohort":[ + "Registered" + ], + "institution_id":[ + "E3SM-Project" + ], + "source_id":"E3SM-1-1-ECA", + "source":"E3SM 1.1 ECA (2019): \naerosol: MAM4 with resuspension, marine organics, and secondary organics (same grid as atmos)\natmos: EAM (v1.1, cubed sphere spectral-element grid; 5400 elements with p=3; 1 deg average grid spacing; 90 x 90 x 6 longitude/latitude/cubeface; 72 levels; top level 0.1 hPa)\natmosChem: Troposphere specified oxidants for aerosols. Stratosphere linearized interactive ozone (LINOZ v2) (same grid as atmos)\nland: ELM (v1.1, same as atmos; active biogeochemistry using the Equilibrium Chemistry Approximation to represent plant and soil carbon and nutrient mechanisms especially carbon, nitrogen and phosphorus limitation), MOSART (v1.1, 0.5 degree latitude/longitude grid)\nlandIce: none\nocean: MPAS-Ocean (v6.0, oEC60to30 unstructured SVTs mesh with 235160 cells and 714274 edges, variable resolution 60 km to 30 km; 60 levels; top grid cell 0-10 m)\nocnBgchem: BEC (Biogeochemical Elemental Cycling model, NPZD-type with C/N/P/Fe/Si/O; same grid as ocean)\nseaIce: MPAS-Seaice (v6.0; same grid as ocean)" + }, "EC-Earth3":{ "activity_participation":[ "CMIP", @@ -817,6 +940,7 @@ "activity_participation":[ "CDRMIP", "CMIP", + "CORDEX", "LS3MIP", "LUMIP", "ScenarioMIP" @@ -955,7 +1079,8 @@ "FGOALS-f3-H":{ "activity_participation":[ "CMIP", - "HighResMIP" + "HighResMIP", + "OMIP" ], "cohort":[ "Registered" @@ -971,7 +1096,10 @@ "CMIP", "DCPP", "GMMIP", + "HighResMIP", "OMIP", + "PAMIP", + "PMIP", "SIMIP", "ScenarioMIP" ], @@ -1005,7 +1133,7 @@ "CAS" ], "source_id":"FGOALS-g3", - "source":"FGOALS-g3 (2017): \naerosol: none\natmos: GAMIL2 (180 x 90 longitude/latitude; 26 levels; top level 2.19hPa)\natmosChem: none\nland: CLM4.0\nlandIce: none\nocean: LICOM3.0 (LICOM3.0, tripolar primarily 1deg; 360 x 218 longitude/latitude; 30 levels; top grid cell 0-10 m)\nocnBgchem: none\nseaIce: CICE4.0" + "source":"FGOALS-g3 (2017): \naerosol: none\natmos: GAMIL3 (180 x 80 longitude/latitude; 26 levels; top level 2.19hPa)\natmosChem: none\nland: CAS-LSM\nlandIce: none\nocean: LICOM3.0 (LICOM3.0, tripolar primarily 1deg; 360 x 218 longitude/latitude; 30 levels; top grid cell 0-10 m)\nocnBgchem: none\nseaIce: CICE4.0" }, "FIO-ESM-2-0":{ "activity_participation":[ @@ -1042,6 +1170,7 @@ "activity_participation":[ "CFMIP", "CMIP", + "DAMIP", "DynVarMIP", "GMMIP", "OMIP", @@ -1092,6 +1221,7 @@ "DAMIP", "DynVarMIP", "LUMIP", + "RFMIP", "ScenarioMIP" ], "cohort":[ @@ -1184,10 +1314,25 @@ "NASA-GISS" ], "source_id":"GISS-E2-1-G", - "source":"GISS-E2.1G (2016): \naerosol: Varies with physics-version (p==1 none, p==3 OMA, p==4 TOMAS, p==5 MATRIX)\natmos: GISS-E2.1 (2.5x2 degree; 144 x 90 longitude/latitude; 40 levels; top level 0.1 hPa)\natmosChem: Varies with physics-version (p==1 Non-interactive, p>1 GPUCCINI)\nland: GISS LSM\nlandIce: none\nocean: GISS Ocean (1 degree; 360 x 180 latitude/longitude; 32 levels; top grid cell 0-10 m)\nocnBgchem: none\nseaIce: GISS SI" + "source":"GISS-E2.1G (2019): \naerosol: Varies with physics-version (p==1 none, p==3 OMA, p==4 TOMAS, p==5 MATRIX)\natmos: GISS-E2.1 (2.5x2 degree; 144 x 90 longitude/latitude; 40 levels; top level 0.1 hPa)\natmosChem: Varies with physics-version (p==1 Non-interactive, p>1 GPUCCINI)\nland: GISS LSM\nlandIce: none\nocean: GISS Ocean (GO1, 1 degree; 360 x 180 longitude/latitude; 40 levels; top grid cell 0-10 m)\nocnBgchem: none\nseaIce: GISS SI" + }, + "GISS-E2-1-G-CC":{ + "activity_participation":[ + "C4MIP", + "CMIP" + ], + "cohort":[ + "Registered" + ], + "institution_id":[ + "NASA-GISS" + ], + "source_id":"GISS-E2-1-G-CC", + "source":"GISS-E2-1-G-CC (2019): \naerosol: varies with physics-version (p==1 none, p==3 OMA, p==4 TOMAS, p==5 MATRIX)\natmos: GISS-E2.1 (2 x 2.5 degrees; 144 x 90 longitude/latitude; 40 levels; top level 0.1 hPa)\natmosChem: varies with physics-version (p==1 Non-interactive, p>1 GPUCCINI)\nland: GISS LSM\nlandIce: Fixed\nocean: GISS Ocean (1 deg; 360 x 180 longitude/latitude; 40 levels; top grid cell 0-10m)\nocnBgchem: NOBM (NASA Ocean Biogeochemistry Model; same grid as ocean)\nseaIce: GISS SI (same grid as ocean)" }, "GISS-E2-1-H":{ "activity_participation":[ + "CFMIP", "CMIP", "OMIP", "PAMIP", @@ -1201,12 +1346,27 @@ "NASA-GISS" ], "source_id":"GISS-E2-1-H", - "source":"GISS-E2.1H (2016): \naerosol: Varies with physics-version (p==1 none, p==3 OMA, p==4 TOMAS, p==5 MATRIX)\natmos: GISS-E2.1 (2.5x2 degree; 144 x 90 longitude/latitude; 40 levels; top level 0.1 hPa)\natmosChem: Varies with physics-version (p==1 Non-interactive, p>1 GPUCCINI)\nland: GISS LSM\nlandIce: none\nocean: HYCOM Ocean (~1 degree tripolar grid; 360 x 180 latitude/longitude; 26 levels; top grid cell 0-10 m)\nocnBgchem: none\nseaIce: GISS SI" + "source":"GISS-E2.1H (2019): \naerosol: Varies with physics-version (p==1 none, p==3 OMA, p==4 TOMAS, p==5 MATRIX)\natmos: GISS-E2.1 (2.5x2 degree; 144 x 90 longitude/latitude; 40 levels; top level 0.1 hPa)\natmosChem: Varies with physics-version (p==1 Non-interactive, p>1 GPUCCINI)\nland: GISS LSM\nlandIce: none\nocean: HYCOM Ocean (~1 degree tripolar grid; 360 x 180 longitude/latitude; 32 levels; top grid cell 0-10 m)\nocnBgchem: none\nseaIce: GISS SI" }, - "GISS-E2-1-MA-G":{ + "GISS-E2-2-G":{ "activity_participation":[ + "AerChemMIP", + "CFMIP", "CMIP", + "DAMIP", + "DynVarMIP", + "FAFMIP", + "GMMIP", + "ISMIP6", + "LS3MIP", + "LUMIP", + "OMIP", + "PAMIP", + "PMIP", "RFMIP", + "SIMIP", + "ScenarioMIP", + "VIACSAB", "VolMIP" ], "cohort":[ @@ -1215,8 +1375,8 @@ "institution_id":[ "NASA-GISS" ], - "source_id":"GISS-E2-1-MA-G", - "source":"GISS-E2.1MA-G (2018): \naerosol: Varies with physics-version (p==1 none, p==3 OMA, p==4 TOMAS, p==5 MATRIX)\natmos: GISS-E2.1MA (2.5x2 degree; 144 x 90 longitude/latitude; 102 levels; top level 0.002 hPa)\natmosChem: Varies with physics-version (p==1 Non-interactive, p>1 GPUCCINI)\nland: GISS LSM\nlandIce: none\nocean: GISS Ocean (1 degree; 360 x 180 longitude/latitude; 32 levels; top grid cell 0-10 m)\nocnBgchem: none\nseaIce: GISS SI" + "source_id":"GISS-E2-2-G", + "source":"GISS-E2-2-G (2019): \naerosol: varies with physics-version (p==1 none, p==3 OMA, p==4 TOMAS, p==5 MATRIX)\natmos: GISS-E2.2 (High-top, 2 x 2.5 degrees; 144 x 90 longitude/latitude; 102 levels; top level 0.002 hPa)\natmosChem: varies with physics-version (p==1 Non-interactive, p>1 GPUCCINI)\nland: GISS LSM\nlandIce: Fixed\nocean: GISS Ocean (GO1, 1 degree; 360 x 180 longitude/latitude; 40 levels; top grid cell 0-10m)\nocnBgchem: none\nseaIce: GISS SI" }, "GISS-E3-G":{ "activity_participation":[ @@ -1247,7 +1407,7 @@ "NASA-GISS" ], "source_id":"GISS-E3-G", - "source":"GISS-E3-G (2018): \naerosol: Varies with physics-version (p==1 none, p==3 OMA, p==4 TOMAS, p==5 MATRIX)\natmos: GISS-E3 (Cubed sphere, C90; 90 x 90 x 6 gridboxes/cubeface, grid resolution aligns with longitude/latitude along central lines for each cubeface; 102 levels; top level 0.002 hPa)\natmosChem: Varies with physics-version (p==1 Non-interactive, p>1 GPUCCINI)\nland: GISS LSM\nlandIce: none\nocean: GISS Ocean (1 degree; 360 x 180 longitude/latitude; 32 levels; top grid cell 0-10 m)\nocnBgchem: none\nseaIce: GISS SI" + "source":"GISS-E3-G (2020): \naerosol: Varies with physics-version (p==1 none, p==3 OMA, p==4 TOMAS, p==5 MATRIX)\natmos: GISS-E3 (Cubed sphere, C90; 90 x 90 x 6 gridboxes/cubeface, grid resolution aligns with longitude/latitude along central lines for each cubeface; 102 levels; top level 0.002 hPa)\natmosChem: Varies with physics-version (p==1 Non-interactive, p>1 GPUCCINI)\nland: GISS LSM\nlandIce: none\nocean: GISS Ocean (1 degree; 360 x 180 longitude/latitude; 32 levels; top grid cell 0-10 m)\nocnBgchem: none\nseaIce: GISS SI" }, "HadGEM3-GC31-HH":{ "activity_participation":[ @@ -1294,7 +1454,8 @@ "Registered" ], "institution_id":[ - "MOHC" + "MOHC", + "NERC" ], "source_id":"HadGEM3-GC31-LL", "source":"HadGEM3-GC31-LL (2016): \naerosol: UKCA-GLOMAP-mode\natmos: MetUM-HadGEM3-GA7.1 (N96; 192 x 144 longitude/latitude; 85 levels; top level 85 km)\natmosChem: none\nland: JULES-HadGEM3-GL7.1\nlandIce: none\nocean: NEMO-HadGEM3-GO6.0 (eORCA1 tripolar primarily 1 deg with meridional refinement down to 1/3 degree in the tropics; 360 x 330 longitude/latitude; 75 levels; top grid cell 0-1 m)\nocnBgchem: none\nseaIce: CICE-HadGEM3-GSI8 (eORCA1 tripolar primarily 1 deg; 360 x 330 longitude/latitude)" @@ -1346,6 +1507,32 @@ "source_id":"HadGEM3-GC31-MM", "source":"HadGEM3-GC31-MM (2016): \naerosol: UKCA-GLOMAP-mode\natmos: MetUM-HadGEM3-GA7.1 (N216; 432 x 324 longitude/latitude; 85 levels; top level 85 km)\natmosChem: none\nland: JULES-HadGEM3-GL7.1\nlandIce: none\nocean: NEMO-HadGEM3-GO6.0 (eORCA025 tripolar primarily 0.25 deg; 1440 x 1205 longitude/latitude; 75 levels; top grid cell 0-1 m)\nocnBgchem: none\nseaIce: CICE-HadGEM3-GSI8 (eORCA025 tripolar primarily 0.25 deg; 1440 x 1205 longitude/latitude)" }, + "HiRAM-SIT-HR":{ + "activity_participation":[ + "HighResMIP" + ], + "cohort":[ + "Registered" + ], + "institution_id":[ + "AS-RCEC" + ], + "source_id":"HiRAM-SIT-HR", + "source":"HiRAM-SIT-HR (2018): \naerosol: none\natmos: GFDL-HiRAM (Cubed-sphere (c384) - 0.25 degree nominal horizontal resolution; 1536 x 768 longitude/latitude; 32 levels; top level 1 hPa)\natmosChem: none\nland: GFDL-LM3 (same grid as atmos)\nlandIce: none\nocean: SIT (1-D, tripolar - nominal 0.25 deg; 1440 x 1080 longitude/latitude; 50 levels with skin layer and 1 m resolution for uppermost 10 m)\nocnBgchem: none\nseaIce: none" + }, + "HiRAM-SIT-LR":{ + "activity_participation":[ + "HighResMIP" + ], + "cohort":[ + "Registered" + ], + "institution_id":[ + "AS-RCEC" + ], + "source_id":"HiRAM-SIT-LR", + "source":"HiRAM-SIT-LR (2018): \naerosol: none\natmos: GFDL-HiRAM (Cubed-sphere (c192) - 0.5 degree nominal horizontal resolution; 768 x 384 longitude/latitude; 32 levels; top level 1 hPa)\natmosChem: none\nland: GFDL-LM3 (same grid as atmos)\nlandIce: none\nocean: SIT (1-D, tripolar - nominal 0.25 deg; 1440 x 1080 longitude/latitude; 50 levels with skin layer and 1 m resolution for uppermost 10 m)\nocnBgchem: none\nseaIce: none" + }, "ICON-ESM-LR":{ "activity_participation":[ "CMIP", @@ -1378,7 +1565,8 @@ "INM-CM4-8":{ "activity_participation":[ "CMIP", - "PMIP" + "PMIP", + "ScenarioMIP" ], "cohort":[ "Registered" @@ -1391,7 +1579,8 @@ }, "INM-CM5-0":{ "activity_participation":[ - "CMIP" + "CMIP", + "ScenarioMIP" ], "cohort":[ "Registered" @@ -1404,7 +1593,8 @@ }, "INM-CM5-H":{ "activity_participation":[ - "CMIP" + "CMIP", + "HighResMIP" ], "cohort":[ "Registered" @@ -1415,6 +1605,19 @@ "source_id":"INM-CM5-H", "source":"INM-CM5-H (2016): \naerosol: INM-AER1\natmos: INM-AM5-H (0.67x0.5; 540 x 360 longitude/latitude; 73 levels; top level sigma = 0.0002)\natmosChem: none\nland: INM-LND1\nlandIce: none\nocean: INM-OM5-H (North Pole shifted to 60N, 90E. 0.167x0.125; 2160x1440 longitude/latitude; 40 levels; vertical sigma coordinate)\nocnBgchem: none\nseaIce: INM-ICE1" }, + "IPSL-CM5A2-INCA":{ + "activity_participation":[ + "AerChemMIP" + ], + "cohort":[ + "Registered" + ], + "institution_id":[ + "IPSL" + ], + "source_id":"IPSL-CM5A2-INCA", + "source":"IPSL-CM5A2-INCA (2019): \naerosol: INCA v6 NMHC-AER-S\natmos: LMDZ (APv5; 96 x 96 longitude/latitude; 39 levels; top level 80000 m)\natmosChem: INCA v6 NMHC-AER-S\nland: ORCHIDEE (IPSLCM5A2.1, Water/Carbon/Energy mode)\nlandIce: none\nocean: NEMO-OPA (v3.6, ORCA2 tripolar primarily 2deg; 182 x 149 longitude/latitude; 31 levels; top grid cell 0-10 m)\nocnBgchem: NEMO-PISCES\nseaIce: NEMO-LIM2" + }, "IPSL-CM6A-ATM-HR":{ "activity_participation":[ "HighResMIP" @@ -1426,20 +1629,23 @@ "IPSL" ], "source_id":"IPSL-CM6A-ATM-HR", - "source":"IPSL-CM6A-ATM-HR (2018): \naerosol: none\natmos: LMDZ (NPv6, N256; 512 x 360 longitude/latitude; 79 levels; top level 40000 m)\natmosChem: none\nland: ORCHIDEE (v2.0, Water/Carbon/Energy mode)\nlandIce: none\nocean: none\nocnBgchem: none\nseaIce: none" + "source":"IPSL-CM6A-ATM-HR (2018): \naerosol: none\natmos: LMDZ (NPv6, N256; 512 x 360 longitude/latitude; 79 levels; top level 80000 m)\natmosChem: none\nland: ORCHIDEE (v2.0, Water/Carbon/Energy mode)\nlandIce: none\nocean: none\nocnBgchem: none\nseaIce: none" }, "IPSL-CM6A-LR":{ "activity_participation":[ "C4MIP", "CFMIP", "CMIP", + "DAMIP", "DCPP", "FAFMIP", "GMMIP", "GeoMIP", + "HighResMIP", "LS3MIP", "LUMIP", "OMIP", + "PAMIP", "PMIP", "RFMIP", "ScenarioMIP", @@ -1452,7 +1658,46 @@ "IPSL" ], "source_id":"IPSL-CM6A-LR", - "source":"IPSL-CM6A-LR (2017): \naerosol: none\natmos: LMDZ (NPv6, N96; 144 x 143 longitude/latitude; 79 levels; top level 40000 m)\natmosChem: none\nland: ORCHIDEE (v2.0, Water/Carbon/Energy mode)\nlandIce: none\nocean: NEMO-OPA (eORCA1.3, tripolar primarily 1deg; 362 x 332 longitude/latitude; 75 levels; top grid cell 0-2 m)\nocnBgchem: NEMO-PISCES\nseaIce: NEMO-LIM3" + "source":"IPSL-CM6A-LR (2017): \naerosol: none\natmos: LMDZ (NPv6, N96; 144 x 143 longitude/latitude; 79 levels; top level 80000 m)\natmosChem: none\nland: ORCHIDEE (v2.0, Water/Carbon/Energy mode)\nlandIce: none\nocean: NEMO-OPA (eORCA1.3, tripolar primarily 1deg; 362 x 332 longitude/latitude; 75 levels; top grid cell 0-2 m)\nocnBgchem: NEMO-PISCES\nseaIce: NEMO-LIM3" + }, + "IPSL-CM6A-LR-INCA":{ + "activity_participation":[ + "AerChemMIP" + ], + "cohort":[ + "Registered" + ], + "institution_id":[ + "IPSL" + ], + "source_id":"IPSL-CM6A-LR-INCA", + "source":"IPSL-CM6A-LR-INCA (2019): \naerosol: INCA v6 AER\natmos: LMDZ (NPv6 ; 144 x 143 longitude/latitude; 79 levels; top level 80000 m)\natmosChem: none\nland: ORCHIDEE (v2.0, Water/Carbon/Energy mode)\nlandIce: none\nocean: NEMO-OPA (eORCA1.3, tripolar primarily 1deg; 362 x 332 longitude/latitude; 75 levels; top grid cell 0-2 m)\nocnBgchem: NEMO-PISCES\nseaIce: NEMO-LIM3" + }, + "IPSL-CM7A-ATM-HR":{ + "activity_participation":[ + "HighResMIP" + ], + "cohort":[ + "Registered" + ], + "institution_id":[ + "IPSL" + ], + "source_id":"IPSL-CM7A-ATM-HR", + "source":"IPSL-CM7A-ATM-HR (2019): \naerosol: none\natmos: DYNAMICO-LMDZ (NPv6; 256000-point icosahedral-hexagonal; 79 levels; top level 80000 m)\natmosChem: none\nland: ORCHIDEE (v2.2, Water/Carbon/Energy mode)\nlandIce: none\nocean: none\nocnBgchem: none\nseaIce: none" + }, + "IPSL-CM7A-ATM-LR":{ + "activity_participation":[ + "HighResMIP" + ], + "cohort":[ + "Registered" + ], + "institution_id":[ + "IPSL" + ], + "source_id":"IPSL-CM7A-ATM-LR", + "source":"IPSL-CM7A-ATM-LR (2019): \naerosol: none\natmos: DYNAMICO-LMDZ (NPv6; 16000-point icosahedral-hexagonal; 79 levels; top level 80000 m)\natmosChem: none\nland: ORCHIDEE (v2.2, Water/Carbon/Energy mode)\nlandIce: none\nocean: none\nocnBgchem: none\nseaIce: none" }, "KACE-1-0-G":{ "activity_participation":[ @@ -1473,7 +1718,8 @@ "C4MIP", "CMIP", "DynVarMIP", - "PMIP" + "PMIP", + "ScenarioMIP" ], "cohort":[ "Registered" @@ -1499,7 +1745,10 @@ }, "MCM-UA-1-0":{ "activity_participation":[ - "CMIP" + "CMIP", + "FAFMIP", + "PMIP", + "ScenarioMIP" ], "cohort":[ "Registered" @@ -1525,7 +1774,21 @@ "MIROC" ], "source_id":"MIROC-ES2H", - "source":"MIROC-ES2H (2018): \naerosol: SPRINTARS6.0\natmos: CCSR AGCM (T85; 256 x 128 longitude/latitude; 81 levels; top level 0.004 hPa)\natmosChem: CHASER4.0\nland: MATSIRO6.0+VISIT-e ver.1.0\nlandIce: none\nocean: COCO4.9 (tripolar primarily 1deg; 360 x 256 longitude/latitude; 63 levels; top grid cell 0-2 m)\nocnBgchem: OECO ver.2.0; NPZD-type with C/N/P/Fe/O cycles\nseaIce: COCO4.9" + "source":"MIROC-ES2H (2018): \naerosol: SPRINTARS6.0\natmos: CCSR AGCM (T85; 256 x 128 longitude/latitude; 81 levels; top level 0.004 hPa)\natmosChem: CHASER4.0 (T42; 128 x 64 longitude/latitude; 81 levels; top level 0.004 hPa)\nland: MATSIRO6.0+VISIT-e ver.1.0\nlandIce: none\nocean: COCO4.9 (tripolar primarily 1deg; 360 x 256 longitude/latitude; 63 levels; top grid cell 0-2 m)\nocnBgchem: OECO ver.2.0; NPZD-type with C/N/P/Fe/O cycles\nseaIce: COCO4.9" + }, + "MIROC-ES2H-NB":{ + "activity_participation":[ + "AerChemMIP", + "CMIP" + ], + "cohort":[ + "Registered" + ], + "institution_id":[ + "MIROC" + ], + "source_id":"MIROC-ES2H-NB", + "source":"MIROC-ES2H-NB (2019): \naerosol: SPRINTARS6.0\natmos: CCSR AGCM (T85; 256 x 128 longitude/latitude; 81 levels; top level 0.004 hPa)\natmosChem: CHASER4.0 (T42; 128 x 64 longitude/latitude; 81 levels; top level 0.004 hPa)\nland: MATSIRO6\nlandIce: none\nocean: COCO4.9 (tripolar primarily 1deg; 360 x 256 longitude/latitude; 63 levels; top grid cell 0-2 m)\nocnBgchem: none\nseaIce: COCO4.9" }, "MIROC-ES2L":{ "activity_participation":[ @@ -1798,7 +2061,7 @@ "source_id":"NICAM16-9S", "source":"NICAM16-9S (2017): \naerosol: Prescribed MACv2-SP\natmos: NICAM.16 (14km icosahedral grid; 2,621,442 grid cells (=10*4^9+2); 38 levels; top level 40 km)\natmosChem: none\nland: MATSIRO6 (w/o MOSAIC)\nlandIce: none\nocean: none\nocnBgchem: none\nseaIce: Fixed" }, - "NorESM1-LM":{ + "NorCPM1":{ "activity_participation":[ "CMIP", "DCPP" @@ -1809,8 +2072,22 @@ "institution_id":[ "NCC" ], - "source_id":"NorESM1-LM", - "source":"NorESM1-LM (2019): \naerosol: OsloAero4.1 (same grid as atmos)\natmos: CAM-OSLO4.1 (2 degree resolution; 144 x 96 longitude/latitude; 26 levels; top level ~2 hPa)\natmosChem: OsloChemSimp4.1 (same grid as atmos)\nland: CLM4 (same grid as atmos)\nlandIce: none\nocean: MICOM1.1 (1 degree resolution; 320 x 384 longitude/latitude; 53 levels; top grid cell 0-2.5 m [native model uses hybrid density and generic upper-layer coordinate interpolated to z-level for contributed data])\nocnBgchem: HAMOCC5.1 (same grid as ocean)\nseaIce: CICE4 (same grid as ocean)" + "source_id":"NorCPM1", + "source":"NorCPM1 (2019): \naerosol: OsloAero4.1 (same grid as atmos)\natmos: CAM-OSLO4.1 (2 degree resolution; 144 x 96 longitude/latitude; 26 levels; top level ~2 hPa)\natmosChem: OsloChemSimp4.1 (same grid as atmos)\nland: CLM4 (same grid as atmos)\nlandIce: none\nocean: MICOM1.1 (1 degree resolution; 320 x 384 longitude/latitude; 53 levels; top grid cell 0-2.5 m [native model uses hybrid density and generic upper-layer coordinate interpolated to z-level for contributed data])\nocnBgchem: HAMOCC5.1 (same grid as ocean)\nseaIce: CICE4 (same grid as ocean)" + }, + "NorESM1-F":{ + "activity_participation":[ + "CMIP", + "PMIP" + ], + "cohort":[ + "Registered" + ], + "institution_id":[ + "NCC" + ], + "source_id":"NorESM1-F", + "source":"NorESM1-F (2018): \naerosol: none\natmos: CAM4 (2 degree resolution; 144 x 96; 32 levels; top level 3 mb)\natmosChem: none\nland: CLM4\nlandIce: CISM\nocean: MICOM (1 degree resolution; 360 x 384; 70 levels; top grid cell minimum 0-2.5 m [native model uses hybrid density and generic upper-layer coordinate interpolated to z-level for contributed data])\nocnBgchem: HAMOCC5.1\nseaIce: CICE4" }, "NorESM2-HH":{ "activity_participation":[ @@ -1829,12 +2106,15 @@ "NorESM2-LM":{ "activity_participation":[ "AerChemMIP", + "C4MIP", + "CDRMIP", "CFMIP", "CMIP", "DAMIP", "DCPP", "LUMIP", "OMIP", + "PAMIP", "PMIP", "RFMIP", "ScenarioMIP", @@ -2007,6 +2287,7 @@ "activity_participation":[ "AerChemMIP", "C4MIP", + "CDRMIP", "CMIP", "GeoMIP", "LUMIP", @@ -2045,6 +2326,20 @@ "source_id":"UKESM1-0-MMh", "source":"UKESM1.0-MMh (2018): \naerosol: UKCA-GLOMAP-mode (horizontal resolution degraded relative to that used for atmosphere physics)\natmos: MetUM-HadGEM3-GA7.1 (N216; 432 x 324 longitude/latitude; 85 levels; top level 85 km)\natmosChem: UKCA-StratTrop (horizontal resolution degraded relative to that used for atmosphere physics)\nland: JULES-ES-1.0\nlandIce: none\nocean: NEMO-HadGEM3-GO6.0 (eORCA025 tripolar primarily 0.25 deg; 1440 x 1205 longitude/latitude; 75 levels; top grid cell 0-1 m)\nocnBgchem: MEDUSA2 (horizontal resolution degraded relative to that used for ocean physics)\nseaIce: CICE-HadGEM3-GSI8 (eORCA025 tripolar primarily 0.25 deg; 1440 x 1205 longitude/latitude)" }, + "UKESM1-ice-LL":{ + "activity_participation":[ + "ISMIP6" + ], + "cohort":[ + "Registered" + ], + "institution_id":[ + "MOHC", + "NERC" + ], + "source_id":"UKESM1-ice-LL", + "source":"UKESM1.ice-LL (2019): \naerosol: UKCA-GLOMAP-mode\natmos: MetUM-HadGEM3-GA7.1 (N96; 192 x 144 longitude/latitude; 85 levels; top level 85 km)\natmosChem: none\nland: JULES-ISMIP6-1.0\nlandIce: BISICLES-UKESM-ISMIP6-1.0\nocean: NEMO-HadGEM3-GO6.0 (eORCA1 tripolar primarily 1 deg with meridional refinement down to 1/3 degree in the tropics; 360 x 330 longitude/latitude; 75 levels; top grid cell 0-1 m)\nocnBgchem: none\nseaIce: CICE-HadGEM3-GSI8 (eORCA1 tripolar primarily 1 deg; 360 x 330 longitude/latitude)" + }, "UofT-CCSM4":{ "activity_participation":[ "CMIP", @@ -4576,6 +4871,30 @@ "none" ] }, + "esm-past1000":{ + "activity_id":[ + "PMIP" + ], + "additional_allowed_model_components":[ + "AER", + "CHEM" + ], + "experiment":"last millennium experiment with interactive carbon cycle", + "experiment_id":"esm-past1000", + "parent_activity_id":[ + "no parent" + ], + "parent_experiment_id":[ + "no parent" + ], + "required_model_components":[ + "AOGCM", + "BGC" + ], + "sub_experiment_id":[ + "none" + ] + }, "esm-pi-CO2pulse":{ "activity_id":[ "CDRMIP" @@ -4960,6 +5279,30 @@ "none" ] }, + "faf-antwater-stress":{ + "activity_id":[ + "FAFMIP" + ], + "additional_allowed_model_components":[ + "AER", + "CHEM", + "BGC" + ], + "experiment":"control plus perturbative surface fluxes of momentum and freshwater into ocean, the latter around the coast of Antarctica only", + "experiment_id":"faf-antwater-stress", + "parent_activity_id":[ + "CMIP" + ], + "parent_experiment_id":[ + "piControl" + ], + "required_model_components":[ + "AOGCM" + ], + "sub_experiment_id":[ + "none" + ] + }, "faf-heat":{ "activity_id":[ "FAFMIP" @@ -4984,6 +5327,54 @@ "none" ] }, + "faf-heat-NA0pct":{ + "activity_id":[ + "FAFMIP" + ], + "additional_allowed_model_components":[ + "AER", + "CHEM", + "BGC" + ], + "experiment":"control plus perturbative surface flux of heat into ocean", + "experiment_id":"faf-heat-NA0pct", + "parent_activity_id":[ + "CMIP" + ], + "parent_experiment_id":[ + "piControl" + ], + "required_model_components":[ + "AOGCM" + ], + "sub_experiment_id":[ + "none" + ] + }, + "faf-heat-NA50pct":{ + "activity_id":[ + "FAFMIP" + ], + "additional_allowed_model_components":[ + "AER", + "CHEM", + "BGC" + ], + "experiment":"control plus perturbative surface flux of heat into ocean", + "experiment_id":"faf-heat-NA50pct", + "parent_activity_id":[ + "CMIP" + ], + "parent_experiment_id":[ + "piControl" + ], + "required_model_components":[ + "AOGCM" + ], + "sub_experiment_id":[ + "none" + ] + }, "faf-passiveheat":{ "activity_id":[ "FAFMIP" @@ -5351,6 +5742,30 @@ "none" ] }, + "hist-GHG-cmip5":{ + "activity_id":[ + "DAMIP" + ], + "additional_allowed_model_components":[ + "AER", + "CHEM", + "BGC" + ], + "experiment":"historical well-mixed GHG-only run (CMIP5-era historical [1850-2005] and RCP4.5 [2006-2020] forcing)", + "experiment_id":"hist-GHG-cmip5", + "parent_activity_id":[ + "CMIP" + ], + "parent_experiment_id":[ + "piControl-cmip5" + ], + "required_model_components":[ + "AOGCM" + ], + "sub_experiment_id":[ + "none" + ] + }, "hist-aer":{ "activity_id":[ "DAMIP" @@ -5375,6 +5790,30 @@ "none" ] }, + "hist-aer-cmip5":{ + "activity_id":[ + "DAMIP" + ], + "additional_allowed_model_components":[ + "AER", + "CHEM", + "BGC" + ], + "experiment":"historical anthropogenic aerosols-only run (CMIP5-era historical [1850-2005] and RCP4.5 [2006-2020] forcing)", + "experiment_id":"hist-aer-cmip5", + "parent_activity_id":[ + "CMIP" + ], + "parent_experiment_id":[ + "piControl-cmip5" + ], + "required_model_components":[ + "AOGCM" + ], + "sub_experiment_id":[ + "none" + ] + }, "hist-all-aer2":{ "activity_id":[ "DAMIP" @@ -5471,6 +5910,30 @@ "none" ] }, + "hist-nat-cmip5":{ + "activity_id":[ + "DAMIP" + ], + "additional_allowed_model_components":[ + "AER", + "CHEM", + "BGC" + ], + "experiment":"historical natural-only run (CMIP5-era historical [1850-2005] and RCP4.5 [2006-2020] forcing)", + "experiment_id":"hist-nat-cmip5", + "parent_activity_id":[ + "CMIP" + ], + "parent_experiment_id":[ + "piControl-cmip5" + ], + "required_model_components":[ + "AOGCM" + ], + "sub_experiment_id":[ + "none" + ] + }, "hist-noLu":{ "activity_id":[ "LUMIP" @@ -5620,7 +6083,8 @@ "RFMIP" ], "additional_allowed_model_components":[ - "" + "CHEM", + "BGC" ], "experiment":"historical simulation with specified anthropogenic aerosols, no other forcings", "experiment_id":"hist-spAer-aer", @@ -5642,7 +6106,8 @@ "RFMIP" ], "additional_allowed_model_components":[ - "" + "CHEM", + "BGC" ], "experiment":"historical simulation with specified anthropogenic aerosols", "experiment_id":"hist-spAer-all", @@ -5667,7 +6132,7 @@ "AER", "BGC" ], - "experiment":"historical stratospheric-ozone-only run", + "experiment":"historical stratospheric ozone-only run", "experiment_id":"hist-stratO3", "parent_activity_id":[ "CMIP" @@ -5682,6 +6147,29 @@ "none" ] }, + "hist-totalO3":{ + "activity_id":[ + "DAMIP" + ], + "additional_allowed_model_components":[ + "AER", + "BGC" + ], + "experiment":"historical total ozone-only run", + "experiment_id":"hist-totalO3", + "parent_activity_id":[ + "CMIP" + ], + "parent_experiment_id":[ + "piControl" + ], + "required_model_components":[ + "AOGCM" + ], + "sub_experiment_id":[ + "none" + ] + }, "hist-volc":{ "activity_id":[ "DAMIP" @@ -5772,7 +6260,7 @@ "piControl" ], "required_model_components":[ - "AOGCM" + "AGCM" ], "sub_experiment_id":[ "none" @@ -5890,15 +6378,39 @@ "piControl" ], "required_model_components":[ - "AGCM", - "AER", - "CHEM" + "AGCM", + "AER", + "CHEM" + ], + "sub_experiment_id":[ + "none" + ] + }, + "historical":{ + "activity_id":[ + "CMIP" + ], + "additional_allowed_model_components":[ + "AER", + "CHEM", + "BGC" + ], + "experiment":"all-forcing simulation of the recent past", + "experiment_id":"historical", + "parent_activity_id":[ + "CMIP" + ], + "parent_experiment_id":[ + "piControl" + ], + "required_model_components":[ + "AOGCM" ], "sub_experiment_id":[ "none" ] }, - "historical":{ + "historical-cmip5":{ "activity_id":[ "CMIP" ], @@ -5907,13 +6419,13 @@ "CHEM", "BGC" ], - "experiment":"all-forcing simulation of the recent past", - "experiment_id":"historical", + "experiment":"all-forcing simulation of the recent past (CMIP5-era [1850-2005] forcing)", + "experiment_id":"historical-cmip5", "parent_activity_id":[ "CMIP" ], "parent_experiment_id":[ - "piControl" + "piControl-cmip5" ], "required_model_components":[ "AOGCM" @@ -7394,6 +7906,78 @@ "none" ] }, + "past1000-solaronly":{ + "activity_id":[ + "PMIP" + ], + "additional_allowed_model_components":[ + "AER", + "CHEM", + "BGC" + ], + "experiment":"last millennium experiment using only solar forcing", + "experiment_id":"past1000-solaronly", + "parent_activity_id":[ + "no parent" + ], + "parent_experiment_id":[ + "no parent" + ], + "required_model_components":[ + "AOGCM" + ], + "sub_experiment_id":[ + "none" + ] + }, + "past1000-volconly":{ + "activity_id":[ + "PMIP" + ], + "additional_allowed_model_components":[ + "AER", + "CHEM", + "BGC" + ], + "experiment":"last millennium experiment using only volcanic forcing", + "experiment_id":"past1000-volconly", + "parent_activity_id":[ + "no parent" + ], + "parent_experiment_id":[ + "no parent" + ], + "required_model_components":[ + "AOGCM" + ], + "sub_experiment_id":[ + "none" + ] + }, + "past2k":{ + "activity_id":[ + "PMIP" + ], + "additional_allowed_model_components":[ + "AER", + "CHEM", + "BGC" + ], + "experiment":"last two millennia experiment", + "experiment_id":"past2k", + "parent_activity_id":[ + "no parent" + ], + "parent_experiment_id":[ + "no parent" + ], + "required_model_components":[ + "AOGCM" + ], + "sub_experiment_id":[ + "none" + ] + }, "pdSST-futAntSIC":{ "activity_id":[ "PAMIP" @@ -8368,6 +8952,30 @@ "none" ] }, + "piControl-cmip5":{ + "activity_id":[ + "CMIP" + ], + "additional_allowed_model_components":[ + "AER", + "CHEM", + "BGC" + ], + "experiment":"pre-industrial control (CMIP5-era [1850-2005] forcing)", + "experiment_id":"piControl-cmip5", + "parent_activity_id":[ + "CMIP" + ], + "parent_experiment_id":[ + "piControl-spinup-cmip5" + ], + "required_model_components":[ + "AOGCM" + ], + "sub_experiment_id":[ + "none" + ] + }, "piControl-spinup":{ "activity_id":[ "CMIP" @@ -8392,6 +9000,30 @@ "none" ] }, + "piControl-spinup-cmip5":{ + "activity_id":[ + "CMIP" + ], + "additional_allowed_model_components":[ + "AER", + "CHEM", + "BGC" + ], + "experiment":"pre-industrial control (spin-up; CMIP5-era [1850-2005] forcing)", + "experiment_id":"piControl-spinup-cmip5", + "parent_activity_id":[ + "CMIP" + ], + "parent_experiment_id":[ + "no parent" + ], + "required_model_components":[ + "AOGCM" + ], + "sub_experiment_id":[ + "none" + ] + }, "piControl-withism":{ "activity_id":[ "ISMIP6" @@ -8602,6 +9234,102 @@ "none" ] }, + "rcp26-cmip5":{ + "activity_id":[ + "ScenarioMIP" + ], + "additional_allowed_model_components":[ + "AER", + "CHEM", + "BGC" + ], + "experiment":"future projection based on CMIP5-era RCP2.6 scenario (CMIP5-era [2006-2100] forcing)", + "experiment_id":"rcp26-cmip5", + "parent_activity_id":[ + "CMIP" + ], + "parent_experiment_id":[ + "historical-cmip5" + ], + "required_model_components":[ + "AOGCM" + ], + "sub_experiment_id":[ + "none" + ] + }, + "rcp45-cmip5":{ + "activity_id":[ + "ScenarioMIP" + ], + "additional_allowed_model_components":[ + "AER", + "CHEM", + "BGC" + ], + "experiment":"future projection based on CMIP5-era RCP4.5 scenario (CMIP5-era [2006-2100] forcing)", + "experiment_id":"rcp45-cmip5", + "parent_activity_id":[ + "CMIP" + ], + "parent_experiment_id":[ + "historical-cmip5" + ], + "required_model_components":[ + "AOGCM" + ], + "sub_experiment_id":[ + "none" + ] + }, + "rcp60-cmip5":{ + "activity_id":[ + "ScenarioMIP" + ], + "additional_allowed_model_components":[ + "AER", + "CHEM", + "BGC" + ], + "experiment":"future projection based on CMIP5-era RCP6.0 scenario (CMIP5-era [2006-2100] forcing)", + "experiment_id":"rcp60-cmip5", + "parent_activity_id":[ + "CMIP" + ], + "parent_experiment_id":[ + "historical-cmip5" + ], + "required_model_components":[ + "AOGCM" + ], + "sub_experiment_id":[ + "none" + ] + }, + "rcp85-cmip5":{ + "activity_id":[ + "ScenarioMIP" + ], + "additional_allowed_model_components":[ + "AER", + "CHEM", + "BGC" + ], + "experiment":"future projection based on CMIP5-era RCP8.5 scenario (CMIP5-era [2006-2100] forcing)", + "experiment_id":"rcp85-cmip5", + "parent_activity_id":[ + "CMIP" + ], + "parent_experiment_id":[ + "historical-cmip5" + ], + "required_model_components":[ + "AOGCM" + ], + "sub_experiment_id":[ + "none" + ] + }, "spinup-1950":{ "activity_id":[ "HighResMIP" @@ -8800,7 +9528,7 @@ "AER", "BGC" ], - "experiment":"stratospheric-ozone-only SSP2-4.5 run", + "experiment":"stratospheric ozone-only SSP2-4.5 (ssp245) run", "experiment_id":"ssp245-stratO3", "parent_activity_id":[ "DAMIP" @@ -8863,6 +9591,30 @@ "none" ] }, + "ssp370-lowNTCFCH4":{ + "activity_id":[ + "AerChemMIP" + ], + "additional_allowed_model_components":[ + "CHEM", + "BGC" + ], + "experiment":"SSP3-7.0, with low NTCF emissions and methane concentrations", + "experiment_id":"ssp370-lowNTCFCH4", + "parent_activity_id":[ + "CMIP" + ], + "parent_experiment_id":[ + "historical" + ], + "required_model_components":[ + "AOGCM", + "AER" + ], + "sub_experiment_id":[ + "none" + ] + }, "ssp370-ssp126Lu":{ "activity_id":[ "LUMIP" @@ -9007,6 +9759,30 @@ "none" ] }, + "ssp370SST-lowNTCFCH4":{ + "activity_id":[ + "AerChemMIP" + ], + "additional_allowed_model_components":[ + "CHEM", + "BGC" + ], + "experiment":"SSP3-7.0, prescribed SSTs, with low NTCF emissions and methane concentrations", + "experiment_id":"ssp370SST-lowNTCFCH4", + "parent_activity_id":[ + "CMIP" + ], + "parent_experiment_id":[ + "historical" + ], + "required_model_components":[ + "AGCM", + "AER" + ], + "sub_experiment_id":[ + "none" + ] + }, "ssp370SST-lowO3":{ "activity_id":[ "AerChemMIP" @@ -9055,6 +9831,30 @@ "none" ] }, + "ssp370pdSST":{ + "activity_id":[ + "AerChemMIP" + ], + "additional_allowed_model_components":[ + "CHEM", + "BGC" + ], + "experiment":"SSP3-7.0, with SSTs prescribed as present day", + "experiment_id":"ssp370pdSST", + "parent_activity_id":[ + "CMIP" + ], + "parent_experiment_id":[ + "historical" + ], + "required_model_components":[ + "AGCM", + "AER" + ], + "sub_experiment_id":[ + "none" + ] + }, "ssp434":{ "activity_id":[ "ScenarioMIP" diff --git a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_E1hr.json b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_E1hr.json index 423af7af07..b02671d036 100644 --- a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_E1hr.json +++ b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_E1hr.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.31", + "data_specs_version": "01.00.32", "cmor_version": "3.5", "table_id": "Table E1hr", "realm": "atmos", - "table_date": "24 July 2019", + "table_date": "28 May 2020", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", diff --git a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_E1hrClimMon.json b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_E1hrClimMon.json index 1b8973e05d..992d9ced4a 100644 --- a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_E1hrClimMon.json +++ b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_E1hrClimMon.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.31", + "data_specs_version": "01.00.32", "cmor_version": "3.5", "table_id": "Table E1hrClimMon", "realm": "atmos", - "table_date": "24 July 2019", + "table_date": "28 May 2020", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", diff --git a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_E3hr.json b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_E3hr.json index 1d33ce2aa5..810e743b5c 100644 --- a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_E3hr.json +++ b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_E3hr.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.31", + "data_specs_version": "01.00.32", "cmor_version": "3.5", "table_id": "Table E3hr", "realm": "land", - "table_date": "24 July 2019", + "table_date": "28 May 2020", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", diff --git a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_E3hrPt.json b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_E3hrPt.json index 0983f40e2b..2d199c43d0 100644 --- a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_E3hrPt.json +++ b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_E3hrPt.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.31", + "data_specs_version": "01.00.32", "cmor_version": "3.5", "table_id": "Table E3hrPt", "realm": "atmos", - "table_date": "24 July 2019", + "table_date": "28 May 2020", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", @@ -125,7 +125,7 @@ "cfadLidarsr532": { "frequency": "3hrPt", "modeling_realm": "atmos", - "standard_name": "histogram_of_backscattering_ratio_over_height_above_reference_ellipsoid", + "standard_name": "histogram_of_backscattering_ratio_in_air_over_height_above_reference_ellipsoid", "units": "1", "cell_methods": "area: mean time: point", "cell_measures": "area: areacella", diff --git a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_E6hrZ.json b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_E6hrZ.json index c2c01b4af5..4099e801f7 100644 --- a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_E6hrZ.json +++ b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_E6hrZ.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.31", + "data_specs_version": "01.00.32", "cmor_version": "3.5", "table_id": "Table E6hrZ", "realm": "atmos", - "table_date": "24 July 2019", + "table_date": "28 May 2020", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", @@ -14,24 +14,6 @@ "Conventions": "CF-1.7 CMIP-6.2" }, "variable_entry": { - "ps": { - "frequency": "6hr", - "modeling_realm": "atmos", - "standard_name": "surface_air_pressure", - "units": "Pa", - "cell_methods": "longitude: mean time: mean", - "cell_measures": "", - "long_name": "Surface Air Pressure", - "comment": "surface pressure (not mean sea-level pressure), 2-D field to calculate the 3-D pressure field from hybrid coordinates", - "dimensions": "latitude time", - "out_name": "ps", - "type": "real", - "positive": "", - "valid_min": "", - "valid_max": "", - "ok_min_mean_abs": "", - "ok_max_mean_abs": "" - }, "zmlwaero": { "frequency": "6hrPt", "modeling_realm": "atmos", diff --git a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_Eday.json b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_Eday.json index baff9fa6a3..dd342119d1 100644 --- a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_Eday.json +++ b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_Eday.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.31", + "data_specs_version": "01.00.32", "cmor_version": "3.5", "table_id": "Table Eday", "realm": "land", - "table_date": "24 July 2019", + "table_date": "28 May 2020", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", @@ -107,7 +107,7 @@ "ccldncl": { "frequency": "day", "modeling_realm": "atmos", - "standard_name": "number_concentration_of_convective_cloud_liquid_water_particle_at_convective_liquid_water_cloud_top", + "standard_name": "number_concentration_of_convective_cloud_liquid_water_particles_at_convective_liquid_water_cloud_top", "units": "m-3", "cell_methods": "area: time: mean", "cell_measures": "area: areacella", @@ -418,7 +418,7 @@ "cell_methods": "area: mean where land time: mean", "cell_measures": "area: areacella", "long_name": "Interception Evaporation", - "comment": "'Water' means water in all phases. 'Canopy' means the plant or vegetation canopy. Evaporation is the conversion of liquid or solid into vapor. (The conversion of solid alone into vapor is called 'sublimation'.) In accordance with common usage in geophysical disciplines, 'flux' implies per unit area, called 'flux density' in physics. Unless indicated in the cell_methods attribute, a quantity is assumed to apply to the whole area of each horizontal grid box. Previously, the qualifier where_type was used to specify that the quantity applies only to the part of the grid box of the named type. Names containing the where_type qualifier are deprecated and newly created data should use the cell_methods attribute to indicate the horizontal area to which the quantity applies.", + "comment": "Evaporation flux from water in all phases on the vegetation canopy.", "dimensions": "longitude latitude time", "out_name": "ec", "type": "real", @@ -1385,7 +1385,7 @@ "reffcclwtop": { "frequency": "day", "modeling_realm": "atmos", - "standard_name": "effective_radius_of_convective_cloud_liquid_water_particle_at_convective_liquid_water_cloud_top", + "standard_name": "effective_radius_of_convective_cloud_liquid_water_particles_at_convective_liquid_water_cloud_top", "units": "m", "cell_methods": "area: time: mean", "cell_measures": "area: areacella", @@ -1403,7 +1403,7 @@ "reffsclwtop": { "frequency": "day", "modeling_realm": "atmos", - "standard_name": "effective_radius_of_stratiform_cloud_liquid_water_particle_at_stratiform_liquid_water_cloud_top", + "standard_name": "effective_radius_of_stratiform_cloud_liquid_water_particles_at_stratiform_liquid_water_cloud_top", "units": "m", "cell_methods": "area: time: mean", "cell_measures": "area: areacella", @@ -1583,7 +1583,7 @@ "scldncl": { "frequency": "day", "modeling_realm": "atmos", - "standard_name": "number_concentration_of_stratiform_cloud_liquid_water_particle_at_stratiform_liquid_water_cloud_top", + "standard_name": "number_concentration_of_stratiform_cloud_liquid_water_particles_at_stratiform_liquid_water_cloud_top", "units": "m-3", "cell_methods": "area: time: mean", "cell_measures": "area: areacella", @@ -1677,7 +1677,7 @@ "units": "kg m-2", "cell_methods": "area: mean where land time: mean", "cell_measures": "area: areacella", - "long_name": " snow water equivalent intercepted by the vegetation", + "long_name": "Snow Water Equivalent Intercepted by the Vegetation", "comment": "Total water mass of the snowpack (liquid or frozen), averaged over a grid cell and intercepted by the canopy.", "dimensions": "longitude latitude time", "out_name": "snwc", diff --git a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_EdayZ.json b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_EdayZ.json index 7f59f11996..66e901fedf 100644 --- a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_EdayZ.json +++ b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_EdayZ.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.31", + "data_specs_version": "01.00.32", "cmor_version": "3.5", "table_id": "Table EdayZ", "realm": "atmos", - "table_date": "24 July 2019", + "table_date": "28 May 2020", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", diff --git a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_Efx.json b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_Efx.json index 36d0a8d1f9..b643b59712 100644 --- a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_Efx.json +++ b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_Efx.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.31", + "data_specs_version": "01.00.32", "cmor_version": "3.5", "table_id": "Table Efx", "realm": "land", - "table_date": "24 July 2019", + "table_date": "28 May 2020", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", diff --git a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_Emon.json b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_Emon.json index 9f270df1c8..78038128b2 100644 --- a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_Emon.json +++ b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_Emon.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.31", + "data_specs_version": "01.00.32", "cmor_version": "3.5", "table_id": "Table Emon", "realm": "land", - "table_date": "24 July 2019", + "table_date": "28 May 2020", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", @@ -575,7 +575,7 @@ "cfadLidarsr532": { "frequency": "mon", "modeling_realm": "atmos", - "standard_name": "histogram_of_backscattering_ratio_over_height_above_reference_ellipsoid", + "standard_name": "histogram_of_backscattering_ratio_in_air_over_height_above_reference_ellipsoid", "units": "1", "cell_methods": "area: time: mean", "cell_measures": "area: areacella", @@ -1030,7 +1030,7 @@ "cell_methods": "area: time: mean", "cell_measures": "area: areacella", "long_name": "Aerosol Extinction Coefficient", - "comment": "Aerosol Extinction at 550nm", + "comment": "Aerosol volume extinction coefficient at 550nm wavelength.", "dimensions": "longitude latitude alevel time lambda550nm", "out_name": "ec550aer", "type": "real", @@ -1403,7 +1403,7 @@ "fLulccResidueLut": { "frequency": "mon", "modeling_realm": "land", - "standard_name": "carbon_mass_flux_into_soil_and_litter_due_to_anthropogenic_land_use_or_land_cover_change", + "standard_name": "carbon_mass_flux_into_litter_and_soil_due_to_anthropogenic_land_use_or_land_cover_change", "units": "kg m-2 s-1", "cell_methods": "area: time: mean where sector", "cell_measures": "area: areacella", @@ -2469,7 +2469,7 @@ "units": "W m-2", "cell_methods": "area: time: mean", "cell_measures": "area: areacella", - "long_name": "TOA Clear-Sky longwave Radiative Forcing due to Aerosols", + "long_name": "TOA Clear-Sky Longwave Radiative Forcing Due to Aerosols", "comment": "Instantaneous forcing is the radiative flux change caused instantaneously by an imposed change in radiative forcing agent (greenhouse gases, aerosol, solar radiation, etc.).", "dimensions": "longitude latitude time", "out_name": "lwtoacsaer", @@ -2973,7 +2973,7 @@ "units": "kg m-2 s-1", "cell_methods": "area: mean where land time: mean", "cell_measures": "area: areacella", - "long_name": "Net Carbon Mass Flux out of Atmosphere due to Net Ecosystem Productivity on Land [kgC m-2 s-1]", + "long_name": "Net Carbon Mass Flux out of Atmosphere Due to Net Ecosystem Productivity on Land [kgC m-2 s-1]", "comment": "Natural flux of CO2 (expressed as a mass flux of carbon) from the atmosphere to the land calculated as the difference between uptake associated will photosynthesis and the release of CO2 from the sum of plant and soil respiration and fire. Positive flux is into the land. Emissions from natural fires and human ignition fires as calculated by the fire module of the dynamic vegetation model, but excluding any CO2 flux from fire included in fLuc (CO2 Flux to Atmosphere from Land Use Change).", "dimensions": "longitude latitude time", "out_name": "nep", @@ -3167,7 +3167,7 @@ "ocontempdiff": { "frequency": "mon", "modeling_realm": "ocean", - "standard_name": "tendency_of_sea_water_conservative_temperature_expressed_as_heat_content_due_to_parameterized_eddy_dianeutral_mixing", + "standard_name": "tendency_of_sea_water_conservative_temperature_expressed_as_heat_content_due_to_parameterized_dianeutral_mixing", "units": "W m-2", "cell_methods": "area: mean where sea time: mean", "cell_measures": "area: areacello volume: volcello", @@ -3185,7 +3185,7 @@ "ocontempmint": { "frequency": "mon", "modeling_realm": "ocean", - "standard_name": "integral_wrt_depth_of_product_of_sea_water_density_and_conservative_temperature", + "standard_name": "integral_wrt_depth_of_product_of_conservative_temperature_and_sea_water_density", "units": "degC kg m-2", "cell_methods": "area: mean where sea time: mean", "cell_measures": "area: areacello", @@ -3365,7 +3365,7 @@ "opottempdiff": { "frequency": "mon", "modeling_realm": "ocean", - "standard_name": "tendency_of_sea_water_potential_temperature_expressed_as_heat_content_due_to_parameterized_eddy_dianeutral_mixing", + "standard_name": "tendency_of_sea_water_potential_temperature_expressed_as_heat_content_due_to_parameterized_dianeutral_mixing", "units": "W m-2", "cell_methods": "area: mean where sea time: mean", "cell_measures": "area: areacello volume: volcello", @@ -3383,7 +3383,7 @@ "opottempmint": { "frequency": "mon", "modeling_realm": "ocean", - "standard_name": "integral_wrt_depth_of_product_of_sea_water_density_and_potential_temperature", + "standard_name": "integral_wrt_depth_of_product_of_potential_temperature_and_sea_water_density", "units": "degC kg m-2", "cell_methods": "area: mean where sea time: mean", "cell_measures": "area: areacello", @@ -3509,7 +3509,7 @@ "osaltdiff": { "frequency": "mon", "modeling_realm": "ocean", - "standard_name": "tendency_of_sea_water_salinity_expressed_as_salt_content_due_to_parameterized_eddy_dianeutral_mixing", + "standard_name": "tendency_of_sea_water_salinity_expressed_as_salt_content_due_to_parameterized_dianeutral_mixing", "units": "kg m-2 s-1", "cell_methods": "area: mean where sea time: mean", "cell_measures": "area: areacello volume: volcello", @@ -3743,7 +3743,7 @@ "ppdiaz": { "frequency": "mon", "modeling_realm": "ocnBgchem", - "standard_name": "tendency_of_mole_concentration_of_particulate_organic_matter_expressed_as_carbon_in_sea_water_due_to_net_primary_production_by_diazotrophs", + "standard_name": "tendency_of_mole_concentration_of_particulate_organic_matter_expressed_as_carbon_in_sea_water_due_to_net_primary_production_by_diazotrophic_phytoplankton", "units": "mol m-3 s-1", "cell_methods": "area: mean where sea time: mean", "cell_measures": "area: areacello volume: volcello", @@ -4229,7 +4229,7 @@ "rainmxrat27": { "frequency": "mon", "modeling_realm": "atmos", - "standard_name": "mass_fraction_of_rain_in_air", + "standard_name": "mass_fraction_of_liquid_precipitation_in_air", "units": "1", "cell_methods": "time: mean", "cell_measures": "area: areacella", @@ -4247,7 +4247,7 @@ "reffclic": { "frequency": "mon", "modeling_realm": "atmos", - "standard_name": "effective_radius_of_convective_cloud_ice_particle", + "standard_name": "effective_radius_of_convective_cloud_ice_particles", "units": "m", "cell_methods": "area: time: mean", "cell_measures": "area: areacella", @@ -4265,7 +4265,7 @@ "reffclis": { "frequency": "mon", "modeling_realm": "atmos", - "standard_name": "effective_radius_of_stratiform_cloud_ice_particle", + "standard_name": "effective_radius_of_stratiform_cloud_ice_particles", "units": "m", "cell_methods": "area: time: mean", "cell_measures": "area: areacella", @@ -4283,7 +4283,7 @@ "reffclwc": { "frequency": "mon", "modeling_realm": "atmos", - "standard_name": "effective_radius_of_convective_cloud_liquid_water_particle", + "standard_name": "effective_radius_of_convective_cloud_liquid_water_particles", "units": "m", "cell_methods": "area: time: mean", "cell_measures": "area: areacella", @@ -4301,7 +4301,7 @@ "reffclws": { "frequency": "mon", "modeling_realm": "atmos", - "standard_name": "effective_radius_of_stratiform_cloud_liquid_water_particle", + "standard_name": "effective_radius_of_stratiform_cloud_liquid_water_particles", "units": "m", "cell_methods": "area: time: mean", "cell_measures": "area: areacella", @@ -4575,7 +4575,7 @@ "units": "W m-2", "cell_methods": "area: time: mean where sector", "cell_measures": "area: areacella", - "long_name": "Surface Upwelling Shortwave on Land-use Tile", + "long_name": "Surface Upwelling Shortwave on Land-Use Tile", "comment": "The surface called 'surface' means the lower boundary of the atmosphere. 'shortwave' means shortwave radiation. Upwelling radiation is radiation from below. It does not mean 'net upward'. When thought of as being incident on a surface, a radiative flux is sometimes called 'irradiance'. In addition, it is identical with the quantity measured by a cosine-collector light-meter and sometimes called 'vector irradiance'. In accordance with common usage in geophysical disciplines, 'flux' implies per unit area, called 'flux density' in physics.", "dimensions": "longitude latitude landUse time", "out_name": "rsusLut", @@ -4697,7 +4697,7 @@ "somint": { "frequency": "mon", "modeling_realm": "ocean", - "standard_name": "integral_wrt_depth_of_product_of_sea_water_density_and_salinity", + "standard_name": "integral_wrt_depth_of_product_of_salinity_and_sea_water_density", "units": "g m-2", "cell_methods": "area: mean where sea time: mean", "cell_measures": "area: areacello", @@ -4845,7 +4845,7 @@ "units": "W m-2", "cell_methods": "area: time: mean", "cell_measures": "area: areacella", - "long_name": "clear sky Shortwave flux due to dust at toa", + "long_name": "Clear Sky Shortwave Flux Due to Dust at Toa", "comment": "Instantaneous forcing is the radiative flux change caused instantaneously by an imposed change in radiative forcing agent (greenhouse gases, aerosol, solar radiation, etc.).", "dimensions": "longitude latitude time", "out_name": "swtoacsdust", @@ -5345,7 +5345,7 @@ "twap": { "frequency": "mon", "modeling_realm": "atmos", - "standard_name": "product_of_omega_and_air_temperature", + "standard_name": "product_of_lagrangian_tendency_of_air_pressure_and_air_temperature", "units": "K Pa s-1", "cell_methods": "area: time: mean", "cell_measures": "area: areacella", @@ -5507,7 +5507,7 @@ "uwap": { "frequency": "mon", "modeling_realm": "atmos", - "standard_name": "product_of_eastward_wind_and_omega", + "standard_name": "product_of_eastward_wind_and_lagrangian_tendency_of_air_pressure", "units": "Pa m s-2", "cell_methods": "area: time: mean", "cell_measures": "area: areacella", @@ -5777,7 +5777,7 @@ "vwap": { "frequency": "mon", "modeling_realm": "atmos", - "standard_name": "product_of_northward_wind_and_omega", + "standard_name": "product_of_northward_wind_and_lagrangian_tendency_of_air_pressure", "units": "Pa m s-2", "cell_methods": "area: time: mean", "cell_measures": "area: areacella", diff --git a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_EmonZ.json b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_EmonZ.json index 8e0aba2af6..8d75ce1fed 100644 --- a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_EmonZ.json +++ b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_EmonZ.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.31", + "data_specs_version": "01.00.32", "cmor_version": "3.5", "table_id": "Table EmonZ", "realm": "atmos", - "table_date": "24 July 2019", + "table_date": "28 May 2020", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", diff --git a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_Esubhr.json b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_Esubhr.json index 89b86e55e7..b437fc731c 100644 --- a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_Esubhr.json +++ b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_Esubhr.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.31", + "data_specs_version": "01.00.32", "cmor_version": "3.5", "table_id": "Table Esubhr", "realm": "atmos", - "table_date": "24 July 2019", + "table_date": "28 May 2020", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", @@ -199,7 +199,7 @@ "reffclic": { "frequency": "subhrPt", "modeling_realm": "atmos", - "standard_name": "effective_radius_of_convective_cloud_ice_particle", + "standard_name": "effective_radius_of_convective_cloud_ice_particles", "units": "m", "cell_methods": "area: point time: point", "cell_measures": "", @@ -217,7 +217,7 @@ "reffclis": { "frequency": "subhrPt", "modeling_realm": "atmos", - "standard_name": "effective_radius_of_stratiform_cloud_ice_particle", + "standard_name": "effective_radius_of_stratiform_cloud_ice_particles", "units": "m", "cell_methods": "area: point time: point", "cell_measures": "", @@ -235,7 +235,7 @@ "reffclwc": { "frequency": "subhrPt", "modeling_realm": "atmos", - "standard_name": "effective_radius_of_convective_cloud_liquid_water_particle", + "standard_name": "effective_radius_of_convective_cloud_liquid_water_particles", "units": "m", "cell_methods": "area: point time: point", "cell_measures": "", @@ -253,7 +253,7 @@ "reffclws": { "frequency": "subhrPt", "modeling_realm": "atmos", - "standard_name": "effective_radius_of_stratiform_cloud_liquid_water_particle", + "standard_name": "effective_radius_of_stratiform_cloud_liquid_water_particles", "units": "m", "cell_methods": "area: point time: point", "cell_measures": "", diff --git a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_Eyr.json b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_Eyr.json index 28672f3715..1099651232 100644 --- a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_Eyr.json +++ b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_Eyr.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.31", + "data_specs_version": "01.00.32", "cmor_version": "3.5", "table_id": "Table Eyr", "realm": "land", - "table_date": "24 July 2019", + "table_date": "28 May 2020", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", @@ -129,7 +129,7 @@ "units": "kg m-2", "cell_methods": "area: mean where sector time: point", "cell_measures": "area: areacella", - "long_name": "carbon in soil pool on Land-use tiles", + "long_name": "Carbon in Soil Pool on Land-Use Tiles", "comment": "end of year values (not annual mean)", "dimensions": "longitude latitude landUse time1", "out_name": "cSoilLut", @@ -237,7 +237,7 @@ "units": "%", "cell_methods": "area: mean where land over all_area_types time: sum", "cell_measures": "area: areacella", - "long_name": "Annual gross percentage of Land-use tile that was transferred into other Land-use tiles", + "long_name": "Annual Gross Percentage of Land-Use Tile That Was Transferred into Other Land-Use Tiles", "comment": "Cumulative percentage transitions over the year; note that percentage should be reported as percentage of atmospheric grid cell", "dimensions": "longitude latitude landUse time", "out_name": "fracOutLut", diff --git a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_IfxAnt.json b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_IfxAnt.json index 7d78f879d0..08c237f19d 100644 --- a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_IfxAnt.json +++ b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_IfxAnt.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.31", + "data_specs_version": "01.00.32", "cmor_version": "3.5", "table_id": "Table IfxAnt", "realm": "landIce", - "table_date": "24 July 2019", + "table_date": "28 May 2020", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", @@ -40,7 +40,7 @@ "cell_methods": "area: mean where grounded_ice_sheet", "cell_measures": "area: areacellg", "long_name": "Geothermal Heat Flux Beneath Land Ice", - "comment": "Upward geothermal heat flux per unit area beneath land ice", + "comment": "Upward geothermal heat flux per unit area into the base of grounded land ice. This is related to the geothermal heat flux out of the bedrock, but may be modified by horizontal transport due to run-off and by melting at the interface.", "dimensions": "xant yant", "out_name": "hfgeoubed", "type": "real", diff --git a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_IfxGre.json b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_IfxGre.json index 5289fe60f6..ca3f35ef3f 100644 --- a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_IfxGre.json +++ b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_IfxGre.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.31", + "data_specs_version": "01.00.32", "cmor_version": "3.5", "table_id": "Table IfxGre", "realm": "landIce", - "table_date": "24 July 2019", + "table_date": "28 May 2020", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", @@ -40,7 +40,7 @@ "cell_methods": "area: mean where grounded_ice_sheet", "cell_measures": "area: areacellg", "long_name": "Geothermal Heat Flux Beneath Land Ice", - "comment": "Upward geothermal heat flux per unit area beneath land ice", + "comment": "Upward geothermal heat flux per unit area into the base of grounded land ice. This is related to the geothermal heat flux out of the bedrock, but may be modified by horizontal transport due to run-off and by melting at the interface.", "dimensions": "xgre ygre", "out_name": "hfgeoubed", "type": "real", diff --git a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_ImonAnt.json b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_ImonAnt.json index f6ccbdb32b..58d2b4c239 100644 --- a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_ImonAnt.json +++ b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_ImonAnt.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.31", + "data_specs_version": "01.00.32", "cmor_version": "3.5", "table_id": "Table ImonAnt", "realm": "landIce land", - "table_date": "24 July 2019", + "table_date": "28 May 2020", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", diff --git a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_ImonGre.json b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_ImonGre.json index 50e691a083..298f6bbcc3 100644 --- a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_ImonGre.json +++ b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_ImonGre.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.31", + "data_specs_version": "01.00.32", "cmor_version": "3.5", "table_id": "Table ImonGre", "realm": "landIce land", - "table_date": "24 July 2019", + "table_date": "28 May 2020", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", diff --git a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_IyrAnt.json b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_IyrAnt.json index 6cd0e29bd4..2fa9fed891 100644 --- a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_IyrAnt.json +++ b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_IyrAnt.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.31", + "data_specs_version": "01.00.32", "cmor_version": "3.5", "table_id": "Table IyrAnt", "realm": "landIce", - "table_date": "24 July 2019", + "table_date": "28 May 2020", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", @@ -40,7 +40,7 @@ "cell_methods": "area: time: mean where grounded_ice_sheet (comment: mask=sfgrlf)", "cell_measures": "area: areacellg", "long_name": "Geothermal Heat Flux Beneath Land Ice", - "comment": "Upward geothermal heat flux per unit area beneath land ice", + "comment": "Upward geothermal heat flux per unit area into the base of grounded land ice. This is related to the geothermal heat flux out of the bedrock, but may be modified by horizontal transport due to run-off and by melting at the interface.", "dimensions": "xant yant time", "out_name": "hfgeoubed", "type": "real", diff --git a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_IyrGre.json b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_IyrGre.json index 023de73126..8a3399eae7 100644 --- a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_IyrGre.json +++ b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_IyrGre.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.31", + "data_specs_version": "01.00.32", "cmor_version": "3.5", "table_id": "Table IyrGre", "realm": "landIce", - "table_date": "24 July 2019", + "table_date": "28 May 2020", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", @@ -40,7 +40,7 @@ "cell_methods": "area: time: mean where grounded_ice_sheet (comment: mask=sfgrlf)", "cell_measures": "area: areacellg", "long_name": "Geothermal Heat Flux Beneath Land Ice", - "comment": "Upward geothermal heat flux per unit area beneath land ice", + "comment": "Upward geothermal heat flux per unit area into the base of grounded land ice. This is related to the geothermal heat flux out of the bedrock, but may be modified by horizontal transport due to run-off and by melting at the interface.", "dimensions": "xgre ygre time", "out_name": "hfgeoubed", "type": "real", diff --git a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_LImon.json b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_LImon.json index 6b965d5d30..8e401c2d5d 100644 --- a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_LImon.json +++ b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_LImon.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.31", + "data_specs_version": "01.00.32", "cmor_version": "3.5", "table_id": "Table LImon", "realm": "landIce land", - "table_date": "24 July 2019", + "table_date": "28 May 2020", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", diff --git a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_Lmon.json b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_Lmon.json index a4f3fdce5c..028718e618 100644 --- a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_Lmon.json +++ b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_Lmon.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.31", + "data_specs_version": "01.00.32", "cmor_version": "3.5", "table_id": "Table Lmon", "realm": "land", - "table_date": "24 July 2019", + "table_date": "28 May 2020", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", @@ -39,7 +39,7 @@ "units": "%", "cell_methods": "area: mean where land over all_area_types time: mean", "cell_measures": "area: areacella", - "long_name": "Percentage of Entire Grid cell that is Covered by Burnt Vegetation (All Classes)", + "long_name": "Percentage of Entire Grid Cell That Is Covered by Burnt Vegetation (All Classes)", "comment": "Percentage of grid cell burned due to all fires including natural and anthropogenic fires and those associated with anthropogenic Land-use change", "dimensions": "longitude latitude time typeburnt", "out_name": "burntFractionAll", diff --git a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_Oclim.json b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_Oclim.json index c99f8c6001..14fd8366cb 100644 --- a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_Oclim.json +++ b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_Oclim.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.31", + "data_specs_version": "01.00.32", "cmor_version": "3.5", "table_id": "Table Oclim", "realm": "ocean", - "table_date": "24 July 2019", + "table_date": "28 May 2020", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", diff --git a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_Oday.json b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_Oday.json index 94ff401328..11dd8bffa6 100644 --- a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_Oday.json +++ b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_Oday.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.31", + "data_specs_version": "01.00.32", "cmor_version": "3.5", "table_id": "Table Oday", "realm": "ocnBgchem", - "table_date": "24 July 2019", + "table_date": "28 May 2020", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", diff --git a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_Odec.json b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_Odec.json index d3799c2941..58e1ce22a1 100644 --- a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_Odec.json +++ b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_Odec.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.31", + "data_specs_version": "01.00.32", "cmor_version": "3.5", "table_id": "Table Odec", "realm": "ocean", - "table_date": "24 July 2019", + "table_date": "28 May 2020", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", diff --git a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_Ofx.json b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_Ofx.json index b6249fba19..e7ba106777 100644 --- a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_Ofx.json +++ b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_Ofx.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.31", + "data_specs_version": "01.00.32", "cmor_version": "3.5", "table_id": "Table Ofx", "realm": "ocean", - "table_date": "24 July 2019", + "table_date": "28 May 2020", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", diff --git a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_Omon.json b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_Omon.json index 8e392cd424..81d993fd08 100644 --- a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_Omon.json +++ b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_Omon.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.31", + "data_specs_version": "01.00.32", "cmor_version": "3.5", "table_id": "Table Omon", "realm": "ocnBgchem", - "table_date": "24 July 2019", + "table_date": "28 May 2020", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", @@ -377,7 +377,7 @@ "chldiaz": { "frequency": "mon", "modeling_realm": "ocnBgchem", - "standard_name": "mass_concentration_of_diazotrophs_expressed_as_chlorophyll_in_sea_water", + "standard_name": "mass_concentration_of_diazotrophic_phytoplankton_expressed_as_chlorophyll_in_sea_water", "units": "kg m-3", "cell_methods": "area: mean where sea time: mean", "cell_measures": "area: areacello volume: volcello", @@ -395,7 +395,7 @@ "chldiazos": { "frequency": "mon", "modeling_realm": "ocnBgchem", - "standard_name": "mass_concentration_of_diazotrophs_expressed_as_chlorophyll_in_sea_water", + "standard_name": "mass_concentration_of_diazotrophic_phytoplankton_expressed_as_chlorophyll_in_sea_water", "units": "kg m-3", "cell_methods": "area: mean where sea time: mean", "cell_measures": "area: areacello", @@ -2042,7 +2042,7 @@ "dimensions": "longitude latitude time", "out_name": "hflso", "type": "real", - "positive": "up", + "positive": "down", "valid_min": "", "valid_max": "", "ok_min_mean_abs": "", @@ -2182,11 +2182,11 @@ "cell_methods": "area: mean where ice_free_sea over sea time: mean", "cell_measures": "area: areacello", "long_name": "Surface Downward Sensible Heat Flux", - "comment": "Upward sensible heat flux over sea ice free sea. The surface sensible heat flux, also called turbulent heat flux, is the exchange of heat between the surface and the air by motion of air.", + "comment": "Downward sensible heat flux over sea ice free sea. The surface sensible heat flux, also called turbulent heat flux, is the exchange of heat between the surface and the air by motion of air.", "dimensions": "longitude latitude time", "out_name": "hfsso", "type": "real", - "positive": "up", + "positive": "down", "valid_min": "", "valid_max": "", "ok_min_mean_abs": "", @@ -2519,7 +2519,7 @@ "intppdiaz": { "frequency": "mon", "modeling_realm": "ocnBgchem", - "standard_name": "net_primary_mole_productivity_of_biomass_expressed_as_carbon_by_diazotrophs", + "standard_name": "net_primary_mole_productivity_of_biomass_expressed_as_carbon_by_diazotrophic_phytoplankton", "units": "mol m-2 s-1", "cell_methods": "area: mean where sea depth: sum where sea time: mean", "cell_measures": "area: areacello", @@ -2627,7 +2627,7 @@ "limfediaz": { "frequency": "mon", "modeling_realm": "ocnBgchem", - "standard_name": "iron_growth_limitation_of_diazotrophs", + "standard_name": "iron_growth_limitation_of_diazotrophic_phytoplankton", "units": "1", "cell_methods": "area: mean where sea time: mean", "cell_measures": "area: areacello", @@ -2717,7 +2717,7 @@ "limirrdiaz": { "frequency": "mon", "modeling_realm": "ocnBgchem", - "standard_name": "growth_limitation_of_diazotrophs_due_to_solar_irradiance", + "standard_name": "growth_limitation_of_diazotrophic_phytoplankton_due_to_solar_irradiance", "units": "1", "cell_methods": "area: mean where sea time: mean", "cell_measures": "area: areacello", @@ -2807,7 +2807,7 @@ "limndiaz": { "frequency": "mon", "modeling_realm": "ocnBgchem", - "standard_name": "nitrogen_growth_limitation_of_diazotrophs", + "standard_name": "nitrogen_growth_limitation_of_diazotrophic_phytoplankton", "units": "1", "cell_methods": "area: mean where sea time: mean", "cell_measures": "area: areacello", @@ -3617,7 +3617,7 @@ "phydiaz": { "frequency": "mon", "modeling_realm": "ocnBgchem", - "standard_name": "mole_concentration_of_diazotrophs_expressed_as_carbon_in_sea_water", + "standard_name": "mole_concentration_of_diazotrophic_phytoplankton_expressed_as_carbon_in_sea_water", "units": "mol m-3", "cell_methods": "area: mean where sea time: mean", "cell_measures": "area: areacello volume: volcello", @@ -3635,7 +3635,7 @@ "phydiazos": { "frequency": "mon", "modeling_realm": "ocnBgchem", - "standard_name": "mole_concentration_of_diazotrophs_expressed_as_carbon_in_sea_water", + "standard_name": "mole_concentration_of_diazotrophic_phytoplankton_expressed_as_carbon_in_sea_water", "units": "mol m-3", "cell_methods": "area: mean where sea time: mean", "cell_measures": "area: areacello", diff --git a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_Oyr.json b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_Oyr.json index 56642510cd..9dc0843478 100644 --- a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_Oyr.json +++ b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_Oyr.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.31", + "data_specs_version": "01.00.32", "cmor_version": "3.5", "table_id": "Table Oyr", "realm": "ocnBgchem", - "table_date": "24 July 2019", + "table_date": "28 May 2020", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", @@ -305,7 +305,7 @@ "chldiaz": { "frequency": "yr", "modeling_realm": "ocnBgchem", - "standard_name": "mass_concentration_of_diazotrophs_expressed_as_chlorophyll_in_sea_water", + "standard_name": "mass_concentration_of_diazotrophic_phytoplankton_expressed_as_chlorophyll_in_sea_water", "units": "kg m-3", "cell_methods": "area: mean where sea time: mean", "cell_measures": "area: areacello volume: volcello", @@ -1115,7 +1115,7 @@ "ocontempdiff": { "frequency": "yr", "modeling_realm": "ocean", - "standard_name": "tendency_of_sea_water_conservative_temperature_expressed_as_heat_content_due_to_parameterized_eddy_dianeutral_mixing", + "standard_name": "tendency_of_sea_water_conservative_temperature_expressed_as_heat_content_due_to_parameterized_dianeutral_mixing", "units": "W m-2", "cell_methods": "area: mean where sea time: mean", "cell_measures": "area: areacello volume: volcello", @@ -1133,7 +1133,7 @@ "ocontempmint": { "frequency": "yr", "modeling_realm": "ocean", - "standard_name": "integral_wrt_depth_of_product_of_sea_water_density_and_conservative_temperature", + "standard_name": "integral_wrt_depth_of_product_of_conservative_temperature_and_sea_water_density", "units": "degC kg m-2", "cell_methods": "area: mean where sea time: mean", "cell_measures": "area: areacello", @@ -1241,7 +1241,7 @@ "opottempdiff": { "frequency": "yr", "modeling_realm": "ocean", - "standard_name": "tendency_of_sea_water_potential_temperature_expressed_as_heat_content_due_to_parameterized_eddy_dianeutral_mixing", + "standard_name": "tendency_of_sea_water_potential_temperature_expressed_as_heat_content_due_to_parameterized_dianeutral_mixing", "units": "W m-2", "cell_methods": "area: mean where sea time: mean", "cell_measures": "area: areacello volume: volcello", @@ -1259,7 +1259,7 @@ "opottempmint": { "frequency": "yr", "modeling_realm": "ocean", - "standard_name": "integral_wrt_depth_of_product_of_sea_water_density_and_potential_temperature", + "standard_name": "integral_wrt_depth_of_product_of_potential_temperature_and_sea_water_density", "units": "degC kg m-2", "cell_methods": "area: mean where sea time: mean", "cell_measures": "area: areacello", @@ -1367,7 +1367,7 @@ "osaltdiff": { "frequency": "yr", "modeling_realm": "ocean", - "standard_name": "tendency_of_sea_water_salinity_expressed_as_salt_content_due_to_parameterized_eddy_dianeutral_mixing", + "standard_name": "tendency_of_sea_water_salinity_expressed_as_salt_content_due_to_parameterized_dianeutral_mixing", "units": "kg m-2 s-1", "cell_methods": "area: mean where sea time: mean", "cell_measures": "area: areacello volume: volcello", @@ -1655,7 +1655,7 @@ "phydiaz": { "frequency": "yr", "modeling_realm": "ocnBgchem", - "standard_name": "mole_concentration_of_diazotrophs_expressed_as_carbon_in_sea_water", + "standard_name": "mole_concentration_of_diazotrophic_phytoplankton_expressed_as_carbon_in_sea_water", "units": "mol m-3", "cell_methods": "area: mean where sea time: mean", "cell_measures": "area: areacello volume: volcello", @@ -1907,7 +1907,7 @@ "ppdiaz": { "frequency": "yr", "modeling_realm": "ocnBgchem", - "standard_name": "tendency_of_mole_concentration_of_particulate_organic_matter_expressed_as_carbon_in_sea_water_due_to_net_primary_production_by_diazotrophs", + "standard_name": "tendency_of_mole_concentration_of_particulate_organic_matter_expressed_as_carbon_in_sea_water_due_to_net_primary_production_by_diazotrophic_phytoplankton", "units": "mol m-3 s-1", "cell_methods": "area: mean where sea time: mean", "cell_measures": "area: areacello volume: volcello", @@ -2033,7 +2033,7 @@ "somint": { "frequency": "yr", "modeling_realm": "ocean", - "standard_name": "integral_wrt_depth_of_product_of_sea_water_density_and_salinity", + "standard_name": "integral_wrt_depth_of_product_of_salinity_and_sea_water_density", "units": "g m-2", "cell_methods": "area: mean where sea time: mean", "cell_measures": "area: areacello", diff --git a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_SIday.json b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_SIday.json index 30503ce435..863d443ed2 100644 --- a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_SIday.json +++ b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_SIday.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.31", + "data_specs_version": "01.00.32", "cmor_version": "3.5", "table_id": "Table SIday", "realm": "seaIce", - "table_date": "24 July 2019", + "table_date": "28 May 2020", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", diff --git a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_SImon.json b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_SImon.json index 2fdc0a1cb0..37c1f7adb5 100644 --- a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_SImon.json +++ b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_SImon.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.31", + "data_specs_version": "01.00.32", "cmor_version": "3.5", "table_id": "Table SImon", "realm": "seaIce", - "table_date": "24 July 2019", + "table_date": "28 May 2020", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", diff --git a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_coordinate.json b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_coordinate.json index d3ef51a159..7e27975004 100644 --- a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_coordinate.json +++ b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_coordinate.json @@ -259,7 +259,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", "bounds_values": "", "generic_level_name": "alevhalf" @@ -523,7 +523,7 @@ "generic_level_name": "olevhalf" }, "effectRadIc": { - "standard_name": "effective_radius_of_convective_cloud_ice_particle", + "standard_name": "effective_radius_of_convective_cloud_ice_particles", "units": "micron", "axis": "", "long_name": "Effective Radius [Values to be specified]", @@ -566,7 +566,7 @@ "generic_level_name": "" }, "effectRadLi": { - "standard_name": "effective_radius_of_cloud_liquid_water_particle", + "standard_name": "effective_radius_of_cloud_liquid_water_particles", "units": "micron", "axis": "", "long_name": "Effective Radius [Values to be specified]", @@ -741,7 +741,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", "bounds_values": "", "generic_level_name": "alevhalf" @@ -843,29 +843,6 @@ "bounds_values": "", "generic_level_name": "" }, - "location": { - "standard_name": "", - "units": "", - "axis": "", - "long_name": "location index", - "climatology": "", - "formula": "", - "must_have_bounds": "no", - "out_name": "loc", - "positive": "", - "requested": "", - "requested_bounds": "", - "stored_direction": "increasing", - "tolerance": "", - "type": "integer", - "valid_max": "", - "valid_min": "", - "value": "", - "z_bounds_factors": "", - "z_factors": "", - "bounds_values": "", - "generic_level_name": "" - }, "longitude": { "standard_name": "longitude", "units": "degrees_east", @@ -889,62 +866,62 @@ "bounds_values": "", "generic_level_name": "" }, - "natural_log_pressure": { - "standard_name": "atmosphere_ln_pressure_coordinate", + "ocean_sigma": { + "standard_name": "ocean_sigma_coordinate", "units": "", "axis": "Z", - "long_name": "atmosphere natural log pressure coordinate", + "long_name": "ocean sigma coordinate", "climatology": "", - "formula": "p = p0 * exp(-lev)", + "formula": "z(n,k,j,i) = eta(n,j,i) + sigma(k)*(depth(j,i)+eta(n,j,i))", "must_have_bounds": "yes", "out_name": "lev", - "positive": "down", + "positive": "up", "requested": "", "requested_bounds": "", "stored_direction": "decreasing", "tolerance": "", "type": "", - "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", "bounds_values": "", - "generic_level_name": "alevel" + "generic_level_name": "olevel" }, - "natural_log_pressure_half": { - "standard_name": "atmosphere_ln_pressure_coordinate", + "ocean_sigma_half": { + "standard_name": "ocean_sigma_coordinate", "units": "", "axis": "Z", - "long_name": "atmosphere natural log pressure coordinate", + "long_name": "ocean sigma coordinate", "climatology": "", - "formula": "p = p0 * exp(-lev)", + "formula": "z(n,k,j,i) = eta(n,j,i) + sigma(k)*(depth(j,i)+eta(n,j,i))", "must_have_bounds": "no", "out_name": "lev", - "positive": "down", + "positive": "up", "requested": "", "requested_bounds": "", "stored_direction": "decreasing", "tolerance": "", "type": "", - "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", "bounds_values": "", - "generic_level_name": "alevhalf" + "generic_level_name": "olevhalf" }, - "ocean_double_sigma": { - "standard_name": "ocean_double_sigma", + "ocean_sigma_z": { + "standard_name": "ocean_sigma_z_coordinate", "units": "", "axis": "Z", - "long_name": "ocean double sigma coordinate", + "long_name": "ocean sigma over z coordinate", "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)", "must_have_bounds": "yes", "out_name": "lev", - "positive": "up", + "positive": "", "requested": "", "requested_bounds": "", "stored_direction": "", @@ -953,65 +930,19 @@ "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", - "bounds_values": "", - "generic_level_name": "olevel" - }, - "ocean_s": { - "standard_name": "ocean_s_coordinate", - "units": "", - "axis": "Z", - "long_name": "ocean s-coordinate", - "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)", - "must_have_bounds": "yes", - "out_name": "lev", - "positive": "up", - "requested": "", - "requested_bounds": "", - "stored_direction": "decreasing", - "tolerance": "", - "type": "", - "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", - "bounds_values": "", - "generic_level_name": "olevel" - }, - "ocean_sigma": { - "standard_name": "ocean_sigma_coordinate", - "units": "", - "axis": "Z", - "long_name": "ocean sigma coordinate", - "climatology": "", - "formula": "z(n,k,j,i) = eta(n,j,i) + sigma(k)*(depth(j,i)+eta(n,j,i))", - "must_have_bounds": "yes", - "out_name": "lev", - "positive": "up", - "requested": "", - "requested_bounds": "", - "stored_direction": "decreasing", - "tolerance": "", - "type": "", - "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", "bounds_values": "", "generic_level_name": "olevel" }, - "ocean_sigma_z": { + "ocean_sigma_z_half": { "standard_name": "ocean_sigma_z_coordinate", "units": "", "axis": "Z", "long_name": "ocean sigma over z coordinate", "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)", - "must_have_bounds": "yes", + "must_have_bounds": "no", "out_name": "lev", "positive": "", "requested": "", @@ -1022,10 +953,10 @@ "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", "bounds_values": "", - "generic_level_name": "olevel" + "generic_level_name": "olevhalf" }, "olayer100m": { "standard_name": "depth", @@ -1629,52 +1560,6 @@ "bounds_values": "", "generic_level_name": "" }, - "plev7": { - "standard_name": "air_pressure", - "units": "Pa", - "axis": "Z", - "long_name": "pressure", - "climatology": "", - "formula": "", - "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." - ], - "stored_direction": "decreasing", - "tolerance": "0.001", - "type": "double", - "valid_max": "", - "valid_min": "", - "value": "", - "z_bounds_factors": "", - "z_factors": "", - "bounds_values": "", - "generic_level_name": "" - }, "plev7c": { "standard_name": "air_pressure", "units": "Pa", @@ -1808,7 +1693,7 @@ "generic_level_name": "" }, "scatratio": { - "standard_name": "backscattering_ratio", + "standard_name": "backscattering_ratio_in_air", "units": "1", "axis": "", "long_name": "lidar backscattering ratio", @@ -2043,52 +1928,6 @@ "bounds_values": "", "generic_level_name": "" }, - "smooth_level": { - "standard_name": "atmosphere_sleve_coordinate", - "units": "m", - "axis": "Z", - "long_name": "atmosphere smooth level vertical (SLEVE) coordinate", - "climatology": "", - "formula": "z = a*ztop + b1*zsurf1 + b2*zsurf2", - "must_have_bounds": "yes", - "out_name": "lev", - "positive": "up", - "requested": "", - "requested_bounds": "", - "stored_direction": "increasing", - "tolerance": "", - "type": "", - "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", - "bounds_values": "", - "generic_level_name": "alevel" - }, - "smooth_level_half": { - "standard_name": "atmosphere_sleve_coordinate", - "units": "m", - "axis": "Z", - "long_name": "atmosphere smooth level vertical (SLEVE) coordinate", - "climatology": "", - "formula": "z = a*ztop + b1*zsurf1 + b2*zsurf2", - "must_have_bounds": "no", - "out_name": "lev", - "positive": "up", - "requested": "", - "requested_bounds": "", - "stored_direction": "increasing", - "tolerance": "", - "type": "", - "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", - "bounds_values": "", - "generic_level_name": "alevhalf" - }, "snowband": { "standard_name": "surface_snow_thickness", "units": "m", @@ -2199,7 +2038,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", "bounds_values": "", "generic_level_name": "alevhalf" @@ -2245,7 +2084,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", "bounds_values": "", "generic_level_name": "alevhalf" diff --git a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_day.json b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_day.json index 99582efad4..66778da61d 100644 --- a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_day.json +++ b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_day.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.31", + "data_specs_version": "01.00.32", "cmor_version": "3.5", "table_id": "Table day", "realm": "atmos", - "table_date": "24 July 2019", + "table_date": "28 May 2020", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", diff --git a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_formula_terms.json b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_formula_terms.json index 93ec01fbe7..afcef0cb9a 100644 --- a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_formula_terms.json +++ b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_formula_terms.json @@ -1,38 +1,35 @@ { "formula_entry": { "a": { - "long_name": "vertical coordinate formula term: a(k)", + "long_name": "vertical coordinate formula term: a", "units": "", "dimensions": "alevel", "out_name": "a", + "standard_name": "", "type": "double" }, - "ps": { - "long_name": "Surface Air Pressure", - "units": "Pa", - "dimensions": "longitude latitude time", - "out_name": "ps", - "type": "real" - }, - "p0": { - "long_name": "vertical coordinate formula term: reference pressure", - "units": "Pa", - "dimensions": "", - "out_name": "p0", - "type": "double" - }, - "b": { - "long_name": "vertical coordinate formula term: b(k)", + "a_bnds": { + "long_name": "vertical coordinate formula term: a(k+1/2)", "units": "", "dimensions": "alevel", - "out_name": "b", + "out_name": "a_bnds", + "standard_name": "", "type": "double" }, - "b_bnds": { - "long_name": "vertical coordinate formula term: b(k+1/2)", + "a_half": { + "long_name": "vertical coordinate formula term: a(k)", "units": "", + "dimensions": "alevhalf", + "out_name": "a", + "standard_name": "", + "type": "double" + }, + "ap": { + "long_name": "vertical coordinate formula term: ap", + "units": "Pa", "dimensions": "alevel", - "out_name": "b_bnds", + "out_name": "ap", + "standard_name": "", "type": "double" }, "ap_bnds": { @@ -40,111 +37,71 @@ "units": "Pa", "dimensions": "alevel", "out_name": "ap_bnds", + "standard_name": "", "type": "double" }, - "ap": { + "ap_half": { "long_name": "vertical coordinate formula term: ap(k)", "units": "Pa", - "dimensions": "alevel", + "dimensions": "alevhalf", "out_name": "ap", + "standard_name": "", "type": "double" }, - "orog": { - "long_name": "Surface Altitude", - "units": "m", - "dimensions": "longitude latitude", - "out_name": "orog", - "type": "real" - }, - "ztop": { - "long_name": "height of top of model", - "units": "m", - "dimensions": "", - "out_name": "ztop", - "type": "double" - }, - "ptop": { - "long_name": "pressure at top of model", - "units": "Pa", - "dimensions": "", - "out_name": "ptop", - "type": "double" - }, - "a_bnds": { - "long_name": "vertical coordinate formula term: a(k+1/2)", + "b": { + "long_name": "vertical coordinate formula term: b", "units": "", "dimensions": "alevel", - "out_name": "a_bnds", - "type": "double" - }, - "depth_c": { - "long_name": "vertical coordinate formula term: depth_c", - "units": "", - "dimensions": "", - "out_name": "depth_c", - "type": "double" - }, - "nsigma": { - "long_name": "vertical coordinate formula term: nsigma", - "units": "", - "dimensions": "", - "out_name": "nsigma", - "type": "integer" - }, - "href": { - "long_name": "vertical coordinate formula term: href", - "units": "", - "dimensions": "", - "out_name": "href", - "type": "double" - }, - "zlev": { - "long_name": "vertical coordinate formula term: zlev(k)", - "units": "", - "dimensions": "olevel", - "out_name": "zlev", - "type": "double" - }, - "zlev_bnds": { - "long_name": "vertical coordinate formula term: zlev(k+1/2)", - "units": "", - "dimensions": "olevel", - "out_name": "zlev_bnds", - "type": "double" - }, - "z1": { - "long_name": "vertical coordinate formula term: z1", - "units": "", - "dimensions": "", - "out_name": "z1", + "out_name": "b", + "standard_name": "", "type": "double" }, - "z2": { - "long_name": "vertical coordinate formula term: z2", + "b_bnds": { + "long_name": "vertical coordinate formula term: b(k+1/2)", "units": "", - "dimensions": "", - "out_name": "z2", + "dimensions": "alevel", + "out_name": "b_bnds", + "standard_name": "", "type": "double" }, - "sigma_bnds": { - "long_name": "vertical coordinate formula term: sigma(k+1/2)", + "b_half": { + "long_name": "vertical coordinate formula term: b(k)", "units": "", - "dimensions": "olevel", - "out_name": "sigma_bnds", + "dimensions": "alevhalf", + "out_name": "b", + "standard_name": "", "type": "double" }, "depth": { - "long_name": "Sea Floor Depth: formula term: thetao", + "long_name": "Sea Floor Depth", "units": "m", "dimensions": "longitude latitude", "out_name": "depth", + "standard_name": "", "type": "real" }, + "depth_c": { + "long_name": "vertical coordinate formula term: depth_c", + "units": "m", + "dimensions": "", + "out_name": "depth_c", + "standard_name": "", + "type": "double" + }, "eta": { - "long_name": "Sea Surface Height formula term: thetao", + "long_name": "Sea Surface Height", "units": "m", "dimensions": "longitude latitude time", "out_name": "eta", + "standard_name": "", + "type": "real" + }, + "eta2": { + "long_name": "Sea Surface Height", + "units": "m", + "dimensions": "longitude latitude time2", + "out_name": "eta", + "standard_name": "", "type": "real" }, "k_c": { @@ -152,104 +109,95 @@ "units": "", "dimensions": "", "out_name": "k_c", + "standard_name": "", "type": "integer" }, - "sigma": { - "long_name": "vertical coordinate formula term: sigma(k)", + "nsigma": { + "long_name": "vertical coordinate formula term: nsigma", "units": "", - "dimensions": "olevel", - "out_name": "sigma", + "dimensions": "", + "out_name": "nsigma", + "standard_name": "", + "type": "integer" + }, + "orog": { + "long_name": "Surface Altitude", + "units": "m", + "dimensions": "longitude latitude", + "out_name": "orog", + "standard_name": "", + "type": "real" + }, + "orog2d": { + "long_name": "Surface Altitude", + "units": "m", + "dimensions": "latitude", + "out_name": "orog", + "standard_name": "", + "type": "real" + }, + "p0": { + "long_name": "vertical coordinate formula term: reference pressure", + "units": "Pa", + "dimensions": "", + "out_name": "p0", + "standard_name": "reference_air_pressure_for_atmosphere_vertical_coordinate", "type": "double" }, - "ps2": { - "long_name": "vertical coordinate formula term: ps", + "ps": { + "long_name": "Surface Air Pressure", "units": "Pa", - "dimensions": "longitude latitude time2", + "dimensions": "longitude latitude time", "out_name": "ps", + "standard_name": "air_pressure", "type": "real" }, "ps1": { - "long_name": "vertical coordinate formula term: ps", + "long_name": "Surface Air Pressure", "units": "Pa", "dimensions": "longitude latitude time1", "out_name": "ps", + "standard_name": "air_pressure", "type": "real" }, - "eta2": { - "long_name": "Sea Surface Height formula term: thetao", - "units": "m", + "ps2": { + "long_name": "Surface Air Pressure", + "units": "Pa", "dimensions": "longitude latitude time2", - "out_name": "eta", + "out_name": "ps", + "standard_name": "air_pressure", "type": "real" }, - "b_half_bnds": { - "long_name": "vertical coordinate formula term: b(k+1/2)", - "units": "", - "dimensions": "alevhalf", - "out_name": "b_bnds", - "type": "double" - }, - "ap_half": { - "long_name": "vertical coordinate formula term: ap(k)", + "ps2d": { + "long_name": "Surface Air Pressure", "units": "Pa", - "dimensions": "alevhalf", - "out_name": "ap", - "type": "double" - }, - "b2_half": { - "long_name": "vertical coordinate formula term: b2(k)", - "units": "", - "dimensions": "alevhalf", - "out_name": "b2", - "type": "double" - }, - "b1_half": { - "long_name": "vertical coordinate formula term: b1(k)", - "units": "", - "dimensions": "alevhalf", - "out_name": "b1", - "type": "double" - }, - "b2": { - "long_name": "vertical coordinate formula term: b2(k)", - "units": "", - "dimensions": "alevel", - "out_name": "b2", - "type": "double" - }, - "a_half": { - "long_name": "vertical coordinate formula term: a(k)", - "units": "", - "dimensions": "alevhalf", - "out_name": "a", - "type": "double" + "dimensions": "latitude time1", + "out_name": "ps", + "standard_name": "air_pressure", + "type": "real" }, - "ap_half_bnds": { - "long_name": "vertical coordinate formula term: ap(k+1/2)", + "ptop": { + "long_name": "pressure at top of model", "units": "Pa", - "dimensions": "alevel", - "out_name": "ap_bnds", - "type": "double" - }, - "b_half": { - "long_name": "vertical coordinate formula term: b(k)", - "units": "", - "dimensions": "alevhalf", - "out_name": "b", + "dimensions": "", + "out_name": "ptop", + "standard_name": "air_pressure_at_top_of_atmosphere", "type": "double" }, - "a_half_bnds": { - "long_name": "vertical coordinate formula term: a(k+1/2)", - "units": "", - "dimensions": "alevhalf", - "out_name": "a_bnds", + "zlev": { + "long_name": "vertical coordinate formula term: zlev(k)", + "units": "m", + "dimensions": "olevel", + "out_name": "zlev", + "standard_name": "", "type": "double" }, - "b1": { - "long_name": "vertical coordinate formula term: b1(k)", - "units": "", - "dimensions": "alevel", - "out_name": "b1", + "zlev_bnds": { + "long_name": "vertical coordinate formula term: zlev(k+1/2)", + "units": "m", + "dimensions": "olevel", + "out_name": "zlev_bnds", + "standard_name": "", "type": "double" } } diff --git a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_fx.json b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_fx.json index 2636813967..5c3b98c8f2 100644 --- a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_fx.json +++ b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_fx.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.31", + "data_specs_version": "01.00.32", "cmor_version": "3.5", "table_id": "Table fx", "realm": "land", - "table_date": "24 July 2019", + "table_date": "28 May 2020", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", @@ -129,7 +129,7 @@ "units": "%", "cell_methods": "area: mean", "cell_measures": "area: areacella", - "long_name": "Percentage of the grid cell occupied by land (including lakes)", + "long_name": "Percentage of the Grid Cell Occupied by Land (Including Lakes)", "comment": "Percentage of horizontal area occupied by land.", "dimensions": "longitude latitude", "out_name": "sftlf", diff --git a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_grids.json b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_grids.json index 3f8f912d69..befc8617a1 100644 --- a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_grids.json +++ b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_grids.json @@ -1,158 +1,158 @@ { "Header": { - "product": "output", - "cmor_version": "3.5", - "Conventions": "CF-1.7 CMIP-6.2", + "data_specs_version": "01.00.32", "table_id": "Table grids", - "data_specs_version": "01.00.31", + "cmor_version": "3.5", + "table_date": "28 May 2020", "missing_value": "1e20", - "table_date": "24 July 2019" + "product": "output", + "Conventions": "CF-1.7 CMIP-6.2" }, "mapping_entry": { "sample_user_mapping": { "parameter1": "false_easting", - "coordinates": "rlon rlat", - "parameter2": "false_northing" + "parameter2": "false_northing", + "coordinates": "rlon rlat" } }, "axis_entry": { "grid_latitude": { - "long_name": "latitude in rotated pole grid", "standard_name": "grid_latitude", - "out_name": "rlat", "units": "degrees", - "type": "double", - "axis": "Y" + "axis": "Y", + "long_name": "latitude in rotated pole grid", + "out_name": "rlat", + "type": "double" }, - "y_deg": { - "long_name": "y coordinate of projection", - "standard_name": "projection_y_coordinate", - "out_name": "y", + "grid_longitude": { + "standard_name": "grid_longitude", "units": "degrees", - "type": "double", - "axis": "Y" + "axis": "X", + "long_name": "longitude in rotated pole grid", + "out_name": "rlon", + "type": "double" }, - "l_index": { - "long_name": "cell index along fourth dimension", + "i_index": { "standard_name": "", - "out_name": "l", "units": "1", - "type": "integer", - "axis": "" + "axis": "", + "long_name": "first spatial index for variables stored on an unstructured grid", + "out_name": "i", + "type": "integer" }, - "grid_longitude": { - "long_name": "longitude in rotated pole grid", - "standard_name": "grid_longitude", - "out_name": "rlon", - "units": "degrees", - "type": "double", - "axis": "X" + "j_index": { + "standard_name": "", + "units": "1", + "axis": "", + "long_name": "second spatial index for variables stored on an unstructured grid", + "out_name": "j", + "type": "integer" }, "k_index": { - "long_name": "cell index along third dimension", "standard_name": "", + "units": "1", + "axis": "", + "long_name": "third spatial index for variables stored on an unstructured grid", "out_name": "k", + "type": "integer" + }, + "l_index": { + "standard_name": "", "units": "1", - "type": "integer", - "axis": "" + "axis": "", + "long_name": "fourth spatial index for variables stored on an unstructured grid", + "out_name": "l", + "type": "integer" + }, + "m_index": { + "standard_name": "", + "units": "1", + "axis": "", + "long_name": "fifth spatial index for variables stored on an unstructured grid", + "out_name": "m", + "type": "integer" }, "vertices": { - "long_name": "", "standard_name": "", - "out_name": "", "units": "", - "type": "", - "axis": "" + "axis": "", + "long_name": "", + "out_name": "", + "type": "" }, - "x_deg": { + "x": { + "standard_name": "projection_x_coordinate", + "units": "m", + "axis": "X", "long_name": "x coordinate of projection", + "out_name": "", + "type": "double" + }, + "x_deg": { "standard_name": "projection_x_coordinate", - "out_name": "x", "units": "degrees", - "type": "double", - "axis": "X" - }, - "i_index": { - "long_name": "cell index along first dimension", - "standard_name": "", - "out_name": "i", - "units": "1", - "type": "integer", - "axis": "" - }, - "j_index": { - "long_name": "cell index along second dimension", - "standard_name": "", - "out_name": "j", - "units": "1", - "type": "integer", - "axis": "" + "axis": "X", + "long_name": "x coordinate of projection", + "out_name": "x", + "type": "double" }, "y": { - "long_name": "y coordinate of projection", "standard_name": "projection_y_coordinate", - "out_name": "", "units": "m", - "type": "double", - "axis": "Y" - }, - "x": { - "long_name": "x coordinate of projection", - "standard_name": "projection_x_coordinate", + "axis": "Y", + "long_name": "y coordinate of projection", "out_name": "", - "units": "m", - "type": "double", - "axis": "X" + "type": "double" }, - "m_index": { - "long_name": "cell index along fifth dimension", - "standard_name": "", - "out_name": "m", - "units": "1", - "type": "integer", - "axis": "" + "y_deg": { + "standard_name": "projection_y_coordinate", + "units": "degrees", + "axis": "Y", + "long_name": "y coordinate of projection", + "out_name": "y", + "type": "double" } }, "variable_entry": { "latitude": { - "dimensions": "longitude latitude", - "type": "double", - "valid_min": "-90.0", - "long_name": "latitude", "standard_name": "latitude", - "out_name": "latitude", "units": "degrees_north", - "valid_max": "90.0" + "long_name": "latitude", + "dimensions": "longitude latitude", + "out_name": "latitude", + "valid_min": "-90.0", + "valid_max": "90.0", + "type": "double" + }, + "longitude": { + "standard_name": "longitude", + "units": "degrees_east", + "long_name": "longitude", + "dimensions": "longitude latitude", + "out_name": "longitude", + "valid_min": "0.0", + "valid_max": "360.0", + "type": "double" }, "vertices_latitude": { - "dimensions": "vertices longitude latitude", - "type": "double", - "valid_min": "-90.0", - "long_name": "", "standard_name": "", - "out_name": "vertices_latitude", "units": "degrees_north", - "valid_max": "90.0" + "long_name": "", + "dimensions": "vertices longitude latitude", + "out_name": "vertices_latitude", + "valid_min": "-90.0", + "valid_max": "90.0", + "type": "double" }, "vertices_longitude": { - "dimensions": "vertices longitude latitude", - "type": "double", - "valid_min": "0.0", - "long_name": "", "standard_name": "", - "out_name": "vertices_longitude", "units": "degrees_east", - "valid_max": "360.0" - }, - "longitude": { - "dimensions": "longitude latitude", - "type": "double", + "long_name": "", + "dimensions": "vertices longitude latitude", + "out_name": "vertices_longitude", "valid_min": "0.0", - "long_name": "longitude", - "standard_name": "longitude", - "out_name": "longitude", - "units": "degrees_east", - "valid_max": "360.0" + "valid_max": "360.0", + "type": "double" } } } diff --git a/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_input_example.json b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_input_example.json new file mode 100644 index 0000000000..159060d454 --- /dev/null +++ b/esmvalcore/cmor/tables/cmip6/Tables/CMIP6_input_example.json @@ -0,0 +1,74 @@ +{ + "#note_source_type": "explanation of what source_type is goes here", + "source_type": "AOGCM ISM AER", + + "#note_experiment_id": "CMIP6 valid experiment_ids are found in CMIP6_CV.json", + "experiment_id": "piControl-withism", + "activity_id": "ISMIP6", + "sub_experiment_id": "none", + + "realization_index": "3", + "initialization_index": "1", + "physics_index": "1", + "forcing_index": "1", + + "#note_run_variant": "Text stored in attribute variant_info (recommended, not required description of run variant)", + "run_variant": "3rd realization", + + "parent_experiment_id": "historical", + "parent_activity_id": "CMIP", + "parent_source_id": "PCMDI-test-1-0", + "parent_variant_label": "r3i1p1f1", + + "parent_time_units": "days since 1850-01-01", + "branch_method": "standard", + "branch_time_in_child": 59400.0, + "branch_time_in_parent": 59400.0, + + "#note_institution_id": "institution_id must be registered at https://github.com/WCRP-CMIP/CMIP6_CVs/issues/new ", + "institution_id": "PCMDI", + + "#note_source_id": "source_id (model name) must be registered at https://github.com/WCRP-CMIP/CMIP6_CVs/issues/new ", + "source_id": "PCMDI-test-1-0", + + "calendar": "360_day", + + "grid": "native atmosphere regular grid (3x4 latxlon)", + "grid_label": "gn", + "nominal_resolution": "10000 km", + + "license": "CMIP6 model data produced by Lawrence Livermore PCMDI is licensed under a Creative Commons Attribution ShareAlike 4.0 International License (https://creativecommons.org/licenses). Consult https://pcmdi.llnl.gov/CMIP6/TermsOfUse for terms of use governing CMIP6 output, including citation requirements and proper acknowledgment. Further information about this data, including some limitations, can be found via the further_info_url (recorded as a global attribute in this file) and at https:///pcmdi.llnl.gov/. The data producers and data providers make no warranty, either express or implied, including, but not limited to, warranties of merchantability and fitness for a particular purpose. All liabilities arising from the supply of the information (including any liability arising in negligence) are excluded to the fullest extent permitted by law.", + + "#output": "Root directory for output (can be either a relative or full path)", + "outpath": "CMIP6", + + "#note_optional": " **** The following descriptors are optional and may be set to an empty string ", + + "contact ": "Python Coder (coder@a.b.c.com)", + "history": "Output from archivcl_A1.nce/giccm_03_std_2xCO2_2256.", + "comment": "", + "references": "Model described by Koder and Tolkien (J. Geophys. Res., 2001, 576-591). Also see http://www.GICC.su/giccm/doc/index.html. The ssp245 simulation is described in Dorkey et al. '(Clim. Dyn., 2003, 323-357.)'", + + "#note_CV": " **** The following will be obtained from the CV and do not need to be defined here", + + "sub_experiment": "none", + "institution": "", + "source": "PCMDI-test 1.0 (1989)", + + "#note_CMIP6": " **** The following are set correctly for CMIP6 and should not normally need editing", + + "_controlled_vocabulary_file": "CMIP6_CV.json", + "_AXIS_ENTRY_FILE": "CMIP6_coordinate.json", + "_FORMULA_VAR_FILE": "CMIP6_formula_terms.json", + "_cmip6_option": "CMIP6", + + "mip_era": "CMIP6", + "parent_mip_era": "CMIP6", + + "tracking_prefix": "hdl:21.14100", + "_history_template": "%s ;rewrote data to be consistent with for variable found in table .", + + "#output_path_template": "Template for output path directory using tables keys or global attributes, these should follow the relevant data reference syntax", + "output_path_template": "<_member_id>", + "output_file_template": "
<_member_id>" + } \ No newline at end of file diff --git a/esmvalcore/cmor/tables/cmip6/VERSION b/esmvalcore/cmor/tables/cmip6/VERSION index 434408a9db..8a6a5c2dba 100644 --- a/esmvalcore/cmor/tables/cmip6/VERSION +++ b/esmvalcore/cmor/tables/cmip6/VERSION @@ -1 +1 @@ -6.5.29 with 'alevhalf' added in Efx generic levels +6.9.32 diff --git a/esmvalcore/cmor/tables/cmip6/ci-support/checkout_merge_commit.sh b/esmvalcore/cmor/tables/cmip6/ci-support/checkout_merge_commit.sh new file mode 100755 index 0000000000..0d82d172e8 --- /dev/null +++ b/esmvalcore/cmor/tables/cmip6/ci-support/checkout_merge_commit.sh @@ -0,0 +1,29 @@ +#!/bin/bash + + +# Add `master` branch to the update list. +# Otherwise CircleCI will give us a cached one. +FETCH_REFS="+master:master" + +# Update PR refs for testing. +if [[ -n "${CIRCLE_PR_NUMBER}" ]] +then + FETCH_REFS="${FETCH_REFS} +refs/pull/${CIRCLE_PR_NUMBER}/head:pr/${CIRCLE_PR_NUMBER}/head" + FETCH_REFS="${FETCH_REFS} +refs/pull/${CIRCLE_PR_NUMBER}/merge:pr/${CIRCLE_PR_NUMBER}/merge" +fi + +# Retrieve the refs. +git fetch -u origin ${FETCH_REFS} + +# Checkout the PR merge ref. +if [[ -n "${CIRCLE_PR_NUMBER}" ]] +then + git checkout -qf "pr/${CIRCLE_PR_NUMBER}/merge" +fi + +# Check for merge conflicts. +if [[ -n "${CIRCLE_PR_NUMBER}" ]] +then + git branch --merged | grep master > /dev/null + git branch --merged | grep "pr/${CIRCLE_PR_NUMBER}/head" > /dev/null +fi diff --git a/esmvalcore/cmor/tables/cmip6/scripts/CMIP6_CV_cron_github.sh b/esmvalcore/cmor/tables/cmip6/scripts/CMIP6_CV_cron_github.sh new file mode 100755 index 0000000000..d551e904ca --- /dev/null +++ b/esmvalcore/cmor/tables/cmip6/scripts/CMIP6_CV_cron_github.sh @@ -0,0 +1,12 @@ +#!/bin/bash -x +export REPO_PATH=${1:-"${HOME}/cmip6-cmor-tables"} +echo ${REPO_PATH} +cd ${REPO_PATH} +git pull origin master +cd scripts +python createCMIP6CV.py +mv ${REPO_PATH}/scripts/CMIP6_CV.json ${REPO_PATH}/Tables +msg="cron: update CMIP6_CV -- "`date +%Y-%m-%dT%H:%M` +echo $msg +git commit -am "$msg" +git push \ No newline at end of file diff --git a/esmvalcore/cmor/tables/cmip6/scripts/README.md b/esmvalcore/cmor/tables/cmip6/scripts/README.md new file mode 100644 index 0000000000..2ae0ae0c6e --- /dev/null +++ b/esmvalcore/cmor/tables/cmip6/scripts/README.md @@ -0,0 +1,22 @@ +# Updating the CV + +## Make sure tables from DRS are up to date + +Follow directions at: +https://github.com/PCMDI/xml-cmor3-database/blob/master/README.md + +## Update CV + +Essentially: + +First clone the cmip6-cmor-tables repo +```bash +git clone git://github.com/pcmdi/cmip6-cmor-tables +cd cmip6-cmor-tables +``` + +Then run the CMIP6_CV_cron_github.sh script + +```bash +bash scripts/CMIP6_CV_cron_github.sh /path/to/cmip6-cmor-tables +``` diff --git a/esmvalcore/cmor/tables/cmip6/scripts/createCMIP6CV.py b/esmvalcore/cmor/tables/cmip6/scripts/createCMIP6CV.py new file mode 100644 index 0000000000..3c409d155e --- /dev/null +++ b/esmvalcore/cmor/tables/cmip6/scripts/createCMIP6CV.py @@ -0,0 +1,109 @@ +# -*- coding: utf-8 -*- +from __future__ import print_function +import os +import sys +import json +import pdb +import requests +from collections import OrderedDict + + +# List of files needed from github for CMIP6 CV +# --------------------------------------------- +filelist = [ + "CMIP6_required_global_attributes.json", + "CMIP6_activity_id.json", + "CMIP6_institution_id.json", + "CMIP6_source_id.json", + "CMIP6_source_type.json", + "CMIP6_frequency.json", + "CMIP6_grid_label.json", + "CMIP6_nominal_resolution.json", + "CMIP6_realm.json", + "CMIP6_table_id.json", + "CMIP6_license.json", + "mip_era.json", + "CMIP6_sub_experiment_id.json", + "CMIP6_experiment_id.json" + ] +# Github repository with CMIP6 related Control Vocabulary files +# ------------------------------------------------------------- +githubRepo = "https://raw.githubusercontent.com/WCRP-CMIP/CMIP6_CVs/master/" + +class readWCRP(): + def __init__(self): + pass + + def createSource(self,myjson): + root = myjson['source_id'] + for key in root.keys(): + root[key]['source']=root[key]['label'] + ' (' + root[key]['release_year'] + '): ' + chr(10) + for realm in root[key]['model_component'].keys(): + if( root[key]['model_component'][realm]['description'].find('None') == -1): + root[key]['source'] += realm + ': ' + root[key]['source'] += root[key]['model_component'][realm]['description'] + chr(10) + root[key]['source'] = root[key]['source'].rstrip() + del root[key]['label'] + del root[key]['release_year'] + del root[key]['label_extended'] + del root[key]['model_component'] + + def createExperimentID(self,myjson): + # + # Delete undesirable attribute for experiement_id + # + root = myjson['experiment_id'] + for key in root.keys(): + del root[key]['tier'] + del root[key]['start_year'] + del root[key]['end_year'] + del root[key]['description'] + del root[key]['min_number_yrs_per_sim'] + + def readGit(self): + Dico = OrderedDict() + for file in filelist: + url = githubRepo + file + response = requests.get(url) + print(url) + urlJson = response.content.decode('utf-8') + myjson = json.loads(urlJson, object_pairs_hook=OrderedDict) + if(file == 'CMIP6_source_id.json'): + self.createSource(myjson) + if(file == 'CMIP6_experiment_id.json'): + self.createExperimentID(myjson) + Dico.update(myjson) + + finalDico = OrderedDict() + finalDico['CV'] = Dico + return finalDico + +def run(): + f = open("CMIP6_CV.json", "w") + gather = readWCRP() + CV = gather.readGit() + regexp = OrderedDict() + regexp["license"] = [ "^CMIP6 model data produced by .* is licensed under a Creative Commons Attribution.*ShareAlike 4.0 International License .https://creativecommons.org/licenses.* *Consult https://pcmdi.llnl.gov/CMIP6/TermsOfUse for terms of use governing CMIP6 output, including citation requirements and proper acknowledgment\\. *Further information about this data, including some limitations, can be found via the further_info_url (recorded as a global attribute in this file).*\\. *The data producers and data providers make no warranty, either express or implied, including, but not limited to, warranties of merchantability and fitness for a particular purpose\\. *All liabilities arising from the supply of the information (including any liability arising in negligence) are excluded to the fullest extent permitted by law\\.$" ] + regexp["mip_era"] = [ "CMIP6" ] + regexp["product"] = [ "model-output" ] + regexp["tracking_id"] = [ "hdl:21.14100/.*" ] + regexp["further_info_url"] = [ "https://furtherinfo.es-doc.org/.*" ] + regexp["realization_index"] = [ "^\\[\\{0,\\}[[:digit:]]\\{1,\\}\\]\\{0,\\}$" ] + regexp["variant_label"] = ["r[[:digit:]]\\{1,\\}i[[:digit:]]\\{1,\\}p[[:digit:]]\\{1,\\}f[[:digit:]]\\{1,\\}$" ] + regexp["data_specs_version"] = [ "^[[:digit:]]\\{2,2\\}\\.[[:digit:]]\\{2,2\\}\\.[[:digit:]]\\{2,2\\}$" ] + regexp["Conventions"] = [ "^CF-1.7 CMIP-6.[0-2]\\( UGRID-1.0\\)\\{0,\\}$" ] + regexp["forcing_index"] = [ "^\\[\\{0,\\}[[:digit:]]\\{1,\\}\\]\\{0,\\}$" ] + regexp["initialization_index"] = [ "^\\[\\{0,\\}[[:digit:]]\\{1,\\}\\]\\{0,\\}$" ] + regexp["physics_index"] = [ "^\\[\\{0,\\}[[:digit:]]\\{1,\\}\\]\\{0,\\}$" ] + + + CV['CV'].update(regexp) + for exp in CV["CV"]["experiment_id"]: + CV["CV"]["experiment_id"][exp]["activity_id"] = [ " ".join(CV["CV"]["experiment_id"][exp]["activity_id"])] + print("AC ID:",CV["CV"]["experiment_id"][exp]["activity_id"]) + f.write(json.dumps(CV, indent=4, separators=(',', ':'), sort_keys=False) ) + + f.close() + +if __name__ == '__main__': + run() diff --git a/tests/integration/cmor/test_table.py b/tests/integration/cmor/test_table.py index 750e52f07a..6caa4437ec 100644 --- a/tests/integration/cmor/test_table.py +++ b/tests/integration/cmor/test_table.py @@ -85,7 +85,7 @@ def test_omon_toz_succes_if_strict(self): def test_get_institute_from_source(self): """Get institution for source ACCESS-CM2""" institute = self.variables_info.institutes['ACCESS-CM2'] - self.assertListEqual(institute, ['CSIRO-ARCCSS-BoM']) + self.assertListEqual(institute, ['CSIRO-ARCCSS']) def test_get_activity_from_exp(self): """Get activity for experiment 1pctCO2""" diff --git a/tests/integration/test_recipe.py b/tests/integration/test_recipe.py index 425571ff73..bf1864eaec 100644 --- a/tests/integration/test_recipe.py +++ b/tests/integration/test_recipe.py @@ -633,7 +633,7 @@ def test_cmip6_variable_autocomplete(tmp_path, patched_datafinder, 'exp': 'historical', 'frequency': '3hr', 'grid': 'gn', - 'institute': ['MOHC'], + 'institute': ['MOHC', 'NERC'], 'long_name': 'Precipitation', 'mip': '3hr', 'modeling_realm': ['atmos'],