Skip to content

fix combine_by_coords #267

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
rabernat merged 3 commits into from
May 28, 2021
Merged

fix combine_by_coords #267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8922a7f
fix combine_by_coords
AaronDavidSchneider May 22, 2021
4dce0a5
change to new only for versions newer than previous xarray version
AaronDavidSchneider May 22, 2021
b912a1e
fix tests
AaronDavidSchneider May 24, 2021
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
4 changes: 3 additions & 1 deletion xmitgcm/mds_store.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,8 +259,10 @@ def open_mdsdataset(data_dir, grid_dir=None,
ds = xr.auto_combine(datasets)
elif xr.__version__ < '0.15.2':
ds = xr.combine_by_coords(datasets)
else:
elif xr.__version__ < '0.18.0':
ds = xr.combine_by_coords(datasets, compat='override', coords='minimal', combine_attrs='drop')
else:
ds = xr.combine_by_coords(datasets, compat='override', coords='minimal', combine_attrs='drop_conflicts')

if swap_dims:
ds = _swap_dimensions(ds, geometry)
Expand Down
2 changes: 1 addition & 1 deletion xmitgcm/test/test_mds_store.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ def test_swap_dims(all_mds_datadirs):
['_bounds', '_center', '_interface']]
expected_dims += extra_dims

assert list(ds.dims.keys()) == expected_dims
assert set(ds.dims.keys()) == set(expected_dims)

# make sure swapping works with multiple iters
ds = xmitgcm.open_mdsdataset(dirname, geometry=expected['geometry'],
Expand Down