Skip to content

Commit 488f52e

Browse files
davidhasselldavidhassell
committed
dev
1 parent 8a8f866 commit 488f52e

25 files changed

+93
-101
lines changed

‎cf/cfimplementation.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ class CFImplementation(cfdm.CFDMImplementation):
5050
5151
"""
5252

53-
def nc_set_hdf5_chunksizes(self, data, sizes, override=False):
54-
"""Set the data HDF5 chunksizes.
53+
def nc_set_dataset_chunksizes(self, data, sizes, override=False):
54+
"""Set the data dataset chunksizes.
5555
5656
.. versionadded:: 3.16.2
5757
@@ -61,21 +61,21 @@ def nc_set_hdf5_chunksizes(self, data, sizes, override=False):
6161
The data.
6262
6363
sizes: sequence of `int`
64-
The new HDF5 chunk sizes.
64+
The new dataset chunk sizes.
6565
6666
override: `bool`, optional
67-
If True then set the HDF5 chunks sizes even if some
67+
If True then set the dataset chunks sizes even if some
6868
have already been specified. If False, the default,
69-
then only set the HDF5 chunks sizes if some none have
70-
already been specified.
69+
then only set the dataset chunks sizes if some none
70+
have already been specified.
7171
7272
:Returns:
7373
7474
`None`
7575
7676
"""
77-
if override or not data.nc_hdf5_chunksizes():
78-
data.nc_set_hdf5_chunksizes(sizes)
77+
if override or not data.nc_dataset_chunksizes():
78+
data.nc_set_dataset_chunksizes(sizes)
7979

8080
def set_construct(self, parent, construct, axes=None, copy=True, **kwargs):
8181
"""Insert a construct into a field or domain.

‎cf/data/data.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5532,7 +5532,7 @@ def outerproduct(self, a, inplace=False, i=False):
55325532
d = _inplace_enabled_define_and_cleanup(self)
55335533

55345534
shape = d.shape
5535-
chunksizes0 = d.nc_hdf5_chunksizes()
5535+
chunksizes0 = d.nc_dataset_chunksizes()
55365536

55375537
# Cast 'a' as a Data object so that it definitely has sensible
55385538
# Units. We don't mind if the units of 'a' are incompatible
@@ -5563,19 +5563,19 @@ def outerproduct(self, a, inplace=False, i=False):
55635563
for a_axis in a._cyclic:
55645564
d.cyclic(ndim + a._axes.index(a_axis))
55655565

5566-
# Update the HDF5 chunking strategy
5567-
chunksizes1 = a.nc_hdf5_chunksizes()
5566+
# Update the dataset chunking strategy
5567+
chunksizes1 = a.nc_dataset_chunksizes()
55685568
if chunksizes0 or chunksizes1:
55695569
if isinstance(chunksizes0, tuple):
55705570
if isinstance(chunksizes1, tuple):
55715571
chunksizes = chunksizes0 + chunksizes1
55725572
else:
55735573
chunksizes = chunksizes0 + a.shape
55745574

5575-
d.nc_set_hdf5_chunksizes(chunksizes)
5575+
d.nc_set_dataset_chunksizes(chunksizes)
55765576
elif isinstance(chunksizes1, tuple):
55775577
chunksizes = shape + chunksizes1
5578-
d.nc_set_hdf5_chunksizes(chunksizes)
5578+
d.nc_set_dataset_chunksizes(chunksizes)
55795579

55805580
d._update_deterministic(a)
55815581
return d

‎cf/data/mixin/deprecations.py‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -441,11 +441,13 @@ def HDF_chunks(self, *chunks):
441441
`Data` objects to be written to netCDF files.
442442
443443
Deprecated at version 3.14.0 and is no longer available. Use
444-
the methods `nc_clear_hdf5_chunksizes`, `nc_hdf5_chunksizes`,
445-
and `nc_set_hdf5_chunksizes` instead.
444+
the methods `nc_clear_dataset_chunksizes`,
445+
`nc_dataset_chunksizes`, and `nc_set_dataset_chunksizes`
446+
instead.
446447
447-
.. seealso:: `nc_clear_hdf5_chunksizes`, `nc_hdf5_chunksizes`,
448-
`nc_set_hdf5_chunksizes`
448+
.. seealso:: `nc_clear_dataset_chunksizes`,
449+
`nc_dataset_chunksizes`,
450+
`nc_set_dataset_chunksizes`
449451
450452
:Parameters:
451453
@@ -506,8 +508,8 @@ def HDF_chunks(self, *chunks):
506508
_DEPRECATION_ERROR_METHOD(
507509
self,
508510
"HDF_chunks",
509-
message="Use the methods 'nc_clear_hdf5_chunksizes', "
510-
"'nc_hdf5_chunksizes', and 'nc_set_hdf5_chunksizes' "
511+
message="Use the methods 'nc_clear_dataset_chunksizes', "
512+
"'nc_dataset_chunksizes', and 'nc_set_dataset_chunksizes' "
511513
"instead.",
512514
version="3.14.0",
513515
removed_at="5.0.0",

‎cf/data/utils.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -435,8 +435,8 @@ def collapse(
435435
d._axes = [a for i, a in enumerate(d._axes) if i not in axis]
436436

437437
if d.size != original_size:
438-
# Remove the out-dated HDF5 chunking strategy
439-
d.nc_clear_hdf5_chunksizes()
438+
# Remove the out-dated dataset chunking strategy
439+
d.nc_clear_dataset_chunksizes()
440440

441441
return d, weights
442442

‎cf/field.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13993,17 +13993,17 @@ def field(
1399313993
def HDF_chunks(self, *chunksizes):
1399413994
"""Deprecated at version 3.0.0.
1399513995

