Skip to content

Commit d979101

Browse files
committed
Merge remote-tracking branch 'origin/main' into rajeeja/yac_structured_mesh
2 parents 0002b1c + 6fb17d8 commit d979101

21 files changed

Lines changed: 697 additions & 3795 deletions

docs/api.rst

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,19 @@ Top Level Functions
2323
open_mfdataset
2424
concat
2525

26+
Tutorial
27+
--------
28+
29+
.. autosummary::
30+
:toctree: generated/
31+
32+
tutorial.available_datasets
33+
tutorial.describe_dataset
34+
tutorial.file_path
35+
tutorial.file_paths
36+
tutorial.open_grid
37+
tutorial.open_dataset
38+
tutorial.open_mfdataset
2639

2740
Grid
2841
----

docs/conf.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,12 @@
1717
from sphinx.application import Sphinx
1818
from sphinx.util import logging
1919

20+
PROJECT_ROOT = pathlib.Path(__file__).resolve().parents[1]
21+
os.environ.setdefault(
22+
"UXARRAY_DATA_DIR",
23+
str(PROJECT_ROOT / "test" / "meshfiles"),
24+
)
25+
2026
import uxarray
2127

2228
__all__ = (uxarray, matplotlib.pyplot)

docs/getting-started/quick-overview.ipynb

Lines changed: 52 additions & 154 deletions
Large diffs are not rendered by default.

docs/user-guide/area_calc.ipynb

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"cell_type": "markdown",
5151
"metadata": {},
5252
"source": [
53-
"We will be using the `outCSne30.ug` grid file, which is encoded in the UGRID convention."
53+
"We will be using the `outCSne30.ug` grid file, which is encoded in the UGRID convention. In the user guide, this file is loaded through `ux.tutorial.open_grid(\"outCSne30\")` for convenience, and its underlying path can be resolved with `ux.tutorial.file_path(\"outCSne30\", \"grid\")`."
5454
]
5555
},
5656
{
@@ -64,11 +64,7 @@
6464
},
6565
"outputs": [],
6666
"source": [
67-
"base_path = \"../../test/meshfiles/\"\n",
68-
"grid_path = base_path + \"/ugrid/outCSne30/outCSne30.ug\"\n",
69-
"\n",
70-
"ugrid = ux.open_grid(grid_path)\n",
71-
"ugrid"
67+
"ugrid = ux.tutorial.open_grid(\"outCSne30\")"
7268
]
7369
},
7470
{
@@ -766,7 +762,7 @@
766762
],
767763
"metadata": {
768764
"kernelspec": {
769-
"display_name": "Python 3 (ipykernel)",
765+
"display_name": "Python 3",
770766
"language": "python",
771767
"name": "python3"
772768
},
@@ -780,7 +776,7 @@
780776
"name": "python",
781777
"nbconvert_exporter": "python",
782778
"pygments_lexer": "ipython3",
783-
"version": "3.12.6"
779+
"version": "3.14.4"
784780
}
785781
},
786782
"nbformat": 4,

docs/user-guide/azimuthal-average.ipynb

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,7 @@
4949
"metadata": {},
5050
"outputs": [],
5151
"source": [
52-
"uxds = ux.open_dataset(\n",
53-
" \"../../test/meshfiles/ugrid/outCSne30/outCSne30.ug\",\n",
54-
" \"../../test/meshfiles/ugrid/outCSne30/outCSne30_vortex.nc\",\n",
55-
")"
52+
"uxds = ux.tutorial.open_dataset(\"outCSne30-vortex\")"
5653
]
5754
},
5855
{
@@ -202,10 +199,7 @@
202199
"outputs": [],
203200
"source": [
204201
"clon, clat = 114.54, -17.66\n",
205-
"tcds = ux.open_dataset(\n",
206-
" \"../../test/meshfiles/ugrid/ne120_TCsubset/ne120_TCsubset.ug\",\n",
207-
" \"../../test/meshfiles/ugrid/ne120_TCsubset/ne120_TCsubset.nc\",\n",
208-
").squeeze()"
202+
"tcds = ux.tutorial.open_dataset(\"ne120-tcsubset\").squeeze()"
209203
]
210204
},
211205
{
@@ -296,7 +290,7 @@
296290
],
297291
"metadata": {
298292
"kernelspec": {
299-
"display_name": "Python 3 (ipykernel)",
293+
"display_name": "Python 3",
300294
"language": "python",
301295
"name": "python3"
302296
},
@@ -310,7 +304,7 @@
310304
"name": "python",
311305
"nbconvert_exporter": "python",
312306
"pygments_lexer": "ipython3",
313-
"version": "3.14.3"
307+
"version": "3.14.4"
314308
}
315309
},
316310
"nbformat": 4,

docs/user-guide/cross-sections.ipynb

Lines changed: 26 additions & 3428 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)