Skip to content

Commit

Permalink
Revert "refactor assert_valid_explicit_coords and rename dims->sizes"
Browse files Browse the repository at this point in the history
This reverts commit 55166fc.
  • Loading branch information
TomNicholas committed Mar 28, 2024
1 parent 35dfb67 commit fd3de2b
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions xarray/core/merge.py
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@ def merge_coords(

def assert_valid_explicit_coords(
variables: Mapping[Any, Any],
dims: Iterable[Any],
dims: Mapping[Any, int],
explicit_coords: Iterable[Hashable],
) -> None:
"""Validate explicit coordinate names/dims.
Expand Down Expand Up @@ -721,16 +721,16 @@ def merge_core(
collected, prioritized, compat=compat, combine_attrs=combine_attrs
)

sizes = calculate_dimensions(variables)
dims = calculate_dimensions(variables)

coord_names, noncoord_names = determine_coords(coerced)
if compat == "minimal":
# coordinates may be dropped in merged results
coord_names.intersection_update(variables)
if explicit_coords is not None:
assert_valid_explicit_coords(variables, sizes.keys(), explicit_coords)
assert_valid_explicit_coords(variables, dims, explicit_coords)
coord_names.update(explicit_coords)
for dim, size in sizes.items():
for dim, size in dims.items():
if dim in variables:
coord_names.add(dim)
ambiguous_coords = coord_names.intersection(noncoord_names)
Expand All @@ -745,7 +745,7 @@ def merge_core(
combine_attrs,
)

return _MergeResult(variables, coord_names, sizes, out_indexes, attrs)
return _MergeResult(variables, coord_names, dims, out_indexes, attrs)


def merge(
Expand Down

0 comments on commit fd3de2b

Please sign in to comment.