Skip to content

Commit 8249823

Browse files
committed
dev
2 parents 339b6c3 + 9d022b2 commit 8249823

5 files changed

Lines changed: 268 additions & 141 deletions

File tree

Changelog.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ Version NEXTVERSION
66
* New methods to allow changing units in a chain: `cf.Field.to_units`,
77
`cf.Data.to_units`
88
(https://github.com/NCAS-CMS/cf-python/issues/874)
9+
* Allow multiple conditions for the same axis in `cf.Field.subspace`
10+
and `cf.Field.indices`
11+
(https://github.com/NCAS-CMS/cf-python/issues/881)
912
* Allow regridding for very large grids. New keyword parameter to
1013
`cf.Field.regrids` and `cf.Field.regridc`: ``dst_grid_partitions``
1114
(https://github.com/NCAS-CMS/cf-python/issues/878)

cf/docstring/docstring.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -596,8 +596,8 @@
596596
balance between memory usage and calculation time to be
597597
adjusted.
598598
599-
The actual number of destination grid partitions, their
600-
sizes and shapes, and the each partition's time and memory
599+
The actual number of destination grid partitions; and each
600+
partition's shape, and weights calculation time and memory
601601
requirement are displayed when ``'DEBUG'`` logging is
602602
activated. See *verbose* for details.
603603

cf/field.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12735,6 +12735,8 @@ def subspace(self):
1273512735
* Multiple domain axes may be subspaced simultaneously, and it
1273612736
doesn't matter which order they are specified in.
1273712737

12738+
* Multiple criteria may be specified for the same domain axis.
12739+
1273812740
* Subspace criteria may be provided for size 1 domain axes that
1273912741
are not spanned by the field construct's data.
1274012742

0 commit comments

Comments
 (0)