Skip to content

Commit cf4f9cd

Browse files
authored
Include start_* vars in GDP 6-hourly and hourly experimental (#239)
1 parent e53db31 commit cf4f9cd

File tree

3 files changed

+34
-5
lines changed

3 files changed

+34
-5
lines changed

clouddrift/adapters/gdp.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@
2727
"deploy_date",
2828
"deploy_lat",
2929
"deploy_lon",
30+
"start_date",
31+
"start_lat",
32+
"start_lon",
3033
"end_date",
3134
"end_lat",
3235
"end_lon",

clouddrift/adapters/gdp1h.py

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -318,12 +318,30 @@ def preprocess(index: int, **kwargs) -> xr.Dataset:
318318
},
319319
"deploy_lon": {"long_name": "Deployment longitude", "units": "degrees_east"},
320320
"deploy_lat": {"long_name": "Deployment latitude", "units": "degrees_north"},
321+
"start_date": {
322+
"long_name": "First good date and time derived by DAC quality control",
323+
"units": "seconds since 1970-01-01 00:00:00",
324+
},
325+
"start_lon": {
326+
"long_name": "First good longitude derived by DAC quality control",
327+
"units": "degrees_east",
328+
},
329+
"start_lat": {
330+
"long_name": "Last good latitude derived by DAC quality control",
331+
"units": "degrees_north",
332+
},
321333
"end_date": {
322-
"long_name": "End date and time",
334+
"long_name": "Last good date and time derived by DAC quality control",
323335
"units": "seconds since 1970-01-01 00:00:00",
324336
},
325-
"end_lon": {"long_name": "End latitude", "units": "degrees_north"},
326-
"end_lat": {"long_name": "End longitude", "units": "degrees_east"},
337+
"end_lon": {
338+
"long_name": "Last good longitude derived by DAC quality control",
339+
"units": "degrees_east",
340+
},
341+
"end_lat": {
342+
"long_name": "Last good latitude derived by DAC quality control",
343+
"units": "degrees_north",
344+
},
327345
"drogue_lost_date": {
328346
"long_name": "Date and time of drogue loss",
329347
"units": "seconds since 1970-01-01 00:00:00",

clouddrift/raggedarray.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,10 @@ def allocate(
325325

326326
metadata = {}
327327
for var in name_meta:
328-
metadata[var] = np.zeros(nb_traj, dtype=ds[var].dtype)
328+
try:
329+
metadata[var] = np.zeros(nb_traj, dtype=ds[var].dtype)
330+
except KeyError:
331+
warnings.warn(f"Variable {var} requested but not found; skipping.")
329332

330333
data = {}
331334
for var in name_data:
@@ -350,7 +353,12 @@ def allocate(
350353
coords[var][oid : oid + size] = ds[var].data
351354

352355
for var in name_meta:
353-
metadata[var][i] = ds[var][0].data
356+
try:
357+
metadata[var][i] = ds[var][0].data
358+
except KeyError:
359+
warnings.warn(
360+
f"Variable {var} requested but not found; skipping."
361+
)
354362

355363
for var in name_data:
356364
if var in ds.keys():

0 commit comments

Comments
 (0)