Skip to content
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

Arguments for open_mfdataset() now match signature in xarray master branch #28

Merged
merged 4 commits into from
Jul 2, 2019
Merged

Arguments for open_mfdataset() now match signature in xarray master branch #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2f94e41
Arguments for open_mfdataset() now match signature in xarray master b…
TomNicholas Dec 14, 2018
5884143
Updated to match xarray v0.12.2 onwards
TomNicholas Jul 2, 2019
dec228c
Updated requirements
TomNicholas Jul 2, 2019
766c5b0
Updated readme to describe dependencies correctly
TomNicholas Jul 2, 2019
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
8 changes: 1 addition & 7 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,13 +101,7 @@ install using `python setup.py`
You can run the tests by navigating to the `/xBOUT/` directory and
entering `pytest`.


It relies on two upstream additions to xarray
([first](https://github.com/pydata/xarray/pull/2482) &
[second](https://github.com/pydata/xarray/pull/2553) pull requests).
The first is merged, but the second isn't, so for now you need to clone
the branch of xarray containing the PR
[here](https://github.com/TomNicholas/xarray/tree/feature/nd_combine).
Requires xarray v0.12.2 or later.

You will also need to install [dask](https://dask.org/),
as described in the xarray documentation
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
git+https://github.com/TomNicholas/xarray@feature/nd_combine#egg=xarray
xarray >= 0.12.2
dask[array] >= 1.0.0
natsort >= 5.5.0
matplotlib >= 2.2
Expand Down
8 changes: 4 additions & 4 deletions xbout/load.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ def _auto_open_mfboutdataset(datapath, chunks={}, info=True, keep_guards=True):

_preprocess = partial(_trim, ghosts={'x': mxg, 'y': myg})

ds = xarray.open_mfdataset(paths_grid, concat_dims=concat_dims,
data_vars='minimal', preprocess=_preprocess,
engine=filetype, chunks=chunks,
infer_order_from_coords=False)
ds = xarray.open_mfdataset(paths_grid, concat_dim=concat_dims,
combine='nested', data_vars='minimal',
preprocess=_preprocess, engine=filetype,
chunks=chunks)

ds, metadata = _strip_metadata(ds)

Expand Down