From 4df66506ef6efe8f62b7e7ba455adebc7793ad66 Mon Sep 17 00:00:00 2001 From: Bill Little Date: Sat, 5 Sep 2020 08:04:12 +0100 Subject: [PATCH 1/2] move whatsnew contributions --- ...gfix_2019-Nov-21_cell_measure_attributes.txt | 2 -- ...change_2020-Aug-25_clarify_unit_handling.txt | 1 - ..._2020-May-15_change_default_unit_loading.txt | 1 - ...eature_2019-Nov-21_netcdf_ancillary_data.txt | 2 -- docs/iris/src/whatsnew/latest.rst | 17 ++++++++++++++++- 5 files changed, 16 insertions(+), 7 deletions(-) delete mode 100644 docs/iris/src/whatsnew/contributions_3.0.0/bugfix_2019-Nov-21_cell_measure_attributes.txt delete mode 100644 docs/iris/src/whatsnew/contributions_3.0.0/docchange_2020-Aug-25_clarify_unit_handling.txt delete mode 100644 docs/iris/src/whatsnew/contributions_3.0.0/incompatiblechange_2020-May-15_change_default_unit_loading.txt delete mode 100644 docs/iris/src/whatsnew/contributions_3.0.0/newfeature_2019-Nov-21_netcdf_ancillary_data.txt diff --git a/docs/iris/src/whatsnew/contributions_3.0.0/bugfix_2019-Nov-21_cell_measure_attributes.txt b/docs/iris/src/whatsnew/contributions_3.0.0/bugfix_2019-Nov-21_cell_measure_attributes.txt deleted file mode 100644 index 577e193fe5..0000000000 --- a/docs/iris/src/whatsnew/contributions_3.0.0/bugfix_2019-Nov-21_cell_measure_attributes.txt +++ /dev/null @@ -1,2 +0,0 @@ -* Fixed a bug where the attributes of cell measures in netcdf-CF files were discarded on - loading. They now appear on the CellMeasure in the loaded cube. diff --git a/docs/iris/src/whatsnew/contributions_3.0.0/docchange_2020-Aug-25_clarify_unit_handling.txt b/docs/iris/src/whatsnew/contributions_3.0.0/docchange_2020-Aug-25_clarify_unit_handling.txt deleted file mode 100644 index a9d953dfbe..0000000000 --- a/docs/iris/src/whatsnew/contributions_3.0.0/docchange_2020-Aug-25_clarify_unit_handling.txt +++ /dev/null @@ -1 +0,0 @@ -* Added an explanation to the user guide of how units are handled by cube arithmetic. \ No newline at end of file diff --git a/docs/iris/src/whatsnew/contributions_3.0.0/incompatiblechange_2020-May-15_change_default_unit_loading.txt b/docs/iris/src/whatsnew/contributions_3.0.0/incompatiblechange_2020-May-15_change_default_unit_loading.txt deleted file mode 100644 index be048990f3..0000000000 --- a/docs/iris/src/whatsnew/contributions_3.0.0/incompatiblechange_2020-May-15_change_default_unit_loading.txt +++ /dev/null @@ -1 +0,0 @@ -* When loading data from netcdf-CF files, where a variable has no "units" property, the corresponding Iris object will have "units='unknown'". Prior to Iris 3.0, these cases defaulted to "units='1'". \ No newline at end of file diff --git a/docs/iris/src/whatsnew/contributions_3.0.0/newfeature_2019-Nov-21_netcdf_ancillary_data.txt b/docs/iris/src/whatsnew/contributions_3.0.0/newfeature_2019-Nov-21_netcdf_ancillary_data.txt deleted file mode 100644 index 26f01c16c2..0000000000 --- a/docs/iris/src/whatsnew/contributions_3.0.0/newfeature_2019-Nov-21_netcdf_ancillary_data.txt +++ /dev/null @@ -1,2 +0,0 @@ -* CF Ancillary Variables are now loaded from and saved to netcdf-CF files. Support for `quality flags `_ is also provided to ensure they load and save with appropriate units. - diff --git a/docs/iris/src/whatsnew/latest.rst b/docs/iris/src/whatsnew/latest.rst index ec7cffad92..5ca3b23df2 100644 --- a/docs/iris/src/whatsnew/latest.rst +++ b/docs/iris/src/whatsnew/latest.rst @@ -27,7 +27,9 @@ Features dependency on `matplotlib`_ at ``v2.x``. Now that ``Python2`` support has been dropped, ``Iris`` is free to use the latest version of `matplotlib`_. -* `CF Ancillary Data`_ variables are now supported. +* `CF Ancillary Data`_ variables are now supported, and can be loaded from and + saved to NetCDF-CF files. Support for `Quality Flags`_ is also provided to + ensure they load and save with appropriate units. Dependency Updates @@ -80,6 +82,10 @@ Bugs Fixed (previously would take the unit from a time coordinate, if present, even though the coordinate's value had been changed via ``date2num``). +* Attributes of cell measures in NetCDF-CF files were being discarded during + loading. They are now available on the :class:`~iris.coords.CellMeasure` in + the loaded :class:`~iris.cube.Cube`. + Incompatible Changes ==================== @@ -109,6 +115,11 @@ Incompatible Changes :func:`iris.experimental.concatenate.concatenate` function raised an exception. +* When loading data from NetCDF-CF files, where a variable has no ``units`` + property, the corresponding Iris object will have ``units='unknown'``. + Prior to Iris ``3.0.0``, these cases defaulted to ``units='1'``. + + Internal ======== @@ -176,6 +187,10 @@ Documentation * Added a warning to the :func:`iris.analysis.cartography.project` function regarding its behaviour on projections with non-rectangular boundaries. +* Added an explanation to the user guide of how ``Units`` are handled during + cube arithmetic. + .. _Read the Docs: https://scitools-iris.readthedocs.io/en/latest/ .. _matplotlib: https://matplotlib.org/ .. _CF Ancillary Data: https://cfconventions.org/Data/cf-conventions/cf-conventions-1.8/cf-conventions.html#ancillary-data +.. _Quality Flags: https://cfconventions.org/Data/cf-conventions/cf-conventions-1.8/cf-conventions.html#flags From 3dc0d305cb09ec91eb7c09b86e2824455411ed8b Mon Sep 17 00:00:00 2001 From: Bill Little Date: Mon, 7 Sep 2020 07:57:24 +0100 Subject: [PATCH 2/2] review actions --- docs/iris/src/userguide/cube_maths.rst | 2 ++ docs/iris/src/whatsnew/latest.rst | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/docs/iris/src/userguide/cube_maths.rst b/docs/iris/src/userguide/cube_maths.rst index e42af10ea2..69273b45b9 100644 --- a/docs/iris/src/userguide/cube_maths.rst +++ b/docs/iris/src/userguide/cube_maths.rst @@ -219,6 +219,8 @@ The result could now be plotted using the guidance provided in the A very similar example to this can be found in the examples section, with the title "Deriving Exner Pressure and Air Temperature". +.. _cube_maths_combining_units: + Combining units --------------- diff --git a/docs/iris/src/whatsnew/latest.rst b/docs/iris/src/whatsnew/latest.rst index 5ca3b23df2..fed6350acf 100644 --- a/docs/iris/src/whatsnew/latest.rst +++ b/docs/iris/src/whatsnew/latest.rst @@ -29,7 +29,7 @@ Features * `CF Ancillary Data`_ variables are now supported, and can be loaded from and saved to NetCDF-CF files. Support for `Quality Flags`_ is also provided to - ensure they load and save with appropriate units. + ensure they load and save with appropriate units. See :pull:`3800`. Dependency Updates @@ -84,7 +84,7 @@ Bugs Fixed * Attributes of cell measures in NetCDF-CF files were being discarded during loading. They are now available on the :class:`~iris.coords.CellMeasure` in - the loaded :class:`~iris.cube.Cube`. + the loaded :class:`~iris.cube.Cube`. See :pull:`3800`. Incompatible Changes @@ -118,6 +118,7 @@ Incompatible Changes * When loading data from NetCDF-CF files, where a variable has no ``units`` property, the corresponding Iris object will have ``units='unknown'``. Prior to Iris ``3.0.0``, these cases defaulted to ``units='1'``. + See :pull:`3795`. Internal @@ -187,8 +188,8 @@ Documentation * Added a warning to the :func:`iris.analysis.cartography.project` function regarding its behaviour on projections with non-rectangular boundaries. -* Added an explanation to the user guide of how ``Units`` are handled during - cube arithmetic. +* Added the :ref:`cube_maths_combining_units` section to the user guide to + clarify how ``Units`` are handled during cube arithmetic. .. _Read the Docs: https://scitools-iris.readthedocs.io/en/latest/ .. _matplotlib: https://matplotlib.org/