Skip to content

Commit 2bf7f14

Browse files
authored
Split Tutorials into Basics+Advanced and move all recipes one directory level up (COSIMA#606)
* restucture * fix docs * fix docs * restucture * aus spelling! * some more restructure * Improve formatting in README.md Updated formatting for tutorial and recipe sections in README. * tweaks * split lessons * split lessons * split lessons * split lessons * split lessons * split lessons * fix dir names * split lessons * fix url * fix dir names * not a notebook, a recipe * relabel some dishes * move images in mains * remove cookbook refs * restructure readme * exclude READMEs * rename * fix icons * simpler title * try to shorten the title * more short titles for toc * restructure docs * more short titles for toc * sections in toc * rename * rename landing tutorial * change depth for lessons toc * change depth for lessons toc * add icon for dask-intake tutorial
1 parent 26b7da4 commit 2bf7f14

File tree

62 files changed

+162
-105
lines changed

Some content is hidden

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

62 files changed

+162
-105
lines changed

.github/workflows/sphinx.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ jobs:
2929
sudo apt-get install -y pandoc
3030
- name: Ensure sphinx builds (warnings allowed)
3131
run: |
32-
cp -r Recipes/ docs/
33-
cp -r Cooking-Lessons-101-Tutorials/ docs/
32+
cp -r 01-Cooking-Lessons-101/ docs/
33+
cp -r 02-Appetisers/ docs/
34+
cp -r 03-Mains/ docs/
35+
cp -r 04-Local-Dishes/ docs/
3436
make -C docs html O=-n

.readthedocs.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@ build:
1212
python: "3"
1313
jobs:
1414
post_checkout:
15-
- cp -r Recipes/ docs/
16-
- cp -r Cooking-Lessons-101-Tutorials/ docs/
15+
- cp -r 01-Cooking-Lessons-101/ docs/
16+
- cp -r 02-Appetisers/ docs/
17+
- cp -r 03-Mains/ docs/
18+
- cp -r 04-Local-Dishes/ docs/
1719

1820
python:
1921
install:

Cooking-Lessons-101-Tutorials/COSIMA_CookBook_Tutorial.ipynb renamed to 01-Cooking-Lessons-101/01-Basics/01-Loading-Slicing-Dicing-Output.ipynb

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,16 @@
44
"cell_type": "markdown",
55
"metadata": {},
66
"source": [
7-
"# How to use the COSIMA Cookbook\n",
7+
"# Introduction: loading, slicing, dicing model output\n",
88
"\n",
9-
"This tutorial is designed to help new users get to grips with the COSIMA Cookbook. The COSIMA Cookbook collection of recipes for analysing ocean and sea ice model output, using a common method of loading the output.\n",
9+
"This tutorial is designed to help new users get to grips with the COSIMA Cookbook.\n",
1010
"\n",
11-
"It assumes that:\n",
12-
" * You have access to the ACCESS-NRI Intake Catalog (through project `xp65`).\n",
13-
" * You can fire up a Jupyter notebook on NCI's ARE.\n",
14-
" * You can access an appropriate set of `conda` packages to load the appropriate python libraries (such as through the `hh5` conda packages, which I've used here)."
11+
"The COSIMA Cookbook is collection of recipes for analysing ocean and sea ice model output, using a common method of loading the output.\n",
12+
"\n",
13+
"The tutorial requires:\n",
14+
" * Access to the ACCESS-NRI Intake Catalog (through project `xp65`).\n",
15+
" * Ability to open a Jupyter notebook on the NCI's Gadi HPC (e.g., via the ARE).\n",
16+
" * Access an appropriate set of `conda` packages to load the appropriate python libraries (such as through the `xp65` conda packages)."
1517
]
1618
},
1719
{
@@ -2464,7 +2466,7 @@
24642466
"We often perform operations such as averaging on dataarrays. Again, knowledge of the coordinates can be a big help here, as you can instruct the `mean()` method to operate along given coordinates. The case below takes a temporal and zonal average of potential density.\n",
24652467
"\n",
24662468
"#### IMPORTANT\n",
2467-
"To be precise, it is actually a mean in the $i$-grid direction, which is only zonal outside the tripolar region in the Arctic, i.e., *south of 65N* in the ACCESS-OM2 models. To compute the zonal mean correctly one needs to be a bit more careful; see [`Recipes/True_Zonal_Mean.ipynb`](https://cosima-recipes.readthedocs.io/en/latest/Recipes/True_Zonal_Mean.html)."
2469+
"To be precise, it is actually a numerical mean in the $i$-grid direction, which is only zonal outside the tripolar region in the Arctic, i.e., *south of 65N* in the ACCESS-OM2 models. To compute the zonal mean correctly one needs to be a bit more careful; see [`02-Appetisers/True_Zonal_Mean.ipynb`](https://cosima-recipes.readthedocs.io/en/latest/02-Appetisers/True_Zonal_Mean.html)."
24682470
]
24692471
},
24702472
{
@@ -2576,19 +2578,21 @@
25762578
"source": [
25772579
"## 3. More Advanced Stuff\n",
25782580
"\n",
2579-
"### 3.1 Making a map with cartopy\n",
2580-
"The maps shown in this tutorial are not publication quality, are missing coastlines and in fact distort data in the Arctic (due to the tripole grid used there). We suggest going through the [`Tutorials/Making_Maps_with_Cartopy`](https://cosima-recipes.readthedocs.io/en/latest/Tutorials/Making_Maps_with_Cartopy.html) tutorial."
2581-
]
2582-
},
2583-
{
2584-
"cell_type": "markdown",
2585-
"metadata": {},
2586-
"source": [
2581+
"### 3.1 Maps with cartopy\n",
2582+
"The maps shown in this tutorial are not publication quality, are missing coastlines and in fact distort data in the Arctic (due to the tripole grid used there). We suggest going through the [`Maps_with_Cartopy`](https://cosima-recipes.readthedocs.io/en/latest/01-Cooking-Lessons-101/01-Basics/Making_Maps_with_Cartopy.html) tutorial.\n",
2583+
"\n",
25872584
"### 3.2 Distributed computing\n",
25882585
"\n",
25892586
"Many of our recipes use multiple cores for their calculations, usually via the using `dask` to set up a local cluster on your node for distributed computation. "
25902587
]
25912588
},
2589+
{
2590+
"cell_type": "code",
2591+
"execution_count": null,
2592+
"metadata": {},
2593+
"outputs": [],
2594+
"source": []
2595+
},
25922596
{
25932597
"cell_type": "code",
25942598
"execution_count": 18,
@@ -4908,9 +4912,9 @@
49084912
],
49094913
"metadata": {
49104914
"kernelspec": {
4911-
"display_name": "Python [conda env:analysis3-unstable]",
4915+
"display_name": "Python [conda env:analysis3-25.08] *",
49124916
"language": "python",
4913-
"name": "conda-env-analysis3-unstable-py"
4917+
"name": "conda-env-analysis3-25.08-py"
49144918
},
49154919
"language_info": {
49164920
"codemirror_mode": {

Cooking-Lessons-101-Tutorials/ACCESS-NRI_Intake_Catalog.ipynb renamed to 01-Cooking-Lessons-101/01-Basics/02-ACCESS-NRI_Intake_Catalog.ipynb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"cell_type": "markdown",
55
"metadata": {},
66
"source": [
7-
"# How to use the ACCESS-NRI Intake catalog to load model output"
7+
"# ACCESS-NRI Intake catalog for loading model output"
88
]
99
},
1010
{
@@ -19,14 +19,14 @@
1919
"\n",
2020
"This is a concise version of the longer [ACCESS-NRI Intake catalog documentation](https://access-nri-intake-catalog.readthedocs.io/) and related [COSIMA training workshop](https://github.com/ACCESS-Hive/cosima-training-workshop-2023/blob/main/Intake.ipynb). Users are encouraged to refer to these for more detail and demonstrations.\n",
2121
"\n",
22-
"Requirements: The `conda/analysis3` (tested on `analysis3-23.07`) module from `/g/data/hh5/public/modules`. "
22+
"Requirements: The `conda/analysis3` module from `/g/data/xp65/public/modules`. "
2323
]
2424
},
2525
{
2626
"cell_type": "markdown",
2727
"metadata": {},
2828
"source": [
29-
"# Too Long; Didn't Read: \n"
29+
"### Too Long; Didn't Read: "
3030
]
3131
},
3232
{
@@ -7966,9 +7966,9 @@
79667966
],
79677967
"metadata": {
79687968
"kernelspec": {
7969-
"display_name": "Python 3 (ipykernel)",
7969+
"display_name": "Python [conda env:analysis3_edge-25.08]",
79707970
"language": "python",
7971-
"name": "python3"
7971+
"name": "conda-env-analysis3_edge-25.08-py"
79727972
},
79737973
"language_info": {
79747974
"codemirror_mode": {
@@ -7980,7 +7980,7 @@
79807980
"name": "python",
79817981
"nbconvert_exporter": "python",
79827982
"pygments_lexer": "ipython3",
7983-
"version": "3.11.9"
7983+
"version": "3.11.13"
79847984
}
79857985
},
79867986
"nbformat": 4,

Cooking-Lessons-101-Tutorials/Making_Maps_with_Cartopy.ipynb renamed to 01-Cooking-Lessons-101/01-Basics/03-Maps_with_Cartopy.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
"tags": []
88
},
99
"source": [
10-
"# Making Maps with Cartopy\n",
10+
"# Maps with Cartopy\n",
1111
"\n",
1212
"This tutorial runs through a series of examples that demonstrate how to make maps using data from the Intake Catalog. This tutorial focusses on mapping with `Cartopy`.\n",
1313
"\n",
14-
"Note that these examples are just to give you ideas of how you might be able to make nice maps, but you should expect to adjust and modify to your own use case.\n"
14+
"Note that these examples are just to give you ideas of how you might be able to make nice maps, but you should expect to adjust and modify to your own use case."
1515
]
1616
},
1717
{
Lines changed: 9 additions & 0 deletions

0 commit comments

Comments
 (0)