Skip to content

Commit 74aa406

Browse files
rbeucherrbeucher
authored
Merge branch 'main' into INTAKE_Fig12-ZonalTempSaltBias
2 parents 8d573bd + 89462b4 commit 74aa406

File tree

94 files changed

+129656
-56803
lines changed

Some content is hidden

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

94 files changed

+129656
-56803
lines changed

‎.github/workflows/sphinx.yml

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,27 @@ jobs:
88
name: Build
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v2
12-
- name: Set up Python
13-
uses: actions/setup-python@v2
14-
with:
15-
python-version: '<=3.9'
16-
- name: Cache pip
17-
uses: actions/cache@v2
18-
with:
19-
path: ~/.cache/pip
20-
key: ${{ runner.os }}-pip-${{ hashFiles('requirements.txt') }}
21-
restore-keys: |
22-
${{ runner.os }}-pip-
23-
${{ runner.os }}-
24-
- name: Install dependencies
25-
run: |
26-
python -m pip install --upgrade pip
27-
pip install -r docs/requirements.txt
28-
sudo apt-get update -y
29-
sudo apt-get install -y pandoc
30-
- name: Ensure sphinx builds (warnings allowed)
31-
run: |
32-
cp -r DocumentedExamples/ docs/
33-
cp -r Tutorials/ docs/
34-
make -C docs html O=-n
11+
- uses: actions/checkout@v2
12+
- name: Set up Python
13+
uses: actions/setup-python@v2
14+
with:
15+
python-version: "<=3.9"
16+
- name: Cache pip
17+
uses: actions/cache@v3
18+
with:
19+
path: ~/.cache/pip
20+
key: ${{ runner.os }}-pip-${{ hashFiles('requirements.txt') }}
21+
restore-keys: |
22+
${{ runner.os }}-pip-
23+
${{ runner.os }}-
24+
- name: Install dependencies
25+
run: |
26+
python -m pip install --upgrade pip
27+
pip install -r docs/requirements.txt
28+
sudo apt-get update -y
29+
sudo apt-get install -y pandoc
30+
- name: Ensure sphinx builds (warnings allowed)
31+
run: |
32+
cp -r Recipes/ docs/
33+
cp -r Tutorials/ docs/
34+
make -C docs html O=-n

‎.jenkins/Jenkinsfile

Lines changed: 0 additions & 62 deletions
This file was deleted.

‎.readthedocs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ sphinx:
77
formats: []
88

99
build:
10-
os: ubuntu-22.04
10+
os: ubuntu-24.04
1111
tools:
1212
python: "3"
1313
jobs:
1414
post_checkout:
15-
- cp -r DocumentedExamples/ docs/
15+
- cp -r Recipes/ docs/
1616
- cp -r Tutorials/ docs/
1717

1818
python:

‎.zenodo.json

