Skip to content

Commit 1f93246

Browse files
rbeucherrbeucher
committed
Merge branch 'v2' of github.com:ACCESS-NRI/ACCESS-MOPPeR into v2
2 parents 2f83d2b + 4545bf5 commit 1f93246

File tree

3 files changed

+372
-24
lines changed

3 files changed

+372
-24
lines changed

‎.github/workflows/cd.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
uses: actions/checkout@v4
1616

1717
- name: Set up Python 3.11
18-
uses: actions/setup-python@v4
18+
uses: actions/setup-python@v5
1919
with:
2020
python-version: 3.11
2121

@@ -46,7 +46,7 @@ jobs:
4646
uses: actions/checkout@v4
4747

4848
- name: Setup conda environment
49-
uses: conda-incubator/setup-miniconda@v2
49+
uses: conda-incubator/setup-miniconda@v3
5050
with:
5151
miniconda-version: "latest"
5252
python-version: ${{ matrix.python-version }}
@@ -56,7 +56,7 @@ jobs:
5656
show-channel-urls: true
5757

5858
- name: Build and upload the conda package
59-
uses: ACCESS-NRI/action-build-and-upload-conda-packages@v2.0.0
59+
uses: ACCESS-NRI/action-build-and-upload-conda-packages@v2.0.1
6060
with:
6161
meta_yaml_dir: .conda
6262
python-version: ${{ matrix.python-version }}

‎src/access_mopper/mappings/Mappings_OM3_Omon.json‎

