Skip to content

Commit d406467

Browse files
rcaneillrcaneill
committed
work ...
1 parent 8d4126a commit d406467

File tree

3 files changed

+286
-100
lines changed

3 files changed

+286
-100
lines changed

‎gsw_xarray/_attributes.py

Lines changed: 222 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,42 @@
77
"units": "1",
88
},
99
),
10-
"CT_first_derivatives_wrt_t_exact": {
11-
"units": "K/(g/kg)",
12-
},
10+
"CT_first_derivatives_wrt_t_exact": (
11+
{
12+
"units": "K/(g/kg)",
13+
},
14+
{
15+
"units": "1",
16+
},
17+
{
18+
"units": "K/Pa",
19+
},
20+
),
1321
"CT_freezing": {
1422
"units": "degC",
23+
"reference_scale": "ITS-90",
24+
"standard_name": "freezing_temperature_of_sea_water", # Not sure
1525
},
16-
"CT_freezing_first_derivatives": {
17-
"units": "K/(g/kg)",
18-
},
19-
"CT_freezing_first_derivatives_poly": {
20-
"units": "K/(g/kg)",
21-
},
26+
"CT_freezing_first_derivatives": (
27+
{
28+
"units": "K/(g/kg)",
29+
},
30+
{
31+
"units": "K/Pa",
32+
},
33+
),
34+
"CT_freezing_first_derivatives_poly": (
35+
{
36+
"units": "K/(g/kg)",
37+
},
38+
{
39+
"units": "K/Pa",
40+
},
41+
),
2242
"CT_freezing_poly": {
2343
"units": "degC",
44+
"reference_scale": "ITS-90",
45+
"standard_name": "freezing_temperature_of_sea_water", # Not sure
2446
},
2547
"CT_from_enthalpy": {
2648
"standard_name": "sea_water_conservative_temperature",
@@ -42,11 +64,18 @@
4264
"units": "degC",
4365
"reference_scale": "ITS-90",
4466
},
45-
"CT_from_rho": {
46-
"standard_name": "sea_water_conservative_temperature",
47-
"units": "degC",
48-
"reference_scale": "ITS-90",
49-
},
67+
"CT_from_rho": (
68+
{
69+
"standard_name": "sea_water_conservative_temperature",
70+
"units": "degC",
71+
"reference_scale": "ITS-90",
72+
},
73+
{
74+
"standard_name": "sea_water_conservative_temperature",
75+
"units": "degC",
76+
"reference_scale": "ITS-90",
77+
},
78+
),
5079
"CT_from_t": {
5180
"standard_name": "sea_water_conservative_temperature",
5281
"units": "degC",
@@ -55,9 +84,17 @@
5584
"CT_maxdensity": {
5685
"units": "degC",
5786
},
58-
"CT_second_derivatives": {
59-
"units": "K/((g/kg)^2)",
60-
},
87+
"CT_second_derivatives": (
88+
{
89+
"units": "K/((g/kg)^2)",
90+
},
91+
{
92+
"units": "1/(g/kg)",
93+
},
94+
{
95+
"units": "1/K",
96+
},
97+
),
6198
"C_from_SP": {
6299
"standard_name": "sea_water_electrical_conductivity",
63100
"units": "mS/cm",
@@ -69,14 +106,27 @@
69106
"units": "J/kg",
70107
},
71108
"Hill_ratio_at_SP2": {
72-
"units": "",
73-
},
74-
"IPV_vs_fNsquared_ratio": {
75109
"units": "1",
76110
},
77-
"Nsquared": {
78-
"units": "",
79-
},
111+
"IPV_vs_fNsquared_ratio": (
112+
{
113+
"units": "1",
114+
},
115+
{
116+
"standard_name": "sea_water_pressure", # Not sure (is it tot pressure or only presure due to sea water?
117+
"units": "dbar",
118+
},
119+
),
120+
"Nsquared": (
121+
{
122+
"standard_name": "square_of_brunt_vaisala_frequency_in_sea_water",
123+
"units": "rad^2 s^-2", # Seems to be an error in the python doc, where it is 1/s
124+
},
125+
{
126+
"standard_name": "sea_water_pressure", # Not sure (is it tot pressure or only presure due to sea water?
127+
"units": "dbar",
128+
},
129+
),
80130
"O2sol": {
81131
"units": "umol/kg",
82132
},
@@ -161,9 +211,18 @@
161211
"standard_name": "sea_water_preformed_salinity",
162212
"units": "g/kg",
163213
},
164-
"Turner_Rsubrho": {
165-
"units": "arcdeg",
166-
},
214+
"Turner_Rsubrho": (
215+
{
216+
"units": "arcdeg",
217+
},
218+
{
219+
"units": "1",
220+
},
221+
{
222+
"standard_name": "sea_water_pressure", # Not sure (is it tot pressure or only presure due to sea water?
223+
"units": "dbar",
224+
},
225+
),
167226
"adiabatic_lapse_rate_from_CT": {
168227
"units": "K/Pa",
169228
},
@@ -227,27 +286,58 @@
227286
"enthalpy_diff": {
228287
"units": "J/kg",
229288
},
230-
"enthalpy_first_derivatives": {
231-
"units": "J/(kg (g/kg))",
232-
},
233-
"enthalpy_first_derivatives_CT_exact": {
234-
"units": "J/(kg (g/kg))",
235-
},
289+
"enthalpy_first_derivatives": (
290+
{
291+
"units": "J/(kg (g/kg))",
292+
},
293+
{
294+
"units": "J/(kg K)",
295+
},
296+
),
297+
"enthalpy_first_derivatives_CT_exact": (
298+
{
299+
"units": "J/(kg (g/kg))",
300+
},
301+
{
302+
"units": "J/(kg K)",
303+
},
304+
),
236305
"enthalpy_ice": {
237306
"units": "J/kg",
238307
},
239-
"enthalpy_second_derivatives": {
240-
"units": "(J/kg)(g/kg)^-2)",
241-
},
242-
"enthalpy_second_derivatives_CT_exact": {
243-
"units": "J/(kg (g/kg)^2)",
244-
},
308+
"enthalpy_second_derivatives": (
309+
{
310+
"units": "(J/kg)(g/kg)^-2)",
311+
},
312+
{
313+
"units": "J/(kg K(g/kg))",
314+
},
315+
{
316+
"units": "J/(kg K^2)",
317+
},
318+
),
319+
"enthalpy_second_derivatives_CT_exact": (
320+
{
321+
"units": "(J/kg)(g/kg)^-2)",
322+
},
323+
{
324+
"units": "J/(kg K(g/kg))",
325+
},
326+
{
327+
"units": "J/(kg K^2)",
328+
},
329+
),
245330
"enthalpy_t_exact": {
246331
"units": "J/kg",
247332
},
248-
"entropy_first_derivatives": {
249-
"units": "J/(kg K(g/kg))",
250-
},
333+
"entropy_first_derivatives": (
334+
{
335+
"units": "J/(kg K(g/kg))",
336+
},
337+
{
338+
"units": "J/(kg K^2)",
339+
},
340+
),
251341
"entropy_from_CT": {
252342
"units": "J/(kg*K)",
253343
},
@@ -260,49 +350,113 @@
260350
"entropy_ice": {
261351
"units": "J/(kg*K)",
262352
},
263-
"entropy_second_derivatives": {
264-
"units": "J/(kg K^3)",
265-
},
353+
"entropy_second_derivatives": (
354+
{
355+
"units": "J/(kg K^3)",
356+
},
357+
{
358+
"units": "J/(kg (g/kg) K^2)",
359+
},
360+
{
361+
"units": "J/(kg K^3)",
362+
},
363+
),
266364
"f": {
267365
"standard_name": "coriolis_parameter",
268366
"units": "radians/s",
269367
},
270-
"frazil_properties": {
271-
"units": "g/kg",
272-
},
273-
"frazil_properties_potential": {
274-
"units": "g/kg",
275-
},
276-
"frazil_properties_potential_poly": {
277-
"units": "g/kg",
278-
},
279-
"frazil_ratios_adiabatic": {
280-
"units": "g/(kg K)",
281-
},
282-
"frazil_ratios_adiabatic_poly": {
283-
"units": "g/(kg K)",
284-
},
368+
"frazil_properties": (
369+
{
370+
"units": "g/kg",
371+
},
372+
{
373+
"units": "degC",
374+
},
375+
{
376+
"units": "1",
377+
},
378+
),
379+
"frazil_properties_potential": (
380+
{
381+
"units": "g/kg",
382+
},
383+
{
384+
"units": "degC",
385+
},
386+
{
387+
"units": "1",
388+
},
389+
),
390+
"frazil_properties_potential_poly": (
391+
{
392+
"units": "g/kg",
393+
},
394+
{
395+
"units": "degC",
396+
},
397+
{
398+
"units": "1",
399+
},
400+
),
401+
"frazil_ratios_adiabatic": (
402+
{
403+
"units": "g/(kg K)",
404+
},
405+
{
406+
"units": "g/(kg Pa)",
407+
},
408+
{
409+
"units": "K/Pa",
410+
},
411+
),
412+
"frazil_ratios_adiabatic_poly": (
413+
{
414+
"units": "g/(kg K)",
415+
},
416+
{
417+
"units": "g/(kg Pa)",
418+
},
419+
{
420+
"units": "K/Pa",
421+
},
422+
),
285423
"geo_strf_dyn_height": {
286424
"units": "m^2/s^2",
287425
},
288-
"geostrophic_velocity": {
289-
"units": "-90 ... +90",
290-
},
426+
"geostrophic_velocity": (
427+
{
428+
"units": "m/s",
429+
},
430+
{
431+
"units": "degree_east",
432+
},
433+
{
434+
"units": "degree_north",
435+
},
436+
),
291437
"gibbs_ice_part_t": {
292-
"units": "",
438+
"units": "J/kg/K",
293439
},
294440
"gibbs_ice_pt0": {
295-
"units": "",
441+
"units": "J/kg/K",
296442
},
297443
"gibbs_ice_pt0_pt0": {
298-
"units": "",
444+
"units": "J/kg/K^2",
299445
},
300446
"grav": {
301447
"units": "m/s^2",
302448
},
303-
"ice_fraction_to_freeze_seawater": {
304-
"units": "g/kg",
305-
},
449+
"ice_fraction_to_freeze_seawater": (
450+
{
451+
"units": "g/kg",
452+
},
453+
{
454+
"units": "degC",
455+
},
456+
{
457+
"units": "1",
458+
},
459+
),
306460
"indexer": {
307461
"units": "",
308462
},

0 commit comments

Comments
 (0)