Skip to content

Commit

Permalink
format
Browse files Browse the repository at this point in the history
  • Loading branch information
JoerivanEngelen committed Feb 14, 2024
1 parent 365ee19 commit 20181c3
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 7 deletions.
13 changes: 8 additions & 5 deletions xugrid/ugrid/partitioning.py
Original file line number Diff line number Diff line change
Expand Up @@ -214,8 +214,9 @@ def validate_partition_objects(
return None



def separate_variables(objects_by_gridname: defaultdict[str, xr.Dataset], ugrid_dims: set[str]):
def separate_variables(
objects_by_gridname: defaultdict[str, xr.Dataset], ugrid_dims: set[str]
):
"""Separate into UGRID variables grouped by dimension, and other variables."""
validate_partition_objects(objects_by_gridname)

Expand Down Expand Up @@ -270,7 +271,7 @@ def merge_data_along_dim(
indexes: list[np.array],
merged_grid: UgridType,
) -> xr.Dataset:
""""
""" "
Select variables from the data objects.
Pad connectivity dims if needed.
Concatenate along dim.
Expand All @@ -286,7 +287,7 @@ def merge_data_along_dim(
raise ValueError(f"Missing variables: {missing_vars} in partition {obj}")

selection = obj[vars].isel({merge_dim: index}, missing_dims="ignore")

# Pad the ugrid connectivity dims (e.g. n_max_face_node_connectivity) if
# needed.
present_dims = ugrid_connectivity_dims.intersection(selection.dims)
Expand Down Expand Up @@ -367,7 +368,9 @@ def merge_partitions(partitions):
vars = vars_by_dim[dim]
if len(vars) == 0:
continue
merged_selection = merge_data_along_dim(data_objects, vars, dim, dim_indexes, merged_grid)
merged_selection = merge_data_along_dim(
data_objects, vars, dim, dim_indexes, merged_grid
)
merged.update(merged_selection)

return UgridDataset(merged, merged_grids)
4 changes: 3 additions & 1 deletion xugrid/ugrid/ugrid1d.py
Original file line number Diff line number Diff line change
Expand Up @@ -630,7 +630,9 @@ def contract_vertices(self, indices: IntArray) -> "Ugrid1d":
)

@staticmethod
def merge_partitions(grids: Sequence["Ugrid1d"]) -> tuple["Ugrid1d", dict[str, np.array]]:
def merge_partitions(
grids: Sequence["Ugrid1d"]
) -> tuple["Ugrid1d", dict[str, np.array]]:
"""
Merge grid partitions into a single whole.
Expand Down
4 changes: 3 additions & 1 deletion xugrid/ugrid/ugrid2d.py
Original file line number Diff line number Diff line change
Expand Up @@ -1505,7 +1505,9 @@ def partition(self, n_part: int):
return [self.topology_subset(index) for index in indices]

@staticmethod
def merge_partitions(grids: Sequence["Ugrid2d"]) -> tuple["Ugrid2d", dict[str, np.array]]:
def merge_partitions(
grids: Sequence["Ugrid2d"]
) -> tuple["Ugrid2d", dict[str, np.array]]:
"""
Merge grid partitions into a single whole.
Expand Down

0 comments on commit 20181c3

Please sign in to comment.