Skip to content

Commit

Permalink
version/date
Browse files Browse the repository at this point in the history
  • Loading branch information
@davidhassell
davidhassell committed Apr 12, 2024
1 parent 6c4040c commit 7d78eac
Show file tree
Hide file tree
Showing 7 changed files with 36 additions and 35 deletions.
6 changes: 3 additions & 3 deletions Changelog.rst
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version NEXT
------------
version 3.16.2
--------------

**2024-??-??**
**2024-04-??**

* Added spherical regridding to discrete sampling geometry destination
grids (https://github.com/NCAS-CMS/cf-python/issues/716)
Expand Down
4 changes: 2 additions & 2 deletions cf/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@
"""

__Conventions__ = "CF-1.11"
__date__ = "2023-03-01"
__version__ = "3.16.1"
__date__ = "2023-04-??"
__version__ = "3.16.2"

_requires = (
"numpy",
Expand Down
28 changes: 14 additions & 14 deletions cf/regrid/regrid.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ def regrid(
See `cf.Field.regrids` (for spherical regridding) or
`cf.Field.regridc` (for Cartesian regridding) for details.
.. versionadded:: NEXTRELEASE
.. versionadded:: 3.16.2
dst_z: optional
The identity of the destination grid vertical coordinates
Expand All @@ -301,7 +301,7 @@ def regrid(
See `cf.Field.regrids` (for spherical regridding) or
`cf.Field.regridc` (for Cartesian regridding) for details.
.. versionadded:: NEXTRELEASE
.. versionadded:: 3.16.2
z: optional
The *z* parameter is a convenience that may be used to
Expand All @@ -311,7 +311,7 @@ def regrid(
See `cf.Field.regrids` (for spherical regridding) or
`cf.Field.regridc` (for Cartesian regridding) for details.
.. versionadded:: NEXTRELEASE
.. versionadded:: 3.16.2
ln_z: `bool` or `None`, optional
Whether or not the weights are to be calculated with the
Expand All @@ -320,7 +320,7 @@ def regrid(
See `cf.Field.regrids` (for spherical regridding) or
`cf.Field.regridc` (for Cartesian regridding) for details.
.. versionadded:: NEXTRELEASE
.. versionadded:: 3.16.2
:Returns:
Expand Down Expand Up @@ -773,7 +773,7 @@ def spherical_coords_to_domain(
``d.coordinate(dst_z)``, where ``d`` is the `Domain`
returned by this function.
.. versionadded:: NEXTRELEASE
.. versionadded:: 3.16.2
domain_class: `Domain` class
The domain class used to create the new `Domain` instance.
Expand Down Expand Up @@ -962,7 +962,7 @@ def Cartesian_coords_to_domain(dst, dst_z=None, domain_class=None):
``d.coordinate(dst_z)``, where ``d`` is the `Domain`
returned by this function.
.. versionadded:: NEXTRELEASE
.. versionadded:: 3.16.2
domain_class: `Domain` class
The domain class used to create the new `Domain` instance.
Expand Down Expand Up @@ -1026,7 +1026,7 @@ def get_grid(
See `cf.Field.regrids` (for spherical regridding) or
`cf.Field.regridc` (for Cartesian regridding) for details.
.. versionadded:: NEXTRELEASE
.. versionadded:: 3.16.2
"""
if coord_sys == "spherical":
Expand Down Expand Up @@ -1106,13 +1106,13 @@ def spherical_grid(
3-d and is defined by the unique construct returned by
``f.coordinate(src_z)``
.. versionadded:: NEXTRELEASE
.. versionadded:: 3.16.2
ln_z: `bool` or `None`, optional
Whether or not the weights are to be calculated with the
natural logarithm of vertical coordinates.
.. versionadded:: NEXTRELEASE
.. versionadded:: 3.16.2
:Returns:
Expand Down Expand Up @@ -1453,13 +1453,13 @@ def Cartesian_grid(f, name=None, method=None, axes=None, z=None, ln_z=None):
If not `None` then *src_z* specifies the identity of a
vertical coordinate construct of the source grid.
.. versionadded:: NEXTRELEASE
.. versionadded:: 3.16.2
ln_z: `bool` or `None`, optional
Whether or not the weights are to be calculated with the
natural logarithm of vertical coordinates.
.. versionadded:: NEXTRELEASE
.. versionadded:: 3.16.2
:Returns:
Expand Down Expand Up @@ -2228,7 +2228,7 @@ def create_esmpy_mesh(grid, mask=None):
def create_esmpy_locstream(grid, mask=None):
"""Create an `esmpy.LocStream`.
.. versionadded:: NEXTRELEASE
.. versionadded:: 3.16.2
.. seealso:: `create_esmpy_grid`, `create_esmpy_mesh`
Expand Down Expand Up @@ -3036,7 +3036,7 @@ def get_mesh(f):
def get_dsg(f):
"""Get domain discrete sampling geometry information.
.. versionadded:: NEXTRELEASE
.. versionadded:: 3.16.2
:Parameters:
Expand Down Expand Up @@ -3102,7 +3102,7 @@ def has_coordinate_arrays(grid):
def set_grid_type(grid):
"""Set the ``type`` attribute of a `Grid` instance in-place.
.. versionadded:: NEXTRELEASE
.. versionadded:: 3.16.2
:Parameters:
Expand Down
26 changes: 13 additions & 13 deletions cf/regrid/regridoperator.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,47 +149,47 @@ def __init__(
The UGRID mesh element of the destination grid
(e.g. ``'face'``).
.. versionadded:: NEXTRELEASE
.. versionadded:: 3.16.2
src_featureType: `str`, optional
The discrete sampling geometry (DSG) featureType of
the source grid (e.g. ``'trajectory'``).
.. versionadded:: NEXTRELEASE
.. versionadded:: 3.16.2
dst_featureType: `str`, optional
The DSG featureType of the destination grid
(e.g. ``'trajectory'``).
.. versionadded:: NEXTRELEASE
.. versionadded:: 3.16.2
src_z: optional
The identity of the source grid vertical coordinates
used to calculate the weights. If `None` then no
source grid vertical axis is identified.
.. versionadded:: NEXTRELEASE
.. versionadded:: 3.16.2
dst_z: optional
The identity of the destination grid vertical
coordinates used to calculate the weights. If `None`
then no destination grid vertical axis is identified.
.. versionadded:: NEXTRELEASE
.. versionadded:: 3.16.2
ln_z: `bool`, optional
Whether or not the weights were calculated with the
natural logarithm of vertical coordinates.
.. versionadded:: NEXTRELEASE
.. versionadded:: 3.16.2
dimensionality: `int`, optional
The number of physical regridding dimensions. This may
differ from the corresponding number of storage
dimensions in the source or destination grids, if
either has an unstructured mesh or a DSG featureType.
.. versionadded:: NEXTRELEASE
.. versionadded:: 3.16.2
"""
super().__init__()
Expand Down Expand Up @@ -254,7 +254,7 @@ def coord_sys(self):
def dimensionality(self):
"""The number of physical regridding dimensions.
.. versionadded:: NEXTRELEASE
.. versionadded:: 3.16.2
"""
return self._get_component("dimensionality")
Expand Down Expand Up @@ -291,7 +291,7 @@ def dst_cyclic(self):
def dst_featureType(self):
"""The DSG featureType of the destination grid.
.. versionadded:: NEXTRELEASE
.. versionadded:: 3.16.2
"""
return self._get_component("dst_featureType")
Expand Down Expand Up @@ -335,7 +335,7 @@ def dst_shape(self):
def dst_z(self):
"""The identity of the destination grid vertical coordinates.
.. versionadded:: NEXTRELEASE
.. versionadded:: 3.16.2
"""
return self._get_component("dst_z")
Expand All @@ -344,7 +344,7 @@ def dst_z(self):
def ln_z(self):
"""Whether or not vertical weights are based on ln(z).
.. versionadded:: NEXTRELEASE
.. versionadded:: 3.16.2
"""
return self._get_component("ln_z")
Expand Down Expand Up @@ -420,7 +420,7 @@ def src_cyclic(self):
def src_featureType(self):
"""The DSG featureType of the source grid.
.. versionadded:: NEXTRELEASE
.. versionadded:: 3.16.2
"""
return self._get_component("src_featureType")
Expand Down Expand Up @@ -464,7 +464,7 @@ def src_shape(self):
def src_z(self):
"""The identity of the source grid vertical coordinates.
.. versionadded:: NEXTRELEASE
.. versionadded:: 3.16.2
"""
return self._get_component("src_z")
Expand Down
4 changes: 2 additions & 2 deletions docs/installation.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@



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



Expand Down Expand Up @@ -377,4 +377,4 @@ <h3>Related Topics</h3>


</body>
</html>
</html>
2 changes: 1 addition & 1 deletion docs/source/installation.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ To install from source (without any dependencies):
1. Download the cf package from https://pypi.org/project/cf-python

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

.. code-block:: console
Expand Down
1 change: 1 addition & 0 deletions docs/source/releases.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ Documentation for all versions of cf.
**CF-1.11**
-----------

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

Expand Down

0 comments on commit 7d78eac

Please sign in to comment.