13996-
Use methods 'Data.nc_hdf5_chunksizes',
13997-
'Data.nc_set_hdf5_chunksizes', 'Data.nc_clear_hdf5_chunksizes'
13998-
instead.
13996+
Use methods 'Data.nc_dataset_chunksizes',
13997+
'Data.nc_set_dataset_chunksizes',
13998+
'Data.nc_clear_dataset_chunksizes' instead.
1399913999

1400014000
"""
1400114001
_DEPRECATION_ERROR_METHOD(
1400214002
self,
1400314003
"HDF_chunks",
14004-
"Use methods 'Data.nc_hdf5_chunksizes', "
14005-
"'Data.nc_set_hdf5_chunksizes', "
14006-
"'Data.nc_clear_hdf5_chunksizes' instead.",
14004+
"Use methods 'Data.nc_dataset_chunksizes', "
14005+
"'Data.nc_set_dataset_chunksizes', "
14006+
"'Data.nc_clear_dataset_chunksizes' instead.",
1400714007
version="3.0.0",
1400814008
removed_at="4.0.0",
1400914009
) # pragma: no cover

‎cf/test/example_field_0.zarr2/lat_bnds/.zattrs~‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎cf/test/example_field_0.zarr2/lon_bnds/.zattrs~‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎cf/test/example_field_0.zarr2/time/.zattrs~‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎cf/test/test_Data.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4661,28 +4661,28 @@ def test_Data_collapse_axes_hdf_chunks(self):
46614661
"""Test that _axes and hdf_chunks are updated after a collapse."""
46624662
d = cf.Data([[1, 2, 3, 4]])
46634663
chunks = d.shape
4664-
d.nc_set_hdf5_chunksizes(chunks)
4664+
d.nc_set_dataset_chunksizes(chunks)
46654665
e = d.mean(axes=1)
46664666
self.assertEqual(d._axes, ("dim0", "dim1"))
4667-
self.assertEqual(d.nc_hdf5_chunksizes(), chunks)
4667+
self.assertEqual(d.nc_dataset_chunksizes(), chunks)
46684668

46694669
e = d.mean(axes=1)
46704670
self.assertNotEqual(e.size, d.size)
46714671
self.assertEqual(e._axes, d._axes)
4672-
self.assertEqual(e.nc_hdf5_chunksizes(), None)
4672+
self.assertEqual(e.nc_dataset_chunksizes(), None)
46734673

46744674
e = d.mean(axes=1, squeeze=True)
46754675
self.assertEqual(e._axes, d._axes[:1])
4676-
self.assertEqual(e.nc_hdf5_chunksizes(), None)
4676+
self.assertEqual(e.nc_dataset_chunksizes(), None)
46774677

46784678
e = d.mean(axes=0)
46794679
self.assertEqual(e.size, d.size)
46804680
self.assertEqual(e._axes, d._axes)
4681-
self.assertEqual(e.nc_hdf5_chunksizes(), chunks)
4681+
self.assertEqual(e.nc_dataset_chunksizes(), chunks)
46824682

46834683
e = d.mean(axes=0, squeeze=True)
46844684
self.assertEqual(e._axes, d._axes[1:])
4685-
self.assertEqual(e.nc_hdf5_chunksizes(), chunks)
4685+
self.assertEqual(e.nc_dataset_chunksizes(), chunks)
46864686

46874687

46884688
if __name__ == "__main__":

‎docs/source/class/cf.AuxiliaryCoordinate.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -502,9 +502,9 @@ NetCDF
502502
~cf.AuxiliaryCoordinate.nc_set_node_coordinate_variable
503503
~cf.AuxiliaryCoordinate.nc_set_node_coordinate_variable_groups
504504
~cf.AuxiliaryCoordinate.nc_clear_node_coordinate_variable_groups
505-
~cf.AuxiliaryCoordinate.nc_clear_hdf5_chunksizes
506-
~cf.AuxiliaryCoordinate.nc_hdf5_chunksizes
507-
~cf.AuxiliaryCoordinate.nc_set_hdf5_chunksizes
505+
~cf.AuxiliaryCoordinate.nc_clear_dataset_chunksizes
506+
~cf.AuxiliaryCoordinate.nc_dataset_chunksizes
507+
~cf.AuxiliaryCoordinate.nc_set_dataset_chunksizes
508508

509509
Groups
510510
^^^^^^

0 commit comments

Comments
 (0)