Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix 4566 #4569

Merged
merged 15 commits into from
May 12, 2023
Merged

Bugfix 4566 #4569

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
79f8259
Standard name of m01i00s023
rsdavies Feb 4, 2022
fcc589d
add note to latest.rst
rsdavies Feb 4, 2022
b0875f5
Adds github page name to dev.rst
rsdavies Feb 9, 2022
ea48601
Standard name of m01i00s023
rsdavies Feb 4, 2022
aea1099
add note to latest.rst
rsdavies Feb 4, 2022
70fc238
Adds github page name to dev.rst
rsdavies Feb 9, 2022
66b2b94
Merge branch 'bugfix-4566' of github.com:rsdavies/iris into bugfix-4566
rsdavies Feb 10, 2022
0c8826a
add information to latest.rst
rsdavies May 12, 2023
ac42f53
Merge remote-tracking branch 'upstream/main' into main
rsdavies May 12, 2023
3054ba5
added to latest.rst
rsdavies May 12, 2023
d164a8e
Merge branch 'main' into bugfix-4566
rsdavies May 12, 2023
68a39a5
Update docs/src/whatsnew/latest.rst
rsdavies May 12, 2023
8f42c71
also change name in um_cf_map.py
rsdavies May 12, 2023
e109b16
fix units
rsdavies May 12, 2023
8a225f7
now properly align units with new name...
rsdavies May 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion docs/src/whatsnew/latest.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ This document explains the changes made to Iris for this release
===========================

#. `@rcomer`_ made :meth:`~iris.cube.Cube.aggregated_by` faster. (:pull:`4970`)
#. `@rsdavies`_ modified the CF complaint standard name for m01s00i023 :issue:`4566`
rsdavies marked this conversation as resolved.
Show resolved Hide resolved

🔥 Deprecations
===============
Expand Down Expand Up @@ -77,7 +78,7 @@ This document explains the changes made to Iris for this release
.. comment
Whatsnew author names (@github name) in alphabetical order. Note that,
core dev names are automatically included by the common_links.inc:

.. _@rsdavies: https://github.com/rsdavies



Expand Down
2 changes: 1 addition & 1 deletion lib/iris/fileformats/um_cf_map.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
'm01s00i012': CFName('mass_fraction_of_cloud_ice_in_air', None, 'kg kg-1'),
'm01s00i013': CFName('convective_cloud_area_fraction', None, '1'),
'm01s00i020': CFName('soil_temperature', None, 'K'),
'm01s00i023': CFName('snowfall_amount', None, 'kg m-2'),
'm01s00i023': CFName('surface_snow_amount', None, 'kg m-2'),
'm01s00i024': CFName('surface_temperature', None, 'K'),
'm01s00i025': CFName('atmosphere_boundary_layer_thickness', None, 'm'),
'm01s00i026': CFName('surface_roughness_length', None, 'm'),
Expand Down