diff --git a/Changelog.rst b/Changelog.rst index 3a0b2560c6..e698df4f48 100644 --- a/Changelog.rst +++ b/Changelog.rst @@ -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) diff --git a/cf/__init__.py b/cf/__init__.py index 59909363f9..bef2e0ea93 100644 --- a/cf/__init__.py +++ b/cf/__init__.py @@ -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", diff --git a/cf/regrid/regrid.py b/cf/regrid/regrid.py index 6861e9e340..0adeef0dc6 100644 --- a/cf/regrid/regrid.py +++ b/cf/regrid/regrid.py @@ -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 @@ -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 @@ -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 @@ -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: @@ -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. @@ -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. @@ -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": @@ -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: @@ -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: @@ -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` @@ -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: @@ -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: diff --git a/cf/regrid/regridoperator.py b/cf/regrid/regridoperator.py index dc86e5c1e2..997cd0d6e6 100644 --- a/cf/regrid/regridoperator.py +++ b/cf/regrid/regridoperator.py @@ -149,39 +149,39 @@ 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 @@ -189,7 +189,7 @@ def __init__( 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__() @@ -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") @@ -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") @@ -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") @@ -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") @@ -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") @@ -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") diff --git a/docs/installation.html b/docs/installation.html index 5babc9965a..4b6e40e223 100644 --- a/docs/installation.html +++ b/docs/installation.html @@ -46,7 +46,7 @@ -