Skip to content

Commit b72de95

Browse files
davidhasselldavidhassell
committed
Merge branch 'main' of github.com:NCAS-CMS/cf-python
2 parents df183dd + 7d78eac commit b72de95

File tree

8 files changed

+45
-44
lines changed

8 files changed

+45
-44
lines changed

‎Changelog.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
version NEXT
2-
------------
1+
version 3.16.2
2+
--------------
33

4-
**2024-??-??**
4+
**2024-04-??**
55

66
* Added spherical regridding to discrete sampling geometry destination
77
grids (https://github.com/NCAS-CMS/cf-python/issues/716)

‎cf/__init__.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@
7474
"""
7575

7676
__Conventions__ = "CF-1.11"
77-
__date__ = "2023-03-01"
78-
__version__ = "3.16.1"
77+
__date__ = "2023-04-??"
78+
__version__ = "3.16.2"
7979

8080
_requires = (
8181
"numpy",

‎cf/field.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13569,7 +13569,7 @@ def regrids(
1356913569
any other latitude-longitude grid, including other UGRID
1357013570
meshes and DSG feature types.
1357113571

13572-
**DSG feature types*
13572+
**DSG feature types**
1357313573

1357413574
Data on any latitude-longitude grid (including tripolar and
1357513575
UGRID meshes) may be regridded to any DSG feature type.
@@ -13721,7 +13721,7 @@ def regrids(
1372113721

1372213722
Ignored if *dst* is a `RegridOperator`.
1372313723

13724-
.. versionadded:: NEXTRELEASE
13724+
.. versionadded:: 3.16.2
1372513725

1372613726
dst_z: optional
1372713727
If `None`, the default, then the regridding is 2-d in
@@ -13735,7 +13735,7 @@ def regrids(
1373513735

1373613736
Ignored if *dst* is a `RegridOperator`.
1373713737

13738-
.. versionadded:: NEXTRELEASE
13738+
.. versionadded:: 3.16.2
1373913739

1374013740
z: optional
1374113741
The *z* parameter is a convenience that may be used to
@@ -13749,11 +13749,11 @@ def regrids(
1374913749
*Example:*
1375013750
``z='Z'`` is equivalent to ``src_z='Z', dst_z='Z'``.
1375113751

13752-
.. versionadded:: NEXTRELEASE
13752+
.. versionadded:: 3.16.2
1375313753

1375413754
{{ln_z: `bool` or `None`, optional}}
1375513755

13756-
.. versionadded:: NEXTRELEASE
13756+
.. versionadded:: 3.16.2
1375713757

1375813758
{{verbose: `int` or `str` or `None`, optional}}
1375913759

@@ -14020,7 +14020,7 @@ def regridc(
1402014020

1402114021
Ignored if *dst* is a `RegridOperator`.
1402214022

14023-
.. versionadded:: NEXTRELEASE
14023+
.. versionadded:: 3.16.2
1402414024

1402514025
dst_z: optional
1402614026
If not `None` then *dst_z* specifies the identity of a
@@ -14030,7 +14030,7 @@ def regridc(
1403014030

1403114031
Ignored if *dst* is a `RegridOperator`.
1403214032

14033-
.. versionadded:: NEXTRELEASE
14033+
.. versionadded:: 3.16.2
1403414034

1403514035
z: optional
1403614036
The *z* parameter is a convenience that may be used to
@@ -14042,11 +14042,11 @@ def regridc(
1404214042
*Example:*
1404314043
``z='Z'`` is equivalent to ``src_z='Z', dst_z='Z'``.
1404414044

14045-
.. versionadded:: NEXTRELEASE
14045+
.. versionadded:: 3.16.2
1404614046

1404714047
{{ln_z: `bool` or `None`, optional}}
1404814048

14049-
.. versionadded:: NEXTRELEASE
14049+
.. versionadded:: 3.16.2
1405014050

1405114051
{{inplace: `bool`, optional}}
1405214052

‎cf/regrid/regrid.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ def regrid(
290290
See `cf.Field.regrids` (for spherical regridding) or
291291
`cf.Field.regridc` (for Cartesian regridding) for details.
292292
293-
.. versionadded:: NEXTRELEASE
293+
.. versionadded:: 3.16.2
294294
295295
dst_z: optional
296296
The identity of the destination grid vertical coordinates
@@ -301,7 +301,7 @@ def regrid(
301301
See `cf.Field.regrids` (for spherical regridding) or
302302
`cf.Field.regridc` (for Cartesian regridding) for details.
303303
304-
.. versionadded:: NEXTRELEASE
304+
.. versionadded:: 3.16.2
305305
306306
z: optional
307307
The *z* parameter is a convenience that may be used to
@@ -311,7 +311,7 @@ def regrid(
311311
See `cf.Field.regrids` (for spherical regridding) or
312312
`cf.Field.regridc` (for Cartesian regridding) for details.
313313
314-
.. versionadded:: NEXTRELEASE
314+
.. versionadded:: 3.16.2
315315
316316
ln_z: `bool` or `None`, optional
317317
Whether or not the weights are to be calculated with the
@@ -320,7 +320,7 @@ def regrid(
320320
See `cf.Field.regrids` (for spherical regridding) or
321321
`cf.Field.regridc` (for Cartesian regridding) for details.
322322
323-
.. versionadded:: NEXTRELEASE
323+
.. versionadded:: 3.16.2
324324
325325
:Returns:
326326
@@ -773,7 +773,7 @@ def spherical_coords_to_domain(
773773
``d.coordinate(dst_z)``, where ``d`` is the `Domain`
774774
returned by this function.
775775
776-
.. versionadded:: NEXTRELEASE
776+
.. versionadded:: 3.16.2
777777
778778
domain_class: `Domain` class
779779
The domain class used to create the new `Domain` instance.
@@ -962,7 +962,7 @@ def Cartesian_coords_to_domain(dst, dst_z=None, domain_class=None):
962962
``d.coordinate(dst_z)``, where ``d`` is the `Domain`
963963
returned by this function.
964964
965-
.. versionadded:: NEXTRELEASE
965+
.. versionadded:: 3.16.2
966966
967967
domain_class: `Domain` class
968968
The domain class used to create the new `Domain` instance.
@@ -1026,7 +1026,7 @@ def get_grid(
10261026
See `cf.Field.regrids` (for spherical regridding) or
10271027
`cf.Field.regridc` (for Cartesian regridding) for details.
10281028
1029-
.. versionadded:: NEXTRELEASE
1029+
.. versionadded:: 3.16.2
10301030
10311031
"""
10321032
if coord_sys == "spherical":
@@ -1106,13 +1106,13 @@ def spherical_grid(
11061106
3-d and is defined by the unique construct returned by
11071107
``f.coordinate(src_z)``
11081108
1109-
.. versionadded:: NEXTRELEASE
1109+
.. versionadded:: 3.16.2
11101110
11111111
ln_z: `bool` or `None`, optional
11121112
Whether or not the weights are to be calculated with the
11131113
natural logarithm of vertical coordinates.
11141114
1115-
.. versionadded:: NEXTRELEASE
1115+
.. versionadded:: 3.16.2
11161116
11171117
:Returns:
11181118
@@ -1453,13 +1453,13 @@ def Cartesian_grid(f, name=None, method=None, axes=None, z=None, ln_z=None):
14531453
If not `None` then *src_z* specifies the identity of a
14541454
vertical coordinate construct of the source grid.
14551455
1456-
.. versionadded:: NEXTRELEASE
1456+
.. versionadded:: 3.16.2
14571457
14581458
ln_z: `bool` or `None`, optional
14591459
Whether or not the weights are to be calculated with the
14601460
natural logarithm of vertical coordinates.
14611461
1462-
.. versionadded:: NEXTRELEASE
1462+
.. versionadded:: 3.16.2
14631463
14641464
:Returns:
14651465
@@ -2228,7 +2228,7 @@ def create_esmpy_mesh(grid, mask=None):
22282228
def create_esmpy_locstream(grid, mask=None):
22292229
"""Create an `esmpy.LocStream`.
22302230
2231-
.. versionadded:: NEXTRELEASE
2231+
.. versionadded:: 3.16.2
22322232
22332233
.. seealso:: `create_esmpy_grid`, `create_esmpy_mesh`
22342234
@@ -3036,7 +3036,7 @@ def get_mesh(f):
30363036
def get_dsg(f):
30373037
"""Get domain discrete sampling geometry information.
30383038
3039-
.. versionadded:: NEXTRELEASE
3039+
.. versionadded:: 3.16.2
30403040
30413041
:Parameters:
30423042
@@ -3102,7 +3102,7 @@ def has_coordinate_arrays(grid):
31023102
def set_grid_type(grid):
31033103
"""Set the ``type`` attribute of a `Grid` instance in-place.
31043104
3105-
.. versionadded:: NEXTRELEASE
3105+
.. versionadded:: 3.16.2
31063106
31073107
:Parameters:
31083108

‎cf/regrid/regridoperator.py‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -149,47 +149,47 @@ def __init__(
149149
The UGRID mesh element of the destination grid
150150
(e.g. ``'face'``).
151151
152-
.. versionadded:: NEXTRELEASE
152+
.. versionadded:: 3.16.2
153153
154154
src_featureType: `str`, optional
155155
The discrete sampling geometry (DSG) featureType of
156156
the source grid (e.g. ``'trajectory'``).
157157
158-
.. versionadded:: NEXTRELEASE
158+
.. versionadded:: 3.16.2
159159
160160
dst_featureType: `str`, optional
161161
The DSG featureType of the destination grid
162162
(e.g. ``'trajectory'``).
163163
164-
.. versionadded:: NEXTRELEASE
164+
.. versionadded:: 3.16.2
165165
166166
src_z: optional
167167
The identity of the source grid vertical coordinates
168168
used to calculate the weights. If `None` then no
169169
source grid vertical axis is identified.
170170
171-
.. versionadded:: NEXTRELEASE
171+
.. versionadded:: 3.16.2
172172
173173
dst_z: optional
174174
The identity of the destination grid vertical
175175
coordinates used to calculate the weights. If `None`
176176
then no destination grid vertical axis is identified.
177177
178-
.. versionadded:: NEXTRELEASE
178+
.. versionadded:: 3.16.2
179179
180180
ln_z: `bool`, optional
181181
Whether or not the weights were calculated with the
182182
natural logarithm of vertical coordinates.
183183
184-
.. versionadded:: NEXTRELEASE
184+
.. versionadded:: 3.16.2
185185
186186
dimensionality: `int`, optional
187187
The number of physical regridding dimensions. This may
188188
differ from the corresponding number of storage
189189
dimensions in the source or destination grids, if
190190
either has an unstructured mesh or a DSG featureType.
191191
192-
.. versionadded:: NEXTRELEASE
192+
.. versionadded:: 3.16.2
193193
194194
"""
195195
super().__init__()
@@ -254,7 +254,7 @@ def coord_sys(self):
254254
def dimensionality(self):
255255
"""The number of physical regridding dimensions.
256256
257-
.. versionadded:: NEXTRELEASE
257+
.. versionadded:: 3.16.2
258258
259259
"""
260260
return self._get_component("dimensionality")
@@ -291,7 +291,7 @@ def dst_cyclic(self):
291291
def dst_featureType(self):
292292
"""The DSG featureType of the destination grid.
293293
294-
.. versionadded:: NEXTRELEASE
294+
.. versionadded:: 3.16.2
295295
296296
"""
297297
return self._get_component("dst_featureType")
@@ -335,7 +335,7 @@ def dst_shape(self):
335335
def dst_z(self):
336336
"""The identity of the destination grid vertical coordinates.
337337
338-
.. versionadded:: NEXTRELEASE
338+
.. versionadded:: 3.16.2
339339
340340
"""
341341
return self._get_component("dst_z")
@@ -344,7 +344,7 @@ def dst_z(self):
344344
def ln_z(self):
345345
"""Whether or not vertical weights are based on ln(z).
346346
347-
.. versionadded:: NEXTRELEASE
347+
.. versionadded:: 3.16.2
348348
349349
"""
350350
return self._get_component("ln_z")
@@ -420,7 +420,7 @@ def src_cyclic(self):
420420
def src_featureType(self):
421421
"""The DSG featureType of the source grid.
422422
423-
.. versionadded:: NEXTRELEASE
423+
.. versionadded:: 3.16.2
424424
425425
"""
426426
return self._get_component("src_featureType")
@@ -464,7 +464,7 @@ def src_shape(self):
464464
def src_z(self):
465465
"""The identity of the source grid vertical coordinates.
466466
467-
.. versionadded:: NEXTRELEASE
467+
.. versionadded:: 3.16.2
468468
469469
"""
470470
return self._get_component("src_z")

‎docs/installation.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646

4747

4848

49-
<h1 class="logo"><a href="index.html">cf 3.16.1</a></h1>
49+
<h1 class="logo"><a href="index.html">cf 3.16.2</a></h1>
5050

5151

5252

@@ -377,4 +377,4 @@ <h3>Related Topics</h3>
377377

378378

379379
</body>
380-
</html>
380+
</html>

‎docs/source/installation.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ To install from source (without any dependencies):
129129
1. Download the cf package from https://pypi.org/project/cf-python
130130

131131
2. Unpack the library (replacing ``<version>`` with the version that
132-
you want to install, e.g. ``3.16.1``):
132+
you want to install, e.g. ``3.16.2``):
133133

134134
.. code-block:: console
135135

‎docs/source/releases.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ Documentation for all versions of cf.
1616
**CF-1.11**
1717
-----------
1818

19+
* `Version 3.16.2 <https://ncas-cms.github.io/cf-python-docs/3.16.2>`_ (2024-04-??)
1920
* `Version 3.16.1 <https://ncas-cms.github.io/cf-python-docs/3.16.1>`_ (2024-03-01)
2021
* `Version 3.16.0 <https://ncas-cms.github.io/cf-python-docs/3.16.0>`_ (2023-12-06)
2122

0 commit comments

Comments
 (0)