roms-tools 1.1.0__py3-none-any.whl → 1.2.0__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- roms_tools/_version.py +1 -1
- roms_tools/setup/boundary_forcing.py +52 -126
- roms_tools/setup/datasets.py +22 -2
- roms_tools/setup/grid.py +20 -4
- roms_tools/setup/initial_conditions.py +84 -35
- roms_tools/setup/mixins.py +58 -47
- roms_tools/setup/plot.py +5 -47
- roms_tools/setup/surface_forcing.py +19 -5
- roms_tools/setup/tides.py +77 -69
- roms_tools/setup/vertical_coordinate.py +5 -0
- roms_tools/tests/test_boundary_forcing.py +197 -235
- roms_tools/tests/test_initial_conditions.py +69 -74
- roms_tools/tests/test_surface_forcing.py +26 -0
- roms_tools/tests/test_vertical_coordinate.py +80 -84
- {roms_tools-1.1.0.dist-info → roms_tools-1.2.0.dist-info}/METADATA +1 -1
- roms_tools-1.2.0.dist-info/RECORD +31 -0
- roms_tools-1.1.0.dist-info/RECORD +0 -31
- {roms_tools-1.1.0.dist-info → roms_tools-1.2.0.dist-info}/LICENSE +0 -0
- {roms_tools-1.1.0.dist-info → roms_tools-1.2.0.dist-info}/WHEEL +0 -0
- {roms_tools-1.1.0.dist-info → roms_tools-1.2.0.dist-info}/top_level.txt +0 -0
|
@@ -88,6 +88,7 @@ def test_boundary_forcing_creation(bdry_forcing_fixture, request):
|
|
|
88
88
|
assert f"u_{direction}" in bdry_forcing.ds["physics"]
|
|
89
89
|
assert f"v_{direction}" in bdry_forcing.ds["physics"]
|
|
90
90
|
assert f"zeta_{direction}" in bdry_forcing.ds["physics"]
|
|
91
|
+
assert len(bdry_forcing.ds["physics"].bry_time) == 1
|
|
91
92
|
|
|
92
93
|
|
|
93
94
|
def test_boundary_forcing_creation_with_bgc(boundary_forcing_with_bgc_from_climatology):
|
|
@@ -106,6 +107,8 @@ def test_boundary_forcing_creation_with_bgc(boundary_forcing_with_bgc_from_clima
|
|
|
106
107
|
in boundary_forcing_with_bgc_from_climatology.ds["bgc"]
|
|
107
108
|
)
|
|
108
109
|
|
|
110
|
+
assert len(boundary_forcing_with_bgc_from_climatology.ds["bgc"].bry_time) == 12
|
|
111
|
+
|
|
109
112
|
|
|
110
113
|
def test_boundary_forcing_data_consistency_plot_save(
|
|
111
114
|
boundary_forcing_with_bgc_from_climatology,
|
|
@@ -131,10 +134,9 @@ def test_boundary_forcing_data_consistency_plot_save(
|
|
|
131
134
|
expected_temp_south = np.array(
|
|
132
135
|
[
|
|
133
136
|
[
|
|
134
|
-
[16.84414,
|
|
135
|
-
[
|
|
136
|
-
[
|
|
137
|
-
[19.294329, 19.30358, 19.439777],
|
|
137
|
+
[16.84414, 18.088203, 18.431192, 19.294329],
|
|
138
|
+
[16.905312, 18.121834, 18.496748, 19.30358],
|
|
139
|
+
[16.967817, 18.315424, 18.718002, 19.439777],
|
|
138
140
|
]
|
|
139
141
|
],
|
|
140
142
|
dtype=np.float32,
|
|
@@ -142,10 +144,9 @@ def test_boundary_forcing_data_consistency_plot_save(
|
|
|
142
144
|
expected_temp_east = np.array(
|
|
143
145
|
[
|
|
144
146
|
[
|
|
145
|
-
[19.294329,
|
|
146
|
-
[
|
|
147
|
-
[
|
|
148
|
-
[9.20282, 10.667074, 11.752404],
|
|
147
|
+
[19.294329, 18.633307, 8.710737, 9.20282],
|
|
148
|
+
[19.30358, 18.637077, 11.25943, 10.667074],
|
|
149
|
+
[19.439777, 18.667465, 13.111585, 11.752404],
|
|
149
150
|
]
|
|
150
151
|
],
|
|
151
152
|
dtype=np.float32,
|
|
@@ -153,10 +154,9 @@ def test_boundary_forcing_data_consistency_plot_save(
|
|
|
153
154
|
expected_temp_north = np.array(
|
|
154
155
|
[
|
|
155
156
|
[
|
|
156
|
-
[10.233599, 10.
|
|
157
|
-
[10.
|
|
158
|
-
[10.
|
|
159
|
-
[9.20282, 10.667074, 11.752404],
|
|
157
|
+
[10.233599, 10.147332, 10.458557, 9.20282],
|
|
158
|
+
[10.546486, 10.502733, 11.209945, 10.667074],
|
|
159
|
+
[10.671082, 10.68275, 11.377164, 11.752404],
|
|
160
160
|
]
|
|
161
161
|
],
|
|
162
162
|
dtype=np.float32,
|
|
@@ -164,10 +164,9 @@ def test_boundary_forcing_data_consistency_plot_save(
|
|
|
164
164
|
expected_temp_west = np.array(
|
|
165
165
|
[
|
|
166
166
|
[
|
|
167
|
-
[16.84414,
|
|
168
|
-
[
|
|
169
|
-
[
|
|
170
|
-
[10.233599, 10.546486, 10.671082],
|
|
167
|
+
[16.84414, 12.639833, 11.027701, 10.233599],
|
|
168
|
+
[16.905312, 13.479691, 11.650267, 10.546486],
|
|
169
|
+
[16.967817, 14.426711, 12.200586, 10.671082],
|
|
171
170
|
]
|
|
172
171
|
],
|
|
173
172
|
dtype=np.float32,
|
|
@@ -179,57 +178,58 @@ def test_boundary_forcing_data_consistency_plot_save(
|
|
|
179
178
|
expected_u_east = np.array(
|
|
180
179
|
[
|
|
181
180
|
[
|
|
182
|
-
[0.0, -0.0,
|
|
183
|
-
[-0.0, -0.0,
|
|
184
|
-
[0.
|
|
185
|
-
[0.0211786, 0.03679834, 0.0274788],
|
|
181
|
+
[0.0, -0.0, 0.06979556, 0.0211786],
|
|
182
|
+
[-0.0, -0.0, 0.06167743, 0.03679834],
|
|
183
|
+
[-0.0, -0.0, -0.02247071, 0.0274788],
|
|
186
184
|
]
|
|
187
185
|
],
|
|
188
186
|
dtype=np.float32,
|
|
189
187
|
)
|
|
188
|
+
|
|
190
189
|
expected_u_north = np.array(
|
|
191
190
|
[
|
|
192
191
|
[
|
|
193
|
-
[0.04268532, 0.
|
|
194
|
-
[0.
|
|
195
|
-
[0.
|
|
192
|
+
[0.04268532, 0.04645353, 0.0211786],
|
|
193
|
+
[0.03889201, 0.04914769, 0.03679834],
|
|
194
|
+
[0.03351666, 0.03673013, 0.0274788],
|
|
196
195
|
]
|
|
197
196
|
],
|
|
198
197
|
dtype=np.float32,
|
|
199
198
|
)
|
|
199
|
+
|
|
200
200
|
expected_u_west = np.array(
|
|
201
201
|
[
|
|
202
202
|
[
|
|
203
|
-
[-0.0,
|
|
204
|
-
[0.0, -0.0,
|
|
205
|
-
[0.0, 0.0, -0.0],
|
|
206
|
-
[0.04268532, 0.03889201, 0.03351666],
|
|
203
|
+
[-0.0, 0.0, 0.0, 0.04268532],
|
|
204
|
+
[-0.0, -0.0, 0.0, 0.03889201],
|
|
205
|
+
[-0.0, -0.0, -0.0, 0.03351666],
|
|
207
206
|
]
|
|
208
207
|
],
|
|
209
208
|
dtype=np.float32,
|
|
210
209
|
)
|
|
211
210
|
|
|
212
211
|
expected_v_south = np.array(
|
|
213
|
-
[[[0.0, 0.0, 0.0
|
|
212
|
+
[[[0.0, 0.0, -0.0, -0.0], [0.0, 0.0, -0.0, -0.0], [0.0, -0.0, -0.0, -0.0]]],
|
|
214
213
|
dtype=np.float32,
|
|
215
214
|
)
|
|
215
|
+
|
|
216
216
|
expected_v_east = np.array(
|
|
217
217
|
[
|
|
218
218
|
[
|
|
219
|
-
[-0.0, -0.0, -0.
|
|
220
|
-
[-0.0, -0.0, -0.
|
|
221
|
-
[-0.
|
|
219
|
+
[-0.0, -0.0, -0.06720348],
|
|
220
|
+
[-0.0, -0.0, -0.08354441],
|
|
221
|
+
[-0.0, -0.0, -0.13835917],
|
|
222
222
|
]
|
|
223
223
|
],
|
|
224
224
|
dtype=np.float32,
|
|
225
225
|
)
|
|
226
|
+
|
|
226
227
|
expected_v_north = np.array(
|
|
227
228
|
[
|
|
228
229
|
[
|
|
229
|
-
[-0.00951457, -0.
|
|
230
|
-
[-0.
|
|
231
|
-
[0.
|
|
232
|
-
[-0.06720348, -0.08354441, -0.13835917],
|
|
230
|
+
[-0.00951457, -0.0, 0.01915873, -0.06720348],
|
|
231
|
+
[-0.00576979, -0.0, 0.02625698, -0.08354441],
|
|
232
|
+
[-0.02147919, -0.0, 0.01757628, -0.13835917],
|
|
233
233
|
]
|
|
234
234
|
],
|
|
235
235
|
dtype=np.float32,
|
|
@@ -237,9 +237,9 @@ def test_boundary_forcing_data_consistency_plot_save(
|
|
|
237
237
|
expected_v_west = np.array(
|
|
238
238
|
[
|
|
239
239
|
[
|
|
240
|
-
[0.0, 0.0, 0.
|
|
241
|
-
[
|
|
242
|
-
[
|
|
240
|
+
[0.0, -0.0, -0.00951457],
|
|
241
|
+
[0.0, -0.0, -0.00576979],
|
|
242
|
+
[0.0, -0.0, -0.02147919],
|
|
243
243
|
]
|
|
244
244
|
],
|
|
245
245
|
dtype=np.float32,
|
|
@@ -264,76 +264,64 @@ def test_boundary_forcing_data_consistency_plot_save(
|
|
|
264
264
|
expected_alk_south = np.array(
|
|
265
265
|
[
|
|
266
266
|
[
|
|
267
|
-
[2352.1636,
|
|
268
|
-
[
|
|
269
|
-
[
|
|
270
|
-
[2286.2327, 2286.0442, 2285.8623],
|
|
267
|
+
[2352.1636, 2333.1094, 2308.618, 2286.2327],
|
|
268
|
+
[2352.128, 2332.9932, 2308.4705, 2286.0442],
|
|
269
|
+
[2352.091, 2332.8738, 2308.3032, 2285.8623],
|
|
271
270
|
],
|
|
272
271
|
[
|
|
273
|
-
[2354.7297,
|
|
274
|
-
[
|
|
275
|
-
[
|
|
276
|
-
[2294.0876, 2293.8918, 2293.6626],
|
|
272
|
+
[2354.7297, 2337.391, 2314.0232, 2294.0876],
|
|
273
|
+
[2354.6863, 2337.259, 2313.8638, 2293.8918],
|
|
274
|
+
[2354.6414, 2337.1223, 2313.6616, 2293.6626],
|
|
277
275
|
],
|
|
278
276
|
[
|
|
279
|
-
[2355.02,
|
|
280
|
-
[
|
|
281
|
-
[
|
|
282
|
-
[2292.2637, 2291.8752, 2291.6702],
|
|
277
|
+
[2355.02, 2336.321, 2312.7905, 2292.2637],
|
|
278
|
+
[2354.9158, 2336.117, 2312.4849, 2291.8752],
|
|
279
|
+
[2354.817, 2335.9214, 2312.2444, 2291.6702],
|
|
283
280
|
],
|
|
284
281
|
[
|
|
285
|
-
[2355.2583,
|
|
286
|
-
[
|
|
287
|
-
[
|
|
288
|
-
[2287.4226, 2285.5466, 2285.0479],
|
|
282
|
+
[2355.2583, 2334.3098, 2309.5273, 2287.4226],
|
|
283
|
+
[2355.052, 2333.913, 2308.292, 2285.5466],
|
|
284
|
+
[2354.9163, 2333.651, 2307.8772, 2285.0479],
|
|
289
285
|
],
|
|
290
286
|
[
|
|
291
|
-
[2354.1216,
|
|
292
|
-
[
|
|
293
|
-
[
|
|
294
|
-
[2280.6, 2276.278, 2275.2761],
|
|
287
|
+
[2354.1216, 2330.6604, 2304.88, 2280.6],
|
|
288
|
+
[2353.7737, 2329.948, 2302.105, 2276.278],
|
|
289
|
+
[2353.6316, 2329.6023, 2301.4136, 2275.2761],
|
|
295
290
|
],
|
|
296
291
|
[
|
|
297
|
-
[2346.881,
|
|
298
|
-
[
|
|
299
|
-
[
|
|
300
|
-
[2279.729, 2265.0488, 2263.0654],
|
|
292
|
+
[2346.881, 2322.218, 2301.2046, 2279.729],
|
|
293
|
+
[2345.7993, 2320.3225, 2291.6438, 2265.0488],
|
|
294
|
+
[2345.4675, 2319.691, 2290.308, 2263.0654],
|
|
301
295
|
],
|
|
302
296
|
[
|
|
303
|
-
[2336.2632,
|
|
304
|
-
[
|
|
305
|
-
[
|
|
306
|
-
[2272.6418, 2250.8848, 2248.0718],
|
|
297
|
+
[2336.2632, 2312.938, 2293.6711, 2272.6418],
|
|
298
|
+
[2335.273, 2310.7412, 2279.314, 2250.8848],
|
|
299
|
+
[2334.9324, 2310.055, 2277.593, 2248.0718],
|
|
307
300
|
],
|
|
308
301
|
[
|
|
309
|
-
[2333.8801,
|
|
310
|
-
[
|
|
311
|
-
[
|
|
312
|
-
[2266.9172, 2246.1714, 2244.1096],
|
|
302
|
+
[2333.8801, 2311.3232, 2289.1548, 2266.9172],
|
|
303
|
+
[2333.265, 2309.5337, 2276.1438, 2246.1714],
|
|
304
|
+
[2333.0667, 2309.034, 2274.885, 2244.1096],
|
|
313
305
|
],
|
|
314
306
|
[
|
|
315
|
-
[2336.8193,
|
|
316
|
-
[
|
|
317
|
-
[
|
|
318
|
-
[2263.7944, 2249.8926, 2249.0842],
|
|
307
|
+
[2336.8193, 2314.2544, 2288.887, 2263.7944],
|
|
308
|
+
[2336.5115, 2313.1343, 2280.0654, 2249.8926],
|
|
309
|
+
[2336.4402, 2312.9004, 2279.546, 2249.0842],
|
|
319
310
|
],
|
|
320
311
|
[
|
|
321
|
-
[2341.18,
|
|
322
|
-
[
|
|
323
|
-
[
|
|
324
|
-
[2262.6213, 2257.4502, 2256.9663],
|
|
312
|
+
[2341.18, 2317.8801, 2289.4714, 2262.6213],
|
|
313
|
+
[2341.0679, 2317.4556, 2286.2214, 2257.4502],
|
|
314
|
+
[2341.025, 2317.3325, 2285.9263, 2256.9663],
|
|
325
315
|
],
|
|
326
316
|
[
|
|
327
|
-
[2344.9026,
|
|
328
|
-
[
|
|
329
|
-
[
|
|
330
|
-
[2273.7996, 2273.2507, 2273.0938],
|
|
317
|
+
[2344.9026, 2323.6404, 2297.1284, 2273.7996],
|
|
318
|
+
[2344.86, 2323.5337, 2296.8164, 2273.2507],
|
|
319
|
+
[2344.8218, 2323.442, 2296.6846, 2273.0938],
|
|
331
320
|
],
|
|
332
321
|
[
|
|
333
|
-
[2349.1636,
|
|
334
|
-
[
|
|
335
|
-
[
|
|
336
|
-
[2281.6301, 2281.4062, 2281.269],
|
|
322
|
+
[2349.1636, 2329.3665, 2304.1536, 2281.6301],
|
|
323
|
+
[2349.1338, 2329.2893, 2304.0178, 2281.4062],
|
|
324
|
+
[2349.1035, 2329.2102, 2303.9006, 2281.269],
|
|
337
325
|
],
|
|
338
326
|
],
|
|
339
327
|
dtype=np.float32,
|
|
@@ -342,76 +330,64 @@ def test_boundary_forcing_data_consistency_plot_save(
|
|
|
342
330
|
expected_alk_east = np.array(
|
|
343
331
|
[
|
|
344
332
|
[
|
|
345
|
-
[2286.2327,
|
|
346
|
-
[
|
|
347
|
-
[
|
|
348
|
-
[2349.247, 2349.1697, 2349.0938],
|
|
333
|
+
[2286.2327, 2268.2373, 2297.2825, 2349.247],
|
|
334
|
+
[2286.0442, 2268.162, 2296.5747, 2349.1697],
|
|
335
|
+
[2285.8623, 2268.0366, 2296.2695, 2349.0938],
|
|
349
336
|
],
|
|
350
337
|
[
|
|
351
|
-
[2294.0876,
|
|
352
|
-
[
|
|
353
|
-
[
|
|
354
|
-
[2352.814, 2352.756, 2352.6907],
|
|
338
|
+
[2294.0876, 2272.6245, 2301.072, 2352.814],
|
|
339
|
+
[2293.8918, 2272.5269, 2300.6504, 2352.756],
|
|
340
|
+
[2293.6626, 2272.3384, 2300.4255, 2352.6907],
|
|
355
341
|
],
|
|
356
342
|
[
|
|
357
|
-
[2292.2637,
|
|
358
|
-
[
|
|
359
|
-
[
|
|
360
|
-
[2352.8616, 2352.795, 2352.7444],
|
|
343
|
+
[2292.2637, 2272.901, 2304.492, 2352.8616],
|
|
344
|
+
[2291.8752, 2272.7153, 2303.8516, 2352.795],
|
|
345
|
+
[2291.6702, 2272.5413, 2303.6313, 2352.7444],
|
|
361
346
|
],
|
|
362
347
|
[
|
|
363
|
-
[2287.4226,
|
|
364
|
-
[
|
|
365
|
-
[
|
|
366
|
-
[2350.9084, 2350.3499, 2350.0247],
|
|
348
|
+
[2287.4226, 2269.8926, 2310.2466, 2350.9084],
|
|
349
|
+
[2285.5466, 2269.2112, 2307.2576, 2350.3499],
|
|
350
|
+
[2285.0479, 2268.8284, 2306.0806, 2350.0247],
|
|
367
351
|
],
|
|
368
352
|
[
|
|
369
|
-
[2280.6,
|
|
370
|
-
[
|
|
371
|
-
[
|
|
372
|
-
[2350.1707, 2348.5422, 2347.7415],
|
|
353
|
+
[2280.6, 2266.4937, 2309.5537, 2350.1707],
|
|
354
|
+
[2276.278, 2264.7148, 2297.2288, 2348.5422],
|
|
355
|
+
[2275.2761, 2263.8596, 2293.6697, 2347.7415],
|
|
373
356
|
],
|
|
374
357
|
[
|
|
375
|
-
[2279.729,
|
|
376
|
-
[
|
|
377
|
-
[
|
|
378
|
-
[2350.3872, 2345.0693, 2342.4902],
|
|
358
|
+
[2279.729, 2263.0278, 2311.0305, 2350.3872],
|
|
359
|
+
[2265.0488, 2254.806, 2290.098, 2345.0693],
|
|
360
|
+
[2263.0654, 2253.1594, 2284.9631, 2342.4902],
|
|
379
361
|
],
|
|
380
362
|
[
|
|
381
|
-
[2272.6418,
|
|
382
|
-
[
|
|
383
|
-
[
|
|
384
|
-
[2349.7207, 2339.6501, 2335.4924],
|
|
363
|
+
[2272.6418, 2256.4866, 2309.7383, 2349.7207],
|
|
364
|
+
[2250.8848, 2239.6753, 2284.9133, 2339.6501],
|
|
365
|
+
[2248.0718, 2237.9412, 2277.729, 2335.4924],
|
|
385
366
|
],
|
|
386
367
|
[
|
|
387
|
-
[2266.9172,
|
|
388
|
-
[
|
|
389
|
-
[
|
|
390
|
-
[2347.7605, 2330.1702, 2325.427],
|
|
368
|
+
[2266.9172, 2249.1013, 2307.639, 2347.7605],
|
|
369
|
+
[2246.1714, 2234.224, 2275.4429, 2330.1702],
|
|
370
|
+
[2244.1096, 2232.722, 2266.299, 2325.427],
|
|
391
371
|
],
|
|
392
372
|
[
|
|
393
|
-
[2263.7944,
|
|
394
|
-
[
|
|
395
|
-
[
|
|
396
|
-
[2338.5127, 2321.7393, 2316.971],
|
|
373
|
+
[2263.7944, 2246.2002, 2301.0461, 2338.5127],
|
|
374
|
+
[2249.8926, 2236.0933, 2269.4448, 2321.7393],
|
|
375
|
+
[2249.0842, 2235.4578, 2263.889, 2316.971],
|
|
397
376
|
],
|
|
398
377
|
[
|
|
399
|
-
[2262.6213,
|
|
400
|
-
[
|
|
401
|
-
[
|
|
402
|
-
[2331.162, 2322.5522, 2320.8901],
|
|
378
|
+
[2262.6213, 2244.3662, 2292.1316, 2331.162],
|
|
379
|
+
[2257.4502, 2241.8052, 2274.763, 2322.5522],
|
|
380
|
+
[2256.9663, 2241.589, 2272.2124, 2320.8901],
|
|
403
381
|
],
|
|
404
382
|
[
|
|
405
|
-
[2273.7996,
|
|
406
|
-
[
|
|
407
|
-
[
|
|
408
|
-
[2333.583, 2332.7646, 2332.3955],
|
|
383
|
+
[2273.7996, 2254.6848, 2290.5637, 2333.583],
|
|
384
|
+
[2273.2507, 2254.4407, 2286.885, 2332.7646],
|
|
385
|
+
[2273.0938, 2254.3308, 2286.088, 2332.3955],
|
|
409
386
|
],
|
|
410
387
|
[
|
|
411
|
-
[2281.6301,
|
|
412
|
-
[
|
|
413
|
-
[
|
|
414
|
-
[2340.852, 2340.6072, 2340.4978],
|
|
388
|
+
[2281.6301, 2262.4211, 2296.095, 2340.852],
|
|
389
|
+
[2281.4062, 2262.3313, 2293.6157, 2340.6072],
|
|
390
|
+
[2281.269, 2262.2532, 2293.1213, 2340.4978],
|
|
415
391
|
],
|
|
416
392
|
],
|
|
417
393
|
dtype=np.float32,
|
|
@@ -420,76 +396,64 @@ def test_boundary_forcing_data_consistency_plot_save(
|
|
|
420
396
|
expected_alk_north = np.array(
|
|
421
397
|
[
|
|
422
398
|
[
|
|
423
|
-
[2376.7993,
|
|
424
|
-
[
|
|
425
|
-
[
|
|
426
|
-
[2349.247, 2349.1697, 2349.0938],
|
|
399
|
+
[2376.7993, 2375.0688, 2372.2307, 2349.247],
|
|
400
|
+
[2376.7961, 2375.0647, 2372.2188, 2349.1697],
|
|
401
|
+
[2376.7932, 2375.0596, 2372.201, 2349.0938],
|
|
427
402
|
],
|
|
428
403
|
[
|
|
429
|
-
[2376.757,
|
|
430
|
-
[
|
|
431
|
-
[
|
|
432
|
-
[2352.814, 2352.756, 2352.6907],
|
|
404
|
+
[2376.757, 2374.8325, 2371.8342, 2352.814],
|
|
405
|
+
[2376.7537, 2374.8286, 2371.8257, 2352.756],
|
|
406
|
+
[2376.7478, 2374.825, 2371.814, 2352.6907],
|
|
433
407
|
],
|
|
434
408
|
[
|
|
435
|
-
[2377.0188,
|
|
436
|
-
[
|
|
437
|
-
[
|
|
438
|
-
[2352.8616, 2352.795, 2352.7444],
|
|
409
|
+
[2377.0188, 2374.9753, 2371.7104, 2352.8616],
|
|
410
|
+
[2377.0137, 2374.9707, 2371.7085, 2352.795],
|
|
411
|
+
[2377.0073, 2374.9666, 2371.707, 2352.7444],
|
|
439
412
|
],
|
|
440
413
|
[
|
|
441
|
-
[2377.3914,
|
|
442
|
-
[
|
|
443
|
-
[
|
|
444
|
-
[2350.9084, 2350.3499, 2350.0247],
|
|
414
|
+
[2377.3914, 2375.5757, 2371.869, 2350.9084],
|
|
415
|
+
[2377.383, 2375.5718, 2371.8706, 2350.3499],
|
|
416
|
+
[2377.3792, 2375.57, 2371.8743, 2350.0247],
|
|
445
417
|
],
|
|
446
418
|
[
|
|
447
|
-
[2378.4722,
|
|
448
|
-
[
|
|
449
|
-
[
|
|
450
|
-
[2350.1707, 2348.5422, 2347.7415],
|
|
419
|
+
[2378.4722, 2377.151, 2373.7805, 2350.1707],
|
|
420
|
+
[2378.5, 2377.2292, 2373.9, 2348.5422],
|
|
421
|
+
[2378.5017, 2377.2666, 2374.0066, 2347.7415],
|
|
451
422
|
],
|
|
452
423
|
[
|
|
453
|
-
[2381.3555,
|
|
454
|
-
[
|
|
455
|
-
[
|
|
456
|
-
[2350.3872, 2345.0693, 2342.4902],
|
|
424
|
+
[2381.3555, 2380.8108, 2378.7131, 2350.3872],
|
|
425
|
+
[2383.3838, 2382.6125, 2379.7717, 2345.0693],
|
|
426
|
+
[2383.9692, 2383.3374, 2380.4094, 2342.4902],
|
|
457
427
|
],
|
|
458
428
|
[
|
|
459
|
-
[2388.7502,
|
|
460
|
-
[
|
|
461
|
-
[
|
|
462
|
-
[2349.7207, 2339.6501, 2335.4924],
|
|
429
|
+
[2388.7502, 2387.0815, 2381.9631, 2349.7207],
|
|
430
|
+
[2389.4453, 2388.0613, 2383.4429, 2339.6501],
|
|
431
|
+
[2389.6758, 2388.3323, 2383.521, 2335.4924],
|
|
463
432
|
],
|
|
464
433
|
[
|
|
465
|
-
[2386.29,
|
|
466
|
-
[
|
|
467
|
-
[
|
|
468
|
-
[2347.7605, 2330.1702, 2325.427],
|
|
434
|
+
[2386.29, 2383.9194, 2380.237, 2347.7605],
|
|
435
|
+
[2385.9524, 2383.5654, 2377.2883, 2330.1702],
|
|
436
|
+
[2385.863, 2383.4429, 2376.6057, 2325.427],
|
|
469
437
|
],
|
|
470
438
|
[
|
|
471
|
-
[2375.1409,
|
|
472
|
-
[
|
|
473
|
-
[
|
|
474
|
-
[2338.5127, 2321.7393, 2316.971],
|
|
439
|
+
[2375.1409, 2370.7205, 2371.8071, 2338.5127],
|
|
440
|
+
[2373.7124, 2368.2014, 2365.7, 2321.7393],
|
|
441
|
+
[2373.2695, 2367.7415, 2365.1226, 2316.971],
|
|
475
442
|
],
|
|
476
443
|
[
|
|
477
|
-
[2371.951,
|
|
478
|
-
[
|
|
479
|
-
[
|
|
480
|
-
[2331.162, 2322.5522, 2320.8901],
|
|
444
|
+
[2371.951, 2365.2358, 2365.8464, 2331.162],
|
|
445
|
+
[2371.8308, 2364.598, 2362.7102, 2322.5522],
|
|
446
|
+
[2371.786, 2364.4639, 2362.5464, 2320.8901],
|
|
481
447
|
],
|
|
482
448
|
[
|
|
483
|
-
[2373.2239,
|
|
484
|
-
[
|
|
485
|
-
[
|
|
486
|
-
[2333.583, 2332.7646, 2332.3955],
|
|
449
|
+
[2373.2239, 2370.007, 2367.3286, 2333.583],
|
|
450
|
+
[2373.2004, 2369.9714, 2367.2654, 2332.7646],
|
|
451
|
+
[2373.1711, 2369.9507, 2367.2217, 2332.3955],
|
|
487
452
|
],
|
|
488
453
|
[
|
|
489
|
-
[2374.99,
|
|
490
|
-
[
|
|
491
|
-
[
|
|
492
|
-
[2340.852, 2340.6072, 2340.4978],
|
|
454
|
+
[2374.99, 2373.9058, 2370.9688, 2340.852],
|
|
455
|
+
[2374.9817, 2373.8901, 2370.9421, 2340.6072],
|
|
456
|
+
[2374.9717, 2373.8748, 2370.907, 2340.4978],
|
|
493
457
|
],
|
|
494
458
|
],
|
|
495
459
|
dtype=np.float32,
|
|
@@ -498,82 +462,70 @@ def test_boundary_forcing_data_consistency_plot_save(
|
|
|
498
462
|
expected_alk_west = np.array(
|
|
499
463
|
[
|
|
500
464
|
[
|
|
501
|
-
[2352.1636,
|
|
502
|
-
[
|
|
503
|
-
[
|
|
504
|
-
[2376.7993, 2376.7961, 2376.7932],
|
|
465
|
+
[2352.1636, 2335.311, 2362.5132, 2376.7993],
|
|
466
|
+
[2352.128, 2335.1162, 2362.5088, 2376.7961],
|
|
467
|
+
[2352.091, 2334.924, 2362.4663, 2376.7932],
|
|
505
468
|
],
|
|
506
469
|
[
|
|
507
|
-
[2354.7297,
|
|
508
|
-
[
|
|
509
|
-
[
|
|
510
|
-
[2376.757, 2376.7537, 2376.7478],
|
|
470
|
+
[2354.7297, 2335.165, 2363.018, 2376.757],
|
|
471
|
+
[2354.6863, 2334.9695, 2363.0068, 2376.7537],
|
|
472
|
+
[2354.6414, 2334.78, 2362.965, 2376.7478],
|
|
511
473
|
],
|
|
512
474
|
[
|
|
513
|
-
[2355.02,
|
|
514
|
-
[
|
|
515
|
-
[
|
|
516
|
-
[2377.0188, 2377.0137, 2377.0073],
|
|
475
|
+
[2355.02, 2334.8015, 2365.7913, 2377.0188],
|
|
476
|
+
[2354.9158, 2334.5276, 2365.8025, 2377.0137],
|
|
477
|
+
[2354.817, 2334.272, 2365.7432, 2377.0073],
|
|
517
478
|
],
|
|
518
479
|
[
|
|
519
|
-
[2355.2583,
|
|
520
|
-
[
|
|
521
|
-
[
|
|
522
|
-
[2377.3914, 2377.383, 2377.3792],
|
|
480
|
+
[2355.2583, 2335.5789, 2370.7808, 2377.3914],
|
|
481
|
+
[2355.052, 2335.267, 2370.754, 2377.383],
|
|
482
|
+
[2354.9163, 2335.0227, 2370.6836, 2377.3792],
|
|
523
483
|
],
|
|
524
484
|
[
|
|
525
|
-
[2354.1216,
|
|
526
|
-
[
|
|
527
|
-
[
|
|
528
|
-
[2378.4722, 2378.5, 2378.5017],
|
|
485
|
+
[2354.1216, 2335.7122, 2375.5793, 2378.4722],
|
|
486
|
+
[2353.7737, 2335.1372, 2375.3132, 2378.5],
|
|
487
|
+
[2353.6316, 2334.8125, 2375.1387, 2378.5017],
|
|
529
488
|
],
|
|
530
489
|
[
|
|
531
|
-
[2346.881,
|
|
532
|
-
[
|
|
533
|
-
[
|
|
534
|
-
[2381.3555, 2383.3838, 2383.9692],
|
|
490
|
+
[2346.881, 2332.2158, 2378.4954, 2381.3555],
|
|
491
|
+
[2345.7993, 2331.5295, 2376.4001, 2383.3838],
|
|
492
|
+
[2345.4675, 2331.2346, 2375.9187, 2383.9692],
|
|
535
493
|
],
|
|
536
494
|
[
|
|
537
|
-
[2336.2632,
|
|
538
|
-
[
|
|
539
|
-
[
|
|
540
|
-
[2388.7502, 2389.4453, 2389.6758],
|
|
495
|
+
[2336.2632, 2328.7188, 2374.763, 2388.7502],
|
|
496
|
+
[2335.273, 2327.8726, 2370.0576, 2389.4453],
|
|
497
|
+
[2334.9324, 2327.576, 2369.491, 2389.6758],
|
|
541
498
|
],
|
|
542
499
|
[
|
|
543
|
-
[2333.8801,
|
|
544
|
-
[
|
|
545
|
-
[
|
|
546
|
-
[2386.29, 2385.9524, 2385.863],
|
|
500
|
+
[2333.8801, 2326.699, 2356.8801, 2386.29],
|
|
501
|
+
[2333.265, 2326.0037, 2352.0618, 2385.9524],
|
|
502
|
+
[2333.0667, 2325.771, 2351.4526, 2385.863],
|
|
547
503
|
],
|
|
548
504
|
[
|
|
549
|
-
[2336.8193,
|
|
550
|
-
[
|
|
551
|
-
[
|
|
552
|
-
[2375.1409, 2373.7124, 2373.2695],
|
|
505
|
+
[2336.8193, 2325.9893, 2346.735, 2375.1409],
|
|
506
|
+
[2336.5115, 2325.512, 2344.9722, 2373.7124],
|
|
507
|
+
[2336.4402, 2325.2942, 2344.6653, 2373.2695],
|
|
553
508
|
],
|
|
554
509
|
[
|
|
555
|
-
[2341.18,
|
|
556
|
-
[
|
|
557
|
-
[
|
|
558
|
-
[2371.951, 2371.8308, 2371.786],
|
|
510
|
+
[2341.18, 2328.2231, 2352.159, 2371.951],
|
|
511
|
+
[2341.0679, 2327.9817, 2351.6226, 2371.8308],
|
|
512
|
+
[2341.025, 2327.8281, 2351.4314, 2371.786],
|
|
559
513
|
],
|
|
560
514
|
[
|
|
561
|
-
[2344.9026,
|
|
562
|
-
[
|
|
563
|
-
[
|
|
564
|
-
[2373.2239, 2373.2004, 2373.1711],
|
|
515
|
+
[2344.9026, 2331.0703, 2356.0095, 2373.2239],
|
|
516
|
+
[2344.86, 2330.9097, 2355.9424, 2373.2004],
|
|
517
|
+
[2344.8218, 2330.7537, 2355.8538, 2373.1711],
|
|
565
518
|
],
|
|
566
519
|
[
|
|
567
|
-
[2349.1636,
|
|
568
|
-
[
|
|
569
|
-
[
|
|
570
|
-
[2374.99, 2374.9817, 2374.9717],
|
|
520
|
+
[2349.1636, 2334.3328, 2359.3823, 2374.99],
|
|
521
|
+
[2349.1338, 2334.043, 2359.3276, 2374.9817],
|
|
522
|
+
[2349.1035, 2333.749, 2359.2634, 2374.9717],
|
|
571
523
|
],
|
|
572
524
|
],
|
|
573
525
|
dtype=np.float32,
|
|
574
526
|
)
|
|
575
527
|
|
|
576
|
-
ds = boundary_forcing_with_bgc_from_climatology.ds["physics"]
|
|
528
|
+
ds = boundary_forcing_with_bgc_from_climatology.ds["physics"].compute()
|
|
577
529
|
ds_bgc = boundary_forcing_with_bgc_from_climatology.ds["bgc"]
|
|
578
530
|
|
|
579
531
|
# Check the values in the dataset
|
|
@@ -606,14 +558,24 @@ def test_boundary_forcing_data_consistency_plot_save(
|
|
|
606
558
|
assert np.allclose(ds_bgc["ALK_north"].values, expected_alk_north)
|
|
607
559
|
assert np.allclose(ds_bgc["ALK_west"].values, expected_alk_west)
|
|
608
560
|
|
|
609
|
-
boundary_forcing_with_bgc_from_climatology.plot(
|
|
610
|
-
|
|
611
|
-
|
|
612
|
-
boundary_forcing_with_bgc_from_climatology.plot(
|
|
561
|
+
boundary_forcing_with_bgc_from_climatology.plot(
|
|
562
|
+
varname="temp_south", layer_contours=True
|
|
563
|
+
)
|
|
564
|
+
boundary_forcing_with_bgc_from_climatology.plot(
|
|
565
|
+
varname="temp_east", layer_contours=True
|
|
566
|
+
)
|
|
567
|
+
boundary_forcing_with_bgc_from_climatology.plot(
|
|
568
|
+
varname="temp_north", layer_contours=True
|
|
569
|
+
)
|
|
570
|
+
boundary_forcing_with_bgc_from_climatology.plot(
|
|
571
|
+
varname="temp_west", layer_contours=True
|
|
572
|
+
)
|
|
613
573
|
boundary_forcing_with_bgc_from_climatology.plot(varname="zeta_south")
|
|
614
574
|
boundary_forcing_with_bgc_from_climatology.plot(varname="zeta_east")
|
|
615
575
|
boundary_forcing_with_bgc_from_climatology.plot(varname="zeta_north")
|
|
616
576
|
boundary_forcing_with_bgc_from_climatology.plot(varname="zeta_west")
|
|
577
|
+
boundary_forcing_with_bgc_from_climatology.plot(varname="vbar_north")
|
|
578
|
+
boundary_forcing_with_bgc_from_climatology.plot(varname="ubar_west")
|
|
617
579
|
boundary_forcing_with_bgc_from_climatology.plot(varname="ALK_south")
|
|
618
580
|
boundary_forcing_with_bgc_from_climatology.plot(varname="ALK_east")
|
|
619
581
|
boundary_forcing_with_bgc_from_climatology.plot(varname="ALK_north")
|