Skip to content

Commit

Permalink
Merge trunk updates & finalise intake conversion
Browse files Browse the repository at this point in the history
  • Loading branch information
marc-white committed Sep 16, 2024
2 parents 49837c6 + 6fae3d6 commit 70de09a
Show file tree
Hide file tree
Showing 71 changed files with 60,729 additions and 30,947 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/sphinx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ jobs:
sudo apt-get install -y pandoc
- name: Ensure sphinx builds (warnings allowed)
run: |
cp -r Examples/ docs/
cp -r Recipes/ docs/
cp -r Tutorials/ docs/
make -C docs html O=-n
2 changes: 1 addition & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ build:
python: "3"
jobs:
post_checkout:
- cp -r Examples/ docs/
- cp -r Recipes/ docs/
- cp -r Tutorials/ docs/

python:
Expand Down
2,565 changes: 2,460 additions & 105 deletions ACCESS-OM2-GMD-Paper-Figs/Fig3-GlobalTimeseries.ipynb

Large diffs are not rendered by default.

3,059 changes: 2,720 additions & 339 deletions ACCESS-OM2-GMD-Paper-Figs/Figs14-20-23-24-PlotWOCETransects.ipynb

Large diffs are not rendered by default.

4,259 changes: 0 additions & 4,259 deletions Examples/Age_at_the_Bottom.ipynb

This file was deleted.

791 changes: 0 additions & 791 deletions Examples/Barotropic_Streamfunction_model_agnostic.ipynb

This file was deleted.

543 changes: 0 additions & 543 deletions Examples/Bathymetry.ipynb

This file was deleted.

2,445 changes: 0 additions & 2,445 deletions Examples/Compare_SSH_model_obs.ipynb

This file was deleted.

1,817 changes: 0 additions & 1,817 deletions Examples/Cross-contour_transport.ipynb

This file was deleted.

1,690 changes: 0 additions & 1,690 deletions Examples/Cross-slope_section.ipynb

This file was deleted.

Loading

0 comments on commit 70de09a

Please sign in to comment.