Skip to content

Commit 232b240

Browse files
committed
Fix nemo ingestion
1 parent 7b05a54 commit 232b240

File tree

1 file changed

+13
-18
lines changed

1 file changed

+13
-18
lines changed

docs/user_guide/examples/tutorial_nemo.ipynb

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,11 @@
6767
"metadata": {},
6868
"outputs": [],
6969
"source": [
70-
"ds_fields = xr.merge(\n",
71-
" [\n",
72-
" parcels.tutorial.open_dataset(\"NemoCurvilinear_data_zonal/U\"),\n",
73-
" parcels.tutorial.open_dataset(\"NemoCurvilinear_data_zonal/V\"),\n",
74-
" ]\n",
75-
") # TODO: Fix grid staggering (using SGRID metadata)\n",
70+
"ds_u = parcels.tutorial.open_dataset(\"NemoCurvilinear_data_zonal/U\")\n",
71+
"ds_v = parcels.tutorial.open_dataset(\"NemoCurvilinear_data_zonal/V\")\n",
7672
"ds_coords = parcels.tutorial.open_dataset(\"NemoCurvilinear_data_zonal/mesh_mask\")\n",
7773
"ds_fset = parcels.convert.nemo_to_sgrid(\n",
78-
" fields=dict(U=ds_fields[\"U\"], V=ds_fields[\"V\"]), coords=ds_coords\n",
74+
" fields=dict(U=ds_u[\"U\"], V=ds_v[\"V\"]), coords=ds_coords\n",
7975
")\n",
8076
"\n",
8177
"fieldset = parcels.FieldSet.from_sgrid_conventions(ds_fset)"
@@ -290,16 +286,15 @@
290286
"metadata": {},
291287
"outputs": [],
292288
"source": [
293-
"ds_fields = xr.merge(\n",
294-
" [\n",
295-
" parcels.tutorial.open_dataset(\"NemoNorthSeaORCA025-N006_data/U\"),\n",
296-
" parcels.tutorial.open_dataset(\"NemoNorthSeaORCA025-N006_data/V\"),\n",
297-
" parcels.tutorial.open_dataset(\"NemoNorthSeaORCA025-N006_data/W\"),\n",
298-
" ]\n",
299-
") # TODO: Fix grid staggering (using SGRID metadata)\n",
300-
"ds_coords = parcels.tutorial.open_dataset(\"NemoNorthSeaORCA025-N006_data/mesh_mask\")\n",
289+
"ds_u = parcels.tutorial.open_dataset(\"NemoNorthSeaORCA025-N006_data/U\")\n",
290+
"ds_v = parcels.tutorial.open_dataset(\"NemoNorthSeaORCA025-N006_data/V\")\n",
291+
"ds_w = parcels.tutorial.open_dataset(\"NemoNorthSeaORCA025-N006_data/W\")\n",
292+
"ds_coords = parcels.tutorial.open_dataset(\"NemoNorthSeaORCA025-N006_data/mesh_mask\")[\n",
293+
" [\"glamf\", \"gphif\"]\n",
294+
"]\n",
295+
"\n",
301296
"ds_fset = parcels.convert.nemo_to_sgrid(\n",
302-
" fields={\"U\": ds_fields[\"uo\"], \"V\": ds_fields[\"vo\"], \"W\": ds_fields[\"wo\"]},\n",
297+
" fields={\"U\": ds_u[\"uo\"], \"V\": ds_v[\"vo\"], \"W\": ds_w[\"wo\"]},\n",
303298
" coords=ds_coords,\n",
304299
")\n",
305300
"fieldset = parcels.FieldSet.from_sgrid_conventions(ds_fset)"
@@ -368,7 +363,7 @@
368363
],
369364
"metadata": {
370365
"kernelspec": {
371-
"display_name": "docs",
366+
"display_name": "default",
372367
"language": "python",
373368
"name": "python3"
374369
},
@@ -382,7 +377,7 @@
382377
"name": "python",
383378
"nbconvert_exporter": "python",
384379
"pygments_lexer": "ipython3",
385-
"version": "3.14.2"
380+
"version": "3.14.3"
386381
}
387382
},
388383
"nbformat": 4,

0 commit comments

Comments
 (0)