Lines changed: 341 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,346 @@
1414
"type": "direct",
1515
"formula": "tos"
1616
}
17+
},
18+
19+
"zos": {
20+
"dimensions": {
21+
"time": "time",
22+
"yh": "latitude",
23+
"xh": "longitude"
24+
},
25+
"units": "m",
26+
"positive": null,
27+
"model_variables": [
28+
"SSH"
29+
],
30+
"calculation": {
31+
"type": "direct",
32+
"formula": "SSH"
33+
}
34+
},
35+
36+
"hfds": {
37+
"dimensions": {
38+
"time": "time",
39+
"yh": "latitude",
40+
"xh": "longitude"
41+
},
42+
"units": "W m-2",
43+
"positive": "down",
44+
"model_variables": [
45+
"hfds"
46+
],
47+
"calculation": {
48+
"type": "direct",
49+
"formula": "hfds"
50+
}
51+
},
52+
53+
"fsitherm": {
54+
"dimensions": {
55+
"time": "time",
56+
"yh": "latitude",
57+
"xh": "longitude"
58+
},
59+
"units": "kg m-2 s-1",
60+
"positive": null,
61+
"model_variables": [
62+
"fsitherm"
63+
],
64+
"calculation": {
65+
"type": "direct",
66+
"formula": "fsitherm"
67+
}
68+
},
69+
70+
"wfo": {
71+
"dimensions": {
72+
"time": "time",
73+
"yh": "latitude",
74+
"xh": "longitude"
75+
},
76+
"units": "kg m-2 s-1",
77+
"positive": null,
78+
"model_variables": [
79+
"wfo"
80+
],
81+
"calculation": {
82+
"type": "direct",
83+
"formula": "wfo"
84+
}
85+
},
86+
87+
"pbo": {
88+
"dimensions": {
89+
"time": "time",
90+
"yh": "latitude",
91+
"xh": "longitude"
92+
},
93+
"units": "dbar",
94+
"positive": null,
95+
"model_variables": [
96+
"pbo"
97+
],
98+
"calculation": {
99+
"type": "direct",
100+
"formula": "pbo"
101+
}
102+
},
103+
104+
"mlotst": {
105+
"dimensions": {
106+
"time": "time",
107+
"yh": "latitude",
108+
"xh": "longitude"
109+
},
110+
"units": "m",
111+
"positive": null,
112+
"model_variables": [
113+
"mlotst"
114+
],
115+
"calculation": {
116+
"type": "direct",
117+
"formula": "mlotst"
118+
}
119+
},
120+
121+
"tauuo": {
122+
"dimensions": {
123+
"time": "time",
124+
"yh": "latitude",
125+
"xh": "longitude"
126+
},
127+
"units": "N m-2",
128+
"positive": "down",
129+
"model_variables": [
130+
"tauuo"
131+
],
132+
"calculation": {
133+
"type": "direct",
134+
"formula": "tauuo"
135+
}
136+
},
137+
138+
"pso": {
139+
"dimensions": {
140+
"time": "time",
141+
"yh": "latitude",
142+
"xh": "longitude"
143+
},
144+
"units": "Pa",
145+
"positive": null,
146+
"model_variables": [
147+
"pso"
148+
],
149+
"calculation": {
150+
"type": "direct",
151+
"formula": "pso"
152+
}
153+
},
154+
155+
"hfrainds": {
156+
"dimensions": {
157+
"time": "time",
158+
"yh": "latitude",
159+
"xh": "longitude"
160+
},
161+
"units": "W m-2",
162+
"positive": "down",
163+
"model_variables": [
164+
"hfrainds"
165+
],
166+
"calculation": {
167+
"type": "direct",
168+
"formula": "hfrainds"
169+
}
170+
},
171+
172+
"sos": {
173+
"dimensions": {
174+
"time": "time",
175+
"yh": "latitude",
176+
"xh": "longitude"
177+
},
178+
"units": "0.001",
179+
"positive": null,
180+
"model_variables": [
181+
"sos"
182+
],
183+
"calculation": {
184+
"type": "direct",
185+
"formula": "sos"
186+
}
187+
},
188+
189+
"rlntds": {
190+
"dimensions": {
191+
"time": "time",
192+
"yh": "latitude",
193+
"xh": "longitude"
194+
},
195+
"units": "W m-2",
196+
"positive": "down",
197+
"model_variables": [
198+
"rlntds"
199+
],
200+
"calculation": {
201+
"type": "direct",
202+
"formula": "rlntds"
203+
}
204+
},
205+
206+
"hfsifrazil": {
207+
"dimensions": {
208+
"time": "time",
209+
"yh": "latitude",
210+
"xh": "longitude"
211+
},
212+
"units": "W m-2",
213+
"positive": null,
214+
"model_variables": [
215+
"hfsifrazil"
216+
],
217+
"calculation": {
218+
"type": "direct",
219+
"formula": "hfsifrazil"
220+
}
221+
},
222+
223+
"evs": {
224+
"dimensions": {
225+
"time": "time",
226+
"yh": "latitude",
227+
"xh": "longitude"
228+
},
229+
"units": "kg m-2 s-1",
230+
"positive": null,
231+
"model_variables": [
232+
"evs"
233+
],
234+
"calculation": {
235+
"type": "direct",
236+
"formula": "evs"
237+
}
238+
},
239+
240+
"hflso": {
241+
"dimensions": {
242+
"time": "time",
243+
"yh": "latitude",
244+
"xh": "longitude"
245+
},
246+
"units": "W m-2",
247+
"positive": "down",
248+
"model_variables": [
249+
"hflso"
250+
],
251+
"calculation": {
252+
"type": "direct",
253+
"formula": "hflso"
254+
}
255+
},
256+
257+
"prsn": {
258+
"dimensions": {
259+
"time": "time",
260+
"yh": "latitude",
261+
"xh": "longitude"
262+
},
263+
"units": "kg m-2 s-1",
264+
"positive": null,
265+
"model_variables": [
266+
"prsn"
267+
],
268+
"calculation": {
269+
"type": "direct",
270+
"formula": "prsn"
271+
}
272+
},
273+
274+
"rsntds": {
275+
"dimensions": {
276+
"time": "time",
277+
"yh": "latitude",
278+
"xh": "longitude"
279+
},
280+
"units": "W m-2",
281+
"positive": "down",
282+
"model_variables": [
283+
"rsntds"
284+
],
285+
"calculation": {
286+
"type": "direct",
287+
"formula": "rsntds"
288+
}
289+
},
290+
291+
"friver": {
292+
"dimensions": {
293+
"time": "time",
294+
"yh": "latitude",
295+
"xh": "longitude"
296+
},
297+
"units": "kg m-2 s-1",
298+
"positive": null,
299+
"model_variables": [
300+
"friver"
301+
],
302+
"calculation": {
303+
"type": "direct",
304+
"formula": "friver"
305+
}
306+
},
307+
308+
"hfsso": {
309+
"dimensions": {
310+
"time": "time",
311+
"yh": "latitude",
312+
"xh": "longitude"
313+
},
314+
"units": "W m-2",
315+
"positive": "down",
316+
"model_variables": [
317+
"hfsso"
318+
],
319+
"calculation": {
320+
"type": "direct",
321+
"formula": "hfsso"
322+
}
323+
},
324+
325+
"tauvo": {
326+
"dimensions": {
327+
"time": "time",
328+
"yh": "latitude",
329+
"xh": "longitude"
330+
},
331+
"units": "N m-2",
332+
"positive": "down",
333+
"model_variables": [
334+
"tauvo"
335+
],
336+
"calculation": {
337+
"type": "direct",
338+
"formula": "tauvo"
339+
}
340+
},
341+
342+
"sfdsi": {
343+
"dimensions": {
344+
"time": "time",
345+
"yh": "latitude",
346+
"xh": "longitude"
347+
},
348+
"units": "kg m-2 s-1",
349+
"positive": "down",
350+
"model_variables": [
351+
"sfdsi"
352+
],
353+
"calculation": {
354+
"type": "direct",
355+
"formula": "sfdsi"
356+
}
17357
}
358+
18359
}

0 commit comments

Comments
 (0)