Skip to content

align mesh api with cube #4057

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

Merged
pp-mo merged 1 commit into from
Mar 8, 2021
Merged

align mesh api with cube #4057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 12 additions & 15 deletions lib/iris/experimental/ugrid.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1410,7 +1410,7 @@ def connectivities(
that matched the given criteria.

"""
return self._connectivity_manager.filters(
result = self._connectivity_manager.filters(
item=item,
standard_name=standard_name,
long_name=long_name,
Expand All @@ -1421,6 +1421,7 @@ def connectivities(
contains_edge=contains_edge,
contains_face=contains_face,
)
return list(result.values())

def connectivity(
self,
Expand Down Expand Up @@ -1502,7 +1503,7 @@ def connectivity(

"""

return self._connectivity_manager.filter(
result = self._connectivity_manager.filter(
item=item,
standard_name=standard_name,
long_name=long_name,
Expand All @@ -1513,6 +1514,7 @@ def connectivity(
contains_edge=contains_edge,
contains_face=contains_face,
)
return list(result.values())[0]

def coord(
self,
Expand Down Expand Up @@ -1591,7 +1593,7 @@ def coord(
that matched the given criteria.

"""
return self._coord_manager.filter(
result = self._coord_manager.filter(
item=item,
standard_name=standard_name,
long_name=long_name,
Expand All @@ -1602,6 +1604,7 @@ def coord(
include_edges=include_edges,
include_faces=include_faces,
)
return list(result.values())[0]

def coords(
self,
Expand Down Expand Up @@ -1675,7 +1678,7 @@ def coords(
:class:`Mesh` that matched the given criteria.

"""
return self._coord_manager.filters(
result = self._coord_manager.filters(
item=item,
standard_name=standard_name,
long_name=long_name,
Expand All @@ -1686,6 +1689,7 @@ def coords(
include_edges=include_edges,
include_faces=include_faces,
)
return list(result.values())

def remove_connectivities(
self,
Expand Down Expand Up @@ -2769,8 +2773,7 @@ def __init__(

# Get the 'coord identity' metadata from the relevant node-coordinate.
# N.B. mesh.coord returns a dict
node_coords = self.mesh.coord(include_nodes=True, axis=self.axis)
(node_coord,) = list(node_coords.values())
node_coord = self.mesh.coord(include_nodes=True, axis=self.axis)
# Call parent constructor to handle the common constructor args.
super().__init__(
points,
Expand Down Expand Up @@ -2911,23 +2914,17 @@ def _construct_access_arrays(self):
# TODO: cheat for now : correct calculations, but not dynamic.
# TODO: replace wth fully dynamic lazy calcs (slightly more complex).
mesh, location, axis = self.mesh, self.location, self.axis
# N.B. mesh.coord returns a dict
node_coords = self.mesh.coord(include_nodes=True, axis=axis)
(node_coord,) = list(node_coords.values())
node_coord = self.mesh.coord(include_nodes=True, axis=axis)
if location == "node":
points = node_coord.core_points()
bounds = None
elif location == "edge":
# N.B. mesh.coord returns a dict
edge_coords = self.mesh.coord(include_edges=True, axis=self.axis)
(edge_coord,) = list(edge_coords.values())
edge_coord = self.mesh.coord(include_edges=True, axis=self.axis)
points = edge_coord.core_points()
inds = mesh.edge_node_connectivity.core_indices()
bounds = node_coord.core_points()[inds]
elif location == "face":
# N.B. mesh.coord returns a dict
face_coords = self.mesh.coord(include_faces=True, axis=self.axis)
(face_coord,) = list(face_coords.values())
face_coord = self.mesh.coord(include_faces=True, axis=self.axis)
points = face_coord.core_points() # For now, this always exists
inds = mesh.face_node_connectivity.core_indices()
bounds = node_coord.core_points()[inds]
Expand Down
33 changes: 14 additions & 19 deletions lib/iris/tests/unit/experimental/ugrid/test_Mesh.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,11 +168,9 @@ def test_connectivities(self):

func = self.mesh.connectivities
for kwargs in positive_kwargs:
self.assertEqual(
self.EDGE_NODE, func(**kwargs)["edge_node_connectivity"]
)
self.assertEqual([self.EDGE_NODE], func(**kwargs))
for kwargs in negative_kwargs:
self.assertNotIn("edge_node_connectivity", func(**kwargs))
self.assertEqual([], func(**kwargs))

def test_connectivities_locations(self):
# topology_dimension-specific results. Method intended to be overridden.
Expand All @@ -188,15 +186,14 @@ def test_connectivities_locations(self):
{"contains_edge": False, "contains_node": False},
)

expected = {self.EDGE_NODE.cf_role: self.EDGE_NODE}
func = self.mesh.connectivities
for kwargs in positive_kwargs:
self.assertEqual(expected, func(**kwargs))
self.assertEqual([self.EDGE_NODE], func(**kwargs))
for kwargs in negative_kwargs:
self.assertEqual({}, func(**kwargs))
self.assertEqual([], func(**kwargs))

with self.assertLogs(ugrid.logger, level="DEBUG") as log:
self.assertEqual({}, func(contains_face=True))
self.assertEqual([], func(contains_face=True))
self.assertIn("filter for non-existent", log.output[0])

def test_coord(self):
Expand Down Expand Up @@ -231,9 +228,9 @@ def test_coords(self):

func = self.mesh.coords
for kwargs in positive_kwargs:
self.assertEqual(self.NODE_LON, func(**kwargs)["node_x"])
self.assertIn(self.NODE_LON, func(**kwargs))
for kwargs in negative_kwargs:
self.assertNotIn("node_x", func(**kwargs))
self.assertNotIn(self.NODE_LON, func(**kwargs))

def test_coords_locations(self):
# topology_dimension-specific results. Method intended to be overridden.
Expand Down Expand Up @@ -264,13 +261,11 @@ def test_coords_locations(self):

func = self.mesh.coords
for kwargs, expected in kwargs_expected:
expected = {
k: all_expected[k] for k in expected if k in all_expected
}
expected = [all_expected[k] for k in expected if k in all_expected]
self.assertEqual(expected, func(**kwargs))

with self.assertLogs(ugrid.logger, level="DEBUG") as log:
self.assertEqual({}, func(include_faces=True))
self.assertEqual([], func(include_faces=True))
self.assertIn("filter non-existent", log.output[0])

def test_edge_dimension(self):
Expand Down Expand Up @@ -472,8 +467,10 @@ def test_connectivities_locations(self):
)
func = self.mesh.connectivities
for kwargs, expected in kwargs_expected:
expected = {c.cf_role: c for c in expected}
self.assertEqual(expected, func(**kwargs))
result = func(**kwargs)
self.assertEqual(len(expected), len(result))
for item in expected:
self.assertIn(item, result)

def test_coords_locations(self):
all_expected = {
Expand Down Expand Up @@ -518,9 +515,7 @@ def test_coords_locations(self):

func = self.mesh.coords
for kwargs, expected in kwargs_expected:
expected = {
k: all_expected[k] for k in expected if k in all_expected
}
expected = [all_expected[k] for k in expected if k in all_expected]
self.assertEqual(expected, func(**kwargs))

def test_edge_face(self):
Expand Down
3 changes: 1 addition & 2 deletions lib/iris/tests/unit/experimental/ugrid/test_MeshCoord.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,7 @@ def test_derived_properties(self):
for axis in Mesh.AXES:
meshcoord = _create_test_meshcoord(axis=axis)
# N.B.
node_x_coords = meshcoord.mesh.coord(include_nodes=True, axis=axis)
(node_x_coord,) = list(node_x_coords.values())
node_x_coord = meshcoord.mesh.coord(include_nodes=True, axis=axis)
for key in node_x_coord.metadata._fields:
meshval = getattr(meshcoord, key)
if key == "var_name":
Expand Down