Skip to content

Fix MeshXY's .coords method #7185

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

Draft
pt331 wants to merge 1 commit into
base: main
Choose a base branch
from
+21 −23
Draft

Fix MeshXY's .coords method #7185

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
44 changes: 21 additions & 23 deletions lib/iris/mesh/components.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2281,32 +2281,30 @@ def filters(
):
# TBD: support coord_systems?

# Determine locations to include.
if location is not None:
if location not in ["node", "edge", "face"]:
def populated_coords[T](coords_tuple: tuple[T, T]) -> list[T]:
return list(filter(None, list(coords_tuple)))

members: list[AuxCoord] = []
match location:
case "node":
members += populated_coords(self.node_coords)
case "edge":
members += populated_coords(self.edge_coords)
case "face":
if hasattr(self, "face_coords"):
members += populated_coords(self.face_coords)
else:
dmsg = "Ignoring request to filter non-existent 'face_coords'"
logger.debug(dmsg, extra=dict(cls=self.__class__.__name__))
case None: # No specified locations means include them all
members += populated_coords(self.node_coords)
members += populated_coords(self.edge_coords)
if hasattr(self, "face_coords"):
members += populated_coords(self.face_coords)
case _:
raise ValueError(
f"Expected location to be one of `node`, `edge` or `face`, got `{location}`"
)
include_nodes = location == "node"
include_edges = location == "edge"
include_faces = location == "face"
else:
include_nodes = include_edges = include_faces = True

def populated_coords(coords_tuple):
return list(filter(None, list(coords_tuple)))

members = []
if include_nodes:
members += populated_coords(self.node_coords)
if include_edges:
members += populated_coords(self.edge_coords)
if hasattr(self, "face_coords"):
if include_faces:
members += populated_coords(self.face_coords)
elif location == "face":
dmsg = "Ignoring request to filter non-existent 'face_coords'"
logger.debug(dmsg, extra=dict(cls=self.__class__.__name__))

result = metadata_filter(
members,
Expand Down
Loading