Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions docs/src/whatsnew/latest.rst
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ This document explains the changes made to Iris for this release
non-existing paths, and added expansion functionality to :func:`~iris.io.save`.
(:issue:`4772`, :pull:`4913`)

#. `@trexfeathers`_ and `Julian Heming`_ added new mappings between CF
standard names and UK Met Office LBFC codes. (:pull:`4859`)


🐛 Bugs Fixed
=============
Expand Down Expand Up @@ -140,6 +143,7 @@ This document explains the changes made to Iris for this release
core dev names are automatically included by the common_links.inc:

.. _@TTV-Intrepid: https://github.com/TTV-Intrepid
.. _Julian Heming: https://www.metoffice.gov.uk/research/people/julian-heming



Expand Down
13 changes: 13 additions & 0 deletions lib/iris/fileformats/um_cf_map.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@
LBFC_TO_CF = {
5: CFName('atmosphere_boundary_layer_thickness', None, 'm'),
16: CFName('air_temperature', None, 'K'),
22: CFName('wet_bulb_potential_temperature', None, 'K'),
23: CFName('soil_temperature', None, 'K'),
27: CFName('air_density', None, 'kg m-3'),
36: CFName('land_area_fraction', None, '1'),
37: CFName('sea_ice_area_fraction', None, '1'),
42: CFName('upward_air_velocity', None, 'm s-1'),
50: CFName('wind_speed', None, 'm s-1'),
56: CFName('x_wind', None, 'm s-1'),
57: CFName('y_wind', None, 'm s-1'),
Expand All @@ -28,11 +30,16 @@
83: CFName('potential_vorticity_of_atmosphere_layer', None, 'Pa-1 s-1'),
94: CFName('convective_rainfall_amount', None, 'kg m-2'),
97: CFName('rainfall_flux', None, 'kg m-2 s-1'),
98: CFName('convective_rainfall_flux', None, 'kg m-2 s-1'),
99: CFName('stratiform_rainfall_flux', None, 'kg m-2 s-1'),
102: CFName('stratiform_rainfall_amount', None, 'kg m-2'),
106: CFName('soil_moisture_content', None, 'kg m-2'),
108: CFName('snowfall_flux', None, 'kg m-2 s-1'),
111: CFName('surface_runoff_amount', None, 'kg m-2'),
116: CFName('stratiform_snowfall_amount', None, 'kg m-2'),
117: CFName('convective_snowfall_amount', None, 'kg m-2'),
118: CFName('stratiform_snowfall_flux', None, 'kg m-2 s-1'),
119: CFName('convective_snowfall_flux', None, 'kg m-2 s-1'),
122: CFName('moisture_content_of_soil_layer', None, 'kg m-2'),
183: CFName('wind_speed', None, 'm s-1'),
200: CFName('toa_incoming_shortwave_flux', None, 'W m-2'),
Expand Down Expand Up @@ -1157,7 +1164,9 @@
CFName('cloud_area_fraction_in_atmosphere_layer', None, '1'): 1720,
CFName('convective_cloud_area_fraction', None, '1'): 34,
CFName('convective_rainfall_amount', None, 'kg m-2'): 94,
CFName('convective_rainfall_flux', None, 'kg m-2 s-1'): 98,
CFName('convective_snowfall_amount', None, 'kg m-2'): 117,
CFName('convective_snowfall_flux', None, 'kg m-2 s-1'): 119,
CFName('dimensionless_exner_function', None, '1'): 7,
CFName('divergence_of_wind', None, 's-1'): 74,
CFName('downward_heat_flux_in_sea_ice', None, 'W m-2'): 261,
Expand Down Expand Up @@ -1203,6 +1212,7 @@
CFName('soil_albedo', None, '1'): 1395,
CFName('soil_carbon_content', None, 'kg m-2'): 1397,
CFName('soil_hydraulic_conductivity_at_saturation', None, 'm s-1'): 333,
CFName('soil_moisture_content', None, 'kg m-2'): 106,
CFName('soil_moisture_content_at_field_capacity', None, 'kg m-2'): 1559,
CFName('soil_porosity', None, '1'): 332,
CFName('soil_suction_at_saturation', None, 'Pa'): 342,
Expand All @@ -1212,8 +1222,10 @@
CFName('specific_kinetic_energy_of_air', None, 'm2 s-2'): 60,
CFName('stratiform_cloud_area_fraction_in_atmosphere_layer', None, '1'): 220,
CFName('stratiform_rainfall_amount', None, 'kg m-2'): 102,
CFName('stratiform_rainfall_flux', None, 'kg m-2 s-1'): 99,
CFName('stratiform_rainfall_rate', None, 'kg m-2 s-1'): 99,
CFName('stratiform_snowfall_amount', None, 'kg m-2'): 116,
CFName('stratiform_snowfall_flux', None, 'kg m-2 s-1'): 118,
CFName('subsurface_runoff_amount', None, 'kg m-2'): 112,
CFName('subsurface_runoff_flux', None, 'kg m-2 s-1'): 1533,
CFName('surface_albedo_assuming_deep_snow', None, '1'): 328,
Expand Down Expand Up @@ -1260,6 +1272,7 @@
CFName('volume_fraction_of_condensed_water_in_soil_at_critical_point', None, '1'): 330,
CFName('volume_fraction_of_condensed_water_in_soil_at_wilting_point', None, '1'): 329,
CFName('water_potential_evaporation_flux', None, 'kg m-2 s-1'): 115,
CFName('wet_bulb_potential_temperature', None, 'K'): 22,
CFName('wind_mixing_energy_flux_into_sea_water', None, 'W m-2'): 182,
CFName('wind_speed', None, 'm s-1'): 50,
CFName('x_wind', None, 'm s-1'): 56,
Expand Down