Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Mesh saveload fix #6004

Merged
merged 8 commits into from
Jun 20, 2024
Merged

Mesh saveload fix #6004

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
802a4f3
Remove obsolete code which saves identical meshes separately.
pp-mo Jun 12, 2024
9ab26dc
Better error messages for mis-configured mesh data variables.
pp-mo Jun 12, 2024
a4dad3a
Add tests for more intelligible errors.
pp-mo Jun 12, 2024
4b06462
Add licence header.
pp-mo Jun 13, 2024
5365ade
Fix test for changes to mesh saving.
pp-mo Jun 13, 2024
e57c30d
Inline method which was used just once, and specific to the use.
pp-mo Jun 13, 2024
993189e
Add whatsnew entry.
pp-mo Jun 19, 2024
f7e87f5
Merge branch 'main' into mesh_saveload_fix
ESadek-MO Jun 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix test for changes to mesh saving.
  • Loading branch information
@pp-mo
pp-mo committed Jun 13, 2024
commit 5365adea44e7b01f4dc55043c62b2cbb1ebe5838
17 changes: 9 additions & 8 deletions lib/iris/tests/unit/fileformats/netcdf/saver/test_Saver__ugrid.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,9 +508,9 @@ def test_multi_cubes_equal_meshes(self):
self.assertEqual(props["location"], "face")
self.assertEqual(props["coordinates"], "face_x face_y")

# the data variables map the appropriate node dimensions
# the data variables map the appropriate node dimension
self.assertEqual(a_props[_VAR_DIMS], ["Mesh2d_faces"])
self.assertEqual(b_props[_VAR_DIMS], ["Mesh2d_faces_0"])
self.assertEqual(b_props[_VAR_DIMS], ["Mesh2d_faces"])

def test_multi_cubes_different_mesh(self):
# Check that we can correctly distinguish 2 different meshes.
Expand Down Expand Up @@ -1188,15 +1188,15 @@ def _check_two_different_meshes(self, vars):

# mesh2
self.assertEqual(
vars_meshdim(vars, "node", mesh_name="Mesh2d_0"), "Mesh2d_nodes_0"
vars_meshdim(vars, "node", mesh_name="Mesh2d_0"), "Mesh2d_nodes"
)
self.assertEqual(
vars_meshdim(vars, "face", mesh_name="Mesh2d_0"), "Mesh2d_faces_0"
)
if "edge_coordinates" in vars["Mesh2d_0"]:
self.assertEqual(
vars_meshdim(vars, "edge", mesh_name="Mesh2d_0"),
"Mesh2d_edge_0",
"Mesh2d_edge",
)

# the relevant coords + connectivities are also distinct
Expand All @@ -1215,17 +1215,17 @@ def _check_two_different_meshes(self, vars):
)

# mesh2
self.assertEqual(vars["node_x_0"][_VAR_DIMS], ["Mesh2d_nodes_0"])
self.assertEqual(vars["node_x_0"][_VAR_DIMS], ["Mesh2d_nodes"])
self.assertEqual(vars["face_x_0"][_VAR_DIMS], ["Mesh2d_faces_0"])
self.assertEqual(
vars["mesh2d_faces_0"][_VAR_DIMS],
["Mesh2d_faces_0", "Mesh2d_0_face_N_nodes"],
)
if "edge_coordinates" in vars["Mesh2d_0"]:
self.assertEqual(vars["longitude_0"][_VAR_DIMS], ["Mesh2d_edge_0"])
self.assertEqual(vars["longitude_0"][_VAR_DIMS], ["Mesh2d_edge"])
self.assertEqual(
vars["mesh2d_edge_0"][_VAR_DIMS],
["Mesh2d_edge_0", "Mesh2d_0_edge_N_nodes"],
["Mesh2d_edge", "Mesh2d_0_edge_N_nodes"],
)

def test_multiple_equal_mesh(self):
ESadek-MO marked this conversation as resolved.
Show resolved Hide resolved
Expand Down Expand Up @@ -1269,8 +1269,9 @@ def test_multiple_different_meshes(self):
# Check the dims are as expected
self.assertEqual(dims["Mesh2d_faces"], 3)
self.assertEqual(dims["Mesh2d_faces_0"], 4)
# There are no 'second' edge and node dims
self.assertEqual(dims["Mesh2d_nodes"], 5)
self.assertEqual(dims["Mesh2d_edge"], 2)
self.assertEqual(dims["Mesh2d_edge_0"], 2)


# WHEN MODIFYING THIS MODULE, CHECK IF ANY CORRESPONDING CHANGES ARE NEEDED IN
Expand Down