Skip to content

Commit 8f6505c

Browse files
dnadeau4dnadeau4
authored
Merge pull request #17 from PCMDI/fixgrids
Fixgrids
2 parents 5e5a799 + 3678ca8 commit 8f6505c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+14211
-14044
lines changed

‎docs/dreq.xml

Lines changed: 12614 additions & 12624 deletions
Large diffs are not rendered by default.

‎src/CMIP6.sql3

0 Bytes
Binary file not shown.

‎src/CMIP6_3hr.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
{
22
"Header": {
3-
"data_specs_version": "01.00.04",
3+
"data_specs_version": "01.00.05",
44
"table_id": "Table 3hr",
55
"realm": "atmos",
66
"frequency": "3hr",
77
"cmor_version": "3.2",
8-
"table_date": "20 March 2017",
8+
"table_date": "31 March 2017",
99
"missing_value": "1e20",
10-
"product": "output",
10+
"product": "model-output",
1111
"approx_interval": "0.125000",
1212
"generic_levels": "",
1313
"mip_era": "CMIP6",
14-
"Conventions": "CF-1.6 CMIP-6.0"
14+
"Conventions": "CF-1.7 CMIP-6.0"
1515
},
1616
"variable_entry": {
1717
"clt": {
1818
"modeling_realm": "atmos",
1919
"standard_name": "cloud_area_fraction",
20-
"units": "1.0",
20+
"units": "%",
2121
"cell_methods": "time: mean",
2222
"cell_measures": "area: areacella",
2323
"long_name": "Total Cloud Fraction",

‎src/CMIP6_6hrLev.json

Lines changed: 9 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
{
22
"Header": {
3-
"data_specs_version": "01.00.04",
3+
"data_specs_version": "01.00.05",
44
"table_id": "Table 6hrLev",
55
"realm": "atmos",
66
"frequency": "6hr",
77
"cmor_version": "3.2",
8-
"table_date": "20 March 2017",
8+
"table_date": "31 March 2017",
99
"missing_value": "1e20",
10-
"product": "output",
10+
"product": "model-output",
1111
"approx_interval": "0.250000",
1212
"generic_levels": "alevel",
1313
"mip_era": "CMIP6",
14-
"Conventions": "CF-1.6 CMIP-6.0"
14+
"Conventions": "CF-1.7 CMIP-6.0"
1515
},
1616
"variable_entry": {
1717
"bs550aer": {
1818
"modeling_realm": "aerosol",
1919
"standard_name": "volume_lidar_backwards_scattering_coefficient_in_air_due_to_ambient_aerosol_particles",
2020
"units": "m-1 sr-1",
21-
"cell_methods": "time: mean",
21+
"cell_methods": "area: mean ",
2222
"cell_measures": "area: areacella",
2323
"long_name": "Aerosol backscatter coefficient",
2424
"comment": "Aerosol Backscatter @550nm @ 180 degrees, computed from extinction and lidar ratio",
25-
"dimensions": "longitude latitude alevel time",
25+
"dimensions": "longitude latitude alevel time1",
2626
"out_name": "bs550aer",
2727
"type": "float",
2828
"positive": "",
@@ -33,13 +33,13 @@
3333
},
3434
"ec550aer": {
3535
"modeling_realm": "aerosol",
36-
"standard_name": "volume_extinction_coefficient_in_air_due_to_ambient_aerosol",
36+
"standard_name": "volume_extinction_coefficient_in_air_due_to_ambient_aerosol_particles",
3737
"units": "m-1",
38-
"cell_methods": "time: mean",
38+
"cell_methods": "area: mean ",
3939
"cell_measures": "area: areacella",
4040
"long_name": "Aerosol extinction coefficient",
4141
"comment": "Aerosol Extinction @550nm",
42-
"dimensions": "longitude latitude alevel time",
42+
"dimensions": "longitude latitude alevel time1",
4343
"out_name": "ec550aer",
4444
"type": "float",
4545
"positive": "",
@@ -149,23 +149,6 @@
149149
"valid_max": "",
150150
"ok_min_mean_abs": "",
151151
"ok_max_mean_abs": ""
152-
},
153-
"zg500": {
154-
"modeling_realm": "aerosol",
155-
"standard_name": "geopotential_height",
156-
"units": "m",
157-
"cell_methods": "time: mean",
158-
"cell_measures": "area: areacella",
159-
"long_name": "Geopotential Height at 500 hPa",
160-
"comment": "geopotential height on the 500 hPa surface",
161-
"dimensions": "longitude latitude time",
162-
"out_name": "zg500",
163-
"type": "float",
164-
"positive": "",
165-
"valid_min": "",
166-
"valid_max": "",
167-
"ok_min_mean_abs": "",
168-
"ok_max_mean_abs": ""
169152
}
170153
}
171154
}

‎src/CMIP6_6hrPlev.json

Lines changed: 15 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{
22
"Header": {
3-
"data_specs_version": "01.00.04",
3+
"data_specs_version": "01.00.05",
44
"table_id": "Table 6hrPlev",
5-
"realm": "",
5+
"realm": "atmos",
66
"frequency": "6hr",
77
"cmor_version": "3.2",
8-
"table_date": "20 March 2017",
8+
"table_date": "31 March 2017",
99
"missing_value": "1e20",
10-
"product": "output",
10+
"product": "model-output",
1111
"approx_interval": "0.250000",
1212
"generic_levels": "",
1313
"mip_era": "CMIP6",
14-
"Conventions": "CF-1.6 CMIP-6.0"
14+
"Conventions": "CF-1.7 CMIP-6.0"
1515
},
1616
"variable_entry": {
1717
"bldep": {
@@ -48,23 +48,6 @@
4848
"ok_min_mean_abs": "",
4949
"ok_max_mean_abs": ""
5050
},
51-
"hus": {
52-
"modeling_realm": "",
53-
"standard_name": "specific_humidity",
54-
"units": "1.0",
55-
"cell_methods": "time: mean",
56-
"cell_measures": "area: areacella",
57-
"long_name": "Specific Humidity",
58-
"comment": "",
59-
"dimensions": "longitude latitude time",
60-
"out_name": "hus",
61-
"type": "",
62-
"positive": "",
63-
"valid_min": "",
64-
"valid_max": "",
65-
"ok_min_mean_abs": "",
66-
"ok_max_mean_abs": ""
67-
},
6851
"hus4": {
6952
"modeling_realm": "atmos",
7053
"standard_name": "specific_humidity",
@@ -105,7 +88,7 @@
10588
"units": "kg m-2 s-1",
10689
"cell_methods": "area: mean time: mean within hours time: maximum over hours",
10790
"cell_measures": "area: areacella",
108-
"long_name": "Daily Maximum Hourly Precipitation Rate",
91+
"long_name": "Maximum Hourly Precipitation Rate",
10992
"comment": "",
11093
"dimensions": "longitude latitude time",
11194
"out_name": "prhmax",
@@ -134,7 +117,7 @@
134117
"ok_max_mean_abs": ""
135118
},
136119
"rv850": {
137-
"modeling_realm": "aerosol",
120+
"modeling_realm": "atmos",
138121
"standard_name": "atmosphere_relative_vorticity",
139122
"units": "s-1",
140123
"cell_methods": "time: mean",
@@ -167,51 +150,17 @@
167150
"ok_min_mean_abs": "",
168151
"ok_max_mean_abs": ""
169152
},
170-
"ta": {
171-
"modeling_realm": "",
172-
"standard_name": "air_temperature",
173-
"units": "K",
174-
"cell_methods": "time: mean",
175-
"cell_measures": "area: areacella",
176-
"long_name": "Air Temperature",
177-
"comment": "Air Temperature",
178-
"dimensions": "longitude latitude time",
179-
"out_name": "ta",
180-
"type": "",
181-
"positive": "",
182-
"valid_min": "",
183-
"valid_max": "",
184-
"ok_min_mean_abs": "",
185-
"ok_max_mean_abs": ""
186-
},
187153
"tas": {
188154
"modeling_realm": "atmos",
189155
"standard_name": "air_temperature",
190156
"units": "K",
191157
"cell_methods": "time: mean",
192158
"cell_measures": "area: areacella",
193-
"long_name": "Near-Surface Air Temperature",
159+
"long_name": "Surface Air Temperature",
194160
"comment": "near-surface (usually, 2 meter) air temperature",
195161
"dimensions": "longitude latitude time",
196162
"out_name": "tas",
197-
"type": "",
198-
"positive": "",
199-
"valid_min": "",
200-
"valid_max": "",
201-
"ok_min_mean_abs": "",
202-
"ok_max_mean_abs": ""
203-
},
204-
"ua": {
205-
"modeling_realm": "",
206-
"standard_name": "eastward_wind",
207-
"units": "m s-1",
208-
"cell_methods": "time: mean",
209-
"cell_measures": "area: areacella",
210-
"long_name": "Eastward Wind",
211-
"comment": "",
212-
"dimensions": "longitude latitude time",
213-
"out_name": "ua",
214-
"type": "",
163+
"type": "float",
215164
"positive": "",
216165
"valid_min": "",
217166
"valid_max": "",
@@ -222,10 +171,10 @@
222171
"modeling_realm": "atmos",
223172
"standard_name": "eastward_wind",
224173
"units": "m s-1",
225-
"cell_methods": "",
174+
"cell_methods": "area: time: mean ",
226175
"cell_measures": "area: areacella",
227176
"long_name": "Eastward Wind at 100 hPa",
228-
"comment": "Zonal wind on the 100m",
177+
"comment": "Zonal wind at 100m height",
229178
"dimensions": "longitude latitude height100m time",
230179
"out_name": "ua100m",
231180
"type": "",
@@ -279,24 +228,7 @@
279228
"comment": "Eastward component of the near-surface (usually, 10 meters) wind",
280229
"dimensions": "longitude latitude time",
281230
"out_name": "uas",
282-
"type": "",
283-
"positive": "",
284-
"valid_min": "",
285-
"valid_max": "",
286-
"ok_min_mean_abs": "",
287-
"ok_max_mean_abs": ""
288-
},
289-
"va": {
290-
"modeling_realm": "",
291-
"standard_name": "northward_wind",
292-
"units": "m s-1",
293-
"cell_methods": "time: mean",
294-
"cell_measures": "area: areacella",
295-
"long_name": "Northward Wind",
296-
"comment": "",
297-
"dimensions": "longitude latitude time",
298-
"out_name": "va",
299-
"type": "",
231+
"type": "real",
300232
"positive": "",
301233
"valid_min": "",
302234
"valid_max": "",
@@ -307,7 +239,7 @@
307239
"modeling_realm": "atmos",
308240
"standard_name": "northward_wind",
309241
"units": "m s-1",
310-
"cell_methods": "",
242+
"cell_methods": "area: time: mean ",
311243
"cell_measures": "area: areacella",
312244
"long_name": "Northward Wind at 100m",
313245
"comment": "Meridional wind at 100m above the surface.",
@@ -375,7 +307,7 @@
375307
"modeling_realm": "atmos",
376308
"standard_name": "wind_speed_of_gust",
377309
"units": "m s-1",
378-
"cell_methods": "",
310+
"cell_methods": "area: time: mean ",
379311
"cell_measures": "area: areacella",
380312
"long_name": "Maximum Wind Speed of Gust at 100m",
381313
"comment": "Wind speed gust maximum at 100m above surface",
@@ -388,25 +320,8 @@
388320
"ok_min_mean_abs": "",
389321
"ok_max_mean_abs": ""
390322
},
391-
"zg": {
392-
"modeling_realm": "",
393-
"standard_name": "geopotential_height",
394-
"units": "m",
395-
"cell_methods": "time: mean",
396-
"cell_measures": "area: areacella",
397-
"long_name": "Geopotential Height",
398-
"comment": "",
399-
"dimensions": "longitude latitude time",
400-
"out_name": "zg",
401-
"type": "",
402-
"positive": "",
403-
"valid_min": "",
404-
"valid_max": "",
405-
"ok_min_mean_abs": "",
406-
"ok_max_mean_abs": ""
407-
},
408323
"zg1000": {
409-
"modeling_realm": "aerosol",
324+
"modeling_realm": "atmos",
410325
"standard_name": "geopotential_height",
411326
"units": "m",
412327
"cell_methods": "time: mean",

0 commit comments

Comments
 (0)