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
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
* The cf_units dependency version has been updated to v1.2.0, which prints shorter unit strings.
For example, the unit ``meter-second^-1`` is now printed as ``m.s-1``.
2 changes: 1 addition & 1 deletion lib/iris/tests/results/analysis/apply_ifunc.cml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube dtype="float32" long_name="squared temperature" units="kelvin^2">
<cube dtype="float32" long_name="squared temperature" units="K2">
<coords>
<coord>
<dimCoord bounds="[[-28083.0, 6477.0]]" id="1d45e087" points="[6477]" shape="(1,)" standard_name="forecast_period" units="Unit('hours')" value_type="int32"/>
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/tests/results/analysis/apply_ifunc_frompyfunc.cml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube dtype="object" units="kelvin^2">
<cube dtype="object" units="K2">
<coords>
<coord>
<dimCoord bounds="[[-28083.0, 6477.0]]" id="1d45e087" points="[6477]" shape="(1,)" standard_name="forecast_period" units="Unit('hours')" value_type="int32"/>
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/tests/results/analysis/apply_ufunc.cml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube dtype="float32" long_name="squared temperature" units="kelvin^2">
<cube dtype="float32" long_name="squared temperature" units="K2">
<coords>
<coord>
<dimCoord bounds="[[-28083.0, 6477.0]]" id="1d45e087" points="[6477]" shape="(1,)" standard_name="forecast_period" units="Unit('hours')" value_type="int32"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube dtype="float64" long_name="u curl of wind" units="0.277777777777778 hertz">
<cube dtype="float64" long_name="u curl of wind" units="0.277777777777778 Hz">
<coords>
<coord datadims="[2]">
<dimCoord id="a2e1fbc2" points="[3.105, 5.315, 7.525, 9.735, 11.945, 14.155,
Expand Down Expand Up @@ -31,7 +31,7 @@
<cellMethods/>
<data dtype="float64" shape="(10, 25, 49)" state="loaded"/>
</cube>
<cube dtype="float64" long_name="v curl of wind" units="0.277777777777778 hertz">
<cube dtype="float64" long_name="v curl of wind" units="0.277777777777778 Hz">
<coords>
<coord datadims="[2]">
<dimCoord id="a2e1fbc2" points="[3.105, 5.315, 7.525, 9.735, 11.945, 14.155,
Expand Down Expand Up @@ -62,7 +62,7 @@
<cellMethods/>
<data dtype="float64" shape="(10, 25, 49)" state="loaded"/>
</cube>
<cube dtype="float64" long_name="w curl of wind" units="0.277777777777778 hertz">
<cube dtype="float64" long_name="w curl of wind" units="0.277777777777778 Hz">
<coords>
<coord datadims="[2]">
<dimCoord id="a2e1fbc2" points="[3.105, 5.315, 7.525, 9.735, 11.945, 14.155,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube dtype="float64" long_name="w curl of wind" units="0.277777777777778 second^-1-radian^-1">
<cube dtype="float64" long_name="w curl of wind" units="0.277777777777778 s-1.rad-1">
<coords>
<coord datadims="[0]">
<dimCoord id="620d7656" points="[-87.0, -81.0, -75.0, -69.0, -63.0, -57.0, -51.0,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube dtype="float64" long_name="w curl of wind" units="0.277777777777778 second^-1-radian^-1">
<cube dtype="float64" long_name="w curl of wind" units="0.277777777777778 s-1.rad-1">
<coords>
<coord datadims="[0]">
<dimCoord id="620d7656" points="[-88.7143, -86.1429, -83.5714, -81.0, -78.4286,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube dtype="float64" long_name="w curl of wind" units="0.277777777777778 hertz">
<cube dtype="float64" long_name="w curl of wind" units="0.277777777777778 Hz">
<coords>
<coord datadims="[1]">
<dimCoord id="a2e1fbc2" points="[3.105, 5.315, 7.525, 9.735, 11.945, 14.155,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube dtype="float32" long_name="derivative_of_x_wind_wrt_latitude" units="15.9154943091895 meter-second^-1-radian^-1">
<cube dtype="float32" long_name="derivative_of_x_wind_wrt_latitude" units="15.9154943091895 m.s-1.rad-1">
<coords>
<coord datadims="[1]">
<dimCoord id="77a50eb5" points="[-87.75, -83.25, -78.75, -74.25, -69.75, -65.25,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube dtype="float32" long_name="derivative_of_x_wind_wrt_longitude" units="15.9154943091895 meter-second^-1-radian^-1">
<cube dtype="float32" long_name="derivative_of_x_wind_wrt_longitude" units="15.9154943091895 m.s-1.rad-1">
<coords>
<coord datadims="[1]">
<dimCoord id="77a50eb5" points="[-90.0, -85.5, -81.0, -76.5, -72.0, -67.5, -63.0,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube dtype="float32" long_name="derivative_of_x_wind_wrt_x" units="0.277777777777778 meter-second^-1">
<cube dtype="float32" long_name="derivative_of_x_wind_wrt_x" units="0.277777777777778 m.s-1">
<coords>
<coord datadims="[0]">
<dimCoord id="61a1c174" long_name="x" points="[0.5, 1.5, 2.5, 3.5]" shape="(4,)" units="Unit('count')" value_type="float32"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube dtype="float32" long_name="derivative_of_x_wind_wrt_latitude" units="15.9154943091895 meter-second^-1-radian^-1">
<cube dtype="float32" long_name="derivative_of_x_wind_wrt_latitude" units="15.9154943091895 m.s-1.rad-1">
<coords>
<coord datadims="[1]">
<dimCoord id="77a50eb5" points="[-67.5, -22.5, 22.5, 67.5]" shape="(4,)" standard_name="latitude" units="Unit('degrees')" value_type="float32">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube dtype="float32" long_name="derivative_of_x_wind_wrt_longitude" units="15.9154943091895 meter-second^-1-radian^-1">
<cube dtype="float32" long_name="derivative_of_x_wind_wrt_longitude" units="15.9154943091895 m.s-1.rad-1">
<coords>
<coord datadims="[1]">
<dimCoord id="77a50eb5" points="[-90.0, -45.0, 0.0, 45.0, 90.0]" shape="(5,)" standard_name="latitude" units="Unit('degrees')" value_type="float32">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube dtype="float32" long_name="derivative_of_x_wind_wrt_x" units="0.277777777777778 meter-second^-1">
<cube dtype="float32" long_name="derivative_of_x_wind_wrt_x" units="0.277777777777778 m.s-1">
<coords>
<coord datadims="[1]">
<dimCoord id="77a50eb5" points="[-90.0, -45.0, 0.0, 45.0, 90.0]" shape="(5,)" standard_name="latitude" units="Unit('degrees')" value_type="float32">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube dtype="float32" long_name="derivative_of_x_wind_wrt_y" units="0.277777777777778 meter-second^-1">
<cube dtype="float32" long_name="derivative_of_x_wind_wrt_y" units="0.277777777777778 m.s-1">
<coords>
<coord datadims="[1]">
<dimCoord id="77a50eb5" points="[-67.5, -22.5, 22.5, 67.5]" shape="(4,)" standard_name="latitude" units="Unit('degrees')" value_type="float32">
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/tests/results/analysis/division_by_array.cml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube dtype="float32" units="kelvin">
<cube dtype="float32" units="K">
<coords>
<coord>
<dimCoord bounds="[[-28083.0, 6477.0]]" id="1d45e087" points="[6477]" shape="(1,)" standard_name="forecast_period" units="Unit('hours')" value_type="int32"/>
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/tests/results/analysis/division_by_latitude.cml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube dtype="float32" units="57.2957795130823 kelvin-radian^-1">
<cube dtype="float32" units="57.2957795130823 K.rad-1">
<coords>
<coord>
<dimCoord bounds="[[-28083.0, 6477.0]]" id="1d45e087" points="[6477]" shape="(1,)" standard_name="forecast_period" units="Unit('hours')" value_type="int32"/>
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/tests/results/analysis/division_by_longitude.cml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube dtype="float32" units="57.2957795130823 kelvin-radian^-1">
<cube dtype="float32" units="57.2957795130823 K.rad-1">
<coords>
<coord>
<dimCoord bounds="[[-28083.0, 6477.0]]" id="1d45e087" points="[6477]" shape="(1,)" standard_name="forecast_period" units="Unit('hours')" value_type="int32"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube dtype="float64" units="kelvin">
<cube dtype="float64" units="K">
<coords>
<coord>
<dimCoord bounds="[[-28083.0, 6477.0]]" id="1d45e087" points="[6477]" shape="(1,)" standard_name="forecast_period" units="Unit('hours')" value_type="int32"/>
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/tests/results/analysis/division_scalar.cml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube dtype="float32" units="kelvin">
<cube dtype="float32" units="K">
<coords>
<coord>
<dimCoord bounds="[[-28083.0, 6477.0]]" id="1d45e087" points="[6477]" shape="(1,)" standard_name="forecast_period" units="Unit('hours')" value_type="int32"/>
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/tests/results/analysis/exponentiate.cml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube dtype="float64" units="kelvin^4">
<cube dtype="float64" units="K4">
<coords>
<coord>
<dimCoord bounds="[[-28083.0, 6477.0]]" id="1d45e087" points="[6477]" shape="(1,)" standard_name="forecast_period" units="Unit('hours')" value_type="int32"/>
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/tests/results/analysis/log.cml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube dtype="float32" units="ln(re 1 kelvin)">
<cube dtype="float32" units="ln(re 1 K)">
<coords>
<coord>
<dimCoord bounds="[[-28083.0, 6477.0]]" id="1d45e087" points="[6477]" shape="(1,)" standard_name="forecast_period" units="Unit('hours')" value_type="int32"/>
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/tests/results/analysis/log10.cml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube dtype="float32" units="lg(re 1 kelvin)">
<cube dtype="float32" units="lg(re 1 K)">
<coords>
<coord>
<dimCoord bounds="[[-28083.0, 6477.0]]" id="1d45e087" points="[6477]" shape="(1,)" standard_name="forecast_period" units="Unit('hours')" value_type="int32"/>
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/tests/results/analysis/log2.cml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube dtype="float32" units="lb(re 1 kelvin)">
<cube dtype="float32" units="lb(re 1 K)">
<coords>
<coord>
<dimCoord bounds="[[-28083.0, 6477.0]]" id="1d45e087" points="[6477]" shape="(1,)" standard_name="forecast_period" units="Unit('hours')" value_type="int32"/>
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/tests/results/analysis/multiply.cml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube dtype="float32" units="kelvin^2">
<cube dtype="float32" units="K2">
<coords>
<coord>
<dimCoord bounds="[[-28083.0, 6477.0]]" id="1d45e087" points="[6477]" shape="(1,)" standard_name="forecast_period" units="Unit('hours')" value_type="int32"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube dtype="float32" units="kelvin^2">
<cube dtype="float32" units="K2">
<coords>
<coord>
<dimCoord bounds="[[-28083.0, 6477.0]]" id="1d45e087" points="[6477]" shape="(1,)" standard_name="forecast_period" units="Unit('hours')" value_type="int32"/>
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/tests/results/analysis/sqrt.cml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube dtype="float32" units="kelvin">
<cube dtype="float32" units="K">
<coords>
<coord>
<dimCoord bounds="[[-28083.0, 6477.0]]" id="1d45e087" points="[6477]" shape="(1,)" standard_name="forecast_period" units="Unit('hours')" value_type="int32"/>
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/tests/results/analysis/variance_latitude.cml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube dtype="float64" standard_name="air_pressure_at_sea_level" units="meter^-2-kilogram^2-second^-4">
<cube dtype="float64" standard_name="air_pressure_at_sea_level" units="m-2.kg2.s-4">
<attributes>
<attribute name="STASH" value="m01s16i222"/>
<attribute name="source" value="Data from Met Office Unified Model"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube dtype="float64" standard_name="air_pressure_at_sea_level" units="meter^-4-kilogram^4-second^-8">
<cube dtype="float64" standard_name="air_pressure_at_sea_level" units="m-4.kg4.s-8">
<attributes>
<attribute name="STASH" value="m01s16i222"/>
<attribute name="source" value="Data from Met Office Unified Model"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube dtype="float64" standard_name="air_pressure_at_sea_level" units="meter^-2-kilogram^2-second^-4">
<cube dtype="float64" standard_name="air_pressure_at_sea_level" units="m-2.kg2.s-4">
<attributes>
<attribute name="STASH" value="m01s16i222"/>
<attribute name="source" value="Data from Met Office Unified Model"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube dtype="float32" units="kelvin^2">
<cube dtype="float32" units="K2">
<coords>
<coord>
<dimCoord id="1d45e087" points="[0.0]" shape="(1,)" standard_name="forecast_period" units="Unit('hours')" value_type="float64"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube dtype="float32" units="kelvin^2">
<cube dtype="float32" units="K2">
<coords>
<coord>
<dimCoord id="1d45e087" points="[0.0]" shape="(1,)" standard_name="forecast_period" units="Unit('hours')" value_type="float64"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube dtype="float32" units="kelvin^2">
<cube dtype="float32" units="K2">
<coords>
<coord>
<dimCoord id="1d45e087" points="[0.0]" shape="(1,)" standard_name="forecast_period" units="Unit('hours')" value_type="float64"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube dtype="float32" units="kelvin^2">
<cube dtype="float32" units="K2">
<coords>
<coord>
<dimCoord id="1d45e087" points="[0.0]" shape="(1,)" standard_name="forecast_period" units="Unit('hours')" value_type="float64"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube dtype="float32" units="kelvin^2">
<cube dtype="float32" units="K2">
<coords>
<coord>
<dimCoord id="1d45e087" points="[0.0]" shape="(1,)" standard_name="forecast_period" units="Unit('hours')" value_type="float64"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" ?>
<cubes xmlns="urn:x-iris:cubeml-0.2">
<cube dtype="float32" units="kelvin^2">
<cube dtype="float32" units="K2">
<coords>
<coord>
<dimCoord id="1d45e087" points="[0.0]" shape="(1,)" standard_name="forecast_period" units="Unit('hours')" value_type="float64"/>
Expand Down