Skip to content

CML changes for cf_units v1.2.0 #2936

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

Merged
pelson merged 4 commits into from
Jan 11, 2018
Merged

CML changes for cf_units v1.2.0 #2936

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9d17b3a
CML changes for cf-units v1.2.0
DPeterK Jan 11, 2018
011befe
Fix newly-failing tests
DPeterK Jan 11, 2018
bedb05b
Add whatsnew entry
DPeterK Jan 11, 2018
98cf27f
Correct another CML file
DPeterK Jan 11, 2018
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
2 changes: 1 addition & 1 deletion lib/iris/tests/results/analysis/apply_ifunc.cml
View file
Open in desktop
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_ufunc.cml
View file
Open in desktop
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
6 changes: 3 additions & 3 deletions lib/iris/tests/results/analysis/calculus/curl_contrived_cartesian2.cml
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion lib/iris/tests/results/analysis/calculus/grad_contrived1.cml
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion lib/iris/tests/results/analysis/calculus/grad_contrived2.cml
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion lib/iris/tests/results/analysis/calculus/grad_contrived_non_spherical1.cml
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion lib/iris/tests/results/analysis/calculus/handmade2_wrt_lat.cml
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion lib/iris/tests/results/analysis/calculus/handmade2_wrt_lon.cml
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion lib/iris/tests/results/analysis/calculus/handmade_simple_wrt_x.cml
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion lib/iris/tests/results/analysis/calculus/handmade_wrt_lat.cml
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion lib/iris/tests/results/analysis/calculus/handmade_wrt_lon.cml
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion lib/iris/tests/results/analysis/calculus/handmade_wrt_x.cml
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion lib/iris/tests/results/analysis/calculus/handmade_wrt_y.cml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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_singular_coord.cml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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/multiply_different_std_name.cml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion lib/iris/tests/results/unit/analysis/maths/multiply/TestBroadcasting/collapse_all_dims.cml
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion lib/iris/tests/results/unit/analysis/maths/multiply/TestBroadcasting/collapse_last_dims.cml
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion lib/iris/tests/results/unit/analysis/maths/multiply/TestBroadcasting/collapse_middle_dim.cml
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion lib/iris/tests/results/unit/analysis/maths/multiply/TestBroadcasting/collapse_zeroth_dim.cml
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion lib/iris/tests/results/unit/analysis/maths/multiply/TestBroadcasting/slice.cml
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion lib/iris/tests/results/unit/analysis/maths/multiply/TestBroadcasting/transposed.cml
View file
Open in desktop
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