Skip to content

Commit b184af9

Browse files
committed
Merge branch 'healpix' of github.com:davidhassell/cf-python into healpix
2 parents 728a080 + 7378e3d commit b184af9

4 files changed

Lines changed: 4 additions & 4 deletions

File tree

Changelog.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ Version NEXTVERSION
1515
(https://github.com/NCAS-CMS/cf-python/issues/909)
1616
* New method: `cf.Data.coarsen`
1717
(https://github.com/NCAS-CMS/cf-python/issues/909)
18-
* New function: `cf.locate`
18+
* New functions: `cf.locate`, `cf.healpix_max_refinement_level`,
19+
`cf.healpix_indexing_schemes`
1920
(https://github.com/NCAS-CMS/cf-python/issues/909)
2021
* New keyword to `cf.read`: ``filesystem``
2122
(https://github.com/NCAS-CMS/cf-python/issues/931)

cf/functions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3437,7 +3437,7 @@ def _locate(lat, lon, f):
34373437

34383438
raise NotImplementedError(
34393439
f"Can't find cell locations for {f!r}: Can only find locations "
3440-
"for UGRID, HEALPix, or geometry cells"
3440+
"for HEALPix cells"
34413441
)
34423442

34433443
if np.abs(lat).max() > 90:

cf/mixin/fielddomain.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3361,7 +3361,7 @@ def radius(self, default=None):
33613361
including `numpy` and `Data` objects. The units of the
33623362
radius are assumed to be metres, unless specified by a
33633363
`Data` object. If the special value ``'earth'`` is
3364-
given then the default radius taken as 6371229
3364+
given then the default radius is taken as 6371229
33653365
metres. If *default* is `None` an exception will be
33663366
raised if no unique datum can be found in the
33673367
coordinate reference constructs.

cf/test/test_Field.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3462,7 +3462,6 @@ def my_mean(a, axis=None):
34623462
f.healpix_decrease_refinement_level(level, "mean")
34633463

34643464
# Can't change refinement level for a 'nuniq' field
3465-
# TODOHEALPIX
34663465
with self.assertRaises(ValueError):
34673466
self.f13.healpix_decrease_refinement_level(0, "mean")
34683467

0 commit comments

Comments
 (0)