Lines changed: 240 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,240 @@
1+
{
2+
"title":"COSIMA Cookbook: A cookbook of recipes for analysing ocean and sea ice model output",
3+
"license":"Apache-2.0",
4+
"creators":[
5+
{
6+
"affiliation":"University of Melbourne",
7+
"name":"Navid C. Constantinou",
8+
"orcid":"0000-0002-8149-4094",
9+
"type":"ProjectLeader"
10+
},
11+
{
12+
"affiliation":"Australian National University, Australian Earth-System Simulator",
13+
"name":"Andy McC. Hogg",
14+
"orcid":"0000-0001-5898-7635",
15+
"type":"ProjectMember"
16+
},
17+
{
18+
"affiliation":"Australian National University",
19+
"name":"Angus Gibson",
20+
"orcid":"0000-0001-7577-3604",
21+
"type":"ProjectMember"
22+
},
23+
{
24+
"affiliation":"Australian National University, Australian Earth-System Simulator",
25+
"name":"Anton Steketee",
26+
"orcid":"0009-0002-9081-4106",
27+
"type":"ProjectMember"
28+
},
29+
{
30+
"affiliation":"Australian National University, Australian Earth-System Simulator",
31+
"name":"Romain Beucher",
32+
"orcid":"0000-0003-3891-5444",
33+
"type":"ProjectMember"
34+
},
35+
{
36+
"affiliation":"Australian National University, Australian Earth-System Simulator",
37+
"name":"Max Proft",
38+
"type":"ProjectMember"
39+
},
40+
{
41+
"affiliation":"Australian National University, Australian Earth-System Simulator",
42+
"name":"Aidan Heerdegen",
43+
"orcid":"0000-0002-4481-4896",
44+
"type":"ProjectMember"
45+
},
46+
{
47+
"affiliation":"Australian National University",
48+
"name":"Julia Neme",
49+
"orcid":"0000-0002-3573-996X",
50+
"type":"ProjectMember"
51+
},
52+
{
53+
"affiliation":"Bureau of Meteorology",
54+
"name":"Ryan M. Holmes",
55+
"orcid":"0000-0002-6799-9109",
56+
"type":"ProjectMember"
57+
},
58+
{
59+
"affiliation":"Australian National University",
60+
"name":"Adele Morrison",
61+
"orcid":"0009-0003-5143-5020",
62+
"type":"ProjectMember"
63+
},
64+
{
65+
"affiliation":"University of Tasmania",
66+
"name":"Denisse Fierro-Arcos",
67+
"orcid":"0000-0002-5039-6272",
68+
"type":"ProjectMember"
69+
},
70+
{
71+
"affiliation":"Australian National University",
72+
"name":"Andrew E. Kiss",
73+
"orcid":"0000-0001-8960-9557",
74+
"type":"ProjectMember"
75+
},
76+
{
77+
"affiliation":"Australian National University, Australian Earth-System Simulator",
78+
"name":"Micael Oliveira",
79+
"orcid":"0000-0003-1364-0907",
80+
"type":"ProjectMember"
81+
},
82+
{
83+
"affiliation":"Australian National University",
84+
"name":"Claire Yung",
85+
"orcid":"0000-0002-0052-7668",
86+
"type":"ProjectMember"
87+
},
88+
{
89+
"affiliation":"University of Tasmania",
90+
"name":"Edward Doddridge",
91+
"orcid":"0000-0002-6097-5729",
92+
"type":"ProjectMember"
93+
},
94+
{
95+
"affiliation":"Australian National University",
96+
"name":"Wilma Huneke",
97+
"orcid":"0000-0001-8624-365X",
98+
"type":"ProjectMember"
99+
},
100+
{
101+
"affiliation":"Australian National University",
102+
"name":"Dhruv Bhagtani",
103+
"orcid":"0000-0002-1222-375X",
104+
"type":"ProjectMember"
105+
},
106+
{
107+
"affiliation":"UNSW Sydney",
108+
"name":"Ellie Q. Y. Ong",
109+
"orcid":"0000-0002-0392-7915",
110+
"type":"ProjectMember"
111+
},
112+
{
113+
"affiliation":"2i2c",
114+
"name":"James Munroe",
115+
"orcid":"0000-0001-9098-6309",
116+
"type":"ProjectMember"
117+
},
118+
{
119+
"affiliation":"UNSW Sydney",
120+
"name":"Christina Schmidt",
121+
"orcid":"0000-0002-7672-5054",
122+
"type":"ProjectMember"
123+
},
124+
{
125+
"affiliation":"University of Tasmania",
126+
"name":"Hannah Dawson",
127+
"orcid":"0000-0001-9113-1329",
128+
"type":"ProjectMember"
129+
},
130+
{
131+
"affiliation":"Australian National University, Australian Earth-System Simulator",
132+
"name":"Dougal T. Squire",
133+
"orcid":"0000-0003-3271-6874",
134+
"type":"ProjectMember"
135+
},
136+
{
137+
"affiliation":"UNSW Sydney",
138+
"name":"Fabio Boeira Dias",
139+
"orcid":"0000-0002-2965-2120",
140+
"type":"ProjectMember"
141+
},
142+
{
143+
"affiliation":"Australian National University",
144+
"name":"Jemma Jeffree",
145+
"orcid":"0000-0001-7190-7329",
146+
"type":"ProjectMember"
147+
},
148+
{
149+
"affiliation":"California Institute of Technology",
150+
"name":"Ruth Moorman",
151+
"orcid":"0000-0001-5054-1559",
152+
"type":"ProjectMember"
153+
},
154+
{
155+
"affiliation":"Laboratoire d'Océanographie Physique et Spatiale",
156+
"name":"Josué Martínez Moreno",
157+
"orcid":"0000-0002-8348-1588",
158+
"type":"ProjectMember"
159+
},
160+
{
161+
"affiliation":"UNSW Sydney",
162+
"name":"Jan Zika",
163+
"orcid":"0000-0003-3462-3559",
164+
"type":"ProjectMember"
165+
},
166+
{
167+
"affiliation":"University of Tasmania",
168+
"name":"Jan Jaap Meijer",
169+
"orcid":"0000-0001-8667-488X",
170+
"type":"ProjectMember"
171+
},
172+
{
173+
"affiliation":"University of Tasmania",
174+
"name":"Matthis Auger",
175+
"orcid":"0000-0001-6228-5732",
176+
"type":"ProjectMember"
177+
},
178+
{
179+
"affiliation":"Australian National University",
180+
"name":"Wilton Aguiar",
181+
"orcid":"0000-0003-2453-9791",
182+
"type":"ProjectMember"
183+
},
184+
{
185+
"affiliation":"Commonwealth Scientific and Industrial Research Organisation",
186+
"name":"Thomas Moore",
187+
"orcid":"0000-0003-3930-1946",
188+
"type":"ProjectMember"
189+
},
190+
{
191+
"affiliation":"University of Tasmania",
192+
"name":"Felipe Vilela da Silva",
193+
"orcid":"0000-0003-1967-880X",
194+
"type":"ProjectMember"
195+
},
196+
{
197+
"affiliation":"Australian National University",
198+
"name":"Luwei Yang",
199+
"orcid":"0000-0001-8570-7424",
200+
"type":"ProjectMember"
201+
},
202+
{
203+
"affiliation":"Australian National University",
204+
"name":"Marc White",
205+
"orcid": "0000-0003-3882-418X",
206+
"type":"ProjectMember"
207+
},
208+
{
209+
"affiliation":"University of Melbourne",
210+
"name":"Taimoor Sohail",
211+
"orcid":"0000-0002-4162-3269",
212+
"type":"ProjectMember"
213+
},
214+
{
215+
"affiliation":"Australian National University",
216+
"name":"Ashley J. Barnes",
217+
"orcid":"0000-0003-3165-8676",
218+
"type":"ProjectMember"
219+
},
220+
{
221+
"affiliation":"University of Tasmania",
222+
"name":"Paul Spence",
223+
"orcid":"0000-0001-5156-2204",
224+
"type":"ProjectMember"
225+
},
226+
{
227+
"affiliation": "Australian National University, Australian Earth-System Simulator",
228+
"name": "Turner, Charles",
229+
"orcid": "0000-0002-3262-4972",
230+
"type":"ProjectMember"
231+
}
232+
],
233+
"keywords": [
234+
"Ocean Modeling",
235+
"Data Analysis",
236+
"Diagnostics",
237+
"Python"
238+
],
239+
"upload_type":"software"
240+
}

0 commit comments

Comments
 (0)