From f708cd0a57bed58c6a2deee7fe35414544332cfe Mon Sep 17 00:00:00 2001 From: Martin Yeo Date: Thu, 3 Oct 2019 17:32:43 +0100 Subject: [PATCH 01/34] Manual elements of What's New --- docs/iris/src/whatsnew/2.3.rst | 84 ++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 docs/iris/src/whatsnew/2.3.rst diff --git a/docs/iris/src/whatsnew/2.3.rst b/docs/iris/src/whatsnew/2.3.rst new file mode 100644 index 0000000000..a544314909 --- /dev/null +++ b/docs/iris/src/whatsnew/2.3.rst @@ -0,0 +1,84 @@ +What's New in Iris 2.3 +********************** + +:Release: 2.3 +:Date: 2019-10-03 + +This document explains the new/changed features of Iris in version 2.3 +(:doc:`View all changes `.) + + +Iris 2.3 Features +================= +.. _showcase: + +.. admonition:: Increased Support for CF 1.7 + + Several changes have contributed to our increased support for CF 1.7. You + can read more about each of these below: climatological coordinate support, + standard name modifier support, name tokens enforcement in cell methods and + coordinate var_name, CF_CONVENTIONS_VERSION advanced to 1.7 + +.. admonition:: Climatological Coordinate Support + + Iris can now load, store and save `NetCDF climatological coordinates + `_. Any cube time + coordinate can be marked as a climatological time axis using the boolean + property: ``climatological``. The climatological bounds are stored in the + coordinate's ``bounds`` property. + + When an Iris climatological coordinate is saved in NetCDF, the NetCDF time + axis will be given a 'climatology' attribute, and the contents of the + coordinate's ``bounds`` property are written to a NetCDF boundary variable + called 'climatology_bounds'. These are in place of the more usual NetCDF + 'bounds' attribute and accompanying 'bnds' boundary variable. See below + for an example: + + .. code-block:: + + dimensions: + time=4; + nv=2; + variables: + float temperature(time,lat,lon); + temperature:long_name="surface air temperature"; + temperature:cell_methods="time: minimum within years time: mean over years"; + temperature:units="K"; + double time(time); + time:climatology="climatology_bounds"; + time:units="days since 1960-1-1"; + double climatology_bounds(time,nv); + data: // time coordinates translated to date/time format + time="1960-4-16", "1960-7-16", "1960-10-16", "1961-1-16" ; + climatology_bounds="1960-3-1", "1990-6-1", + "1960-6-1", "1990-9-1", + "1960-9-1", "1990-12-1", + "1960-12-1", "1991-3-1" ; + + If a climatological time axis is detected when loading NetCDF - + indicated by the format described above - the ``climatological`` property + of the Iris coordinate will be set to ``True``. + +.. admonition:: New Chunking Strategy + + Iris now makes better choices of Dask chunk sizes when loading from NetCDF + files: If a file variable has specified, small chunks, Iris will now choose + Dask chunks which are a multiple of these up to a default target size. + + This is particularly relevant to files with an unlimited dimension, which + previously could produce a large number of small chunks. This had an adverse + effect on performance. + + In addition, Iris now takes its default chunksize from the default configured + in Dask itself, i.e. ``dask.config.get('array.chunk-size')``. + + +Iris 2.3 Dependency Updates +=========================== +* The Proj4 pin has been moved from version 5 to version 6 pending `fixes to +some cartopy tests `_. +* Iris now requires Dask > 1.2 to allow for improved coordinate equality +checks. + From 8f1812486604c2c58f995761ad5a7418ae10a7ef Mon Sep 17 00:00:00 2001 From: Martin Yeo Date: Fri, 4 Oct 2019 09:41:08 +0100 Subject: [PATCH 02/34] renamed manual 2.3 What's New entries --- docs/iris/src/whatsnew/{2.3.rst => 2.3_manual.rst} | 13 +++++++++++++ 1 file changed, 13 insertions(+) rename docs/iris/src/whatsnew/{2.3.rst => 2.3_manual.rst} (91%) diff --git a/docs/iris/src/whatsnew/2.3.rst b/docs/iris/src/whatsnew/2.3_manual.rst similarity index 91% rename from docs/iris/src/whatsnew/2.3.rst rename to docs/iris/src/whatsnew/2.3_manual.rst index a544314909..57fcd6a392 100644 --- a/docs/iris/src/whatsnew/2.3.rst +++ b/docs/iris/src/whatsnew/2.3_manual.rst @@ -73,12 +73,25 @@ Iris 2.3 Features In addition, Iris now takes its default chunksize from the default configured in Dask itself, i.e. ``dask.config.get('array.chunk-size')``. +.. admonition:: Lazy Statistics + + Several statistical operations can now be done lazily, taking advantage of the + performance improvements offered by Dask: + + * :meth:`~iris.cube.Cube.aggregated_by` + + * | :class:`~iris.analysis.RMS` + | NOTE: RMS currently only supports un-masked arrays. + + * :class:`~iris.analysis.MEAN` + Iris 2.3 Dependency Updates =========================== * The Proj4 pin has been moved from version 5 to version 6 pending `fixes to some cartopy tests `_. + * Iris now requires Dask > 1.2 to allow for improved coordinate equality checks. From 42ce665d6a4850db095dd2a065fd1e2b01fea056 Mon Sep 17 00:00:00 2001 From: Martin Yeo Date: Fri, 4 Oct 2019 11:50:47 +0100 Subject: [PATCH 03/34] Created 2.3 What's New document. --- docs/iris/src/whatsnew/2.3.rst | 193 ++++++++++++++++++++++++++ docs/iris/src/whatsnew/2.3_manual.rst | 97 ------------- 2 files changed, 193 insertions(+), 97 deletions(-) create mode 100644 docs/iris/src/whatsnew/2.3.rst delete mode 100644 docs/iris/src/whatsnew/2.3_manual.rst diff --git a/docs/iris/src/whatsnew/2.3.rst b/docs/iris/src/whatsnew/2.3.rst new file mode 100644 index 0000000000..552ef3d19f --- /dev/null +++ b/docs/iris/src/whatsnew/2.3.rst @@ -0,0 +1,193 @@ +What's New in Iris 2.3 +********************** + +:Release: 2.3 +:Date: 2019-10-04 + +This document explains the new/changed features of Iris in version 2.3 +(:doc:`View all changes `.) + +Iris 2.3 Features +================= +.. _showcase: + +.. admonition:: Increased Support for CF 1.7 + + Several changes have contributed to our increased support for CF 1.7: + + * climatological coordinate support + * standard name modifier support + * name tokens enforcement in cell methods + * coordinate var_name, CF_CONVENTIONS_VERSION advanced to 1.7 + + You can read more about each of these below. + +.. admonition:: Climatological Coordinate Support + + Iris can now load, store and save `NetCDF climatological coordinates + `_. Any cube time + coordinate can be marked as a climatological time axis using the boolean + property: ``climatological``. The climatological bounds are stored in the + coordinate's ``bounds`` property. + + When an Iris climatological coordinate is saved in NetCDF, the NetCDF time + axis will be given a 'climatology' attribute, and the contents of the + coordinate's ``bounds`` property are written to a NetCDF boundary variable + called 'climatology_bounds'. These are in place of the more usual NetCDF + 'bounds' attribute and accompanying 'bnds' boundary variable. See below + for an example: + + .. code-block:: + + dimensions: + time=4; + nv=2; + variables: + float temperature(time,lat,lon); + temperature:long_name="surface air temperature"; + temperature:cell_methods="time: minimum within years time: mean over years"; + temperature:units="K"; + double time(time); + time:climatology="climatology_bounds"; + time:units="days since 1960-1-1"; + double climatology_bounds(time,nv); + data: // time coordinates translated to date/time format + time="1960-4-16", "1960-7-16", "1960-10-16", "1961-1-16" ; + climatology_bounds="1960-3-1", "1990-6-1", + "1960-6-1", "1990-9-1", + "1960-9-1", "1990-12-1", + "1960-12-1", "1991-3-1" ; + + If a climatological time axis is detected when loading NetCDF - + indicated by the format described above - the ``climatological`` property + of the Iris coordinate will be set to ``True``. + +.. admonition:: New Chunking Strategy + + Iris now makes better choices of Dask chunk sizes when loading from NetCDF + files: If a file variable has specified, small chunks, Iris will now choose + Dask chunks which are a multiple of these up to a default target size. + + This is particularly relevant to files with an unlimited dimension, which + previously could produce a large number of small chunks. This had an adverse + effect on performance. + + In addition, Iris now takes its default chunksize from the default configured + in Dask itself, i.e. ``dask.config.get('array.chunk-size')``. + +.. admonition:: Lazy Statistics + + Several statistical operations can now be done lazily, taking advantage of the + performance improvements offered by Dask: + + * :meth:`~iris.cube.Cube.aggregated_by` + * :class:`~iris.analysis.RMS` (more detail below) + * :class:`~iris.analysis.MEAN` + +| + +* Cube data equality testing (and hence cube equality) now uses a more relaxed + tolerance : This means that some cubes may now test 'equal' that previously + did not. + Previously, Iris compared cube data arrays using "abs(a - b) < 1.e-8". + We now apply the default operation of :func:`numpy.allclose` instead, + which is equivalent to "abs(a - b) < (1.e-8 + 1.e-5 * b)". +* Added support to render HTML for :class:`iris.cube.CubeList`s in Jupyter Notebooks and JupyterLab. +* Loading CellMeasures with non-float values is now supported. +* New coordinate system: :class:`iris.coord_systems.Geostationary`, based on + the `CF Geostationary projection definition `_. +* :class:`iris.coord_systems.VerticalPerspective` can now be saved to and + loaded from NetCDF files. +* :class:`iris.experimental.regrid.PointInCell` moved to + :class:`iris.analysis.PointInCell` to make this regridding scheme public +* Iris now supports standard name modifiers. See `Appendix C, Standard Name Modifiers `_ for more information. +* :meth:`iris.cube.Cube.remove_cell_measure` now also allows removal of a cell + measure by its name (previously only accepted a CellMeasure object). +* The :data:`iris.analysis.RMS` aggregator now supports a lazy calculation. + However, the "weights" keyword is not currently supported by this, so a + *weighted* calculation will still return a realised result, *and* force + realisation of the original cube data. **NOTE:** lazy calculation with RMS + is currently only supported for un-masked arrays. + + +Iris 2.3 Dependency Updates +=========================== +* The Proj4 pin has been moved from version 5 to version 6 pending `fixes to + some cartopy tests `_. +* Iris now requires Dask > 1.2 to allow for improved coordinate equality + checks. + + +Bugs Fixed +========== +* Cube equality of boolean data is now handled correctly. +* Iris now supports NetCDF Climate and Forecast (CF) Metadata Conventions 1.7 (see `CF 1.7 Conventions Document `_ for more information) +* Fixed a bug where cell measures were incorrect after a cube + :meth:`~iris.cube.Cube.transpose` operation. Previously, this resulted in + cell-measures that were no longer correctly mapped to the cube dimensions. +* The :class:`~iris.coords.AuxCoord` disregarded masked points and bounds, as did the :class:`~iris.coords.DimCoord`. + Fix permits an :class:`~iris.coords.AuxCoord` to contain masked points/bounds, and a TypeError exception is now + raised when attempting to create or set the points/bounds of a :class:`~iris.coords.DimCoord` with masked arrays. +* :class:`iris.coord_systems.VerticalPerspective` coordinate system now uses + the `CF Vertical perspective definition `_; had been + erroneously using Geostationary. +* :class:`~iris.coords.CellMethod` will now only use valid `NetCDF name tokens `_ to reference the coordinates involved in the statistical operation. +* The following var_names will now only use valid `NetCDF name tokens + `_ to + reference the said NetCDF variable name. Note that names with a leading + underscore are not permitted. + - :attr:`iris.aux_factory.AuxCoordFactory.var_name` + - :attr:`iris.coords.CellMeasure.var_name` + - :attr:`iris.coords.Coord.var_name` + - :attr:`iris.coords.AuxCoord.var_name` + - :attr:`iris.cube.Cube.var_name` +* Cubes are now rendered more robustly by Jupyter. + :meth:`~iris.cube.Cube._repr_html_` no longer crashes for a cube with + attributes containing ``\n``. +* Variables which reference themselves in ``cell_measures`` can now be read. +* :func:`~iris.plot.quiver` now handles circular coordinates. +* The name of cubes loaded from abf/abl files has been corrected. +* Fixed a bug in UM file loading, where any landsea-mask-compressed fields + (i.e. with LBPACK=x2x) would cause an error later, when realising the data. +* :meth:`iris.cube.Cube.coll\apsed` now handles partial collapsing of + multidimensional coordinates that have bounds. +* Fixed a bug in the :data:`~iris.analysis.PROPORTION` aggregator, where cube + data in the form of a masked array with ``array.mask=False`` would cause an + error, but possibly only later when the values are actually realised. + ( Note: since netCDF4 version 1.4.0, this is now a common form for data + loaded from netCDF files ). +* Fixed a bug where plotting a cube with a + :class:`iris.coord_systems.LambertConformal` coordinate system would result + in an error. This would happen if the coordinate system was defined with one + standard parallel, rather than two. + In these cases, a call to + :meth:`~iris.coord_systems.LambertConformal.as_cartopy_crs` would fail. +* :meth:`iris.cube.Cube.aggregated_by` now gives correct values in points and + bounds when handling multidimensional coordinates. +* Fixed a bug in the :meth:`iris.cube.Cube.collapsed` operation, which caused + the unexpected realization of any attached auxiliary coordinates that were + *bounded*. It now correctly produces a lazy result and does not realise + the original attached AuxCoords. + + +Documentation Changes +===================== +* Added a gallery example showing how to concatenate NEMO ocean model data. +* Added an example in the + `Loading Iris Cubes: Constraining on Time `_ + Userguide section, demonstrating how to load data within a specified date + range. +* Added notes to the :func:`iris.load` documentation, and the userguide + `Loading Iris Cubes `_ + chapter, emphasizing that the *order* of the cubes returned by an iris load + operation is effectively random and unstable, and should not be relied on. +* Fixed references in the documentation of + :func:`iris.util.find_discontiguities` to a nonexistent + "mask_discontiguities" routine : these now refer to + :func:`~iris.util.mask_cube`. + diff --git a/docs/iris/src/whatsnew/2.3_manual.rst b/docs/iris/src/whatsnew/2.3_manual.rst deleted file mode 100644 index 57fcd6a392..0000000000 --- a/docs/iris/src/whatsnew/2.3_manual.rst +++ /dev/null @@ -1,97 +0,0 @@ -What's New in Iris 2.3 -********************** - -:Release: 2.3 -:Date: 2019-10-03 - -This document explains the new/changed features of Iris in version 2.3 -(:doc:`View all changes `.) - - -Iris 2.3 Features -================= -.. _showcase: - -.. admonition:: Increased Support for CF 1.7 - - Several changes have contributed to our increased support for CF 1.7. You - can read more about each of these below: climatological coordinate support, - standard name modifier support, name tokens enforcement in cell methods and - coordinate var_name, CF_CONVENTIONS_VERSION advanced to 1.7 - -.. admonition:: Climatological Coordinate Support - - Iris can now load, store and save `NetCDF climatological coordinates - `_. Any cube time - coordinate can be marked as a climatological time axis using the boolean - property: ``climatological``. The climatological bounds are stored in the - coordinate's ``bounds`` property. - - When an Iris climatological coordinate is saved in NetCDF, the NetCDF time - axis will be given a 'climatology' attribute, and the contents of the - coordinate's ``bounds`` property are written to a NetCDF boundary variable - called 'climatology_bounds'. These are in place of the more usual NetCDF - 'bounds' attribute and accompanying 'bnds' boundary variable. See below - for an example: - - .. code-block:: - - dimensions: - time=4; - nv=2; - variables: - float temperature(time,lat,lon); - temperature:long_name="surface air temperature"; - temperature:cell_methods="time: minimum within years time: mean over years"; - temperature:units="K"; - double time(time); - time:climatology="climatology_bounds"; - time:units="days since 1960-1-1"; - double climatology_bounds(time,nv); - data: // time coordinates translated to date/time format - time="1960-4-16", "1960-7-16", "1960-10-16", "1961-1-16" ; - climatology_bounds="1960-3-1", "1990-6-1", - "1960-6-1", "1990-9-1", - "1960-9-1", "1990-12-1", - "1960-12-1", "1991-3-1" ; - - If a climatological time axis is detected when loading NetCDF - - indicated by the format described above - the ``climatological`` property - of the Iris coordinate will be set to ``True``. - -.. admonition:: New Chunking Strategy - - Iris now makes better choices of Dask chunk sizes when loading from NetCDF - files: If a file variable has specified, small chunks, Iris will now choose - Dask chunks which are a multiple of these up to a default target size. - - This is particularly relevant to files with an unlimited dimension, which - previously could produce a large number of small chunks. This had an adverse - effect on performance. - - In addition, Iris now takes its default chunksize from the default configured - in Dask itself, i.e. ``dask.config.get('array.chunk-size')``. - -.. admonition:: Lazy Statistics - - Several statistical operations can now be done lazily, taking advantage of the - performance improvements offered by Dask: - - * :meth:`~iris.cube.Cube.aggregated_by` - - * | :class:`~iris.analysis.RMS` - | NOTE: RMS currently only supports un-masked arrays. - - * :class:`~iris.analysis.MEAN` - - -Iris 2.3 Dependency Updates -=========================== -* The Proj4 pin has been moved from version 5 to version 6 pending `fixes to -some cartopy tests `_. - -* Iris now requires Dask > 1.2 to allow for improved coordinate equality -checks. - From 8d344a6dda77b68faaa36a650bbe8125d57b6fa8 Mon Sep 17 00:00:00 2001 From: Martin Yeo Date: Fri, 4 Oct 2019 12:18:38 +0100 Subject: [PATCH 04/34] Referencing 2.3 What's New in index.html --- docs/iris/src/_templates/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/iris/src/_templates/index.html b/docs/iris/src/_templates/index.html index 068a6fc09b..e9f9b16111 100644 --- a/docs/iris/src/_templates/index.html +++ b/docs/iris/src/_templates/index.html @@ -134,7 +134,7 @@ extra information on specific technical issues

  • -

    What's new in Iris 2.3?
    +

    What's new in Iris 2.3?
    recent changes in Iris's capabilities

    • From c48c0ef29488baf2490a28266837dfdd67e72c53 Mon Sep 17 00:00:00 2001 From: Martin Yeo Date: Fri, 4 Oct 2019 14:22:43 +0100 Subject: [PATCH 05/34] Explicit reference to 2.3.0 --- docs/iris/src/whatsnew/2.3.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/iris/src/whatsnew/2.3.rst b/docs/iris/src/whatsnew/2.3.rst index 552ef3d19f..2a25b884b1 100644 --- a/docs/iris/src/whatsnew/2.3.rst +++ b/docs/iris/src/whatsnew/2.3.rst @@ -1,13 +1,13 @@ -What's New in Iris 2.3 +What's New in Iris 2.3.0 ********************** -:Release: 2.3 +:Release: 2.3.0 :Date: 2019-10-04 -This document explains the new/changed features of Iris in version 2.3 +This document explains the new/changed features of Iris in version 2.3.0 (:doc:`View all changes `.) -Iris 2.3 Features +Iris 2.3.0 Features ================= .. _showcase: @@ -112,7 +112,7 @@ Iris 2.3 Features is currently only supported for un-masked arrays. -Iris 2.3 Dependency Updates +Iris 2.3.0 Dependency Updates =========================== * The Proj4 pin has been moved from version 5 to version 6 pending `fixes to some cartopy tests Date: Fri, 4 Oct 2019 15:15:04 +0100 Subject: [PATCH 06/34] Added separator underneath showcases --- docs/iris/src/whatsnew/2.3.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/iris/src/whatsnew/2.3.rst b/docs/iris/src/whatsnew/2.3.rst index 2a25b884b1..72dba38c33 100644 --- a/docs/iris/src/whatsnew/2.3.rst +++ b/docs/iris/src/whatsnew/2.3.rst @@ -85,7 +85,7 @@ Iris 2.3.0 Features * :class:`~iris.analysis.RMS` (more detail below) * :class:`~iris.analysis.MEAN` -| +---- * Cube data equality testing (and hence cube equality) now uses a more relaxed tolerance : This means that some cubes may now test 'equal' that previously From 4c26070f1486070b71788b4ca8c0b463aae7b1a1 Mon Sep 17 00:00:00 2001 From: Martin Yeo Date: Fri, 4 Oct 2019 15:16:10 +0100 Subject: [PATCH 07/34] Deleted contributions folder. --- .../bugfix_2018-Aug-28_lazy_bounds_collapse.txt | 4 ---- ...gfix_2018-Nov-28_lambert_conformal_secant_latitudes.txt | 6 ------ .../bugfix_2018-Nov-29_proportion_falsemask.txt | 5 ----- .../bugfix_2018-Sep-17_aggregate_by_multdim_coords.txt | 2 -- .../bugfix_2019-Apr-03_partial_collapse_bounded_coords.txt | 2 -- .../bugfix_2019-Aug-29_abf_abl_cube_names.txt | 1 - .../bugfix_2019-Aug-30_circular_quiver_plot.txt | 1 - .../bugfix_2019-May-20_um_landsea_masked.txt | 2 -- .../bugfix_2019-Oct-01_cf_conventions_attribute.txt | 1 - .../bugfix_2019-Oct-01_cube_transpose_cell_measures.txt | 3 --- .../bugfix_2019-Oct-01_masked_dimcoords_and_auxcoords.txt | 3 --- .../bugfix_2019-Oct-02_boolean_data_compare.txt | 1 - ...gfix_2019-Sep-03_self_referencing_vollcello_reading.txt | 1 - .../bugfix_2019-Sep-06_html_repr_crash.txt | 3 --- .../bugfix_2019-Sep-16_cellmethod_tokens.txt | 1 - .../bugfix_2019-Sep-16_var_name_tokens.txt | 1 - .../bugfix_2019-Sep-20_vp_coordsystem_definition.txt | 4 ---- .../docchange_2019-Aug-22_random_load_order.txt | 4 ---- .../docchange_2019-Aug-27_date_range_constraints.txt | 4 ---- .../docchange_2019-Mar-06_discontig_masking.txt | 4 ---- .../docchange_2019-Sep-13_nemo_gallery_example.txt | 1 - .../newfeature_2018-Jul-25_dask_chunking.txt | 7 ------- .../newfeature_2018-Oct-24_lazy_rms_agg.txt | 4 ---- .../newfeature_2019-Jul-11_lazy-aggregated_by.txt | 2 -- .../newfeature_2019-Mar-08_remove_cell_measure_by_name.txt | 2 -- .../newfeature_2019-Oct-02_cube_equality_tolerance.txt | 6 ------ .../newfeature_2019-Oct-02_cubelist_repr_html.txt | 1 - .../newfeature_2019-Sep-02_standard_name_modifiers.txt | 1 - ...ve_experimental_point-in-cell_regridder_to_analysis.txt | 2 -- .../newfeature_2019-Sep-11_climatological_bounds.txt | 3 --- .../newfeature_2019-Sep-20_geostationary_coordsystem.txt | 5 ----- .../newfeature_2019-Sep-27_cell_measure_integer_data.txt | 1 - 32 files changed, 88 deletions(-) delete mode 100644 docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2018-Aug-28_lazy_bounds_collapse.txt delete mode 100644 docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2018-Nov-28_lambert_conformal_secant_latitudes.txt delete mode 100644 docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2018-Nov-29_proportion_falsemask.txt delete mode 100644 docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2018-Sep-17_aggregate_by_multdim_coords.txt delete mode 100644 docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-Apr-03_partial_collapse_bounded_coords.txt delete mode 100644 docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-Aug-29_abf_abl_cube_names.txt delete mode 100644 docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-Aug-30_circular_quiver_plot.txt delete mode 100644 docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-May-20_um_landsea_masked.txt delete mode 100644 docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-Oct-01_cf_conventions_attribute.txt delete mode 100644 docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-Oct-01_cube_transpose_cell_measures.txt delete mode 100644 docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-Oct-01_masked_dimcoords_and_auxcoords.txt delete mode 100644 docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-Oct-02_boolean_data_compare.txt delete mode 100644 docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-Sep-03_self_referencing_vollcello_reading.txt delete mode 100644 docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-Sep-06_html_repr_crash.txt delete mode 100644 docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-Sep-16_cellmethod_tokens.txt delete mode 100644 docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-Sep-16_var_name_tokens.txt delete mode 100644 docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-Sep-20_vp_coordsystem_definition.txt delete mode 100644 docs/iris/src/whatsnew/contributions_2.3.0/docchange_2019-Aug-22_random_load_order.txt delete mode 100644 docs/iris/src/whatsnew/contributions_2.3.0/docchange_2019-Aug-27_date_range_constraints.txt delete mode 100644 docs/iris/src/whatsnew/contributions_2.3.0/docchange_2019-Mar-06_discontig_masking.txt delete mode 100644 docs/iris/src/whatsnew/contributions_2.3.0/docchange_2019-Sep-13_nemo_gallery_example.txt delete mode 100644 docs/iris/src/whatsnew/contributions_2.3.0/newfeature_2018-Jul-25_dask_chunking.txt delete mode 100644 docs/iris/src/whatsnew/contributions_2.3.0/newfeature_2018-Oct-24_lazy_rms_agg.txt delete mode 100644 docs/iris/src/whatsnew/contributions_2.3.0/newfeature_2019-Jul-11_lazy-aggregated_by.txt delete mode 100644 docs/iris/src/whatsnew/contributions_2.3.0/newfeature_2019-Mar-08_remove_cell_measure_by_name.txt delete mode 100644 docs/iris/src/whatsnew/contributions_2.3.0/newfeature_2019-Oct-02_cube_equality_tolerance.txt delete mode 100644 docs/iris/src/whatsnew/contributions_2.3.0/newfeature_2019-Oct-02_cubelist_repr_html.txt delete mode 100644 docs/iris/src/whatsnew/contributions_2.3.0/newfeature_2019-Sep-02_standard_name_modifiers.txt delete mode 100644 docs/iris/src/whatsnew/contributions_2.3.0/newfeature_2019-Sep-04_move_experimental_point-in-cell_regridder_to_analysis.txt delete mode 100644 docs/iris/src/whatsnew/contributions_2.3.0/newfeature_2019-Sep-11_climatological_bounds.txt delete mode 100644 docs/iris/src/whatsnew/contributions_2.3.0/newfeature_2019-Sep-20_geostationary_coordsystem.txt delete mode 100644 docs/iris/src/whatsnew/contributions_2.3.0/newfeature_2019-Sep-27_cell_measure_integer_data.txt diff --git a/docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2018-Aug-28_lazy_bounds_collapse.txt b/docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2018-Aug-28_lazy_bounds_collapse.txt deleted file mode 100644 index f069b041ad..0000000000 --- a/docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2018-Aug-28_lazy_bounds_collapse.txt +++ /dev/null @@ -1,4 +0,0 @@ -* Fixed a bug in the :meth:`iris.cube.Cube.collapse` operation, which caused - the unexpected realization of any attached auxiliary coordinates that were - _bounded_. It now correctly produces a lazy result and does not realise the - original attached AuxCoords. diff --git a/docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2018-Nov-28_lambert_conformal_secant_latitudes.txt b/docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2018-Nov-28_lambert_conformal_secant_latitudes.txt deleted file mode 100644 index 1aa3d07ba0..0000000000 --- a/docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2018-Nov-28_lambert_conformal_secant_latitudes.txt +++ /dev/null @@ -1,6 +0,0 @@ -* Fixed a bug where plotting a cube with a - :class:`iris.coord_systems.LamberConformal` coordinate system would result - in an error. This would happen if the coordinate system was defined with one - standard parallel, rather than two. - In these cases, a call to - :meth:`~iris.coord_systems.LambertConform.as_cartopy_crs` would fail. diff --git a/docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2018-Nov-29_proportion_falsemask.txt b/docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2018-Nov-29_proportion_falsemask.txt deleted file mode 100644 index 3aa7d946c0..0000000000 --- a/docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2018-Nov-29_proportion_falsemask.txt +++ /dev/null @@ -1,5 +0,0 @@ -* Fixed a bug in the :data:`~iris.analysis.PROPORTION` aggregator, where cube - data in the form of a masked array with "array.mask=False" would cause an - error, but possibly only later when the values are actually realised. - ( Note: since netCDF4 version 1.4.0, this is now a common form for data - loaded from netCDF files ). diff --git a/docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2018-Sep-17_aggregate_by_multdim_coords.txt b/docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2018-Sep-17_aggregate_by_multdim_coords.txt deleted file mode 100644 index 4a2181ec2d..0000000000 --- a/docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2018-Sep-17_aggregate_by_multdim_coords.txt +++ /dev/null @@ -1,2 +0,0 @@ -* :meth:`iris.cube.Cube.aggregated_by` now gives correct values in points and -bounds when handling multidimensional coordinates. \ No newline at end of file diff --git a/docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-Apr-03_partial_collapse_bounded_coords.txt b/docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-Apr-03_partial_collapse_bounded_coords.txt deleted file mode 100644 index 27f1aad5c6..0000000000 --- a/docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-Apr-03_partial_collapse_bounded_coords.txt +++ /dev/null @@ -1,2 +0,0 @@ -* :meth:`iris.cube.Cube.collapsed` now handles partial collapsing of -multidimensional coordinates that have bounds. diff --git a/docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-Aug-29_abf_abl_cube_names.txt b/docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-Aug-29_abf_abl_cube_names.txt deleted file mode 100644 index e324f625d2..0000000000 --- a/docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-Aug-29_abf_abl_cube_names.txt +++ /dev/null @@ -1 +0,0 @@ -* The name of cubes loaded from abf/abl files has been corrected. diff --git a/docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-Aug-30_circular_quiver_plot.txt b/docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-Aug-30_circular_quiver_plot.txt deleted file mode 100644 index cc1a184a90..0000000000 --- a/docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-Aug-30_circular_quiver_plot.txt +++ /dev/null @@ -1 +0,0 @@ -* :func:`~iris.plot.quiver` now handles circular coordinates. diff --git a/docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-May-20_um_landsea_masked.txt b/docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-May-20_um_landsea_masked.txt deleted file mode 100644 index 45d7e09f32..0000000000 --- a/docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-May-20_um_landsea_masked.txt +++ /dev/null @@ -1,2 +0,0 @@ -* Fixed a bug in UM file loading, where any landsea-mask-compressed fields - (i.e. with LBPACK=x2x) would cause an error later, when realising the data. diff --git a/docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-Oct-01_cf_conventions_attribute.txt b/docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-Oct-01_cf_conventions_attribute.txt deleted file mode 100644 index 43c5065147..0000000000 --- a/docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-Oct-01_cf_conventions_attribute.txt +++ /dev/null @@ -1 +0,0 @@ -* Iris now supports NetCDF Climate and Forecast (CF) Metadata Conventions 1.7 (see `CF 1.7 Conventions Document `_ for more information) diff --git a/docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-Oct-01_cube_transpose_cell_measures.txt b/docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-Oct-01_cube_transpose_cell_measures.txt deleted file mode 100644 index 5c4a63f355..0000000000 --- a/docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-Oct-01_cube_transpose_cell_measures.txt +++ /dev/null @@ -1,3 +0,0 @@ -* Fixed a bug where cell measures were incorrect after a cube - :meth:`~iris.cube.Cube.transpose` operation. Previously, this resulted in - cell-measures that were no longer correctly mapped to the cube dimensions. diff --git a/docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-Oct-01_masked_dimcoords_and_auxcoords.txt b/docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-Oct-01_masked_dimcoords_and_auxcoords.txt deleted file mode 100644 index 13b03cbeb2..0000000000 --- a/docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-Oct-01_masked_dimcoords_and_auxcoords.txt +++ /dev/null @@ -1,3 +0,0 @@ -* The :class:`~iris.coords.AuxCoord` disregarded masked points and bounds, as did the :class:`~iris.coords.DimCoord`. - Fix permits an :class:`~iris.coords.AuxCoord` to contain masked points/bounds, and an TypeError exception is now - raised when attempting to create or set the points/bounds of a :class:`~iris.coords.DimCoord` with masked arrays. diff --git a/docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-Oct-02_boolean_data_compare.txt b/docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-Oct-02_boolean_data_compare.txt deleted file mode 100644 index 332e60c863..0000000000 --- a/docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-Oct-02_boolean_data_compare.txt +++ /dev/null @@ -1 +0,0 @@ -* Cube equality of boolean data is now handled correctly. diff --git a/docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-Sep-03_self_referencing_vollcello_reading.txt b/docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-Sep-03_self_referencing_vollcello_reading.txt deleted file mode 100644 index b89d716930..0000000000 --- a/docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-Sep-03_self_referencing_vollcello_reading.txt +++ /dev/null @@ -1 +0,0 @@ -* Variables which reference themselves in ``cell_measures`` can now be read. diff --git a/docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-Sep-06_html_repr_crash.txt b/docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-Sep-06_html_repr_crash.txt deleted file mode 100644 index 878b80f791..0000000000 --- a/docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-Sep-06_html_repr_crash.txt +++ /dev/null @@ -1,3 +0,0 @@ -* Cubes are now rendered more robustly by Jupyter. -:meth:`~iris.cube.Cube._repr_html_` no longer crashes for a cube with -attributes containing '\n'. diff --git a/docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-Sep-16_cellmethod_tokens.txt b/docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-Sep-16_cellmethod_tokens.txt deleted file mode 100644 index 6073b92fb2..0000000000 --- a/docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-Sep-16_cellmethod_tokens.txt +++ /dev/null @@ -1 +0,0 @@ -* :class:`~iris.coords.CellMethod` will now only use valid `NetCDF name tokens `_ to reference the coordinates involved in the statistical operation. diff --git a/docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-Sep-16_var_name_tokens.txt b/docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-Sep-16_var_name_tokens.txt deleted file mode 100644 index 59e85dbdcf..0000000000 --- a/docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-Sep-16_var_name_tokens.txt +++ /dev/null @@ -1 +0,0 @@ -* :attr:`~iris.aux_factory.AuxCoordFactory.var_name`, :attr:`~iris.coords.CellMeasure.var_name`, :attr:`~iris.coords.Coord.var_name`, :attr:`~iris.coords.AuxCoord.var_name` and :attr:`~iris.cube.Cube.var_name` will now only use valid `NetCDF name tokens `_ to reference the said NetCDF variable name. Note that, names with a leading inderscore are not permitted. diff --git a/docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-Sep-20_vp_coordsystem_definition.txt b/docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-Sep-20_vp_coordsystem_definition.txt deleted file mode 100644 index 1ed987782e..0000000000 --- a/docs/iris/src/whatsnew/contributions_2.3.0/bugfix_2019-Sep-20_vp_coordsystem_definition.txt +++ /dev/null @@ -1,4 +0,0 @@ -* :class:`iris.coord_systems.VerticalPerspective` coordinate system now uses -the `CF Vertical perspective definition `_; had been -erroneously using Geostationary. diff --git a/docs/iris/src/whatsnew/contributions_2.3.0/docchange_2019-Aug-22_random_load_order.txt b/docs/iris/src/whatsnew/contributions_2.3.0/docchange_2019-Aug-22_random_load_order.txt deleted file mode 100644 index e42abaa315..0000000000 --- a/docs/iris/src/whatsnew/contributions_2.3.0/docchange_2019-Aug-22_random_load_order.txt +++ /dev/null @@ -1,4 +0,0 @@ -* Added notes to the :func:`iris.load` documentation, and the userguide - `Loading Iris Cubes `_ - chapter, emphasizing that the _order_ of the cubes returned by an iris load - operation is effectively random and unstable, and should not be relied on. diff --git a/docs/iris/src/whatsnew/contributions_2.3.0/docchange_2019-Aug-27_date_range_constraints.txt b/docs/iris/src/whatsnew/contributions_2.3.0/docchange_2019-Aug-27_date_range_constraints.txt deleted file mode 100644 index be1d760100..0000000000 --- a/docs/iris/src/whatsnew/contributions_2.3.0/docchange_2019-Aug-27_date_range_constraints.txt +++ /dev/null @@ -1,4 +0,0 @@ -* Added an example in the - `Loading Iris Cubes: Constraining on Time `_ - Userguide section, demonstrating how to load data within a specified date - range. diff --git a/docs/iris/src/whatsnew/contributions_2.3.0/docchange_2019-Mar-06_discontig_masking.txt b/docs/iris/src/whatsnew/contributions_2.3.0/docchange_2019-Mar-06_discontig_masking.txt deleted file mode 100644 index e3dd7c1cfe..0000000000 --- a/docs/iris/src/whatsnew/contributions_2.3.0/docchange_2019-Mar-06_discontig_masking.txt +++ /dev/null @@ -1,4 +0,0 @@ -* Fixed references in the documentation of - :func:`iris.utils.find_discontiguities` to a nonexistent - "mask_discontiguities" routine : these now refer to - :func:`~iris.utils.mask_cube`. diff --git a/docs/iris/src/whatsnew/contributions_2.3.0/docchange_2019-Sep-13_nemo_gallery_example.txt b/docs/iris/src/whatsnew/contributions_2.3.0/docchange_2019-Sep-13_nemo_gallery_example.txt deleted file mode 100644 index b5f866c287..0000000000 --- a/docs/iris/src/whatsnew/contributions_2.3.0/docchange_2019-Sep-13_nemo_gallery_example.txt +++ /dev/null @@ -1 +0,0 @@ -* Added a gallery example showing how to concatenate NEMO ocean model data. diff --git a/docs/iris/src/whatsnew/contributions_2.3.0/newfeature_2018-Jul-25_dask_chunking.txt b/docs/iris/src/whatsnew/contributions_2.3.0/newfeature_2018-Jul-25_dask_chunking.txt deleted file mode 100644 index 0b710ed34d..0000000000 --- a/docs/iris/src/whatsnew/contributions_2.3.0/newfeature_2018-Jul-25_dask_chunking.txt +++ /dev/null @@ -1,7 +0,0 @@ -* Iris now makes better choices of dask chunk sizes, when loading from netcdf - files: If a file variable has specified, small chunks, Iris will now choose - dask chunks which are a multiple of these, up to a default target size. - This is particularly relevant to files with an unlimited dimension, which - previously could produce a large number of small chunks. - In addition, Iris now takes its default chunksize from the default configured - in dask itself, i.e. `dask.config.get('array.chunk-size')`. diff --git a/docs/iris/src/whatsnew/contributions_2.3.0/newfeature_2018-Oct-24_lazy_rms_agg.txt b/docs/iris/src/whatsnew/contributions_2.3.0/newfeature_2018-Oct-24_lazy_rms_agg.txt deleted file mode 100644 index b6e3c17694..0000000000 --- a/docs/iris/src/whatsnew/contributions_2.3.0/newfeature_2018-Oct-24_lazy_rms_agg.txt +++ /dev/null @@ -1,4 +0,0 @@ -* The :data:`iris.analysis.RMS` aggregator now supports a lazy calculation. - However, the "weights" keyword is not currently supported by this, so a - *weighted* calculation will still return a realised result, *and* force - realisation of the original cube data. diff --git a/docs/iris/src/whatsnew/contributions_2.3.0/newfeature_2019-Jul-11_lazy-aggregated_by.txt b/docs/iris/src/whatsnew/contributions_2.3.0/newfeature_2019-Jul-11_lazy-aggregated_by.txt deleted file mode 100644 index 268b993f14..0000000000 --- a/docs/iris/src/whatsnew/contributions_2.3.0/newfeature_2019-Jul-11_lazy-aggregated_by.txt +++ /dev/null @@ -1,2 +0,0 @@ -* :meth:`iris.cube.Cube.aggregated_by` now performs aggregation lazily where -possible. diff --git a/docs/iris/src/whatsnew/contributions_2.3.0/newfeature_2019-Mar-08_remove_cell_measure_by_name.txt b/docs/iris/src/whatsnew/contributions_2.3.0/newfeature_2019-Mar-08_remove_cell_measure_by_name.txt deleted file mode 100644 index a7c417c729..0000000000 --- a/docs/iris/src/whatsnew/contributions_2.3.0/newfeature_2019-Mar-08_remove_cell_measure_by_name.txt +++ /dev/null @@ -1,2 +0,0 @@ -* :meth:`iris.cube.Cube.remove_cell_measure` now also allows removal of a cell -measure by its name (previously only accepted a CellMeasure object). diff --git a/docs/iris/src/whatsnew/contributions_2.3.0/newfeature_2019-Oct-02_cube_equality_tolerance.txt b/docs/iris/src/whatsnew/contributions_2.3.0/newfeature_2019-Oct-02_cube_equality_tolerance.txt deleted file mode 100644 index 7a0c15f421..0000000000 --- a/docs/iris/src/whatsnew/contributions_2.3.0/newfeature_2019-Oct-02_cube_equality_tolerance.txt +++ /dev/null @@ -1,6 +0,0 @@ -* Cube data equality testing (and hence cube equality) now uses a more relaxed - tolerance : This means that some cubes may now test 'equal' that previously - did not. - Previously, Iris compared cube data arrays using "abs(a - b) < 1.e-8". - We now apply the default operation of :func:`numpy.allclose` instead, - which is equivalent to "abs(a - b) < (1.e-8 + 1.e-5 * b)". diff --git a/docs/iris/src/whatsnew/contributions_2.3.0/newfeature_2019-Oct-02_cubelist_repr_html.txt b/docs/iris/src/whatsnew/contributions_2.3.0/newfeature_2019-Oct-02_cubelist_repr_html.txt deleted file mode 100644 index 0bf2789be8..0000000000 --- a/docs/iris/src/whatsnew/contributions_2.3.0/newfeature_2019-Oct-02_cubelist_repr_html.txt +++ /dev/null @@ -1 +0,0 @@ -* Added support to render HTML for :class:`~iris.cube.CubeList`s in Jupyter Notebooks and JupyterLab. diff --git a/docs/iris/src/whatsnew/contributions_2.3.0/newfeature_2019-Sep-02_standard_name_modifiers.txt b/docs/iris/src/whatsnew/contributions_2.3.0/newfeature_2019-Sep-02_standard_name_modifiers.txt deleted file mode 100644 index de8a7fc443..0000000000 --- a/docs/iris/src/whatsnew/contributions_2.3.0/newfeature_2019-Sep-02_standard_name_modifiers.txt +++ /dev/null @@ -1 +0,0 @@ -* Iris now supports standard name modifiers. See `Appendix C, Standard Name Modifiers `_ for more information. diff --git a/docs/iris/src/whatsnew/contributions_2.3.0/newfeature_2019-Sep-04_move_experimental_point-in-cell_regridder_to_analysis.txt b/docs/iris/src/whatsnew/contributions_2.3.0/newfeature_2019-Sep-04_move_experimental_point-in-cell_regridder_to_analysis.txt deleted file mode 100644 index 65b3d8d568..0000000000 --- a/docs/iris/src/whatsnew/contributions_2.3.0/newfeature_2019-Sep-04_move_experimental_point-in-cell_regridder_to_analysis.txt +++ /dev/null @@ -1,2 +0,0 @@ -* :class:`iris.experimental.regrid.PointInCell` moved to -:class:`iris.analysis.PointInCell` to make this regridding scheme public \ No newline at end of file diff --git a/docs/iris/src/whatsnew/contributions_2.3.0/newfeature_2019-Sep-11_climatological_bounds.txt b/docs/iris/src/whatsnew/contributions_2.3.0/newfeature_2019-Sep-11_climatological_bounds.txt deleted file mode 100644 index 7b4c62690e..0000000000 --- a/docs/iris/src/whatsnew/contributions_2.3.0/newfeature_2019-Sep-11_climatological_bounds.txt +++ /dev/null @@ -1,3 +0,0 @@ -* Support for loading, storing and saving of NetCDF climatological coordinates. -Stored as a boolean property - ``climatological`` - of the relevant -cube coordinate. diff --git a/docs/iris/src/whatsnew/contributions_2.3.0/newfeature_2019-Sep-20_geostationary_coordsystem.txt b/docs/iris/src/whatsnew/contributions_2.3.0/newfeature_2019-Sep-20_geostationary_coordsystem.txt deleted file mode 100644 index 67900c288a..0000000000 --- a/docs/iris/src/whatsnew/contributions_2.3.0/newfeature_2019-Sep-20_geostationary_coordsystem.txt +++ /dev/null @@ -1,5 +0,0 @@ -* New coordinate system: :class:`iris.coord_systems.Geostationary`, based on -the `CF Geostationary projection definition `_. -* :class:`iris.coord_systems.VerticalPerspective` can now be saved to and -loaded from NetCDF files. diff --git a/docs/iris/src/whatsnew/contributions_2.3.0/newfeature_2019-Sep-27_cell_measure_integer_data.txt b/docs/iris/src/whatsnew/contributions_2.3.0/newfeature_2019-Sep-27_cell_measure_integer_data.txt deleted file mode 100644 index 0a32b863dc..0000000000 --- a/docs/iris/src/whatsnew/contributions_2.3.0/newfeature_2019-Sep-27_cell_measure_integer_data.txt +++ /dev/null @@ -1 +0,0 @@ -* Loading CellMeasures with non-float values is now supported. From a5ddbf845c253d6a48db22e5172aabe123193622 Mon Sep 17 00:00:00 2001 From: Martin Yeo Date: Fri, 4 Oct 2019 15:17:48 +0100 Subject: [PATCH 08/34] Referenced CF conventions for NetCDF format example --- docs/iris/src/whatsnew/2.3.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/iris/src/whatsnew/2.3.rst b/docs/iris/src/whatsnew/2.3.rst index 72dba38c33..3c6b3e48ca 100644 --- a/docs/iris/src/whatsnew/2.3.rst +++ b/docs/iris/src/whatsnew/2.3.rst @@ -36,7 +36,9 @@ Iris 2.3.0 Features coordinate's ``bounds`` property are written to a NetCDF boundary variable called 'climatology_bounds'. These are in place of the more usual NetCDF 'bounds' attribute and accompanying 'bnds' boundary variable. See below - for an example: + for an `example from CF conventions `_: .. code-block:: From e870a91fe0482741a1abcf6ccfc8e3d205a6a93a Mon Sep 17 00:00:00 2001 From: Martin Yeo Date: Fri, 4 Oct 2019 15:21:54 +0100 Subject: [PATCH 09/34] Moved CF 1.7 support from bugfix to new feature. --- docs/iris/src/whatsnew/2.3.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/iris/src/whatsnew/2.3.rst b/docs/iris/src/whatsnew/2.3.rst index 3c6b3e48ca..c98c0e00fd 100644 --- a/docs/iris/src/whatsnew/2.3.rst +++ b/docs/iris/src/whatsnew/2.3.rst @@ -112,6 +112,7 @@ Iris 2.3.0 Features *weighted* calculation will still return a realised result, *and* force realisation of the original cube data. **NOTE:** lazy calculation with RMS is currently only supported for un-masked arrays. +* Iris now supports NetCDF Climate and Forecast (CF) Metadata Conventions 1.7 (see `CF 1.7 Conventions Document `_ for more information) Iris 2.3.0 Dependency Updates @@ -126,7 +127,6 @@ Iris 2.3.0 Dependency Updates Bugs Fixed ========== * Cube equality of boolean data is now handled correctly. -* Iris now supports NetCDF Climate and Forecast (CF) Metadata Conventions 1.7 (see `CF 1.7 Conventions Document `_ for more information) * Fixed a bug where cell measures were incorrect after a cube :meth:`~iris.cube.Cube.transpose` operation. Previously, this resulted in cell-measures that were no longer correctly mapped to the cube dimensions. From 1437aea5c924f20f0f4068762a1af251635fea88 Mon Sep 17 00:00:00 2001 From: Martin Yeo Date: Fri, 4 Oct 2019 15:22:54 +0100 Subject: [PATCH 10/34] Typo in Cube.collapsed. --- docs/iris/src/whatsnew/2.3.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/iris/src/whatsnew/2.3.rst b/docs/iris/src/whatsnew/2.3.rst index c98c0e00fd..cb66098f98 100644 --- a/docs/iris/src/whatsnew/2.3.rst +++ b/docs/iris/src/whatsnew/2.3.rst @@ -156,7 +156,7 @@ Bugs Fixed * The name of cubes loaded from abf/abl files has been corrected. * Fixed a bug in UM file loading, where any landsea-mask-compressed fields (i.e. with LBPACK=x2x) would cause an error later, when realising the data. -* :meth:`iris.cube.Cube.coll\apsed` now handles partial collapsing of +* :meth:`iris.cube.Cube.collapsed` now handles partial collapsing of multidimensional coordinates that have bounds. * Fixed a bug in the :data:`~iris.analysis.PROPORTION` aggregator, where cube data in the form of a masked array with ``array.mask=False`` would cause an From a4dbfbe7d6f9b6b30ab8d25eac21e99162010444 Mon Sep 17 00:00:00 2001 From: Martin Yeo Date: Fri, 4 Oct 2019 15:28:30 +0100 Subject: [PATCH 11/34] Underlines, code-block language and CF terminology fixes. --- docs/iris/src/whatsnew/2.3.rst | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/docs/iris/src/whatsnew/2.3.rst b/docs/iris/src/whatsnew/2.3.rst index cb66098f98..196ae3bfbe 100644 --- a/docs/iris/src/whatsnew/2.3.rst +++ b/docs/iris/src/whatsnew/2.3.rst @@ -1,5 +1,5 @@ What's New in Iris 2.3.0 -********************** +************************ :Release: 2.3.0 :Date: 2019-10-04 @@ -8,7 +8,7 @@ This document explains the new/changed features of Iris in version 2.3.0 (:doc:`View all changes `.) Iris 2.3.0 Features -================= +=================== .. _showcase: .. admonition:: Increased Support for CF 1.7 @@ -31,8 +31,9 @@ Iris 2.3.0 Features property: ``climatological``. The climatological bounds are stored in the coordinate's ``bounds`` property. - When an Iris climatological coordinate is saved in NetCDF, the NetCDF time - axis will be given a 'climatology' attribute, and the contents of the + When an Iris climatological coordinate is saved in NetCDF, the NetCDF + coordinate variable will be given a 'climatology' attribute, and the + contents of the coordinate's ``bounds`` property are written to a NetCDF boundary variable called 'climatology_bounds'. These are in place of the more usual NetCDF 'bounds' attribute and accompanying 'bnds' boundary variable. See below @@ -40,7 +41,7 @@ Iris 2.3.0 Features .org/Data/cf-conventions/cf-conventions-1.7/cf-conventions .html#climatological-statistics>`_: - .. code-block:: + .. code-block:: none dimensions: time=4; @@ -116,7 +117,7 @@ Iris 2.3.0 Features Iris 2.3.0 Dependency Updates -=========================== +============================= * The Proj4 pin has been moved from version 5 to version 6 pending `fixes to some cartopy tests `_. From 46c28001fc95d138fa0c86f15d83923b26fec1ea Mon Sep 17 00:00:00 2001 From: Martin Yeo Date: Fri, 4 Oct 2019 16:00:10 +0100 Subject: [PATCH 12/34] Correction to climatological docstring and What's New. --- docs/iris/src/whatsnew/2.3.rst | 20 ++++++++++---------- lib/iris/coords.py | 7 ++++--- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/docs/iris/src/whatsnew/2.3.rst b/docs/iris/src/whatsnew/2.3.rst index 196ae3bfbe..dfd78a0628 100644 --- a/docs/iris/src/whatsnew/2.3.rst +++ b/docs/iris/src/whatsnew/2.3.rst @@ -35,9 +35,9 @@ Iris 2.3.0 Features coordinate variable will be given a 'climatology' attribute, and the contents of the coordinate's ``bounds`` property are written to a NetCDF boundary variable - called 'climatology_bounds'. These are in place of the more usual NetCDF - 'bounds' attribute and accompanying 'bnds' boundary variable. See below - for an `example from CF conventions _bounds'. These are in place of a standard + 'bounds' attribute and accompanying boundary variable. See below + for an `example adapted from CF conventions `_: @@ -45,22 +45,22 @@ Iris 2.3.0 Features dimensions: time=4; - nv=2; + bnds=2; variables: float temperature(time,lat,lon); temperature:long_name="surface air temperature"; temperature:cell_methods="time: minimum within years time: mean over years"; temperature:units="K"; double time(time); - time:climatology="climatology_bounds"; + time:climatology="time_climatology"; time:units="days since 1960-1-1"; - double climatology_bounds(time,nv); + double time_climatology(time,bnds); data: // time coordinates translated to date/time format time="1960-4-16", "1960-7-16", "1960-10-16", "1961-1-16" ; - climatology_bounds="1960-3-1", "1990-6-1", - "1960-6-1", "1990-9-1", - "1960-9-1", "1990-12-1", - "1960-12-1", "1991-3-1" ; + time_climatology="1960-3-1", "1990-6-1", + "1960-6-1", "1990-9-1", + "1960-9-1", "1990-12-1", + "1960-12-1", "1991-3-1" ; If a climatological time axis is detected when loading NetCDF - indicated by the format described above - the ``climatological`` property diff --git a/lib/iris/coords.py b/lib/iris/coords.py index 67f41e911a..e66d5f1ac0 100644 --- a/lib/iris/coords.py +++ b/lib/iris/coords.py @@ -489,9 +489,10 @@ def __init__(self, points, standard_name=None, long_name=None, e.g. a :class:`~iris.coord_systems.GeogCS` for a longitude Coord. * climatological (bool): When True: the coordinate is a NetCDF climatological time axis. - When True: saving in NetCDF will label the time axis with - 'climatology' and 'climatology_bounds' in place of standard - bounds labels. + When True: saving in NetCDF will give the time axis a + 'climatology' attribute and a boundary variable called + '_climatology' in place of a standard bounds + attribute and bounds variable. Will set to True when a climatological time axis is loaded from NetCDF. Always False if no bounds exist. From ac6e8bb44a9a4ebe30dc3fcc1af7b7a51b582f36 Mon Sep 17 00:00:00 2001 From: Martin Yeo Date: Fri, 4 Oct 2019 16:02:48 +0100 Subject: [PATCH 13/34] Correction to climatological docstring and What's New. --- lib/iris/coords.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/iris/coords.py b/lib/iris/coords.py index e66d5f1ac0..27c793241a 100644 --- a/lib/iris/coords.py +++ b/lib/iris/coords.py @@ -489,8 +489,8 @@ def __init__(self, points, standard_name=None, long_name=None, e.g. a :class:`~iris.coord_systems.GeogCS` for a longitude Coord. * climatological (bool): When True: the coordinate is a NetCDF climatological time axis. - When True: saving in NetCDF will give the time axis a - 'climatology' attribute and a boundary variable called + When True: saving in NetCDF will give the coordinate variable a + 'climatology' attribute and will create a boundary variable called '_climatology' in place of a standard bounds attribute and bounds variable. Will set to True when a climatological time axis is loaded From 36e02545bfac251616eb6faea287e1697fae8429 Mon Sep 17 00:00:00 2001 From: Martin Yeo Date: Fri, 4 Oct 2019 16:05:05 +0100 Subject: [PATCH 14/34] Added Geostationary projection to CF 1.7 showcase. --- docs/iris/src/whatsnew/2.3.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/iris/src/whatsnew/2.3.rst b/docs/iris/src/whatsnew/2.3.rst index dfd78a0628..435d7360ee 100644 --- a/docs/iris/src/whatsnew/2.3.rst +++ b/docs/iris/src/whatsnew/2.3.rst @@ -19,6 +19,7 @@ Iris 2.3.0 Features * standard name modifier support * name tokens enforcement in cell methods * coordinate var_name, CF_CONVENTIONS_VERSION advanced to 1.7 + * Geostationary projection support You can read more about each of these below. From 33c5291d394fbf6815eb0176fb3201fef132f4a4 Mon Sep 17 00:00:00 2001 From: Martin Yeo Date: Fri, 4 Oct 2019 16:06:24 +0100 Subject: [PATCH 15/34] Chunking strategy phrasing. --- docs/iris/src/whatsnew/2.3.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/iris/src/whatsnew/2.3.rst b/docs/iris/src/whatsnew/2.3.rst index 435d7360ee..d84e31b626 100644 --- a/docs/iris/src/whatsnew/2.3.rst +++ b/docs/iris/src/whatsnew/2.3.rst @@ -70,7 +70,7 @@ Iris 2.3.0 Features .. admonition:: New Chunking Strategy Iris now makes better choices of Dask chunk sizes when loading from NetCDF - files: If a file variable has specified, small chunks, Iris will now choose + files: If a file variable has small, specified chunks, Iris will now choose Dask chunks which are a multiple of these up to a default target size. This is particularly relevant to files with an unlimited dimension, which From 66e78a34aa75eff8c785bbf6ff93c82279a1a8ef Mon Sep 17 00:00:00 2001 From: Martin Yeo Date: Fri, 4 Oct 2019 16:08:40 +0100 Subject: [PATCH 16/34] CubeList link for render HTML point. --- docs/iris/src/whatsnew/2.3.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/iris/src/whatsnew/2.3.rst b/docs/iris/src/whatsnew/2.3.rst index d84e31b626..1fe555d2ca 100644 --- a/docs/iris/src/whatsnew/2.3.rst +++ b/docs/iris/src/whatsnew/2.3.rst @@ -97,7 +97,8 @@ Iris 2.3.0 Features Previously, Iris compared cube data arrays using "abs(a - b) < 1.e-8". We now apply the default operation of :func:`numpy.allclose` instead, which is equivalent to "abs(a - b) < (1.e-8 + 1.e-5 * b)". -* Added support to render HTML for :class:`iris.cube.CubeList`s in Jupyter Notebooks and JupyterLab. +* Added support to render HTML for :class:`~iris.cube.CubeList` in Jupyter + Notebooks and JupyterLab. * Loading CellMeasures with non-float values is now supported. * New coordinate system: :class:`iris.coord_systems.Geostationary`, based on the `CF Geostationary projection definition Date: Fri, 4 Oct 2019 16:14:13 +0100 Subject: [PATCH 17/34] Removed reference to latest.rst from What's New index. --- docs/iris/src/whatsnew/index.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/iris/src/whatsnew/index.rst b/docs/iris/src/whatsnew/index.rst index 4341738d25..a4a472de53 100644 --- a/docs/iris/src/whatsnew/index.rst +++ b/docs/iris/src/whatsnew/index.rst @@ -9,7 +9,6 @@ Iris versions. .. toctree:: :maxdepth: 2 - latest.rst 2.3.rst 2.2.rst 2.1.rst From 814e0cd7bd7cd8dbf6bdadd2095ed31c2ee03916 Mon Sep 17 00:00:00 2001 From: Martin Yeo Date: Fri, 4 Oct 2019 16:35:02 +0100 Subject: [PATCH 18/34] CF 1.7 section links. --- docs/iris/src/whatsnew/2.3.rst | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/docs/iris/src/whatsnew/2.3.rst b/docs/iris/src/whatsnew/2.3.rst index 1fe555d2ca..ed0ccf49ff 100644 --- a/docs/iris/src/whatsnew/2.3.rst +++ b/docs/iris/src/whatsnew/2.3.rst @@ -15,14 +15,16 @@ Iris 2.3.0 Features Several changes have contributed to our increased support for CF 1.7: - * climatological coordinate support - * standard name modifier support - * name tokens enforcement in cell methods - * coordinate var_name, CF_CONVENTIONS_VERSION advanced to 1.7 - * Geostationary projection support + * :ref:`climatological coordinate support` + * :ref:`standard name modifier support` + * :ref:`name tokens enforcement in cell methods and coordinate + var_name` + * :ref:`CF_CONVENTIONS_VERSION advanced to 1.7` + * :ref:`Geostationary projection support` You can read more about each of these below. +.. _climatological: .. admonition:: Climatological Coordinate Support Iris can now load, store and save `NetCDF climatological coordinates @@ -91,6 +93,10 @@ Iris 2.3.0 Features ---- +.. _geostationary: +.. _standard_name: +.. _conventions_1.7: + * Cube data equality testing (and hence cube equality) now uses a more relaxed tolerance : This means that some cubes may now test 'equal' that previously did not. @@ -129,6 +135,8 @@ Iris 2.3.0 Dependency Updates Bugs Fixed ========== +.. _name_tokens: + * Cube equality of boolean data is now handled correctly. * Fixed a bug where cell measures were incorrect after a cube :meth:`~iris.cube.Cube.transpose` operation. Previously, this resulted in From 9f9260ebd9a2687d87d8d02b71e63463699b1e90 Mon Sep 17 00:00:00 2001 From: Martin Yeo Date: Fri, 4 Oct 2019 16:37:18 +0100 Subject: [PATCH 19/34] Removed duplicate note about realisation with iris.analysis.RMS --- docs/iris/src/whatsnew/2.3.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/iris/src/whatsnew/2.3.rst b/docs/iris/src/whatsnew/2.3.rst index ed0ccf49ff..d34e9d29a7 100644 --- a/docs/iris/src/whatsnew/2.3.rst +++ b/docs/iris/src/whatsnew/2.3.rst @@ -119,8 +119,7 @@ Iris 2.3.0 Features * The :data:`iris.analysis.RMS` aggregator now supports a lazy calculation. However, the "weights" keyword is not currently supported by this, so a *weighted* calculation will still return a realised result, *and* force - realisation of the original cube data. **NOTE:** lazy calculation with RMS - is currently only supported for un-masked arrays. + realisation of the original cube data. * Iris now supports NetCDF Climate and Forecast (CF) Metadata Conventions 1.7 (see `CF 1.7 Conventions Document `_ for more information) From 7075750f3b1657a7c924dfd8266dc45df069c6ea Mon Sep 17 00:00:00 2001 From: Martin Yeo Date: Fri, 4 Oct 2019 16:44:29 +0100 Subject: [PATCH 20/34] Improved formatting for cube equality point. --- docs/iris/src/whatsnew/2.3.rst | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/docs/iris/src/whatsnew/2.3.rst b/docs/iris/src/whatsnew/2.3.rst index d34e9d29a7..a4e7e9127f 100644 --- a/docs/iris/src/whatsnew/2.3.rst +++ b/docs/iris/src/whatsnew/2.3.rst @@ -97,12 +97,17 @@ Iris 2.3.0 Features .. _standard_name: .. _conventions_1.7: -* Cube data equality testing (and hence cube equality) now uses a more relaxed +* Cube data equality testing (and hence cube equality) now uses a more + relaxed tolerance : This means that some cubes may now test 'equal' that previously did not. - Previously, Iris compared cube data arrays using "abs(a - b) < 1.e-8". + Previously, Iris compared cube data arrays using: + ``abs(a - b) < 1.e-8`` + We now apply the default operation of :func:`numpy.allclose` instead, - which is equivalent to "abs(a - b) < (1.e-8 + 1.e-5 * b)". + which is equivalent to: + ``abs(a - b) < (1.e-8 + 1.e-5 * b)`` + * Added support to render HTML for :class:`~iris.cube.CubeList` in Jupyter Notebooks and JupyterLab. * Loading CellMeasures with non-float values is now supported. From 9aef9f3a9109d26461fa9dc0e77d3de6e47f1425 Mon Sep 17 00:00:00 2001 From: Martin Yeo Date: Fri, 4 Oct 2019 16:48:41 +0100 Subject: [PATCH 21/34] Fixed Dask dependency to by >=1.2. --- docs/iris/src/whatsnew/2.3.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/iris/src/whatsnew/2.3.rst b/docs/iris/src/whatsnew/2.3.rst index a4e7e9127f..b0cb734eac 100644 --- a/docs/iris/src/whatsnew/2.3.rst +++ b/docs/iris/src/whatsnew/2.3.rst @@ -133,7 +133,7 @@ Iris 2.3.0 Dependency Updates * The Proj4 pin has been moved from version 5 to version 6 pending `fixes to some cartopy tests `_. -* Iris now requires Dask > 1.2 to allow for improved coordinate equality +* Iris now requires Dask >= 1.2 to allow for improved coordinate equality checks. From d2422480fd055176b594706efe1aabb8f2420b9d Mon Sep 17 00:00:00 2001 From: Martin Yeo Date: Fri, 4 Oct 2019 16:55:00 +0100 Subject: [PATCH 22/34] Proj4 dependency phrasing. --- docs/iris/src/whatsnew/2.3.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/iris/src/whatsnew/2.3.rst b/docs/iris/src/whatsnew/2.3.rst index b0cb734eac..1ed268d043 100644 --- a/docs/iris/src/whatsnew/2.3.rst +++ b/docs/iris/src/whatsnew/2.3.rst @@ -130,8 +130,8 @@ Iris 2.3.0 Features Iris 2.3.0 Dependency Updates ============================= -* The Proj4 pin has been moved from version 5 to version 6 pending `fixes to - some cartopy tests `_. * Iris now requires Dask >= 1.2 to allow for improved coordinate equality checks. From ae4b4c0a38d4edcf6df144794bab22270452b74b Mon Sep 17 00:00:00 2001 From: Martin Yeo Date: Fri, 4 Oct 2019 16:56:40 +0100 Subject: [PATCH 23/34] with masked arrays -> with arrays with missing points. --- docs/iris/src/whatsnew/2.3.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/iris/src/whatsnew/2.3.rst b/docs/iris/src/whatsnew/2.3.rst index 1ed268d043..fcbdea2925 100644 --- a/docs/iris/src/whatsnew/2.3.rst +++ b/docs/iris/src/whatsnew/2.3.rst @@ -147,7 +147,8 @@ Bugs Fixed cell-measures that were no longer correctly mapped to the cube dimensions. * The :class:`~iris.coords.AuxCoord` disregarded masked points and bounds, as did the :class:`~iris.coords.DimCoord`. Fix permits an :class:`~iris.coords.AuxCoord` to contain masked points/bounds, and a TypeError exception is now - raised when attempting to create or set the points/bounds of a :class:`~iris.coords.DimCoord` with masked arrays. + raised when attempting to create or set the points/bounds of a + :class:`~iris.coords.DimCoord` with arrays with missing points. * :class:`iris.coord_systems.VerticalPerspective` coordinate system now uses the `CF Vertical perspective definition `_; had been From b82215bee8bc7f04f0f51d43058ad10b3730faeb Mon Sep 17 00:00:00 2001 From: Martin Yeo Date: Fri, 4 Oct 2019 16:58:00 +0100 Subject: [PATCH 24/34] var_name name token phrasing. --- docs/iris/src/whatsnew/2.3.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/iris/src/whatsnew/2.3.rst b/docs/iris/src/whatsnew/2.3.rst index fcbdea2925..12cffcd4bc 100644 --- a/docs/iris/src/whatsnew/2.3.rst +++ b/docs/iris/src/whatsnew/2.3.rst @@ -154,7 +154,8 @@ Bugs Fixed .org/cf-conventions/cf-conventions.html#vertical-perspective>`_; had been erroneously using Geostationary. * :class:`~iris.coords.CellMethod` will now only use valid `NetCDF name tokens `_ to reference the coordinates involved in the statistical operation. -* The following var_names will now only use valid `NetCDF name tokens +* The following var_name properties will now only allow valid `NetCDF name + tokens `_ to reference the said NetCDF variable name. Note that names with a leading From 28b509ac9792bf1d9075ab1c0e227193c7654b43 Mon Sep 17 00:00:00 2001 From: Martin Yeo Date: Fri, 4 Oct 2019 17:06:06 +0100 Subject: [PATCH 25/34] Removed reference to private method Cube._html_repr_. --- docs/iris/src/whatsnew/2.3.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/iris/src/whatsnew/2.3.rst b/docs/iris/src/whatsnew/2.3.rst index 12cffcd4bc..6fbbcc7dc8 100644 --- a/docs/iris/src/whatsnew/2.3.rst +++ b/docs/iris/src/whatsnew/2.3.rst @@ -165,8 +165,7 @@ Bugs Fixed - :attr:`iris.coords.Coord.var_name` - :attr:`iris.coords.AuxCoord.var_name` - :attr:`iris.cube.Cube.var_name` -* Cubes are now rendered more robustly by Jupyter. - :meth:`~iris.cube.Cube._repr_html_` no longer crashes for a cube with +* Rendering a cube in Jupyter will no longer crash for a cube with attributes containing ``\n``. * Variables which reference themselves in ``cell_measures`` can now be read. * :func:`~iris.plot.quiver` now handles circular coordinates. From f51562da8bd9ed319459f7932009c0231bc8e4f0 Mon Sep 17 00:00:00 2001 From: Martin Yeo Date: Fri, 4 Oct 2019 17:07:03 +0100 Subject: [PATCH 26/34] abf/abl cube pluralisation. --- docs/iris/src/whatsnew/2.3.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/iris/src/whatsnew/2.3.rst b/docs/iris/src/whatsnew/2.3.rst index 6fbbcc7dc8..dadd8782c4 100644 --- a/docs/iris/src/whatsnew/2.3.rst +++ b/docs/iris/src/whatsnew/2.3.rst @@ -169,7 +169,7 @@ Bugs Fixed attributes containing ``\n``. * Variables which reference themselves in ``cell_measures`` can now be read. * :func:`~iris.plot.quiver` now handles circular coordinates. -* The name of cubes loaded from abf/abl files has been corrected. +* The names of cubes loaded from abf/abl files have been corrected. * Fixed a bug in UM file loading, where any landsea-mask-compressed fields (i.e. with LBPACK=x2x) would cause an error later, when realising the data. * :meth:`iris.cube.Cube.collapsed` now handles partial collapsing of From 48abcaf9cf46feeae2ac6962d1f339ca34c0b35f Mon Sep 17 00:00:00 2001 From: Martin Yeo Date: Fri, 4 Oct 2019 17:17:51 +0100 Subject: [PATCH 27/34] Link for NEMO example. --- docs/iris/src/whatsnew/2.3.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/iris/src/whatsnew/2.3.rst b/docs/iris/src/whatsnew/2.3.rst index dadd8782c4..3b8eb8c9fa 100644 --- a/docs/iris/src/whatsnew/2.3.rst +++ b/docs/iris/src/whatsnew/2.3.rst @@ -195,7 +195,8 @@ Bugs Fixed Documentation Changes ===================== -* Added a gallery example showing how to concatenate NEMO ocean model data. +* Added a gallery example showing `how to concatenate NEMO ocean model data + `_. * Added an example in the `Loading Iris Cubes: Constraining on Time `_ Userguide section, demonstrating how to load data within a specified date From 2cd1abbd3b2c409c6a37953b7b773fd0b937397f Mon Sep 17 00:00:00 2001 From: Martin Yeo Date: Fri, 4 Oct 2019 17:21:03 +0100 Subject: [PATCH 28/34] Corrected internal documentation links. --- docs/iris/src/whatsnew/2.3.rst | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/iris/src/whatsnew/2.3.rst b/docs/iris/src/whatsnew/2.3.rst index 3b8eb8c9fa..f52bd5d0a6 100644 --- a/docs/iris/src/whatsnew/2.3.rst +++ b/docs/iris/src/whatsnew/2.3.rst @@ -196,13 +196,14 @@ Bugs Fixed Documentation Changes ===================== * Added a gallery example showing `how to concatenate NEMO ocean model data - `_. + `_. * Added an example in the - `Loading Iris Cubes: Constraining on Time `_ + `Loading Iris Cubes: Constraining on Time `_ Userguide section, demonstrating how to load data within a specified date range. * Added notes to the :func:`iris.load` documentation, and the userguide - `Loading Iris Cubes `_ + `Loading Iris Cubes `_ chapter, emphasizing that the *order* of the cubes returned by an iris load operation is effectively random and unstable, and should not be relied on. * Fixed references in the documentation of From c868fa6db10e475abb587d976e40fea03fe1e0a9 Mon Sep 17 00:00:00 2001 From: Martin Yeo Date: Fri, 4 Oct 2019 17:21:40 +0100 Subject: [PATCH 29/34] Corrected *integer* value support. --- docs/iris/src/whatsnew/2.3.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/iris/src/whatsnew/2.3.rst b/docs/iris/src/whatsnew/2.3.rst index f52bd5d0a6..93b29d0876 100644 --- a/docs/iris/src/whatsnew/2.3.rst +++ b/docs/iris/src/whatsnew/2.3.rst @@ -110,7 +110,7 @@ Iris 2.3.0 Features * Added support to render HTML for :class:`~iris.cube.CubeList` in Jupyter Notebooks and JupyterLab. -* Loading CellMeasures with non-float values is now supported. +* Loading CellMeasures with integer values is now supported. * New coordinate system: :class:`iris.coord_systems.Geostationary`, based on the `CF Geostationary projection definition `_. From aff6bc3080a6d884e07f532cc9e943dce8407df4 Mon Sep 17 00:00:00 2001 From: Martin Yeo Date: Fri, 4 Oct 2019 17:22:45 +0100 Subject: [PATCH 30/34] Geostationary includes load and save support. --- docs/iris/src/whatsnew/2.3.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/iris/src/whatsnew/2.3.rst b/docs/iris/src/whatsnew/2.3.rst index 93b29d0876..605143ef54 100644 --- a/docs/iris/src/whatsnew/2.3.rst +++ b/docs/iris/src/whatsnew/2.3.rst @@ -111,8 +111,9 @@ Iris 2.3.0 Features * Added support to render HTML for :class:`~iris.cube.CubeList` in Jupyter Notebooks and JupyterLab. * Loading CellMeasures with integer values is now supported. -* New coordinate system: :class:`iris.coord_systems.Geostationary`, based on - the `CF Geostationary projection definition `_. * :class:`iris.coord_systems.VerticalPerspective` can now be saved to and loaded from NetCDF files. From 5cc4fdf157a3f80ae5256bf6c72fce3a0afc4016 Mon Sep 17 00:00:00 2001 From: Martin Yeo Date: Fri, 4 Oct 2019 17:24:10 +0100 Subject: [PATCH 31/34] Clarified self-referencing NetCDF variables. --- docs/iris/src/whatsnew/2.3.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/iris/src/whatsnew/2.3.rst b/docs/iris/src/whatsnew/2.3.rst index 605143ef54..7e7ecc930e 100644 --- a/docs/iris/src/whatsnew/2.3.rst +++ b/docs/iris/src/whatsnew/2.3.rst @@ -168,7 +168,8 @@ Bugs Fixed - :attr:`iris.cube.Cube.var_name` * Rendering a cube in Jupyter will no longer crash for a cube with attributes containing ``\n``. -* Variables which reference themselves in ``cell_measures`` can now be read. +* NetCDF variables which reference themselves in their ``cell_measures`` + attribute can now be read. * :func:`~iris.plot.quiver` now handles circular coordinates. * The names of cubes loaded from abf/abl files have been corrected. * Fixed a bug in UM file loading, where any landsea-mask-compressed fields From a93d68803b5ab3c66e9cdb0e2b63a8a1c1b7e35b Mon Sep 17 00:00:00 2001 From: Martin Yeo Date: Fri, 4 Oct 2019 17:30:34 +0100 Subject: [PATCH 32/34] Reworded CF 1.7 showcase. --- docs/iris/src/whatsnew/2.3.rst | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/docs/iris/src/whatsnew/2.3.rst b/docs/iris/src/whatsnew/2.3.rst index 7e7ecc930e..3886043054 100644 --- a/docs/iris/src/whatsnew/2.3.rst +++ b/docs/iris/src/whatsnew/2.3.rst @@ -13,17 +13,21 @@ Iris 2.3.0 Features .. admonition:: Increased Support for CF 1.7 - Several changes have contributed to our increased support for CF 1.7: + We have introduced several changes that contribute to Iris's support for + the CF Conventions, including some CF 1.7 additions. We are now able to + support: - * :ref:`climatological coordinate support` - * :ref:`standard name modifier support` - * :ref:`name tokens enforcement in cell methods and coordinate + * :ref:`Climatological Coordinates` + * :ref:`Standard name modifiers` + * :ref:`Name tokens enforcement in cell methods and coordinate var_name` - * :ref:`CF_CONVENTIONS_VERSION advanced to 1.7` - * :ref:`Geostationary projection support` + * :ref:`Geostationary projection` You can read more about each of these below. + Additionally, the conventions attribute, added by Iris when saving to + NetCDF, has been updated to "CF-1.7", accordingly. + .. _climatological: .. admonition:: Climatological Coordinate Support @@ -113,7 +117,7 @@ Iris 2.3.0 Features * Loading CellMeasures with integer values is now supported. * New coordinate system: :class:`iris.coord_systems.Geostationary`, including load and save support, based on the `CF Geostationary projection - definition `_. * :class:`iris.coord_systems.VerticalPerspective` can now be saved to and loaded from NetCDF files. From 6688f35533feff84583fd6b71824121ec9de1966 Mon Sep 17 00:00:00 2001 From: Martin Yeo Date: Fri, 4 Oct 2019 17:31:49 +0100 Subject: [PATCH 33/34] Internal address fixes. --- docs/iris/src/whatsnew/2.3.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/iris/src/whatsnew/2.3.rst b/docs/iris/src/whatsnew/2.3.rst index 3886043054..d87647d502 100644 --- a/docs/iris/src/whatsnew/2.3.rst +++ b/docs/iris/src/whatsnew/2.3.rst @@ -202,14 +202,14 @@ Bugs Fixed Documentation Changes ===================== * Added a gallery example showing `how to concatenate NEMO ocean model data - `_. + <../examples/Oceanography/load_nemo.html>`_. * Added an example in the - `Loading Iris Cubes: Constraining on Time `_ Userguide section, demonstrating how to load data within a specified date range. * Added notes to the :func:`iris.load` documentation, and the userguide - `Loading Iris Cubes `_ + `Loading Iris Cubes <../userguide/loading_iris_cubes.html>`_ chapter, emphasizing that the *order* of the cubes returned by an iris load operation is effectively random and unstable, and should not be relied on. * Fixed references in the documentation of From 72a5c1f8a99347979d16f6b223d23f77a8d097fe Mon Sep 17 00:00:00 2001 From: Martin Yeo Date: Fri, 4 Oct 2019 17:40:28 +0100 Subject: [PATCH 34/34] Removed name tokens from the CF 1.7 showcase. --- docs/iris/src/whatsnew/2.3.rst | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docs/iris/src/whatsnew/2.3.rst b/docs/iris/src/whatsnew/2.3.rst index d87647d502..c5a6060146 100644 --- a/docs/iris/src/whatsnew/2.3.rst +++ b/docs/iris/src/whatsnew/2.3.rst @@ -19,8 +19,6 @@ Iris 2.3.0 Features * :ref:`Climatological Coordinates` * :ref:`Standard name modifiers` - * :ref:`Name tokens enforcement in cell methods and coordinate - var_name` * :ref:`Geostationary projection` You can read more about each of these below. @@ -144,8 +142,6 @@ Iris 2.3.0 Dependency Updates Bugs Fixed ========== -.. _name_tokens: - * Cube equality of boolean data is now handled correctly. * Fixed a bug where cell measures were incorrect after a cube :meth:`~iris.cube.Cube.transpose` operation. Previously, this resulted in