From 56ae360cf775bf763d75a23a1a9d6c7b5f496ec8 Mon Sep 17 00:00:00 2001 From: Charles Doutriaux Date: Tue, 7 Aug 2018 10:47:49 -0700 Subject: [PATCH 1/7] fix #366 --- Test/test_python_CMIP6_CV_load_tables.py | 25 ++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 Test/test_python_CMIP6_CV_load_tables.py diff --git a/Test/test_python_CMIP6_CV_load_tables.py b/Test/test_python_CMIP6_CV_load_tables.py new file mode 100644 index 00000000..c7ddf849 --- /dev/null +++ b/Test/test_python_CMIP6_CV_load_tables.py @@ -0,0 +1,25 @@ +from __future__ import print_function +import cmor +import glob +import unittest + + + +def run(): + unittest.main() + +class TestLoadTables(unittest.TestCase): + def testLoadTables(self): + tables = glob.glob("Tables/CMIP6*json") + for table in tables: + if "formula_terms" in table: + continue + cmor.setup(inpath='Tables', netcdf_file_action=cmor.CMOR_REPLACE) + cmor.dataset_json("Test/common_user_input.json") + print("Loading table:", table) + ierr = cmor.load_table(table) + self.assertEqual(ierr, 0) + cmor.close() + +if __name__ == '__main__': + run() \ No newline at end of file From c84223bad1e9742c96ad25657e8048420decd351 Mon Sep 17 00:00:00 2001 From: Zebedee Nicholls Date: Fri, 14 Dec 2018 15:40:54 +1100 Subject: [PATCH 2/7] Update example files with comments --- Test/CMOR_input_example.json | 3 ++- Test/test_doc.py | 48 ++++++++++++++++++++++-------------- 2 files changed, 32 insertions(+), 19 deletions(-) diff --git a/Test/CMOR_input_example.json b/Test/CMOR_input_example.json index fee45c89..71cf687f 100644 --- a/Test/CMOR_input_example.json +++ b/Test/CMOR_input_example.json @@ -1,4 +1,5 @@ { + "#note": "explanation of what source_type is goes here", "source_type": "AOGCM ISM AER", "#note": "CMIP6 valid experiment_ids are found in CMIP6_CV.json", @@ -67,7 +68,7 @@ "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", + "#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/Test/test_doc.py b/Test/test_doc.py index 611d23a2..add1eb30 100644 --- a/Test/test_doc.py +++ b/Test/test_doc.py @@ -1,29 +1,41 @@ import cmor -cmor.setup(inpath='Tables', netcdf_file_action=cmor.CMOR_REPLACE_4) +cmor.setup( + inpath='./cmip6-cmor-tables/Tables', # this has to point to the CMIP6 CMOR tables path + netcdf_file_action=cmor.CMOR_REPLACE_4 +) -cmor.dataset_json("Test/CMOR_input_example.json") - -table = 'CMIP6_Amon.json' +cmor.dataset_json("common_user_input.json") + +# Loading this test table overwrites the normal CF checks on valid variable values. +# This is perfect for testing but shouldn't be done when writing real data. +table='CMIP6_Amon.json' cmor.load_table(table) -itime = cmor.axis(table_entry='time', - units='days since 2000-01-01 00:00:00', - coord_vals=[15, ], - cell_bounds=[0, 30]) -ilat = cmor.axis(table_entry='latitude', - units='degrees_north', - coord_vals=[0], - cell_bounds=[-1, 1]) -ilon = cmor.axis(table_entry='longitude', - units='degrees_east', - coord_vals=[90], - cell_bounds=[89, 91]) -axis_ids = [itime, ilat, ilon] +# here is where you add your axes +itime = cmor.axis(table_entry= 'time', + units= 'days since 2000-01-01 00:00:00', + coord_vals= [15,], + cell_bounds= [0, 30]) +ilat = cmor.axis(table_entry= 'latitude', + units= 'degrees_north', + coord_vals= [0], + cell_bounds= [-1, 1]) +ilon = cmor.axis(table_entry= 'longitude', + units= 'degrees_east', + coord_vals= [90], + cell_bounds= [89, 91]) +axis_ids = [itime,ilat,ilon] + +# here we create a variable with appropriate name, units and axes varid = cmor.variable('ts', 'K', axis_ids) + +# then we can write the variable along with the data cmor.write(varid, [273]) + +# finally we close the file and print where it was saved outfile = cmor.close(varid, file_name=True) -print "File written: ", outfile +print("File written to: {}".format(outfile)) cmor.close() From c149c20e264548608e954d58401ce8328f329ee8 Mon Sep 17 00:00:00 2001 From: mauzey1 Date: Mon, 17 Dec 2018 17:01:13 -0800 Subject: [PATCH 3/7] Updating tables to 01.00.28 --- TestTables/CMIP6_3hr.json | 4 +- TestTables/CMIP6_6hrLev.json | 4 +- TestTables/CMIP6_6hrPlev.json | 12 +-- TestTables/CMIP6_6hrPlevPt.json | 10 +-- TestTables/CMIP6_AERday.json | 4 +- TestTables/CMIP6_AERhr.json | 4 +- TestTables/CMIP6_AERmon.json | 8 +- TestTables/CMIP6_AERmonZ.json | 4 +- TestTables/CMIP6_Amon.json | 4 +- TestTables/CMIP6_CF3hr.json | 4 +- TestTables/CMIP6_CFday.json | 4 +- TestTables/CMIP6_CFmon.json | 4 +- TestTables/CMIP6_CFsubhr.json | 4 +- TestTables/CMIP6_CV.json | 125 ++++++++++++++++++---------- TestTables/CMIP6_E1hr.json | 4 +- TestTables/CMIP6_E1hrClimMon.json | 4 +- TestTables/CMIP6_E3hr.json | 4 +- TestTables/CMIP6_E3hrPt.json | 4 +- TestTables/CMIP6_E6hrZ.json | 4 +- TestTables/CMIP6_Eday.json | 18 ++-- TestTables/CMIP6_EdayZ.json | 4 +- TestTables/CMIP6_Efx.json | 6 +- TestTables/CMIP6_Emon.json | 132 +++++++----------------------- TestTables/CMIP6_EmonZ.json | 22 +---- TestTables/CMIP6_Esubhr.json | 4 +- TestTables/CMIP6_Eyr.json | 12 +-- TestTables/CMIP6_IfxAnt.json | 10 +-- TestTables/CMIP6_IfxGre.json | 10 +-- TestTables/CMIP6_ImonAnt.json | 28 +++---- TestTables/CMIP6_ImonGre.json | 28 +++---- TestTables/CMIP6_IyrAnt.json | 38 ++++----- TestTables/CMIP6_IyrGre.json | 36 ++++---- TestTables/CMIP6_LImon.json | 4 +- TestTables/CMIP6_Lmon.json | 4 +- TestTables/CMIP6_Oclim.json | 8 +- TestTables/CMIP6_Oday.json | 4 +- TestTables/CMIP6_Odec.json | 4 +- TestTables/CMIP6_Ofx.json | 4 +- TestTables/CMIP6_Omon.json | 16 ++-- TestTables/CMIP6_Oyr.json | 4 +- TestTables/CMIP6_SIday.json | 10 +-- TestTables/CMIP6_SImon.json | 120 +++++++++++++-------------- TestTables/CMIP6_coordinate.json | 52 ++++++------ TestTables/CMIP6_day.json | 4 +- TestTables/CMIP6_fx.json | 4 +- TestTables/CMIP6_grids.json | 4 +- 46 files changed, 378 insertions(+), 427 deletions(-) diff --git a/TestTables/CMIP6_3hr.json b/TestTables/CMIP6_3hr.json index 82970fdc..449e2dec 100644 --- a/TestTables/CMIP6_3hr.json +++ b/TestTables/CMIP6_3hr.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.27", + "data_specs_version": "01.00.28", "cmor_version": "3.3", "table_id": "Table 3hr", "realm": "atmos", - "table_date": "30 July 2018", + "table_date": "06 November 2018", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", diff --git a/TestTables/CMIP6_6hrLev.json b/TestTables/CMIP6_6hrLev.json index 2698b4cf..4ab0dc80 100644 --- a/TestTables/CMIP6_6hrLev.json +++ b/TestTables/CMIP6_6hrLev.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.27", + "data_specs_version": "01.00.28", "cmor_version": "3.3", "table_id": "Table 6hrLev", "realm": "atmos", - "table_date": "30 July 2018", + "table_date": "06 November 2018", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", diff --git a/TestTables/CMIP6_6hrPlev.json b/TestTables/CMIP6_6hrPlev.json index 98d48b55..f008b023 100644 --- a/TestTables/CMIP6_6hrPlev.json +++ b/TestTables/CMIP6_6hrPlev.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.27", + "data_specs_version": "01.00.28", "cmor_version": "3.3", "table_id": "Table 6hrPlev", "realm": "atmos", - "table_date": "30 July 2018", + "table_date": "06 November 2018", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", @@ -178,7 +178,7 @@ }, "ua100m": { "frequency": "6hr", - "modeling_realm": "", + "modeling_realm": "atmos", "standard_name": "eastward_wind", "units": "m s-1", "cell_methods": "area: time: mean", @@ -214,7 +214,7 @@ }, "va100m": { "frequency": "6hr", - "modeling_realm": "", + "modeling_realm": "atmos", "standard_name": "northward_wind", "units": "m s-1", "cell_methods": "area: time: mean", @@ -268,7 +268,7 @@ }, "wsgmax100m": { "frequency": "6hr", - "modeling_realm": "", + "modeling_realm": "atmos", "standard_name": "wind_speed_of_gust", "units": "m s-1", "cell_methods": "area: mean time: maximum", @@ -286,7 +286,7 @@ }, "wsgmax10m": { "frequency": "6hr", - "modeling_realm": "", + "modeling_realm": "atmos", "standard_name": "wind_speed_of_gust", "units": "m s-1", "cell_methods": "area: mean time: maximum", diff --git a/TestTables/CMIP6_6hrPlevPt.json b/TestTables/CMIP6_6hrPlevPt.json index 2998771f..9483a192 100644 --- a/TestTables/CMIP6_6hrPlevPt.json +++ b/TestTables/CMIP6_6hrPlevPt.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.27", + "data_specs_version": "01.00.28", "cmor_version": "3.3", "table_id": "Table 6hrPlevPt", "realm": "atmos", - "table_date": "30 July 2018", + "table_date": "06 November 2018", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", @@ -325,7 +325,7 @@ "modeling_realm": "landIce land", "standard_name": "surface_snow_amount", "units": "kg m-2", - "cell_methods": "area: mean time: point", + "cell_methods": "area: mean where land time: point", "cell_measures": "area: areacella", "long_name": "Surface Snow Amount", "comment": "The mass of surface snow on the land portion of the grid cell divided by the land area in the grid cell; reported as missing where the land fraction is 0; excludes snow on vegetation canopy or on sea ice.", @@ -346,7 +346,7 @@ "cell_methods": "area: mean time: point", "cell_measures": "area: areacella", "long_name": "Shortwave heating rate due to volcanic aerosols", - "comment": "shortwave heating rate due to volcanic aerosols to be diagnosed through double radiation call, zonal average values required", + "comment": "Shortwave heating rate due to volcanic aerosols to be diagnosed through double radiation call", "dimensions": "longitude latitude time1", "out_name": "swsffluxaero", "type": "real", @@ -364,7 +364,7 @@ "cell_methods": "area: mean time: point", "cell_measures": "area: areacella", "long_name": "Shortwave flux due to volcanic aerosols at TOA under clear sky", - "comment": "downwelling shortwave flux due to volcanic aerosols at TOA under clear sky to be diagnosed through double radiation call", + "comment": "Downwelling shortwave flux due to volcanic aerosols at TOA under clear sky to be diagnosed through double radiation call", "dimensions": "longitude latitude time1", "out_name": "swtoafluxaerocs", "type": "real", diff --git a/TestTables/CMIP6_AERday.json b/TestTables/CMIP6_AERday.json index 78f00603..99c46715 100644 --- a/TestTables/CMIP6_AERday.json +++ b/TestTables/CMIP6_AERday.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.27", + "data_specs_version": "01.00.28", "cmor_version": "3.3", "table_id": "Table AERday", "realm": "aerosol", - "table_date": "30 July 2018", + "table_date": "06 November 2018", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", diff --git a/TestTables/CMIP6_AERhr.json b/TestTables/CMIP6_AERhr.json index 57732c76..68b2bc3c 100644 --- a/TestTables/CMIP6_AERhr.json +++ b/TestTables/CMIP6_AERhr.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.27", + "data_specs_version": "01.00.28", "cmor_version": "3.3", "table_id": "Table AERhr", "realm": "aerosol", - "table_date": "30 July 2018", + "table_date": "06 November 2018", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", diff --git a/TestTables/CMIP6_AERmon.json b/TestTables/CMIP6_AERmon.json index 1c4a9676..8aae8796 100644 --- a/TestTables/CMIP6_AERmon.json +++ b/TestTables/CMIP6_AERmon.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.27", + "data_specs_version": "01.00.28", "cmor_version": "3.3", "table_id": "Table AERmon", "realm": "aerosol", - "table_date": "30 July 2018", + "table_date": "06 November 2018", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", @@ -1407,8 +1407,8 @@ "units": "mol mol-1", "cell_methods": "area: time: mean", "cell_measures": "area: areacella", - "long_name": "Ozone volume mixing ratio", - "comment": "Ozone tracer intended to map out strat-trop exchange (STE) of ozone.", + "long_name": "Stratospheric Ozone Tracer Volume Mixing Ratio", + "comment": "Ozone tracer intended to map out strat-trop exchange (STE) of ozone. Set to ozone in the stratosphere, then destroyed in the troposphere using the ozone chemical loss rate. Please specify the tropopause definition used", "dimensions": "longitude latitude alevel time", "out_name": "o3ste", "type": "real", diff --git a/TestTables/CMIP6_AERmonZ.json b/TestTables/CMIP6_AERmonZ.json index b6a43696..b1b2a13c 100644 --- a/TestTables/CMIP6_AERmonZ.json +++ b/TestTables/CMIP6_AERmonZ.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.27", + "data_specs_version": "01.00.28", "cmor_version": "3.3", "table_id": "Table AERmonZ", "realm": "aerosol", - "table_date": "30 July 2018", + "table_date": "06 November 2018", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", diff --git a/TestTables/CMIP6_Amon.json b/TestTables/CMIP6_Amon.json index 03e8a3ed..b141e57e 100644 --- a/TestTables/CMIP6_Amon.json +++ b/TestTables/CMIP6_Amon.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.27", + "data_specs_version": "01.00.28", "cmor_version": "3.3", "table_id": "Table Amon", "realm": "atmos atmosChem", - "table_date": "30 July 2018", + "table_date": "06 November 2018", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", diff --git a/TestTables/CMIP6_CF3hr.json b/TestTables/CMIP6_CF3hr.json index cc90f55a..e0252b80 100644 --- a/TestTables/CMIP6_CF3hr.json +++ b/TestTables/CMIP6_CF3hr.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.27", + "data_specs_version": "01.00.28", "cmor_version": "3.3", "table_id": "Table CF3hr", "realm": "atmos", - "table_date": "30 July 2018", + "table_date": "06 November 2018", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", diff --git a/TestTables/CMIP6_CFday.json b/TestTables/CMIP6_CFday.json index f9728248..aab8c2be 100644 --- a/TestTables/CMIP6_CFday.json +++ b/TestTables/CMIP6_CFday.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.27", + "data_specs_version": "01.00.28", "cmor_version": "3.3", "table_id": "Table CFday", "realm": "atmos", - "table_date": "30 July 2018", + "table_date": "06 November 2018", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", diff --git a/TestTables/CMIP6_CFmon.json b/TestTables/CMIP6_CFmon.json index e1664e57..7337ed02 100644 --- a/TestTables/CMIP6_CFmon.json +++ b/TestTables/CMIP6_CFmon.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.27", + "data_specs_version": "01.00.28", "cmor_version": "3.3", "table_id": "Table CFmon", "realm": "atmos", - "table_date": "30 July 2018", + "table_date": "06 November 2018", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", diff --git a/TestTables/CMIP6_CFsubhr.json b/TestTables/CMIP6_CFsubhr.json index 0e0c7771..07376920 100644 --- a/TestTables/CMIP6_CFsubhr.json +++ b/TestTables/CMIP6_CFsubhr.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.27", + "data_specs_version": "01.00.28", "cmor_version": "3.3", "table_id": "Table CFsubhr", "realm": "atmos", - "table_date": "30 July 2018", + "table_date": "06 November 2018", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", diff --git a/TestTables/CMIP6_CV.json b/TestTables/CMIP6_CV.json index 5d9475d2..96f912e2 100644 --- a/TestTables/CMIP6_CV.json +++ b/TestTables/CMIP6_CV.json @@ -33,14 +33,14 @@ "variant_label" ], "version_metadata":{ - "CV_collection_modified":"Tue Jul 31 17:33:00 2018 -0700", - "CV_collection_version":"6.2.11.2", + "CV_collection_modified":"Thu Nov 29 10:12:56 2018 -0800", + "CV_collection_version":"6.2.15.0", "author":"Paul J. Durack ", - "experiment_id_CV_modified":"Wed Jul 25 07:56:41 2018 -0700", - "experiment_id_CV_note":"Revise LS3MIP experiment_ids, add land-ssp126", + "experiment_id_CV_modified":"Fri Sep 28 11:32:31 2018 -0700", + "experiment_id_CV_note":"Revise experiment_id values, BGC as allowed component", "institution_id":"PCMDI", - "previous_commit":"80f0f714fd30fee5fe9e41c58e60a6d520c0e0d2", - "specs_doc":"v6.2.6 (20th December 2017; https://goo.gl/v1drZl)" + "previous_commit":"970e50891f92b970949669d0ab73b1f6230142b7", + "specs_doc":"v6.2.7 (10th September 2018; https://goo.gl/v1drZl)" }, "activity_id":{ "AerChemMIP":"Aerosols and Chemistry Model Intercomparison Project", @@ -70,6 +70,7 @@ }, "institution_id":{ "AER":"Research and Climate Group, Atmospheric and Environmental Research, 131 Hartwell Avenue, Lexington, MA 02421, USA", + "AS-RCEC":"Research Center for Environmental Changes, Nankang, Taipei 11529, Taiwan", "AWI":"Alfred Wegener Institute, Helmholtz Centre for Polar and Marine Research, Am Handelshafen 12, 27570 Bremerhaven, Germany", "BCC":"Beijing Climate Center, Beijing 100081, China", "BNU":"Beijing Normal University, Beijing 100875, China", @@ -187,7 +188,6 @@ "CORDEX", "HighResMIP", "OMIP", - "PMIP", "SIMIP", "ScenarioMIP", "VIACSAB" @@ -219,6 +219,20 @@ "source_id":"AWI-CM-1-1-MR", "source":"AWI-CM 1.1 MR (2018): \naerosol: none\natmos: ECHAM6.3.04p1 (T127L95 native atmosphere T127 gaussian grid; 384 x 192 longitude/latitude; 95 levels; top level 80 km)\natmosChem: none\nland: JSBACH 3.20\nlandIce: none\nocean: FESOM 1.4 (unstructured grid in the horizontal with 830305 wet nodes; 46 levels; top grid cell 0-5 m)\nocnBgchem: none\nseaIce: FESOM 1.4" }, + "AWI-ESM-1-1-LR":{ + "activity_participation":[ + "CMIP", + "PMIP" + ], + "cohort":[ + "Registered" + ], + "institution_id":[ + "AWI" + ], + "source_id":"AWI-ESM-1-1-LR", + "source":"AWI-ESM 1.1 LR (2018): \naerosol: none\natmos: ECHAM6.3.04p1 (T63L47 native atmosphere T63 gaussian grid; 192 x 96 longitude/latitude; 47 levels; top level 80 km)\natmosChem: none\nland: JSBACH 3.20 with dynamic vegetation\nlandIce: none\nocean: FESOM 1.4 (unstructured grid in the horizontal with 126859 wet nodes; 46 levels; top grid cell 0-5 m)\nocnBgchem: none\nseaIce: FESOM 1.4" + }, "BCC-CSM2-HR":{ "activity_participation":[ "CMIP", @@ -231,7 +245,7 @@ "BCC" ], "source_id":"BCC-CSM2-HR", - "source":"BCC-CSM 2 HR (2017): \naerosol: none\natmos: BCC_AGCM3_LR (T266; 800 x 400 longitude/latitude; 56 levels; top level 0.1 hPa)\natmosChem: none\nland: BCC_AVIM2\nlandIce: none\nocean: MOM4 (1/3 deg 30S-30N, 1/3-1 deg 30-60 N/S, and 1 deg in high latitudes; 360 x 232 longitude/latitude; 40 levels; top grid cell 0-10 m)\nocnBgchem: none\nseaIce: SIS2" + "source":"BCC-CSM 2 HR (2017): \naerosol: none\natmos: BCC_AGCM3_HR (T266; 800 x 400 longitude/latitude; 56 levels; top level 0.1 hPa)\natmosChem: none\nland: BCC_AVIM2\nlandIce: none\nocean: MOM4 (1/3 deg 10S-10N, 1/3-1 deg 10-30 N/S, and 1 deg in high latitudes; 360 x 232 longitude/latitude; 40 levels; top grid cell 0-10 m)\nocnBgchem: none\nseaIce: SIS2" }, "BCC-CSM2-MR":{ "activity_participation":[ @@ -253,7 +267,7 @@ "BCC" ], "source_id":"BCC-CSM2-MR", - "source":"BCC-CSM 2 MR (2017): \naerosol: none\natmos: BCC_AGCM3_MR (T106; 320 x 160 longitude/latitude; 46 levels; top level 1.46 hPa)\natmosChem: none\nland: BCC_AVIM2\nlandIce: none\nocean: MOM4 (1/3 deg 30S-30N, 1/3-1 deg 30-60 N/S, and 1 deg in high latitudes; 360 x 232 longitude/latitude; 40 levels; top grid cell 0-10 m)\nocnBgchem: none\nseaIce: SIS2" + "source":"BCC-CSM 2 MR (2017): \naerosol: none\natmos: BCC_AGCM3_MR (T106; 320 x 160 longitude/latitude; 46 levels; top level 1.46 hPa)\natmosChem: none\nland: BCC_AVIM2\nlandIce: none\nocean: MOM4 (1/3 deg 10S-10N, 1/3-1 deg 10-30 N/S, and 1 deg in high latitudes; 360 x 232 longitude/latitude; 40 levels; top grid cell 0-10 m)\nocnBgchem: none\nseaIce: SIS2" }, "BCC-ESM1":{ "activity_participation":[ @@ -267,7 +281,7 @@ "BCC" ], "source_id":"BCC-ESM1", - "source":"BCC-ESM 1 (2017): \naerosol: none\natmos: BCC_AGCM3_LR (T42; 128 x 64 longitude/latitude; 26 levels; top level 2.19 hPa)\natmosChem: BCC-AGCM3-Chem\nland: BCC_AVIM2\nlandIce: none\nocean: MOM4 (1/3 deg 30S-30N, 1/3-1 deg 30-60 N/S, and 1 deg in high latitudes; 360 x 232 longitude/latitude; 40 levels; top grid cell 0-10 m)\nocnBgchem: none\nseaIce: SIS2" + "source":"BCC-ESM 1 (2017): \naerosol: none\natmos: BCC_AGCM3_LR (T42; 128 x 64 longitude/latitude; 26 levels; top level 2.19 hPa)\natmosChem: BCC-AGCM3-Chem\nland: BCC_AVIM2\nlandIce: none\nocean: MOM4 (1/3 deg 10S-10N, 1/3-1 deg 10-30 N/S, and 1 deg in high latitudes; 360 x 232 longitude/latitude; 40 levels; top grid cell 0-10 m)\nocnBgchem: none\nseaIce: SIS2" }, "BESM-2-7":{ "activity_participation":[ @@ -504,6 +518,7 @@ "HighResMIP", "ISMIP6", "LS3MIP", + "PAMIP", "PMIP", "RFMIP", "ScenarioMIP" @@ -537,10 +552,14 @@ "activity_participation":[ "AerChemMIP", "C4MIP", + "CDRMIP", "CMIP", + "CORDEX", "GeoMIP", + "LS3MIP", "LUMIP", "OMIP", + "RFMIP", "ScenarioMIP" ], "cohort":[ @@ -947,9 +966,11 @@ "activity_participation":[ "CFMIP", "CMIP", + "DynVarMIP", "GMMIP", "OMIP", - "RFMIP" + "RFMIP", + "ScenarioMIP" ], "cohort":[ "Registered" @@ -958,11 +979,10 @@ "NOAA-GFDL" ], "source_id":"GFDL-CM4", - "source":"GFDL-CM4 (2018): \naerosol: interactive\natmos: GFDL-AM4.1 (Cubed-sphere (c96) - 1 degree nominal horizontal resolution; 360 x 180 longitude/latitude; 33 levels; top level 1 hPa)\natmosChem: unnamed (fast chemistry, aerosol only)\nland: GFDL-LM4.0\nlandIce: GFDL-LM4.0\nocean: GFDL-MOM6 (tripolar - nominal 0.25 deg; 1440 x 720 longitude/latitude; 75 levels; top grid cell 0-2 m)\nocnBgchem: GFDL BLING v2\nseaIce: SIS2" + "source":"GFDL-CM4 (2018): \naerosol: interactive\natmos: GFDL-AM4.0.1 (Cubed-sphere (c96) - 1 degree nominal horizontal resolution; 360 x 180 longitude/latitude; 33 levels; top level 1 hPa)\natmosChem: fast chemistry, aerosol only\nland: GFDL-LM4.0.1 (1 degree nominal horizontal resolution; 360 x 180 longitude/latitude; 20 levels; bottom level 10m); land-Veg:unnamed (dynamic vegetation, dynamic land use); land-Hydro:unnamed (soil water and ice, multi-layer snow, rivers and lakes)\nlandIce: GFDL-LM4.0.1\nocean: GFDL-OM4p25 (GFDL-MOM6, tripolar - nominal 0.25 deg; 1440 x 1080 longitude/latitude; 75 levels; top grid cell 0-2 m)\nocnBgchem: GFDL-BLINGv2\nseaIce: GFDL-SIM4p25 (GFDL-SIS2.0, tripolar - nominal 0.25 deg; 1440 x 1080 longitude/latitude; 5 layers; 5 thickness categories)" }, "GFDL-CM4C192":{ "activity_participation":[ - "CMIP", "HighResMIP" ], "cohort":[ @@ -972,11 +992,10 @@ "NOAA-GFDL" ], "source_id":"GFDL-CM4C192", - "source":"GFDL-CM4C192 (2018): \naerosol: interactive\natmos: GFDL-AM4.0.1 (Cubed-sphere (c192) - 0.5 degree nominal horizontal resolution; 720 x 360 longitude/latitude; 33 levels; top level 1 hPa)\natmosChem: unnamed (fast chemistry, aerosol only)\nland: GFDL-LM4.0.1\nlandIce: GFDL-LM4.0.1\nocean: GFDL-MOM6 (tripolar - nominal 0.25 deg; 1440 x 720 longitude/latitude; 75 levels; top grid cell 0-2 m)\nocnBgchem: none\nseaIce: SIS2" + "source":"GFDL-CM4C192 (2018): \naerosol: interactive\natmos: GFDL-AM4C192 (Cubed-sphere (c192) - 0.5 degree nominal horizontal resolution; 720 x 360 longitude/latitude; 33 levels; top level 1 hPa)\natmosChem: fast chemistry, aerosol only\nland: GFDL-LM4.0.1\nlandIce: GFDL-LM4.0.1\nocean: GFDL-OM4p25 (GFDL-MOM6, tripolar - nominal 0.25 deg; 1440 x 1080 longitude/latitude; 75 levels; top grid cell 0-2 m)\nocnBgchem: none\nseaIce: GFDL-SIM4p25 (GFDL-SIS2.0, tripolar - nominal 0.25 deg; 1440 x 1080 longitude/latitude; 5 layers; 5 thickness categories)" }, "GFDL-ESM2M":{ "activity_participation":[ - "CMIP", "FAFMIP" ], "cohort":[ @@ -986,7 +1005,7 @@ "NOAA-GFDL" ], "source_id":"GFDL-ESM2M", - "source":"GFDL-ESM2M (2012): \naerosol: GFDL-AM2\natmos: GFDL-AM2 (Cubed-sphere (c48L24) - 2.5 degree lon x 2 degree lat; 144 x 90 longitude/latitude; 24 levels; top level ~3 hPa)\natmosChem: GFDL-AM2 (full atmospheric chemistry)\nland: GFDL-LM3.0\nlandIce: GFDL-LM3.0\nocean: GFDL-MOM4p1 (tripolar - nominal 1 deg; 360 x 200 longitude/latitude; 50 levels; top grid cell 0-10 m)\nocnBgchem: none\nseaIce: SIS (Tripolar360x200L50)" + "source":"GFDL-ESM2M (2012): \naerosol: prescribed\natmos: GFDL-AM2 (144 x 90 longitude/latitude; 24 levels; top level 1 hPa)\natmosChem: prescribed\nland: GFDL-LM3.0\nlandIce: GFDL-LM3.0\nocean: GFDL-MOM4p1 (tripolar - nominal 1 deg; 360 x 200 longitude/latitude; 50 levels; top grid cell 0-10 m)\nocnBgchem: GFDL-TOPAZ2\nseaIce: GFDL-SIM2 (GFDL-SIS, tripolar - nominal 1 deg; 360 x 200 longitude/latitude; 3 layers; 5 thickness categories)" }, "GFDL-ESM4":{ "activity_participation":[ @@ -997,7 +1016,6 @@ "DAMIP", "DynVarMIP", "LUMIP", - "OMIP", "ScenarioMIP" ], "cohort":[ @@ -1007,11 +1025,10 @@ "NOAA-GFDL" ], "source_id":"GFDL-ESM4", - "source":"GFDL-ESM4 (2018): \naerosol: interactive\natmos: GFDL-AM4.1 (Cubed-sphere (c96) - 1 degree nominal horizontal resolution; 360 x 180 longitude/latitude; 49 levels; top level 1 Pa)\natmosChem: GFDL-ATMCHEM4.1 (full atmospheric chemistry)\nland: GFDL-LM4.1\nlandIce: GFDL-LM4.1\nocean: GFDL-MOM6 (tripolar - nominal 0.5 deg; 720 x 360 longitude/latitude; 75 levels; top grid cell 0-2 m)\nocnBgchem: COBALT 2.0\nseaIce: SIS2" + "source":"GFDL-ESM4 (2018): \naerosol: interactive\natmos: GFDL-AM4.1 (Cubed-sphere (c96) - 1 degree nominal horizontal resolution; 360 x 180 longitude/latitude; 49 levels; top level 1 Pa)\natmosChem: GFDL-ATMCHEM4.1 (full atmospheric chemistry)\nland: GFDL-LM4.1\nlandIce: GFDL-LM4.1\nocean: GFDL-OM4p5 (GFDL-MOM6, tripolar - nominal 0.5 deg; 720 x 576 longitude/latitude; 75 levels; top grid cell 0-2 m)\nocnBgchem: GFDL-COBALTv2\nseaIce: GFDL-SIM4p5 (GFDL-SIS2.0, tripolar - nominal 0.5 deg; 720 x 576 longitude/latitude; 5 layers; 5 thickness categories)" }, "GFDL-OM4p5B":{ "activity_participation":[ - "CMIP", "OMIP" ], "cohort":[ @@ -1021,7 +1038,7 @@ "NOAA-GFDL" ], "source_id":"GFDL-OM4p5B", - "source":"GFDL-OM4p5B (2018): \naerosol: none\natmos: none\natmosChem: none\nland: none\nlandIce: none\nocean: GFDL-MOM6 (tripolar - nominal 0.5 deg; 720 x 576 longitude/latitude; 75 levels; top grid cell 0-2 m)\nocnBgchem: GFDL BLING v2\nseaIce: SIS2" + "source":"GFDL-OM4p5B (2018): \naerosol: none\natmos: none\natmosChem: none\nland: none\nlandIce: none\nocean: GFDL-OM4p5 (GFDL-MOM6, tripolar - nominal 0.5 deg; 720 x 576 longitude/latitude; 75 levels; top grid cell 0-2 m)\nocnBgchem: GFDL-BLINGv2\nseaIce: GFDL-SIM4p5 (GFDL-SIS2.0, tripolar - nominal 0.5 deg; 720 x 576 longitude/latitude; 5 layers; 5 thickness categories)" }, "GISS-E2-1-G":{ "activity_participation":[ @@ -1770,6 +1787,25 @@ "source_id":"SAM0-UNICON", "source":"SAM0-UNICON (2017): \naerosol: MAM3\natmos: CAM5.3 with UNICON (1deg; 288 x 192 longitude/latitude; 30 levels; top level ~2 hPa)\natmosChem: none\nland: CLM4.0\nlandIce: none\nocean: POP2 (Displaced Pole; 320 x 384 longitude/latitude; 60 levels; top grid cell 0-10 m)\nocnBgchem: none\nseaIce: CICE4.0" }, + "TaiESM1":{ + "activity_participation":[ + "AerChemMIP", + "CFMIP", + "CMIP", + "GMMIP", + "LUMIP", + "PMIP", + "ScenarioMIP" + ], + "cohort":[ + "Registered" + ], + "institution_id":[ + "AS-RCEC" + ], + "source_id":"TaiESM1", + "source":"TaiESM 1.0 (2018): \naerosol: SNAP (same grid as atmos)\natmos: TaiAM1 (0.9x1.25 degree; 288 x 192 longitude/latitude; 30 levels; top level ~2 hPa)\natmosChem: SNAP (same grid as atmos)\nland: CLM4.0 (same grid as atmos)\nlandIce: none\nocean: POP2 (320x384 longitude/latitude; 60 levels; top grid cell 0-10 m)\nocnBgchem: none\nseaIce: CICE4" + }, "UKESM1-0-LL":{ "activity_participation":[ "AerChemMIP", @@ -2720,7 +2756,8 @@ ], "additional_allowed_model_components":[ "AER", - "CHEM" + "CHEM", + "BGC" ], "experiment":"same as \"amip\" run, but surface elevations of the Tibetan-Iranian Plateau and Himalayas reduced to 500m", "experiment_id":"amip-TIP", @@ -2743,7 +2780,8 @@ ], "additional_allowed_model_components":[ "AER", - "CHEM" + "CHEM", + "BGC" ], "experiment":"same as \"amip\" run, but sensible heat not allowed for elevations of the Tibetan-Iranian Plateau and Himalayas above 500m", "experiment_id":"amip-TIP-nosh", @@ -2860,7 +2898,8 @@ ], "additional_allowed_model_components":[ "AER", - "CHEM" + "CHEM", + "BGC" ], "experiment":"AMIP-style simulation covering the period 1870-2014", "experiment_id":"amip-hist", @@ -2883,7 +2922,8 @@ ], "additional_allowed_model_components":[ "AER", - "CHEM" + "CHEM", + "BGC" ], "experiment":"same as \"amip\" run, but surface elevations of the East African Highlands in Africa, Sierra Madre in N. America and Andes in S. America reduced to 500m", "experiment_id":"amip-hld", @@ -3833,8 +3873,7 @@ }, "dcppC-forecast-addPinatubo":{ "activity_id":[ - "DCPP", - "VolMIP" + "DCPP VolMIP" ], "additional_allowed_model_components":[ "AER", @@ -4260,10 +4299,10 @@ "experiment":"emission-driven SSP5-3.4-OS scenario", "experiment_id":"esm-ssp534-over", "parent_activity_id":[ - "CMIP" + "C4MIP" ], "parent_experiment_id":[ - "esm-hist" + "esm-ssp585" ], "required_model_components":[ "AOGCM", @@ -5950,8 +5989,7 @@ }, "land-hist":{ "activity_id":[ - "LS3MIP", - "LUMIP" + "LS3MIP LUMIP" ], "additional_allowed_model_components":[ "BGC" @@ -7599,8 +7637,7 @@ }, "piClim-aer":{ "activity_id":[ - "RFMIP", - "AerChemMIP" + "RFMIP AerChemMIP" ], "additional_allowed_model_components":[ "AER", @@ -7647,8 +7684,7 @@ }, "piClim-control":{ "activity_id":[ - "RFMIP", - "AerChemMIP" + "RFMIP AerChemMIP" ], "additional_allowed_model_components":[ "AER", @@ -7676,7 +7712,8 @@ ], "additional_allowed_model_components":[ "AER", - "CHEM" + "CHEM", + "BGC" ], "experiment":"effective radiative forcing by present-day greenhouse gases", "experiment_id":"piClim-ghg", @@ -7699,7 +7736,8 @@ ], "additional_allowed_model_components":[ "AER", - "CHEM" + "CHEM", + "BGC" ], "experiment":"transient effective radiative forcing by aerosols", "experiment_id":"piClim-histaer", @@ -7722,7 +7760,8 @@ ], "additional_allowed_model_components":[ "AER", - "CHEM" + "CHEM", + "BGC" ], "experiment":"transient effective radiative forcing", "experiment_id":"piClim-histall", @@ -7745,7 +7784,8 @@ ], "additional_allowed_model_components":[ "AER", - "CHEM" + "CHEM", + "BGC" ], "experiment":"transient effective radiative forcing by greenhouse gases", "experiment_id":"piClim-histghg", @@ -7768,7 +7808,8 @@ ], "additional_allowed_model_components":[ "AER", - "CHEM" + "CHEM", + "BGC" ], "experiment":"transient effective radiative forcing by natural perturbations", "experiment_id":"piClim-histnat", @@ -7791,7 +7832,8 @@ ], "additional_allowed_model_components":[ "AER", - "CHEM" + "CHEM", + "BGC" ], "experiment":"effective radiative forcing by present-day land use", "experiment_id":"piClim-lu", @@ -8369,8 +8411,7 @@ }, "ssp370":{ "activity_id":[ - "ScenarioMIP", - "AerChemMIP" + "ScenarioMIP AerChemMIP" ], "additional_allowed_model_components":[ "AER", diff --git a/TestTables/CMIP6_E1hr.json b/TestTables/CMIP6_E1hr.json index 90990b2c..8b407685 100644 --- a/TestTables/CMIP6_E1hr.json +++ b/TestTables/CMIP6_E1hr.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.27", + "data_specs_version": "01.00.28", "cmor_version": "3.3", "table_id": "Table E1hr", "realm": "atmos", - "table_date": "30 July 2018", + "table_date": "06 November 2018", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", diff --git a/TestTables/CMIP6_E1hrClimMon.json b/TestTables/CMIP6_E1hrClimMon.json index 73f2696a..fc41c3c6 100644 --- a/TestTables/CMIP6_E1hrClimMon.json +++ b/TestTables/CMIP6_E1hrClimMon.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.27", + "data_specs_version": "01.00.28", "cmor_version": "3.3", "table_id": "Table E1hrClimMon", "realm": "atmos", - "table_date": "30 July 2018", + "table_date": "06 November 2018", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", diff --git a/TestTables/CMIP6_E3hr.json b/TestTables/CMIP6_E3hr.json index cda99855..52c24a03 100644 --- a/TestTables/CMIP6_E3hr.json +++ b/TestTables/CMIP6_E3hr.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.27", + "data_specs_version": "01.00.28", "cmor_version": "3.3", "table_id": "Table E3hr", "realm": "land", - "table_date": "30 July 2018", + "table_date": "06 November 2018", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", diff --git a/TestTables/CMIP6_E3hrPt.json b/TestTables/CMIP6_E3hrPt.json index 0cad443a..2514f6f5 100644 --- a/TestTables/CMIP6_E3hrPt.json +++ b/TestTables/CMIP6_E3hrPt.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.27", + "data_specs_version": "01.00.28", "cmor_version": "3.3", "table_id": "Table E3hrPt", "realm": "atmos", - "table_date": "30 July 2018", + "table_date": "06 November 2018", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", diff --git a/TestTables/CMIP6_E6hrZ.json b/TestTables/CMIP6_E6hrZ.json index 4bc86d32..4d97ea83 100644 --- a/TestTables/CMIP6_E6hrZ.json +++ b/TestTables/CMIP6_E6hrZ.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.27", + "data_specs_version": "01.00.28", "cmor_version": "3.3", "table_id": "Table E6hrZ", "realm": "atmos", - "table_date": "30 July 2018", + "table_date": "06 November 2018", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", diff --git a/TestTables/CMIP6_Eday.json b/TestTables/CMIP6_Eday.json index dac9706d..280a97f2 100644 --- a/TestTables/CMIP6_Eday.json +++ b/TestTables/CMIP6_Eday.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.27", + "data_specs_version": "01.00.28", "cmor_version": "3.3", "table_id": "Table Eday", "realm": "land", - "table_date": "30 July 2018", + "table_date": "06 November 2018", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", @@ -55,7 +55,7 @@ "modeling_realm": "land", "standard_name": "surface_albedo", "units": "1", - "cell_methods": "area: time: mean where snow (comment: this needs a new area type to be strictly correct ...)", + "cell_methods": "area: time: mean where snow (comment: mask=snc)", "cell_measures": "area: areacella", "long_name": "Snow Albedo", "comment": "Albedo of the snow-covered surface, averaged over the grid cell.", @@ -346,7 +346,7 @@ "cell_methods": "area: mean where land time: mean", "cell_measures": "area: areacella", "long_name": "Change in snow water equivalent", - "comment": "The phrase 'change_over_time_in_X' means change in a quantity X over a time-interval, which should be defined by the bounds of the time coordinate. 'Amount' means mass per unit area. The phrase 'ice_and_snow_on_land' means ice in glaciers, ice caps, ice sheets & shelves, river and lake ice, any other ice on a land surface, such as frozen flood water, and snow lying on such ice or on the land surface.", + "comment": "The phrase 'change_over_time_in_X' means change in a quantity X over a time-interval, which should be defined by the bounds of the time coordinate. 'Amount' means mass per unit area. The phrase 'ice_and_snow_on_land' means ice in glaciers, ice caps, ice sheets and shelves, river and lake ice, any other ice on a land surface, such as frozen flood water, and snow lying on such ice or on the land surface.", "dimensions": "longitude latitude time", "out_name": "dsn", "type": "real", @@ -667,7 +667,7 @@ "modeling_realm": "atmos", "standard_name": "relative_humidity", "units": "%", - "cell_methods": "area: mean time: minimum", + "cell_methods": "area: mean where crops time: minimum", "cell_measures": "area: areacella", "long_name": "Daily Minimum Near-Surface Relative Humidity over Crop Tile", "comment": "minimum near-surface (usually, 2 meter) relative humidity (add cell_method attribute 'time: min')", @@ -1207,7 +1207,7 @@ "modeling_realm": "atmos", "standard_name": "precipitation_flux", "units": "kg m-2 s-1", - "cell_methods": "area: time: mean", + "cell_methods": "area: time: mean where crops (comment: mask=cropFrac)", "cell_measures": "area: areacella", "long_name": "Precipitation over Crop Tile", "comment": "includes both liquid and solid phases", @@ -1801,7 +1801,7 @@ "modeling_realm": "atmos", "standard_name": "air_temperature", "units": "K", - "cell_methods": "area: mean time: maximum", + "cell_methods": "area: mean where crops time: maximum", "cell_measures": "area: areacella", "long_name": "Daily Maximum Near-Surface Air Temperature over Crop Tile", "comment": "maximum near-surface (usually, 2 meter) air temperature (add cell_method attribute 'time: max')", @@ -1819,7 +1819,7 @@ "modeling_realm": "atmos", "standard_name": "air_temperature", "units": "K", - "cell_methods": "area: mean time: minimum", + "cell_methods": "area: mean where crops time: minimum", "cell_measures": "area: areacella", "long_name": "Daily Minimum Near-Surface Air Temperature over Crop Tile", "comment": "minimum near-surface (usually, 2 meter) air temperature (add cell_method attribute 'time: min')", @@ -2076,7 +2076,7 @@ "long_name": "Surface Temperature", "comment": "Temperature of the lower boundary of the atmosphere", "dimensions": "longitude latitude time", - "out_name": "ts", + "out_name": "tsland", "type": "real", "positive": "", "valid_min": "", diff --git a/TestTables/CMIP6_EdayZ.json b/TestTables/CMIP6_EdayZ.json index 10505554..685cf340 100644 --- a/TestTables/CMIP6_EdayZ.json +++ b/TestTables/CMIP6_EdayZ.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.27", + "data_specs_version": "01.00.28", "cmor_version": "3.3", "table_id": "Table EdayZ", "realm": "atmos", - "table_date": "30 July 2018", + "table_date": "06 November 2018", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", diff --git a/TestTables/CMIP6_Efx.json b/TestTables/CMIP6_Efx.json index c61ef2fb..ebc50ec5 100644 --- a/TestTables/CMIP6_Efx.json +++ b/TestTables/CMIP6_Efx.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.27", + "data_specs_version": "01.00.28", "cmor_version": "3.3", "table_id": "Table Efx", "realm": "land", - "table_date": "30 July 2018", + "table_date": "06 November 2018", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", @@ -238,7 +238,7 @@ "cell_methods": "area: mean where land", "cell_measures": "area: areacella", "long_name": "Silt Fraction", - "comment": "'Volume fraction' is used in the construction volume_fraction_of_X_in_Y, where X is a material constituent of Y.", + "comment": "Volume fraction of silt in soil", "dimensions": "longitude latitude sdepth", "out_name": "siltfrac", "type": "real", diff --git a/TestTables/CMIP6_Emon.json b/TestTables/CMIP6_Emon.json index a694e7fe..e1b2d9be 100644 --- a/TestTables/CMIP6_Emon.json +++ b/TestTables/CMIP6_Emon.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.27", + "data_specs_version": "01.00.28", "cmor_version": "3.3", "table_id": "Table Emon", "realm": "land", - "table_date": "30 July 2018", + "table_date": "06 November 2018", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", @@ -487,7 +487,7 @@ "modeling_realm": "land", "standard_name": "surface_upward_mass_flux_of_carbon_dioxide_expressed_as_carbon_due_to_emission_from_fires", "units": "kg m-2 s-1", - "cell_methods": "area: time: mean where landuse", + "cell_methods": "area: time: mean where sector", "cell_measures": "area: areacella", "long_name": "Total carbon loss from natural and managed fire on land use tile, including deforestation fires", "comment": "Different from LMON this flux should include all fires occurring on the land use tile, including natural, man-made and deforestation fires", @@ -1387,7 +1387,7 @@ "modeling_realm": "land", "standard_name": "surface_upward_mass_flux_of_carbon_dioxide_expressed_as_carbon_due_to_anthropogenic_land_use_or_land_cover_change_excluding_forestry_and_agricultural_products", "units": "kg m-2 s-1", - "cell_methods": "area: time: mean where landuse", + "cell_methods": "area: time: mean where sector", "cell_measures": "area: areacella", "long_name": "carbon transferred directly to atmosphere due to any land-use or land-cover change activities including deforestation or agricultural fire", "comment": "This annual mean flux refers to the transfer of carbon directly to the atmosphere due to any land-use or land-cover change activities. Include carbon transferred due to deforestation or agricultural directly into atmosphere, and emissions form anthropogenic pools into atmosphere", @@ -1405,7 +1405,7 @@ "modeling_realm": "land", "standard_name": "carbon_mass_flux_into_forestry_and_agricultural_products_due_to_anthropogenic_land_use_or_land_cover_change", "units": "kg m-2 s-1", - "cell_methods": "area: time: mean where landuse", + "cell_methods": "area: time: mean where sector", "cell_measures": "area: areacella", "long_name": "carbon harvested due to land-use or land-cover change process that enters anthropogenic product pools on tile", "comment": "This annual mean flux refers to the transfer of carbon primarily through harvesting land use into anthropogenic product pools, e.g.,deforestation or wood harvestingfrom primary or secondary lands, food harvesting on croplands, harvesting (grazing) by animals on pastures.", @@ -1423,7 +1423,7 @@ "modeling_realm": "land", "standard_name": "carbon_mass_flux_into_soil_and_litter_due_to_anthropogenic_land_use_or_land_cover_change", "units": "kg m-2 s-1", - "cell_methods": "area: time: mean where landuse", + "cell_methods": "area: time: mean where sector", "cell_measures": "area: areacella", "long_name": "carbon transferred to soil or litter pools due to land-use or land-cover change processes on tile", "comment": "This annual mean flux refers to the transfer of carbon into soil or litter pools due to any land use or land-cover change activities", @@ -1765,7 +1765,7 @@ "modeling_realm": "land", "standard_name": "tendency_of_atmosphere_mass_content_of_carbon_dioxide_expressed_as_carbon_due_to_emission_from_forestry_and_agricultural_products", "units": "kg m-2 s-1", - "cell_methods": "area: time: mean where landuse", + "cell_methods": "area: time: mean where sector", "cell_measures": "area: areacella", "long_name": "flux from wood and agricultural product pools on land use tile into atmosphere", "comment": "If a model has explicit anthropogenic product pools by land use tile", @@ -1873,7 +1873,7 @@ "modeling_realm": "land", "standard_name": "surface_upward_heat_flux_due_to_anthropogenic_energy_consumption", "units": "W m-2", - "cell_methods": "area: time: mean where landuse", + "cell_methods": "area: time: mean where sector", "cell_measures": "area: areacella", "long_name": "Anthropogenic heat flux generated from non-renewable human primary energy consumption, including energy use by vehicles, commercial and residential buildings, industry, and power plants. Primary energy refers to energy in natural resources, fossil and nonfossil, before conversion into other forms, such as electricity.", "comment": "The surface called 'surface' means the lower boundary of the atmosphere. 'Upward' indicates a vector component which is positive when directed upward (negative downward). The vertical heat flux in air is the sum of all heat fluxes i.e. radiative, latent and sensible. In accordance with common usage in geophysical disciplines, 'flux' implies per unit area, called 'flux density' in physics. The specification of a physical process by the phrase 'due_to_' process means that the quantity named is a single term in a sum of terms which together compose the general quantity named by omitting the phrase. 'Anthropogenic' means influenced, caused, or created by human activity. The heat flux due to anthropogenic energy consumption results from non-renewable human primary energy consumption, including energy use by vehicles, commercial and residential buildings, industry, and power plants. Primary energy refers to energy in natural resources, fossil and non-fossil, before conversion into other forms, such as electricity.", @@ -1886,24 +1886,6 @@ "ok_min_mean_abs": "", "ok_max_mean_abs": "" }, - "fddtalk": { - "frequency": "mon", - "modeling_realm": "ocnBgchem", - "standard_name": "integral_wrt_depth_of_tendency_of_sea_water_alkalinity_expressed_as_mole_equivalent", - "units": "mol m-2 s-1", - "cell_methods": "area: mean where sea time: mean", - "cell_measures": "area: areacello volume: volcello", - "long_name": "Rate of Change of Total Alkalinity", - "comment": "vertical integral of net time rate of change of alkalinity", - "dimensions": "longitude latitude olevel time", - "out_name": "fddtalk", - "type": "real", - "positive": "", - "valid_min": "", - "valid_max": "", - "ok_min_mean_abs": "", - "ok_max_mean_abs": "" - }, "fg14co2": { "frequency": "mon", "modeling_realm": "ocnBgchem", @@ -1922,60 +1904,6 @@ "ok_min_mean_abs": "", "ok_max_mean_abs": "" }, - "fg14co2abio": { - "frequency": "mon", - "modeling_realm": "ocnBgchem", - "standard_name": "surface_downward_mass_flux_of_14C_dioxide_abiotic_analogue_expressed_as_carbon", - "units": "kg m-2 s-1", - "cell_methods": "area: mean where sea time: mean", - "cell_measures": "area: areacello volume: volcello", - "long_name": "Surface Downward Flux of Abiotic 14CO2", - "comment": "Gas exchange flux of abiotic 14CO2 (positive into ocean)", - "dimensions": "longitude latitude olevel time", - "out_name": "fg14co2abio", - "type": "real", - "positive": "down", - "valid_min": "", - "valid_max": "", - "ok_min_mean_abs": "", - "ok_max_mean_abs": "" - }, - "fgco2abio": { - "frequency": "mon", - "modeling_realm": "ocnBgchem", - "standard_name": "surface_downward_mass_flux_of_carbon_dioxide_abiotic_analogue_expressed_as_carbon", - "units": "kg m-2 s-1", - "cell_methods": "area: mean where sea time: mean", - "cell_measures": "area: areacello volume: volcello", - "long_name": "Surface Downward Flux of Abiotic CO2", - "comment": "Gas exchange flux of abiotic CO2 (positive into ocean)", - "dimensions": "longitude latitude olevel time", - "out_name": "fgco2abio", - "type": "real", - "positive": "down", - "valid_min": "", - "valid_max": "", - "ok_min_mean_abs": "", - "ok_max_mean_abs": "" - }, - "fgco2nat": { - "frequency": "mon", - "modeling_realm": "ocnBgchem", - "standard_name": "surface_downward_mass_flux_of_carbon_dioxide_natural_analogue_expressed_as_carbon", - "units": "kg m-2 s-1", - "cell_methods": "area: mean where sea time: mean", - "cell_measures": "area: areacello volume: volcello", - "long_name": "Surface Downward Flux of Natural CO2", - "comment": "Gas exchange flux of natural CO2 (positive into ocean)", - "dimensions": "longitude latitude olevel time", - "out_name": "fgco2nat", - "type": "real", - "positive": "down", - "valid_min": "", - "valid_max": "", - "ok_min_mean_abs": "", - "ok_max_mean_abs": "" - }, "flandice": { "frequency": "mon", "modeling_realm": "ocean", @@ -2053,7 +1981,7 @@ "modeling_realm": "land", "standard_name": "gross_primary_productivity_of_biomass_expressed_as_carbon", "units": "kg m-2 s-1", - "cell_methods": "area: time: mean where landuse", + "cell_methods": "area: time: mean where sector", "cell_measures": "area: areacella", "long_name": "gross primary productivity on land use tile", "comment": "'Production of carbon' means the production of biomass expressed as the mass of carbon which it contains. Gross primary production is the rate of synthesis of biomass from inorganic precursors by autotrophs ('producers'), for example, photosynthesis in plants or phytoplankton. The producers also respire some of this biomass and the difference is 'net_primary_production'. 'Productivity' means production per unit area. The phrase 'expressed_as' is used in the construction A_expressed_as_B, where B is a chemical constituent of A. It means that the quantity indicated by the standard name is calculated solely with respect to the B contained in A, neglecting all other chemical constituents of A.", @@ -2197,7 +2125,7 @@ "modeling_realm": "land", "standard_name": "surface_upward_latent_heat_flux", "units": "W m-2", - "cell_methods": "area: time: mean where landuse", + "cell_methods": "area: time: mean where sector", "cell_measures": "area: areacella", "long_name": "latent heat flux on land use tile", "comment": "The surface called 'surface' means the lower boundary of the atmosphere. 'Upward' indicates a vector component which is positive when directed upward (negative downward). The surface latent heat flux is the exchange of heat between the surface and the air on account of evaporation (including sublimation). In accordance with common usage in geophysical disciplines, 'flux' implies per unit area, called 'flux density' in physics.", @@ -2215,7 +2143,7 @@ "modeling_realm": "land", "standard_name": "surface_upward_sensible_heat_flux", "units": "W m-2", - "cell_methods": "area: time: mean where landuse", + "cell_methods": "area: time: mean where sector", "cell_measures": "area: areacella", "long_name": "sensible heat flux on land use tile", "comment": "The surface called 'surface' means the lower boundary of the atmosphere. 'Upward' indicates a vector component which is positive when directed upward (negative downward). 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. 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.", @@ -2233,7 +2161,7 @@ "modeling_realm": "atmos", "standard_name": "relative_humidity", "units": "%", - "cell_methods": "area: mean time: minimum within days time: mean over days", + "cell_methods": "area: mean where crops time: minimum within days time: mean over days", "cell_measures": "area: areacella", "long_name": "Daily Minimum Near-Surface Relative Humidity over Crop Tile", "comment": "minimum near-surface (usually, 2 meter) relative humidity (add cell_method attribute 'time: min')", @@ -2287,7 +2215,7 @@ "modeling_realm": "land", "standard_name": "specific_humidity", "units": "1", - "cell_methods": "area: time: mean where landuse", + "cell_methods": "area: time: mean where sector", "cell_measures": "area: areacella", "long_name": "near-surface specific humidity on land use tile", "comment": "Normally, the specific humidity should be reported at the 2 meter height", @@ -2377,7 +2305,7 @@ "modeling_realm": "land", "standard_name": "surface_downward_mass_flux_of_water_due_to_irrigation", "units": "kg m-2 s-1", - "cell_methods": "area: time: mean where landuse", + "cell_methods": "area: time: mean where sector", "cell_measures": "area: areacella", "long_name": "Irrigation flux including any irrigation for crops, trees, pasture, or urban lawns", "comment": "Mass flux of water due to irrigation.", @@ -2431,7 +2359,7 @@ "modeling_realm": "land", "standard_name": "leaf_area_index", "units": "1", - "cell_methods": "area: time: mean where landuse", + "cell_methods": "area: time: mean where sector", "cell_measures": "area: areacella", "long_name": "Leaf Area Index on Land Use Tile", "comment": "A ratio obtained by dividing the total upper leaf surface area of vegetation by the (horizontal) surface area of the land on which it grows.", @@ -2647,7 +2575,7 @@ "modeling_realm": "land", "standard_name": "runoff_flux", "units": "kg m-2 s-1", - "cell_methods": "area: time: mean where landuse", + "cell_methods": "area: time: mean where sector", "cell_measures": "area: areacella", "long_name": "Total runoff from land use tile", "comment": "the total runoff (including 'drainage' through the base of the soil model) leaving the land use tile portion of the grid cell", @@ -2701,7 +2629,7 @@ "modeling_realm": "land", "standard_name": "mass_content_of_water_in_soil", "units": "kg m-2", - "cell_methods": "area: time: mean where landuse", + "cell_methods": "area: time: mean where sector", "cell_measures": "area: areacella", "long_name": "Total soil moisture", "comment": "'Water' means water in all phases. 'Content' indicates a quantity per unit area. The mass content of water in soil refers to the vertical integral from the surface down to the bottom of the soil model. For the content between specified levels in the soil, standard names including 'content_of_soil_layer' are used.", @@ -2737,7 +2665,7 @@ "modeling_realm": "land", "standard_name": "mass_content_of_water_in_soil_layer", "units": "kg m-2", - "cell_methods": "area: time: mean where landuse", + "cell_methods": "area: time: mean where sector", "cell_measures": "area: areacella", "long_name": "Moisture in Upper Portion of Soil Column of land use tile", "comment": "the mass of water in all phases in a thin surface layer; integrate over uppermost 10cm", @@ -3043,7 +2971,7 @@ "modeling_realm": "land", "standard_name": "surface_net_downward_mass_flux_of_carbon_dioxide_expressed_as_carbon_due_to_all_land_processes", "units": "kg m-2 s-1", - "cell_methods": "area: time: mean where landuse", + "cell_methods": "area: time: mean where sector", "cell_measures": "area: areacella", "long_name": "net rate of C accumulation (or loss) on land use tile", "comment": "Computed as npp minus heterotrophic respiration minus fire minus C leaching minus harvesting/clearing. Positive rate is into the land, negative rate is from the land. Do not include fluxes from anthropogenic product pools to atmosphere", @@ -3151,7 +3079,7 @@ "modeling_realm": "land", "standard_name": "net_primary_productivity_of_biomass_expressed_as_carbon", "units": "kg m-2 s-1", - "cell_methods": "area: time: mean where landuse", + "cell_methods": "area: time: mean where sector", "cell_measures": "area: areacella", "long_name": "net primary productivity on land use tile", "comment": "'Production of carbon' means the production of biomass expressed as the mass of carbon which it contains. Net primary production is the excess of gross primary production (rate of synthesis of biomass from inorganic precursors) by autotrophs ('producers'), for example, photosynthesis in plants or phytoplankton, over the rate at which the autotrophs themselves respire some of this biomass. 'Productivity' means production per unit area. The phrase 'expressed_as' is used in the construction A_expressed_as_B, where B is a chemical constituent of A. It means that the quantity indicated by the standard name is calculated solely with respect to the B contained in A, neglecting all other chemical constituents of A.", @@ -3943,7 +3871,7 @@ "modeling_realm": "atmos", "standard_name": "precipitation_flux", "units": "kg m-2 s-1", - "cell_methods": "area: time: mean", + "cell_methods": "area: time: mean where crops (comment: mask=cropFrac)", "cell_measures": "area: areacella", "long_name": "Precipitation over Crop Tile", "comment": "includes both liquid and solid phases", @@ -4177,7 +4105,7 @@ "modeling_realm": "land", "standard_name": "surface_upward_mass_flux_of_carbon_dioxide_expressed_as_carbon_due_to_plant_respiration", "units": "kg m-2 s-1", - "cell_methods": "area: time: mean where landuse", + "cell_methods": "area: time: mean where sector", "cell_measures": "area: areacella", "long_name": "plant respiration on land use tile", "comment": "The surface called 'surface' means the lower boundary of the atmosphere. 'Upward' indicates a vector component which is positive when directed upward (negative downward). In accordance with common usage in geophysical disciplines, 'flux' implies per unit area, called 'flux density' in physics. The chemical formula for carbon dioxide is CO2. The phrase 'expressed_as' is used in the construction A_expressed_as_B, where B is a chemical constituent of A. It means that the quantity indicated by the standard name is calculated solely with respect to the B contained in A, neglecting all other chemical constituents of A. The specification of a physical process by the phrase 'due_to_' process means that the quantity named is a single term in a sum of terms which together compose the general quantity named by omitting the phrase. Plant respiration is the sum of respiration by parts of plants both above and below the soil. It is assumed that all the respired carbon dioxide is emitted to the atmosphere.", @@ -4447,7 +4375,7 @@ "modeling_realm": "land", "standard_name": "surface_upward_mass_flux_of_carbon_dioxide_expressed_as_carbon_due_to_heterotrophic_respiration", "units": "kg m-2 s-1", - "cell_methods": "area: time: mean where landuse", + "cell_methods": "area: time: mean where sector", "cell_measures": "area: areacella", "long_name": "soil heterotrophic respiration on land use tile", "comment": "The surface called 'surface' means the lower boundary of the atmosphere. 'Upward' indicates a vector component which is positive when directed upward (negative downward). In accordance with common usage in geophysical disciplines, 'flux' implies per unit area, called 'flux density' in physics. The chemical formula for carbon dioxide is CO2. The phrase 'expressed_as' is used in the construction A_expressed_as_B, where B is a chemical constituent of A. It means that the quantity indicated by the standard name is calculated solely with respect to the B contained in A, neglecting all other chemical constituents of A. The specification of a physical process by the phrase 'due_to_' process means that the quantity named is a single term in a sum of terms which together compose the general quantity named by omitting the phrase.", @@ -4573,7 +4501,7 @@ "modeling_realm": "land", "standard_name": "surface_upwelling_longwave_flux_in_air", "units": "W m-2", - "cell_methods": "area: time: mean where landuse", + "cell_methods": "area: time: mean where sector", "cell_measures": "area: areacella", "long_name": "Surface Upwelling Longwave on Land Use Tile", "comment": "The surface called 'surface' means the lower boundary of the atmosphere. 'longwave' means longwave 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.", @@ -4663,7 +4591,7 @@ "modeling_realm": "land", "standard_name": "surface_upwelling_shortwave_flux_in_air", "units": "W m-2", - "cell_methods": "area: time: mean where landuse", + "cell_methods": "area: time: mean where sector", "cell_measures": "area: areacella", "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.", @@ -4843,7 +4771,7 @@ "modeling_realm": "land", "standard_name": "lwe_thickness_of_surface_snow_amount", "units": "m", - "cell_methods": "area: time: mean where landuse", + "cell_methods": "area: time: mean where sector", "cell_measures": "area: areacella", "long_name": "snow water equivalent on land use tile", "comment": "The surface called 'surface' means the lower boundary of the atmosphere. 'lwe' means liquid water equivalent. 'Amount' means mass per unit area. The construction lwe_thickness_of_X_amount or _content means the vertical extent of a layer of liquid water having the same mass per unit area. Surface amount refers to the amount on the ground, excluding that on the plant or vegetation canopy.", @@ -5005,7 +4933,7 @@ "modeling_realm": "land", "standard_name": "air_temperature", "units": "K", - "cell_methods": "area: time: mean where landuse", + "cell_methods": "area: time: mean where sector", "cell_measures": "area: areacella", "long_name": "near-surface air temperature (2m above displacement height, i.e. t_ref) on land use tile", "comment": "Air temperature is the bulk temperature of the air, not the surface (skin) temperature.", @@ -5023,7 +4951,7 @@ "modeling_realm": "atmos", "standard_name": "air_temperature", "units": "K", - "cell_methods": "area: mean time: maximum within days time: mean over days", + "cell_methods": "area: mean where crops time: maximum within days time: mean over days", "cell_measures": "area: areacella", "long_name": "Daily Maximum Near-Surface Air Temperature over Crop Tile", "comment": "maximum near-surface (usually, 2 meter) air temperature (add cell_method attribute 'time: max')", @@ -5041,7 +4969,7 @@ "modeling_realm": "atmos", "standard_name": "air_temperature", "units": "K", - "cell_methods": "area: mean time: minimum within days time: mean over days", + "cell_methods": "area: mean where crops time: minimum within days time: mean over days", "cell_measures": "area: areacella", "long_name": "Daily Minimum Near-Surface Air Temperature over Crop Tile", "comment": "minimum near-surface (usually, 2 meter) air temperature (add cell_method attribute 'time: min')", @@ -5401,7 +5329,7 @@ "modeling_realm": "land", "standard_name": "surface_temperature", "units": "K", - "cell_methods": "area: time: mean where landuse", + "cell_methods": "area: time: mean where sector", "cell_measures": "area: areacella", "long_name": "Surface Temperature on Landuse Tile", "comment": "Surface temperature (i.e. temperature at which long-wave radiation emitted)", diff --git a/TestTables/CMIP6_EmonZ.json b/TestTables/CMIP6_EmonZ.json index 81c983dd..78139411 100644 --- a/TestTables/CMIP6_EmonZ.json +++ b/TestTables/CMIP6_EmonZ.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.27", + "data_specs_version": "01.00.28", "cmor_version": "3.3", "table_id": "Table EmonZ", "realm": "atmos", - "table_date": "30 July 2018", + "table_date": "06 November 2018", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", @@ -140,24 +140,6 @@ "ok_min_mean_abs": "", "ok_max_mean_abs": "" }, - "sltnortha": { - "frequency": "mon", - "modeling_realm": "ocean", - "standard_name": "northward_ocean_salt_transport", - "units": "kg s-1", - "cell_methods": "longitude: mean (basin) time: mean", - "cell_measures": "", - "long_name": "Atlantic Northward Ocean Salt Transport", - "comment": "'Northward' indicates a vector component which is positive when directed northward (negative southward). Ocean transport means transport by all processes, both sea water and sea ice.", - "dimensions": "latitude basin time", - "out_name": "sltnortha", - "type": "real", - "positive": "", - "valid_min": "", - "valid_max": "", - "ok_min_mean_abs": "", - "ok_max_mean_abs": "" - }, "tntc": { "frequency": "mon", "modeling_realm": "atmos", diff --git a/TestTables/CMIP6_Esubhr.json b/TestTables/CMIP6_Esubhr.json index 70b7a327..3bc84301 100644 --- a/TestTables/CMIP6_Esubhr.json +++ b/TestTables/CMIP6_Esubhr.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.27", + "data_specs_version": "01.00.28", "cmor_version": "3.3", "table_id": "Table Esubhr", "realm": "atmos", - "table_date": "30 July 2018", + "table_date": "06 November 2018", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", diff --git a/TestTables/CMIP6_Eyr.json b/TestTables/CMIP6_Eyr.json index 753f92f9..85e8c0df 100644 --- a/TestTables/CMIP6_Eyr.json +++ b/TestTables/CMIP6_Eyr.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.27", + "data_specs_version": "01.00.28", "cmor_version": "3.3", "table_id": "Table Eyr", "realm": "land", - "table_date": "30 July 2018", + "table_date": "06 November 2018", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", @@ -55,7 +55,7 @@ "modeling_realm": "land", "standard_name": "litter_mass_content_of_carbon", "units": "kg m-2", - "cell_methods": "area: mean where landuse time: point", + "cell_methods": "area: mean where sector time: point", "cell_measures": "area: areacella", "long_name": "carbon in above and belowground litter pools on land use tiles", "comment": "end of year values (not annual mean)", @@ -91,7 +91,7 @@ "modeling_realm": "land", "standard_name": "carbon_mass_content_of_forestry_and_agricultural_products", "units": "kg m-2", - "cell_methods": "area: mean where landuse time: point", + "cell_methods": "area: mean where sector time: point", "cell_measures": "area: areacella", "long_name": "wood and agricultural product pool carbon associated with land use tiles; examples of products include paper, cardboard, timber for construction, and crop harvest for food or fuel.", "comment": "anthropogenic pools associated with land use tiles into which harvests and cleared carbon are deposited before release into atmosphere PLUS any remaining anthropogenic pools that may be associated with lands which were converted into land use tiles during reported period . Does NOT include residue which is deposited into soil or litter; end of year values (not annual mean)", @@ -127,7 +127,7 @@ "modeling_realm": "land", "standard_name": "soil_mass_content_of_carbon", "units": "kg m-2", - "cell_methods": "area: mean where landuse time: point", + "cell_methods": "area: mean where sector time: point", "cell_measures": "area: areacella", "long_name": "carbon in soil pool on land use tiles", "comment": "end of year values (not annual mean)", @@ -163,7 +163,7 @@ "modeling_realm": "land", "standard_name": "vegetation_carbon_content", "units": "kg m-2", - "cell_methods": "area: mean where landuse time: point", + "cell_methods": "area: mean where sector time: point", "cell_measures": "area: areacella", "long_name": "carbon in vegetation on land use tiles", "comment": "end of year values (not annual mean)", diff --git a/TestTables/CMIP6_IfxAnt.json b/TestTables/CMIP6_IfxAnt.json index c3c757f4..0f5597e5 100644 --- a/TestTables/CMIP6_IfxAnt.json +++ b/TestTables/CMIP6_IfxAnt.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.27", + "data_specs_version": "01.00.28", "cmor_version": "3.3", "table_id": "Table IfxAnt", "realm": "landIce", - "table_date": "30 July 2018", + "table_date": "06 November 2018", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", @@ -37,7 +37,7 @@ "modeling_realm": "landIce", "standard_name": "upward_geothermal_heat_flux_at_ground_level_in_land_ice", "units": "W m-2", - "cell_methods": "area: mean", + "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", @@ -55,7 +55,7 @@ "modeling_realm": "landIce", "standard_name": "land_ice_thickness", "units": "m", - "cell_methods": "area: mean", + "cell_methods": "area: mean where ice_sheet", "cell_measures": "area: areacellg", "long_name": "Ice Sheet Thickness", "comment": "The thickness of the ice sheet", @@ -73,7 +73,7 @@ "modeling_realm": "landIce", "standard_name": "bedrock_altitude", "units": "m", - "cell_methods": "area: mean", + "cell_methods": "area: mean where grounded_ice_sheet", "cell_measures": "area: areacellg", "long_name": "Bedrock Altitude", "comment": "The bedrock topography beneath the land ice", diff --git a/TestTables/CMIP6_IfxGre.json b/TestTables/CMIP6_IfxGre.json index 2baa5bf3..0a95b34f 100644 --- a/TestTables/CMIP6_IfxGre.json +++ b/TestTables/CMIP6_IfxGre.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.27", + "data_specs_version": "01.00.28", "cmor_version": "3.3", "table_id": "Table IfxGre", "realm": "landIce", - "table_date": "30 July 2018", + "table_date": "06 November 2018", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", @@ -37,7 +37,7 @@ "modeling_realm": "landIce", "standard_name": "upward_geothermal_heat_flux_at_ground_level_in_land_ice", "units": "W m-2", - "cell_methods": "area: mean", + "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", @@ -55,7 +55,7 @@ "modeling_realm": "landIce", "standard_name": "land_ice_thickness", "units": "m", - "cell_methods": "area: mean", + "cell_methods": "area: mean where ice_sheet", "cell_measures": "area: areacellg", "long_name": "Ice Sheet Thickness", "comment": "The thickness of the ice sheet", @@ -73,7 +73,7 @@ "modeling_realm": "landIce", "standard_name": "bedrock_altitude", "units": "m", - "cell_methods": "area: mean", + "cell_methods": "area: mean where grounded_ice_sheet", "cell_measures": "area: areacellg", "long_name": "Bedrock Altitude", "comment": "The bedrock topography beneath the land ice", diff --git a/TestTables/CMIP6_ImonAnt.json b/TestTables/CMIP6_ImonAnt.json index ff17caa3..c5cb10e2 100644 --- a/TestTables/CMIP6_ImonAnt.json +++ b/TestTables/CMIP6_ImonAnt.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.27", + "data_specs_version": "01.00.28", "cmor_version": "3.3", "table_id": "Table ImonAnt", - "realm": "atmos", - "table_date": "30 July 2018", + "realm": "landIce land", + "table_date": "06 November 2018", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", @@ -34,7 +34,7 @@ }, "hfls": { "frequency": "mon", - "modeling_realm": "atmos", + "modeling_realm": "landIce land", "standard_name": "surface_upward_latent_heat_flux", "units": "W m-2", "cell_methods": "area: time: mean where ice_sheet", @@ -52,7 +52,7 @@ }, "hfss": { "frequency": "mon", - "modeling_realm": "atmos", + "modeling_realm": "landIce land", "standard_name": "surface_upward_sensible_heat_flux", "units": "W m-2", "cell_methods": "area: time: mean where ice_sheet", @@ -214,7 +214,7 @@ }, "mrroLi": { "frequency": "mon", - "modeling_realm": "atmos", + "modeling_realm": "landIce land", "standard_name": "land_ice_runoff_flux", "units": "kg m-2 s-1", "cell_methods": "area: time: mean where ice_sheet", @@ -250,7 +250,7 @@ }, "prra": { "frequency": "mon", - "modeling_realm": "atmos", + "modeling_realm": "landIce land", "standard_name": "rainfall_flux", "units": "kg m-2 s-1", "cell_methods": "area: time: mean where ice_sheet", @@ -268,7 +268,7 @@ }, "prsn": { "frequency": "mon", - "modeling_realm": "atmos", + "modeling_realm": "landIce land", "standard_name": "snowfall_flux", "units": "kg m-2 s-1", "cell_methods": "area: time: mean where ice_sheet", @@ -286,7 +286,7 @@ }, "rlds": { "frequency": "mon", - "modeling_realm": "atmos", + "modeling_realm": "landIce land", "standard_name": "surface_downwelling_longwave_flux_in_air", "units": "W m-2", "cell_methods": "area: time: mean where ice_sheet", @@ -304,7 +304,7 @@ }, "rlus": { "frequency": "mon", - "modeling_realm": "atmos", + "modeling_realm": "landIce land", "standard_name": "surface_upwelling_longwave_flux_in_air", "units": "W m-2", "cell_methods": "area: time: mean where ice_sheet", @@ -322,7 +322,7 @@ }, "rsds": { "frequency": "mon", - "modeling_realm": "atmos", + "modeling_realm": "landIce land", "standard_name": "surface_downwelling_shortwave_flux_in_air", "units": "W m-2", "cell_methods": "area: time: mean where ice_sheet", @@ -340,7 +340,7 @@ }, "rsus": { "frequency": "mon", - "modeling_realm": "atmos", + "modeling_realm": "landIce land", "standard_name": "surface_upwelling_shortwave_flux_in_air", "units": "W m-2", "cell_methods": "area: time: mean where ice_sheet", @@ -448,7 +448,7 @@ }, "tas": { "frequency": "mon", - "modeling_realm": "atmos", + "modeling_realm": "landIce land", "standard_name": "air_temperature", "units": "K", "cell_methods": "area: time: mean where ice_sheet", @@ -466,7 +466,7 @@ }, "ts": { "frequency": "mon", - "modeling_realm": "atmos", + "modeling_realm": "landIce land", "standard_name": "surface_temperature", "units": "K", "cell_methods": "area: time: mean where ice_sheet", diff --git a/TestTables/CMIP6_ImonGre.json b/TestTables/CMIP6_ImonGre.json index 861df282..f62924f2 100644 --- a/TestTables/CMIP6_ImonGre.json +++ b/TestTables/CMIP6_ImonGre.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.27", + "data_specs_version": "01.00.28", "cmor_version": "3.3", "table_id": "Table ImonGre", - "realm": "atmos", - "table_date": "30 July 2018", + "realm": "landIce land", + "table_date": "06 November 2018", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", @@ -34,7 +34,7 @@ }, "hfls": { "frequency": "mon", - "modeling_realm": "atmos", + "modeling_realm": "landIce land", "standard_name": "surface_upward_latent_heat_flux", "units": "W m-2", "cell_methods": "area: time: mean where ice_sheet", @@ -52,7 +52,7 @@ }, "hfss": { "frequency": "mon", - "modeling_realm": "atmos", + "modeling_realm": "landIce land", "standard_name": "surface_upward_sensible_heat_flux", "units": "W m-2", "cell_methods": "area: time: mean where ice_sheet", @@ -214,7 +214,7 @@ }, "mrroLi": { "frequency": "mon", - "modeling_realm": "atmos", + "modeling_realm": "landIce land", "standard_name": "land_ice_runoff_flux", "units": "kg m-2 s-1", "cell_methods": "area: time: mean where ice_sheet", @@ -250,7 +250,7 @@ }, "prra": { "frequency": "mon", - "modeling_realm": "atmos", + "modeling_realm": "landIce land", "standard_name": "rainfall_flux", "units": "kg m-2 s-1", "cell_methods": "area: time: mean where ice_sheet", @@ -268,7 +268,7 @@ }, "prsn": { "frequency": "mon", - "modeling_realm": "atmos", + "modeling_realm": "landIce land", "standard_name": "snowfall_flux", "units": "kg m-2 s-1", "cell_methods": "area: time: mean where ice_sheet", @@ -286,7 +286,7 @@ }, "rlds": { "frequency": "mon", - "modeling_realm": "atmos", + "modeling_realm": "landIce land", "standard_name": "surface_downwelling_longwave_flux_in_air", "units": "W m-2", "cell_methods": "area: time: mean where ice_sheet", @@ -304,7 +304,7 @@ }, "rlus": { "frequency": "mon", - "modeling_realm": "atmos", + "modeling_realm": "landIce land", "standard_name": "surface_upwelling_longwave_flux_in_air", "units": "W m-2", "cell_methods": "area: time: mean where ice_sheet", @@ -322,7 +322,7 @@ }, "rsds": { "frequency": "mon", - "modeling_realm": "atmos", + "modeling_realm": "landIce land", "standard_name": "surface_downwelling_shortwave_flux_in_air", "units": "W m-2", "cell_methods": "area: time: mean where ice_sheet", @@ -340,7 +340,7 @@ }, "rsus": { "frequency": "mon", - "modeling_realm": "atmos", + "modeling_realm": "landIce land", "standard_name": "surface_upwelling_shortwave_flux_in_air", "units": "W m-2", "cell_methods": "area: time: mean where ice_sheet", @@ -448,7 +448,7 @@ }, "tas": { "frequency": "mon", - "modeling_realm": "atmos", + "modeling_realm": "landIce land", "standard_name": "air_temperature", "units": "K", "cell_methods": "area: time: mean where ice_sheet", @@ -466,7 +466,7 @@ }, "ts": { "frequency": "mon", - "modeling_realm": "atmos", + "modeling_realm": "landIce land", "standard_name": "surface_temperature", "units": "K", "cell_methods": "area: time: mean where ice_sheet", diff --git a/TestTables/CMIP6_IyrAnt.json b/TestTables/CMIP6_IyrAnt.json index e520baa9..4100bb6c 100644 --- a/TestTables/CMIP6_IyrAnt.json +++ b/TestTables/CMIP6_IyrAnt.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.27", + "data_specs_version": "01.00.28", "cmor_version": "3.3", "table_id": "Table IyrAnt", - "realm": "atmos", - "table_date": "30 July 2018", + "realm": "landIce", + "table_date": "06 November 2018", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", @@ -37,11 +37,11 @@ "modeling_realm": "landIce", "standard_name": "upward_geothermal_heat_flux_at_ground_level_in_land_ice", "units": "W m-2", - "cell_methods": "area: time: mean where ice_sheet", + "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", - "dimensions": "xant yant time", + "dimensions": "xant yant", "out_name": "hfgeoubed", "type": "real", "positive": "", @@ -52,7 +52,7 @@ }, "iareafl": { "frequency": "yr", - "modeling_realm": "atmos", + "modeling_realm": "landIce", "standard_name": "floating_ice_shelf_area", "units": "m2", "cell_methods": "area: time: mean where floating_ice_shelf (comment: mask=sftflf)", @@ -70,7 +70,7 @@ }, "iareagr": { "frequency": "yr", - "modeling_realm": "atmos", + "modeling_realm": "landIce", "standard_name": "grounded_ice_sheet_area", "units": "m2", "cell_methods": "area: time: mean where grounded_ice_sheet (comment: mask=sfgrlf)", @@ -160,10 +160,10 @@ }, "lim": { "frequency": "yr", - "modeling_realm": "atmos", + "modeling_realm": "landIce", "standard_name": "land_ice_mass", "units": "kg", - "cell_methods": "area: time: mean where ice_sheet", + "cell_methods": "area: sum where ice_sheet time: mean", "cell_measures": "", "long_name": "Ice sheet mass", "comment": "The ice sheet mass is computed as the volume times density", @@ -178,7 +178,7 @@ }, "limnsw": { "frequency": "yr", - "modeling_realm": "atmos", + "modeling_realm": "landIce", "standard_name": "land_ice_mass_not_displacing_sea_water", "units": "kg", "cell_methods": "area: time: mean where grounded_ice_sheet (comment: mask=sfgrlf)", @@ -253,11 +253,11 @@ "modeling_realm": "landIce", "standard_name": "land_ice_thickness", "units": "m", - "cell_methods": "area: time: mean where ice_sheet", + "cell_methods": "area: mean where grounded_ice_sheet", "cell_measures": "area: areacellg", "long_name": "Ice Sheet Thickness", "comment": "The thickness of the ice sheet", - "dimensions": "xant yant time", + "dimensions": "xant yant", "out_name": "lithk", "type": "real", "positive": "", @@ -358,7 +358,7 @@ }, "snc": { "frequency": "yr", - "modeling_realm": "landIce land", + "modeling_realm": "landIce", "standard_name": "surface_snow_area_fraction", "units": "%", "cell_methods": "area: time: mean where ice_sheet", @@ -394,10 +394,10 @@ }, "tendacabf": { "frequency": "yr", - "modeling_realm": "atmos", + "modeling_realm": "landIce", "standard_name": "tendency_of_land_ice_mass_due_to_surface_mass_balance", "units": "kg s-1", - "cell_methods": "area: time: mean where ice_sheet", + "cell_methods": "area: sum where ice_sheet time: mean", "cell_measures": "", "long_name": "Total surface mass balance flux", "comment": "The total surface mass balance flux over land ice is a spatial integration of the surface mass balance flux", @@ -412,10 +412,10 @@ }, "tendlibmassbf": { "frequency": "yr", - "modeling_realm": "atmos", + "modeling_realm": "landIce", "standard_name": "tendency_of_land_ice_mass_due_to_basal_mass_balance", "units": "kg s-1", - "cell_methods": "area: time: mean where ice_sheet", + "cell_methods": "area: sum where ice_sheet time: mean", "cell_measures": "", "long_name": "Total basal mass balance flux", "comment": "The total basal mass balance flux over land ice is a spatial integration of the basal mass balance flux", @@ -430,10 +430,10 @@ }, "tendlicalvf": { "frequency": "yr", - "modeling_realm": "atmos", + "modeling_realm": "landIce", "standard_name": "tendency_of_land_ice_mass_due_to_calving", "units": "kg s-1", - "cell_methods": "area: time: mean where ice_sheet", + "cell_methods": "area: sum where ice_sheet time: mean", "cell_measures": "", "long_name": "Total calving flux", "comment": "The total calving flux over land ice is a spatial integration of the calving flux", diff --git a/TestTables/CMIP6_IyrGre.json b/TestTables/CMIP6_IyrGre.json index e23f940e..4531f6af 100644 --- a/TestTables/CMIP6_IyrGre.json +++ b/TestTables/CMIP6_IyrGre.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.27", + "data_specs_version": "01.00.28", "cmor_version": "3.3", "table_id": "Table IyrGre", - "realm": "atmos", - "table_date": "30 July 2018", + "realm": "landIce", + "table_date": "06 November 2018", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", @@ -37,11 +37,11 @@ "modeling_realm": "landIce", "standard_name": "upward_geothermal_heat_flux_at_ground_level_in_land_ice", "units": "W m-2", - "cell_methods": "area: time: mean where ice_sheet", + "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", - "dimensions": "xgre ygre time", + "dimensions": "xgre ygre", "out_name": "hfgeoubed", "type": "real", "positive": "", @@ -52,7 +52,7 @@ }, "iareafl": { "frequency": "yr", - "modeling_realm": "atmos", + "modeling_realm": "landIce", "standard_name": "floating_ice_shelf_area", "units": "m2", "cell_methods": "area: time: mean where floating_ice_shelf (comment: mask=sftflf)", @@ -70,7 +70,7 @@ }, "iareagr": { "frequency": "yr", - "modeling_realm": "atmos", + "modeling_realm": "landIce", "standard_name": "grounded_ice_sheet_area", "units": "m2", "cell_methods": "area: time: mean where grounded_ice_sheet (comment: mask=sfgrlf)", @@ -160,10 +160,10 @@ }, "lim": { "frequency": "yr", - "modeling_realm": "atmos", + "modeling_realm": "landIce", "standard_name": "land_ice_mass", "units": "kg", - "cell_methods": "area: time: mean where ice_sheet", + "cell_methods": "area: sum where ice_sheet time: mean", "cell_measures": "", "long_name": "Ice sheet mass", "comment": "The ice sheet mass is computed as the volume times density", @@ -178,7 +178,7 @@ }, "limnsw": { "frequency": "yr", - "modeling_realm": "atmos", + "modeling_realm": "landIce", "standard_name": "land_ice_mass_not_displacing_sea_water", "units": "kg", "cell_methods": "area: time: mean where grounded_ice_sheet (comment: mask=sfgrlf)", @@ -253,11 +253,11 @@ "modeling_realm": "landIce", "standard_name": "land_ice_thickness", "units": "m", - "cell_methods": "area: time: mean where ice_sheet", + "cell_methods": "area: mean where grounded_ice_sheet", "cell_measures": "area: areacellg", "long_name": "Ice Sheet Thickness", "comment": "The thickness of the ice sheet", - "dimensions": "xgre ygre time", + "dimensions": "xgre ygre", "out_name": "lithk", "type": "real", "positive": "", @@ -394,10 +394,10 @@ }, "tendacabf": { "frequency": "yr", - "modeling_realm": "atmos", + "modeling_realm": "landIce", "standard_name": "tendency_of_land_ice_mass_due_to_surface_mass_balance", "units": "kg s-1", - "cell_methods": "area: time: mean where ice_sheet", + "cell_methods": "area: sum where ice_sheet time: mean", "cell_measures": "", "long_name": "Total surface mass balance flux", "comment": "The total surface mass balance flux over land ice is a spatial integration of the surface mass balance flux", @@ -412,10 +412,10 @@ }, "tendlibmassbf": { "frequency": "yr", - "modeling_realm": "atmos", + "modeling_realm": "landIce", "standard_name": "tendency_of_land_ice_mass_due_to_basal_mass_balance", "units": "kg s-1", - "cell_methods": "area: time: mean where ice_sheet", + "cell_methods": "area: sum where ice_sheet time: mean", "cell_measures": "", "long_name": "Total basal mass balance flux", "comment": "The total basal mass balance flux over land ice is a spatial integration of the basal mass balance flux", @@ -430,10 +430,10 @@ }, "tendlicalvf": { "frequency": "yr", - "modeling_realm": "atmos", + "modeling_realm": "landIce", "standard_name": "tendency_of_land_ice_mass_due_to_calving", "units": "kg s-1", - "cell_methods": "area: time: mean where ice_sheet", + "cell_methods": "area: sum where ice_sheet time: mean", "cell_measures": "", "long_name": "Total calving flux", "comment": "The total calving flux over land ice is a spatial integration of the calving flux", diff --git a/TestTables/CMIP6_LImon.json b/TestTables/CMIP6_LImon.json index 84a979f4..5b772c7a 100644 --- a/TestTables/CMIP6_LImon.json +++ b/TestTables/CMIP6_LImon.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.27", + "data_specs_version": "01.00.28", "cmor_version": "3.3", "table_id": "Table LImon", "realm": "landIce land", - "table_date": "30 July 2018", + "table_date": "06 November 2018", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", diff --git a/TestTables/CMIP6_Lmon.json b/TestTables/CMIP6_Lmon.json index 609db5e7..c7dee415 100644 --- a/TestTables/CMIP6_Lmon.json +++ b/TestTables/CMIP6_Lmon.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.27", + "data_specs_version": "01.00.28", "cmor_version": "3.3", "table_id": "Table Lmon", "realm": "land", - "table_date": "30 July 2018", + "table_date": "06 November 2018", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", diff --git a/TestTables/CMIP6_Oclim.json b/TestTables/CMIP6_Oclim.json index 58eb46be..ae4a1f90 100644 --- a/TestTables/CMIP6_Oclim.json +++ b/TestTables/CMIP6_Oclim.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.27", + "data_specs_version": "01.00.28", "cmor_version": "3.3", "table_id": "Table Oclim", "realm": "ocean", - "table_date": "30 July 2018", + "table_date": "06 November 2018", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", @@ -614,10 +614,10 @@ "standard_name": "depth_below_geoid", "units": "m", "cell_methods": "area: mean time: mean within years time: mean over years", - "cell_measures": "area: areacello volume: volcello", + "cell_measures": "area: areacello", "long_name": "Depth Below Geoid of Interfaces Between Ocean Layers", "comment": "Depth below geoid", - "dimensions": "longitude latitude olevel time2", + "dimensions": "longitude latitude olevhalf time2", "out_name": "zhalfo", "type": "real", "positive": "", diff --git a/TestTables/CMIP6_Oday.json b/TestTables/CMIP6_Oday.json index ea16f119..482c3632 100644 --- a/TestTables/CMIP6_Oday.json +++ b/TestTables/CMIP6_Oday.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.27", + "data_specs_version": "01.00.28", "cmor_version": "3.3", "table_id": "Table Oday", "realm": "ocnBgchem", - "table_date": "30 July 2018", + "table_date": "06 November 2018", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", diff --git a/TestTables/CMIP6_Odec.json b/TestTables/CMIP6_Odec.json index 77d55c7c..07955faa 100644 --- a/TestTables/CMIP6_Odec.json +++ b/TestTables/CMIP6_Odec.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.27", + "data_specs_version": "01.00.28", "cmor_version": "3.3", "table_id": "Table Odec", "realm": "ocean", - "table_date": "30 July 2018", + "table_date": "06 November 2018", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", diff --git a/TestTables/CMIP6_Ofx.json b/TestTables/CMIP6_Ofx.json index 9de6ec65..bc9fe6ef 100644 --- a/TestTables/CMIP6_Ofx.json +++ b/TestTables/CMIP6_Ofx.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.27", + "data_specs_version": "01.00.28", "cmor_version": "3.3", "table_id": "Table Ofx", "realm": "ocean", - "table_date": "30 July 2018", + "table_date": "06 November 2018", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", diff --git a/TestTables/CMIP6_Omon.json b/TestTables/CMIP6_Omon.json index 26fe258a..2c20fd8e 100644 --- a/TestTables/CMIP6_Omon.json +++ b/TestTables/CMIP6_Omon.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.27", + "data_specs_version": "01.00.28", "cmor_version": "3.3", "table_id": "Table Omon", "realm": "ocnBgchem", - "table_date": "30 July 2018", + "table_date": "06 November 2018", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", @@ -1673,7 +1673,7 @@ "frfe": { "frequency": "mon", "modeling_realm": "ocnBgchem", - "standard_name": "tendency_of_ocean_mole_content_of_iron_due_to_sedimentation", + "standard_name": "minus_tendency_of_ocean_mole_content_of_iron_due_to_sedimentation", "units": "mol m-2 s-1", "cell_methods": "area: mean where sea time: mean", "cell_measures": "area: areacello", @@ -1691,7 +1691,7 @@ "fric": { "frequency": "mon", "modeling_realm": "ocnBgchem", - "standard_name": "tendency_of_ocean_mole_content_of_inorganic_carbon_due_to_sedimentation", + "standard_name": "minus_tendency_of_ocean_mole_content_of_inorganic_carbon_due_to_sedimentation", "units": "mol m-2 s-1", "cell_methods": "area: mean where sea time: mean", "cell_measures": "area: areacello", @@ -1727,7 +1727,7 @@ "frn": { "frequency": "mon", "modeling_realm": "ocnBgchem", - "standard_name": "tendency_of_ocean_mole_content_of_elemental_nitrogen_due_to_denitrification_and_sedimentation", + "standard_name": "minus_tendency_of_ocean_mole_content_of_elemental_nitrogen_due_to_denitrification_and_sedimentation", "units": "mol m-2 s-1", "cell_methods": "area: mean where sea time: mean", "cell_measures": "area: areacello", @@ -1745,7 +1745,7 @@ "froc": { "frequency": "mon", "modeling_realm": "ocnBgchem", - "standard_name": "tendency_of_ocean_mole_content_of_organic_carbon_due_to_sedimentation", + "standard_name": "minus_tendency_of_ocean_mole_content_of_organic_carbon_due_to_sedimentation", "units": "mol m-2 s-1", "cell_methods": "area: mean where sea time: mean", "cell_measures": "area: areacello", @@ -5006,10 +5006,10 @@ "standard_name": "depth_below_geoid", "units": "m", "cell_methods": "area: mean where sea time: mean", - "cell_measures": "area: areacello volume: volcello", + "cell_measures": "area: areacello", "long_name": "Depth Below Geoid of Interfaces Between Ocean Layers", "comment": "Depth below geoid", - "dimensions": "longitude latitude olevel time", + "dimensions": "longitude latitude olevhalf time", "out_name": "zhalfo", "type": "real", "positive": "", diff --git a/TestTables/CMIP6_Oyr.json b/TestTables/CMIP6_Oyr.json index fb8ad237..bd8b47bd 100644 --- a/TestTables/CMIP6_Oyr.json +++ b/TestTables/CMIP6_Oyr.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.27", + "data_specs_version": "01.00.28", "cmor_version": "3.3", "table_id": "Table Oyr", "realm": "ocnBgchem", - "table_date": "30 July 2018", + "table_date": "06 November 2018", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", diff --git a/TestTables/CMIP6_SIday.json b/TestTables/CMIP6_SIday.json index 6944280b..d5429780 100644 --- a/TestTables/CMIP6_SIday.json +++ b/TestTables/CMIP6_SIday.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.27", + "data_specs_version": "01.00.28", "cmor_version": "3.3", "table_id": "Table SIday", "realm": "seaIce", - "table_date": "30 July 2018", + "table_date": "06 November 2018", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", @@ -56,7 +56,7 @@ "standard_name": "surface_snow_thickness", "units": "m", "cell_methods": "area: mean where snow over sea_ice area: time: mean where sea_ice", - "cell_measures": "area: areacella", + "cell_measures": "area: areacello", "long_name": "Snow thickness", "comment": "Actual thickness of snow (snow volume divided by snow-covered area)", "dimensions": "longitude latitude time", @@ -127,8 +127,8 @@ "modeling_realm": "seaIce", "standard_name": "fraction_of_time_with_sea_ice_area_fraction_above_threshold", "units": "1", - "cell_methods": "area: time: mean", - "cell_measures": "area: areacella", + "cell_methods": "area: mean where sea time: mean", + "cell_measures": "area: areacello", "long_name": "Fraction of time steps with sea ice", "comment": "Fraction of time steps of the averaging period during which sea ice is present (siconc >0 ) in a grid cell", "dimensions": "longitude latitude time", diff --git a/TestTables/CMIP6_SImon.json b/TestTables/CMIP6_SImon.json index 30cdc6b6..15cb20b0 100644 --- a/TestTables/CMIP6_SImon.json +++ b/TestTables/CMIP6_SImon.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.27", + "data_specs_version": "01.00.28", "cmor_version": "3.3", "table_id": "Table SImon", "realm": "seaIce", - "table_date": "30 July 2018", + "table_date": "06 November 2018", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", @@ -163,8 +163,8 @@ "modeling_realm": "seaIce", "standard_name": "tendency_of_sea_ice_area_fraction_due_to_dynamics", "units": "s-1", - "cell_methods": "area: time: mean", - "cell_measures": "area: areacella", + "cell_methods": "area: mean where sea time: mean", + "cell_measures": "area: areacello", "long_name": "sea-ice area fraction change from dynamics", "comment": "Total change in sea-ice area fraction through dynamics-related processes (advection, divergence...)", "dimensions": "longitude latitude time", @@ -181,8 +181,8 @@ "modeling_realm": "seaIce", "standard_name": "tendency_of_sea_ice_area_fraction_due_to_thermodynamics", "units": "s-1", - "cell_methods": "area: time: mean", - "cell_measures": "area: areacella", + "cell_methods": "area: mean where sea time: mean", + "cell_measures": "area: areacello", "long_name": "sea-ice area fraction change from thermodynamics", "comment": "Total change in sea-ice area fraction through thermodynamic processes", "dimensions": "longitude latitude time", @@ -217,8 +217,8 @@ "modeling_realm": "seaIce", "standard_name": "tendency_of_sea_ice_amount_due_to_sea_ice_dynamics", "units": "kg m-2 s-1", - "cell_methods": "area: time: mean", - "cell_measures": "area: areacella", + "cell_methods": "area: mean where sea time: mean", + "cell_measures": "area: areacello", "long_name": "sea-ice mass change from dynamics", "comment": "Total change in sea-ice mass through dynamics-related processes (advection,...) divided by grid-cell area", "dimensions": "longitude latitude time", @@ -235,8 +235,8 @@ "modeling_realm": "seaIce", "standard_name": "water_evapotranspiration_flux", "units": "kg m-2 s-1", - "cell_methods": "area: time: mean", - "cell_measures": "area: areacella", + "cell_methods": "area: mean where sea time: mean", + "cell_measures": "area: areacello", "long_name": "sea-ice mass change through evaporation and sublimation", "comment": "The rate of change of sea-ice mass change through evaporation and sublimation divided by grid-cell area", "dimensions": "longitude latitude time", @@ -253,8 +253,8 @@ "modeling_realm": "seaIce", "standard_name": "tendency_of_sea_ice_amount_due_to_congelation_ice_accumulation", "units": "kg m-2 s-1", - "cell_methods": "area: time: mean", - "cell_measures": "area: areacella", + "cell_methods": "area: mean where sea time: mean", + "cell_measures": "area: areacello", "long_name": "sea-ice mass change through basal growth", "comment": "The rate of change of sea ice mass due to vertical growth of existing sea ice at its base divided by grid-cell area.", "dimensions": "longitude latitude time", @@ -271,8 +271,8 @@ "modeling_realm": "seaIce", "standard_name": "tendency_of_sea_ice_amount_due_to_frazil_ice_accumulation_in_leads", "units": "kg m-2 s-1", - "cell_methods": "area: time: mean", - "cell_measures": "area: areacella", + "cell_methods": "area: mean where sea time: mean", + "cell_measures": "area: areacello", "long_name": "sea-ice mass change through growth in supercooled open water (aka frazil)", "comment": "The rate of change of sea ice mass due to sea ice formation in supercooled water (often through frazil formation) divided by grid-cell area. Together, sidmassgrowthwat and sidmassgrowthbot should give total ice growth", "dimensions": "longitude latitude time", @@ -289,8 +289,8 @@ "modeling_realm": "seaIce", "standard_name": "tendency_of_sea_ice_amount_due_to_lateral_melting", "units": "kg m-2 s-1", - "cell_methods": "area: time: mean", - "cell_measures": "area: areacella", + "cell_methods": "area: mean where sea time: mean", + "cell_measures": "area: areacello", "long_name": "Lateral sea ice melt rate", "comment": "The rate of change of sea ice mass through lateral melting divided by grid-cell area (report 0 if not explicitly calculated thermodynamically)", "dimensions": "longitude latitude time", @@ -307,8 +307,8 @@ "modeling_realm": "seaIce", "standard_name": "tendency_of_sea_ice_amount_due_to_basal_melting", "units": "kg m-2 s-1", - "cell_methods": "area: time: mean", - "cell_measures": "area: areacella", + "cell_methods": "area: mean where sea time: mean", + "cell_measures": "area: areacello", "long_name": "sea-ice mass change through bottom melting", "comment": "The rate of change of sea ice mass through melting at the ice bottom divided by grid-cell area", "dimensions": "longitude latitude time", @@ -325,8 +325,8 @@ "modeling_realm": "seaIce", "standard_name": "tendency_of_sea_ice_amount_due_to_surface_melting", "units": "kg m-2 s-1", - "cell_methods": "area: time: mean", - "cell_measures": "area: areacella", + "cell_methods": "area: mean where sea time: mean", + "cell_measures": "area: areacello", "long_name": "sea-ice mass change through surface melting", "comment": "The rate of change of sea ice mass through melting at the ice surface divided by grid-cell area", "dimensions": "longitude latitude time", @@ -343,8 +343,8 @@ "modeling_realm": "seaIce", "standard_name": "tendency_of_sea_ice_amount_due_to_conversion_of_snow_to_sea_ice", "units": "kg m-2 s-1", - "cell_methods": "area: time: mean", - "cell_measures": "area: areacella", + "cell_methods": "area: mean where sea time: mean", + "cell_measures": "area: areacello", "long_name": "sea-ice mass change through snow-to-ice conversion", "comment": "The rate of change of sea ice mass due to transformation of snow to sea ice divided by grid-cell area", "dimensions": "longitude latitude time", @@ -361,8 +361,8 @@ "modeling_realm": "seaIce", "standard_name": "tendency_of_sea_ice_amount_due_to_sea_ice_thermodynamics", "units": "kg m-2 s-1", - "cell_methods": "area: time: mean", - "cell_measures": "area: areacella", + "cell_methods": "area: mean where sea time: mean", + "cell_measures": "area: areacello", "long_name": "sea-ice mass change from thermodynamics", "comment": "Total change in sea-ice mass from thermodynamic processes divided by grid-cell area", "dimensions": "longitude latitude time", @@ -829,8 +829,8 @@ "modeling_realm": "seaIce", "standard_name": "sea_ice_temperature_expressed_as_heat_content", "units": "J m-2", - "cell_methods": "area: time: mean", - "cell_measures": "area: areacella", + "cell_methods": "area: mean where sea time: mean", + "cell_measures": "area: areacello", "long_name": "Sea-ice heat content per unit area", "comment": "Heat content of all ice in grid cell divided by total grid-cell area. Water at 0 Celsius is assumed to have a heat content of 0 J. Does not include heat content of snow, but does include heat content of brine. Heat content is always negative, since both the sensible and the latent heat content of ice are less than that of water", "dimensions": "longitude latitude time", @@ -848,7 +848,7 @@ "standard_name": "sea_ice_area_fraction", "units": "%", "cell_methods": "area: time: mean where sea_ice (comment: mask=siconc)", - "cell_measures": "area: areacella", + "cell_measures": "area: areacello", "long_name": "Sea-ice area fractions in thickness categories", "comment": "Area fraction of grid cell covered by each ice-thickness category (vector with one entry for each thickness category starting from the thinnest category, netcdf file should use thickness bounds of the categories as third coordinate axis)", "dimensions": "longitude latitude iceband time", @@ -866,7 +866,7 @@ "standard_name": "surface_snow_area_fraction", "units": "%", "cell_methods": "area: time: mean where sea_ice (comment: mask=siitdconc)", - "cell_measures": "area: areacella", + "cell_measures": "area: areacello", "long_name": "Snow area fractions in thickness categories", "comment": "Area fraction of grid cell covered by snow in each ice-thickness category (vector with one entry for each thickness category starting from the thinnest category, netcdf file should use thickness bounds of the categories as third coordinate axis)", "dimensions": "longitude latitude iceband time", @@ -884,7 +884,7 @@ "standard_name": "surface_snow_thickness", "units": "m", "cell_methods": "area: time: mean where sea_ice (comment: mask=siitdconc)", - "cell_measures": "area: areacella", + "cell_measures": "area: areacello", "long_name": "Snow thickness in thickness categories", "comment": "Actual thickness of snow in each category (NOT volume divided by grid area), (vector with one entry for each thickness category starting from the thinnest category, netcdf file should use thickness bounds of categories as third coordinate axis)", "dimensions": "longitude latitude iceband time", @@ -902,7 +902,7 @@ "standard_name": "sea_ice_thickness", "units": "m", "cell_methods": "area: time: mean where sea_ice (comment: mask=siitdconc)", - "cell_measures": "area: areacella", + "cell_measures": "area: areacello", "long_name": "Sea-ice thickness in thickness categories", "comment": "Actual (floe) thickness of sea ice in each category (NOT volume divided by grid area), (vector with one entry for each thickness category starting from the thinnest category, netcdf file should use thickness bounds of categories as third coordinate axis)", "dimensions": "longitude latitude iceband time", @@ -919,8 +919,8 @@ "modeling_realm": "seaIce", "standard_name": "sea_ice_amount", "units": "kg m-2", - "cell_methods": "area: time: mean", - "cell_measures": "area: areacella", + "cell_methods": "area: mean where sea time: mean", + "cell_measures": "area: areacello", "long_name": "Sea-ice mass per area", "comment": "Total mass of sea ice divided by grid-cell area", "dimensions": "longitude latitude time", @@ -956,7 +956,7 @@ "standard_name": "area_fraction", "units": "%", "cell_methods": "area: time: mean where sea_ice (comment: mask=siconc)", - "cell_measures": "area: areacella", + "cell_measures": "area: areacello", "long_name": "Percentage Cover of Sea-Ice by Meltpond", "comment": "Percentage of sea ice, by area, which is covered by melt ponds, giving equal weight to every square metre of sea ice .", "dimensions": "longitude latitude time typemp", @@ -972,11 +972,11 @@ "frequency": "mon", "modeling_realm": "seaIce", "standard_name": "sea_ice_melt_pond_thickness", - "units": "kg m-2", + "units": "m", "cell_methods": "area: time: mean where sea_ice_melt_pond (comment: mask=simpconc)", "cell_measures": "area: areacello", "long_name": "Meltpond Mass per Unit Area", - "comment": "Meltpond mass per area of sea ice.", + "comment": "Meltpond Depth", "dimensions": "longitude latitude time", "out_name": "simpmass", "type": "real", @@ -1081,8 +1081,8 @@ "modeling_realm": "seaIce", "standard_name": "sea_ice_mass_content_of_salt", "units": "kg m-2", - "cell_methods": "area: time: mean", - "cell_measures": "area: areacella", + "cell_methods": "area: mean where sea time: mean", + "cell_measures": "area: areacello", "long_name": "Mass of salt in sea ice per area", "comment": "Total mass of all salt in sea ice divided by grid-cell area", "dimensions": "longitude latitude time", @@ -1172,7 +1172,7 @@ "standard_name": "surface_snow_thickness", "units": "m", "cell_methods": "area: mean where snow over sea_ice area: time: mean where sea_ice", - "cell_measures": "area: areacella", + "cell_measures": "area: areacello", "long_name": "Snow thickness", "comment": "Actual thickness of snow (snow volume divided by snow-covered area)", "dimensions": "longitude latitude time", @@ -1387,8 +1387,8 @@ "modeling_realm": "seaIce", "standard_name": "fraction_of_time_with_sea_ice_area_fraction_above_threshold", "units": "1", - "cell_methods": "area: time: mean", - "cell_measures": "area: areacella", + "cell_methods": "area: mean where sea time: mean", + "cell_measures": "area: areacello", "long_name": "Fraction of time steps with sea ice", "comment": "Fraction of time steps of the averaging period during which sea ice is present (siconc >0 ) in a grid cell", "dimensions": "longitude latitude time", @@ -1441,8 +1441,8 @@ "modeling_realm": "seaIce", "standard_name": "sea_ice_thickness", "units": "m", - "cell_methods": "area: time: mean", - "cell_measures": "area: areacella", + "cell_methods": "area: mean where sea time: mean", + "cell_measures": "area: areacello", "long_name": "Sea-ice volume per area", "comment": "Total volume of sea ice divided by grid-cell area (this used to be called ice thickness in CMIP5)", "dimensions": "longitude latitude time", @@ -1495,10 +1495,10 @@ "modeling_realm": "seaIce", "standard_name": "tendency_of_surface_snow_amount_due_to_sea_ice_dynamics", "units": "kg m-2 s-1", - "cell_methods": "area: time: mean", - "cell_measures": "area: areacella", + "cell_methods": "area: time: mean where sea_ice (comment: mask=siconc)", + "cell_measures": "area: areacello", "long_name": "Snow Mass Rate of Change through Avection by Sea-ice Dynamics", - "comment": "the rate of change of snow mass through advection with sea ice divided by grid-cell area", + "comment": "The rate of change of snow mass through advection with sea ice divided by sea-ice area", "dimensions": "longitude latitude time", "out_name": "sndmassdyn", "type": "real", @@ -1513,10 +1513,10 @@ "modeling_realm": "seaIce", "standard_name": "surface_snow_melt_flux", "units": "kg m-2 s-1", - "cell_methods": "area: time: mean", - "cell_measures": "area: areacella", + "cell_methods": "area: time: mean where sea_ice (comment: mask=siconc)", + "cell_measures": "area: areacello", "long_name": "Snow Mass Rate of Change through Melt", - "comment": "the rate of change of snow mass through melt divided by grid-cell area", + "comment": "the rate of change of snow mass through melt divided by sea-ice area", "dimensions": "longitude latitude time", "out_name": "sndmassmelt", "type": "real", @@ -1531,10 +1531,10 @@ "modeling_realm": "seaIce", "standard_name": "tendency_of_surface_snow_amount_due_to_conversion_of_snow_to_sea_ice", "units": "kg m-2 s-1", - "cell_methods": "area: time: mean", - "cell_measures": "area: areacella", + "cell_methods": "area: time: mean where sea_ice (comment: mask=siconc)", + "cell_measures": "area: areacello", "long_name": "Snow Mass Rate of Change through Snow-to-Ice Conversion", - "comment": "the rate of change of snow mass due to transformation of snow to sea ice divided by grid-cell area", + "comment": "the rate of change of snow mass due to transformation of snow to sea ice divided by sea-ice area", "dimensions": "longitude latitude time", "out_name": "sndmasssi", "type": "real", @@ -1549,10 +1549,10 @@ "modeling_realm": "seaIce", "standard_name": "snowfall_flux", "units": "kg m-2 s-1", - "cell_methods": "area: time: mean", - "cell_measures": "area: areacella", + "cell_methods": "area: time: mean where sea_ice (comment: mask=siconc)", + "cell_measures": "area: areacello", "long_name": "snow mass change through snow fall", - "comment": "mass of solid precipitation falling onto sea ice divided by grid-cell area", + "comment": "mass of solid precipitation falling onto sea ice divided by sea-ice area", "dimensions": "longitude latitude time", "out_name": "sndmasssnf", "type": "real", @@ -1567,10 +1567,10 @@ "modeling_realm": "seaIce", "standard_name": "tendency_of_atmosphere_mass_content_of_water_vapor_due_to_sublimation_of_surface_snow_and_ice", "units": "kg m-2 s-1", - "cell_methods": "area: time: mean", - "cell_measures": "area: areacella", + "cell_methods": "area: time: mean where sea_ice (comment: mask=siconc)", + "cell_measures": "area: areacello", "long_name": "Snow Mass Rate of Change through Evaporation or Sublimation", - "comment": "the rate of change of snow mass through sublimation and evaporation divided by grid-cell area", + "comment": "the rate of change of snow mass through sublimation and evaporation divided by sea-ice area", "dimensions": "longitude latitude time", "out_name": "sndmasssubl", "type": "real", @@ -1585,10 +1585,10 @@ "modeling_realm": "seaIce", "standard_name": "tendency_of_surface_snow_amount_due_to_drifting_into_sea", "units": "kg m-2 s-1", - "cell_methods": "area: time: mean", - "cell_measures": "area: areacella", + "cell_methods": "area: time: mean where sea_ice (comment: mask=siconc)", + "cell_measures": "area: areacello", "long_name": "Snow Mass Rate of Change through Wind Drift of Snow", - "comment": "the rate of change of snow mass through wind drift of snow (from sea-ice into the sea) divided by grid-cell area", + "comment": "the rate of change of snow mass through wind drift of snow (from sea-ice into the sea) divided by sea-ice area", "dimensions": "longitude latitude time", "out_name": "sndmasswindrif", "type": "real", diff --git a/TestTables/CMIP6_coordinate.json b/TestTables/CMIP6_coordinate.json index 021e84bd..529c2c91 100644 --- a/TestTables/CMIP6_coordinate.json +++ b/TestTables/CMIP6_coordinate.json @@ -753,7 +753,7 @@ "long_name": "Radiation Wavelength 550 nanometers", "climatology": "", "formula": "", - "must_have_bounds": "yes", + "must_have_bounds": "", "out_name": "wavelength", "positive": "", "requested": "", @@ -801,7 +801,7 @@ "standard_name": "latitude", "units": "degrees_north", "axis": "Y", - "long_name": "latitude", + "long_name": "Latitude", "climatology": "", "formula": "", "must_have_bounds": "yes", @@ -1027,6 +1027,29 @@ "bounds_values": "0.0 100.0", "generic_level_name": "" }, + "olevhalf": { + "standard_name": "", + "units": "", + "axis": "Z", + "long_name": "ocean model half levels", + "climatology": "", + "formula": "", + "must_have_bounds": "no", + "out_name": "lev", + "positive": "down", + "requested": "", + "requested_bounds": "", + "stored_direction": "", + "tolerance": "", + "type": "double", + "valid_max": "", + "valid_min": "", + "value": "", + "z_bounds_factors": "", + "z_factors": "", + "bounds_values": "", + "generic_level_name": "" + }, "oline": { "standard_name": "region", "units": "", @@ -1268,7 +1291,7 @@ "type": "double", "valid_max": "", "valid_min": "", - "value": "84000", + "value": "84000.", "z_bounds_factors": "", "z_factors": "", "bounds_values": "100000.0 68000.0", @@ -2089,29 +2112,6 @@ "bounds_values": "", "generic_level_name": "" }, - "snowdepth": { - "standard_name": "depth", - "units": "m", - "axis": "Z", - "long_name": "depth", - "climatology": "", - "formula": "", - "must_have_bounds": "yes", - "out_name": "depth", - "positive": "down", - "requested": "", - "requested_bounds": "", - "stored_direction": "increasing", - "tolerance": "", - "type": "double", - "valid_max": "200.0", - "valid_min": "0.0", - "value": "", - "z_bounds_factors": "", - "z_factors": "", - "bounds_values": "", - "generic_level_name": "" - }, "soilpools": { "standard_name": "", "units": "", diff --git a/TestTables/CMIP6_day.json b/TestTables/CMIP6_day.json index 89649950..bb386368 100644 --- a/TestTables/CMIP6_day.json +++ b/TestTables/CMIP6_day.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.27", + "data_specs_version": "01.00.28", "cmor_version": "3.3", "table_id": "Table day", "realm": "atmos", - "table_date": "30 July 2018", + "table_date": "06 November 2018", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", diff --git a/TestTables/CMIP6_fx.json b/TestTables/CMIP6_fx.json index cf698c49..b3fb07ac 100644 --- a/TestTables/CMIP6_fx.json +++ b/TestTables/CMIP6_fx.json @@ -1,10 +1,10 @@ { "Header": { - "data_specs_version": "01.00.27", + "data_specs_version": "01.00.28", "cmor_version": "3.3", "table_id": "Table fx", "realm": "land", - "table_date": "30 July 2018", + "table_date": "06 November 2018", "missing_value": "1e20", "int_missing_value": "-999", "product": "model-output", diff --git a/TestTables/CMIP6_grids.json b/TestTables/CMIP6_grids.json index e61671ef..e91e8d6c 100644 --- a/TestTables/CMIP6_grids.json +++ b/TestTables/CMIP6_grids.json @@ -4,9 +4,9 @@ "cmor_version": "3.3", "Conventions": "CF-1.7 CMIP-6.2", "table_id": "Table grids", - "data_specs_version": "01.00.27", + "data_specs_version": "01.00.28", "missing_value": "1e20", - "table_date": "30 July 2018" + "table_date": "06 November 2018" }, "mapping_entry": { "sample_user_mapping": { From 7a2f2d467191456362432b5cdbce6891e925d54b Mon Sep 17 00:00:00 2001 From: mauzey1 <42009431+mauzey1@users.noreply.github.com> Date: Wed, 19 Dec 2018 08:10:00 +1100 Subject: [PATCH 4/7] Update Test/test_doc.py Co-Authored-By: znicholls --- Test/test_doc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Test/test_doc.py b/Test/test_doc.py index add1eb30..aa36ce04 100644 --- a/Test/test_doc.py +++ b/Test/test_doc.py @@ -5,7 +5,7 @@ netcdf_file_action=cmor.CMOR_REPLACE_4 ) -cmor.dataset_json("common_user_input.json") +cmor.dataset_json("CMOR_input_example.json") # Loading this test table overwrites the normal CF checks on valid variable values. # This is perfect for testing but shouldn't be done when writing real data. From dd188ced214c9aada9ec1122d1c5544977cad1ad Mon Sep 17 00:00:00 2001 From: mauzey1 <42009431+mauzey1@users.noreply.github.com> Date: Wed, 19 Dec 2018 11:55:28 +1100 Subject: [PATCH 5/7] Update Test/test_doc.py Co-Authored-By: znicholls --- Test/test_doc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Test/test_doc.py b/Test/test_doc.py index aa36ce04..a0459c20 100644 --- a/Test/test_doc.py +++ b/Test/test_doc.py @@ -5,7 +5,7 @@ netcdf_file_action=cmor.CMOR_REPLACE_4 ) -cmor.dataset_json("CMOR_input_example.json") +cmor.dataset_json("Test/CMOR_input_example.json") # Loading this test table overwrites the normal CF checks on valid variable values. # This is perfect for testing but shouldn't be done when writing real data. From 142a0f9156ef13294f925b49691b333968e880d8 Mon Sep 17 00:00:00 2001 From: Zeb Nicholls Date: Wed, 19 Dec 2018 11:57:00 +1100 Subject: [PATCH 6/7] Update test_doc.py --- Test/test_doc.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Test/test_doc.py b/Test/test_doc.py index a0459c20..02d0d4fa 100644 --- a/Test/test_doc.py +++ b/Test/test_doc.py @@ -1,7 +1,9 @@ import cmor cmor.setup( - inpath='./cmip6-cmor-tables/Tables', # this has to point to the CMIP6 CMOR tables path + # inpath has to point to the CMOR + # tables path (CMIP6, input4MIPs or otherwise) + inpath='Tables', netcdf_file_action=cmor.CMOR_REPLACE_4 ) From 5f0191abb5192b2668d490802a36645208a59b65 Mon Sep 17 00:00:00 2001 From: mauzey1 Date: Wed, 19 Dec 2018 09:18:07 -0800 Subject: [PATCH 7/7] changing input file to CMOR_input_example.json --- Test/test_python_CMIP6_CV_load_tables.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Test/test_python_CMIP6_CV_load_tables.py b/Test/test_python_CMIP6_CV_load_tables.py index c7ddf849..d95cf292 100644 --- a/Test/test_python_CMIP6_CV_load_tables.py +++ b/Test/test_python_CMIP6_CV_load_tables.py @@ -15,7 +15,7 @@ def testLoadTables(self): if "formula_terms" in table: continue cmor.setup(inpath='Tables', netcdf_file_action=cmor.CMOR_REPLACE) - cmor.dataset_json("Test/common_user_input.json") + cmor.dataset_json("Test/CMOR_input_example.json") print("Loading table:", table) ierr = cmor.load_table(table) self.assertEqual(ierr, 0)