Skip to content

Commit d92ec6d

Browse files
Merge branch 'master' into plotting-tutorial-reference
2 parents 49e5522 + 42630ee commit d92ec6d

2 files changed

Lines changed: 3440 additions & 2 deletions

File tree

parcels/examples/tutorial_output.ipynb

Lines changed: 3438 additions & 0 deletions
Large diffs are not rendered by default.

parcels/fieldfilebuffer.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def __enter__(self):
3636
try:
3737
# Unfortunately we need to do if-else here, cause the lock-parameter is either False or a Lock-object
3838
# (which we would rather want to have being auto-managed).
39-
# If 'lock' is not specified, the Lock-object is auto-created and managed bz xarray internally.
39+
# If 'lock' is not specified, the Lock-object is auto-created and managed by xarray internally.
4040
self.dataset = xr.open_dataset(str(self.filename), decode_cf=True, engine=self.netcdf_engine)
4141
self.dataset['decoded'] = True
4242
except:
@@ -252,7 +252,7 @@ def __enter__(self):
252252
try:
253253
# Unfortunately we need to do if-else here, cause the lock-parameter is either False or a Lock-object
254254
# (which we would rather want to have being auto-managed).
255-
# If 'lock' is not specified, the Lock-object is auto-created and managed bz xarray internally.
255+
# If 'lock' is not specified, the Lock-object is auto-created and managed by xarray internally.
256256
if self.lock_file:
257257
self.dataset = xr.open_dataset(str(self.filename), decode_cf=True, engine=self.netcdf_engine, chunks=init_chunk_dict)
258258
else:

0 commit comments

Comments
 (0)