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

[FB] [PI-3585] Change default loading unit from "1" to "unknown" (correct branch) #3709

Merged
merged 9 commits into from
Jun 1, 2020
Merged

[FB] [PI-3585] Change default loading unit from "1" to "unknown" (correct branch) #3709

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
58f2509
change default loading unit from "1" to "unknown"
stephenworsley May 15, 2020
63001bf
fix unit default code
stephenworsley May 15, 2020
0a21653
update results to account for new default unit loading
stephenworsley May 15, 2020
17ea646
update results to account for new default unit loading
stephenworsley May 15, 2020
b30b0c6
address review comments
stephenworsley Jun 1, 2020
b0f23a5
fix tests
stephenworsley Jun 1, 2020
e568742
fix tests
stephenworsley Jun 1, 2020
c0190d4
address review comments
stephenworsley Jun 1, 2020
c051bb1
address review comments
stephenworsley Jun 1, 2020
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
1 change: 1 addition & 0 deletions ...atsnew/contributions_3.0.0/incompatiblechange_2020-May-15_change_default_unit_loading.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* NetCDF files containing variables without units will be given a unit of "unknown" rather than "1"
Copy link
Member

@pp-mo pp-mo May 29, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs fleshing out to make it clearer how it may affect the user.
Something like ...
"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".
This applies to cubes, coordinates, and ancillary data."

4 changes: 2 additions & 2 deletions lib/iris/fileformats/_pyke_rules/fc_rules_cf.krb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1651,9 +1651,9 @@ fc_extras

################################################################################
def get_attr_units(cf_var, attributes):
attr_units = getattr(cf_var, CF_ATTR_UNITS, cf_units._UNIT_DIMENSIONLESS)
attr_units = getattr(cf_var, CF_ATTR_UNITS, cf_units._UNKNOWN_UNIT_STRING)
Copy link
Member

@pp-mo pp-mo May 29, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see no need here to reference private bits of cf_units
-- though I admit that is what the existing code is doing !
We should set up our own global for this, with something like UNKNOWN_UNIT_STRING = str(cf_units(None))

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it make sense to change all the other references to private bits of cf_units to something similar? i.e. cf_units._NO_UNIT_STRING.

if not attr_units:
attr_units = '1'
attr_units = cf_units._UNKNOWN_UNIT_STRING

# Sanitise lat/lon units.
if attr_units in UD_UNITS_LAT or attr_units in UD_UNITS_LON:
Expand Down
56 changes: 28 additions & 28 deletions lib/iris/tests/results/netcdf/netcdf_cell_methods.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="int32" long_name="cube_axes_0" units="1" var_name="cube_axes_0">
<cube dtype="int32" long_name="cube_axes_0" units="unknown" var_name="cube_axes_0">
<coords>
<coord datadims="[1]">
<dimCoord id="4a0cb9d8" points="[0, 1]" shape="(2,)" standard_name="latitude" units="Unit('degrees')" value_type="int32" var_name="lat"/>
Expand All @@ -20,7 +20,7 @@
</cellMethods>
<data checksum="0xecbb4b55" dtype="int32" mask_checksum="0xf626d399" shape="(1, 2, 2)"/>
</cube>
<cube dtype="int32" long_name="cube_axes_1" units="1" var_name="cube_axes_1">
<cube dtype="int32" long_name="cube_axes_1" units="unknown" var_name="cube_axes_1">
<coords>
<coord datadims="[1]">
<dimCoord id="4a0cb9d8" points="[0, 1]" shape="(2,)" standard_name="latitude" units="Unit('degrees')" value_type="int32" var_name="lat"/>
Expand All @@ -41,7 +41,7 @@
</cellMethods>
<data checksum="0xecbb4b55" dtype="int32" mask_checksum="0xf626d399" shape="(1, 2, 2)"/>
</cube>
<cube dtype="int32" long_name="cube_axes_2" units="1" var_name="cube_axes_2">
<cube dtype="int32" long_name="cube_axes_2" units="unknown" var_name="cube_axes_2">
<coords>
<coord datadims="[1]">
<dimCoord id="4a0cb9d8" points="[0, 1]" shape="(2,)" standard_name="latitude" units="Unit('degrees')" value_type="int32" var_name="lat"/>
Expand All @@ -66,7 +66,7 @@
</cellMethods>
<data checksum="0xecbb4b55" dtype="int32" mask_checksum="0xf626d399" shape="(1, 2, 2)"/>
</cube>
<cube dtype="int32" long_name="cube_axes_3" units="1" var_name="cube_axes_3">
<cube dtype="int32" long_name="cube_axes_3" units="unknown" var_name="cube_axes_3">
<coords>
<coord datadims="[1]">
<dimCoord id="4a0cb9d8" points="[0, 1]" shape="(2,)" standard_name="latitude" units="Unit('degrees')" value_type="int32" var_name="lat"/>
Expand All @@ -89,7 +89,7 @@
</cellMethods>
<data checksum="0xecbb4b55" dtype="int32" mask_checksum="0xf626d399" shape="(1, 2, 2)"/>
</cube>
<cube dtype="int32" long_name="cube_axes_4" units="1" var_name="cube_axes_4">
<cube dtype="int32" long_name="cube_axes_4" units="unknown" var_name="cube_axes_4">
<coords>
<coord datadims="[1]">
<dimCoord id="4a0cb9d8" points="[0, 1]" shape="(2,)" standard_name="latitude" units="Unit('degrees')" value_type="int32" var_name="lat"/>
Expand All @@ -112,7 +112,7 @@
</cellMethods>
<data checksum="0xecbb4b55" dtype="int32" mask_checksum="0xf626d399" shape="(1, 2, 2)"/>
</cube>
<cube dtype="int32" long_name="cube_comment_0" units="1" var_name="cube_comment_0">
<cube dtype="int32" long_name="cube_comment_0" units="unknown" var_name="cube_comment_0">
<coords>
<coord datadims="[1]">
<dimCoord id="4a0cb9d8" points="[0, 1]" shape="(2,)" standard_name="latitude" units="Unit('degrees')" value_type="int32" var_name="lat"/>
Expand All @@ -131,7 +131,7 @@
</cellMethods>
<data checksum="0xecbb4b55" dtype="int32" mask_checksum="0xf626d399" shape="(1, 2, 2)"/>
</cube>
<cube dtype="int32" long_name="cube_comment_1" units="1" var_name="cube_comment_1">
<cube dtype="int32" long_name="cube_comment_1" units="unknown" var_name="cube_comment_1">
<coords>
<coord datadims="[1]">
<dimCoord id="4a0cb9d8" points="[0, 1]" shape="(2,)" standard_name="latitude" units="Unit('degrees')" value_type="int32" var_name="lat"/>
Expand All @@ -150,7 +150,7 @@
</cellMethods>
<data checksum="0xecbb4b55" dtype="int32" mask_checksum="0xf626d399" shape="(1, 2, 2)"/>
</cube>
<cube dtype="int32" long_name="cube_comment_2" units="1" var_name="cube_comment_2">
<cube dtype="int32" long_name="cube_comment_2" units="unknown" var_name="cube_comment_2">
<coords>
<coord datadims="[1]">
<dimCoord id="4a0cb9d8" points="[0, 1]" shape="(2,)" standard_name="latitude" units="Unit('degrees')" value_type="int32" var_name="lat"/>
Expand All @@ -170,7 +170,7 @@
</cellMethods>
<data checksum="0xecbb4b55" dtype="int32" mask_checksum="0xf626d399" shape="(1, 2, 2)"/>
</cube>
<cube dtype="int32" long_name="cube_comment_3" units="1" var_name="cube_comment_3">
<cube dtype="int32" long_name="cube_comment_3" units="unknown" var_name="cube_comment_3">
<coords>
<coord datadims="[1]">
<dimCoord id="4a0cb9d8" points="[0, 1]" shape="(2,)" standard_name="latitude" units="Unit('degrees')" value_type="int32" var_name="lat"/>
Expand All @@ -190,7 +190,7 @@
</cellMethods>
<data checksum="0xecbb4b55" dtype="int32" mask_checksum="0xf626d399" shape="(1, 2, 2)"/>
</cube>
<cube dtype="int32" long_name="cube_comment_4" units="1" var_name="cube_comment_4">
<cube dtype="int32" long_name="cube_comment_4" units="unknown" var_name="cube_comment_4">
<coords>
<coord datadims="[1]">
<dimCoord id="4a0cb9d8" points="[0, 1]" shape="(2,)" standard_name="latitude" units="Unit('degrees')" value_type="int32" var_name="lat"/>
Expand All @@ -213,7 +213,7 @@
</cellMethods>
<data checksum="0xecbb4b55" dtype="int32" mask_checksum="0xf626d399" shape="(1, 2, 2)"/>
</cube>
<cube dtype="int32" long_name="cube_interval_0" units="1" var_name="cube_interval_0">
<cube dtype="int32" long_name="cube_interval_0" units="unknown" var_name="cube_interval_0">
<coords>
<coord datadims="[1]">
<dimCoord id="4a0cb9d8" points="[0, 1]" shape="(2,)" standard_name="latitude" units="Unit('degrees')" value_type="int32" var_name="lat"/>
Expand All @@ -232,7 +232,7 @@
</cellMethods>
<data checksum="0xecbb4b55" dtype="int32" mask_checksum="0xf626d399" shape="(1, 2, 2)"/>
</cube>
<cube dtype="int32" long_name="cube_interval_1" units="1" var_name="cube_interval_1">
<cube dtype="int32" long_name="cube_interval_1" units="unknown" var_name="cube_interval_1">
<coords>
<coord datadims="[1]">
<dimCoord id="4a0cb9d8" points="[0, 1]" shape="(2,)" standard_name="latitude" units="Unit('degrees')" value_type="int32" var_name="lat"/>
Expand All @@ -252,7 +252,7 @@
</cellMethods>
<data checksum="0xecbb4b55" dtype="int32" mask_checksum="0xf626d399" shape="(1, 2, 2)"/>
</cube>
<cube dtype="int32" long_name="cube_interval_2" units="1" var_name="cube_interval_2">
<cube dtype="int32" long_name="cube_interval_2" units="unknown" var_name="cube_interval_2">
<coords>
<coord datadims="[1]">
<dimCoord id="4a0cb9d8" points="[0, 1]" shape="(2,)" standard_name="latitude" units="Unit('degrees')" value_type="int32" var_name="lat"/>
Expand All @@ -272,7 +272,7 @@
</cellMethods>
<data checksum="0xecbb4b55" dtype="int32" mask_checksum="0xf626d399" shape="(1, 2, 2)"/>
</cube>
<cube dtype="int32" long_name="cube_interval_3" units="1" var_name="cube_interval_3">
<cube dtype="int32" long_name="cube_interval_3" units="unknown" var_name="cube_interval_3">
<coords>
<coord datadims="[1]">
<dimCoord id="4a0cb9d8" points="[0, 1]" shape="(2,)" standard_name="latitude" units="Unit('degrees')" value_type="int32" var_name="lat"/>
Expand All @@ -295,7 +295,7 @@
</cellMethods>
<data checksum="0xecbb4b55" dtype="int32" mask_checksum="0xf626d399" shape="(1, 2, 2)"/>
</cube>
<cube dtype="int32" long_name="cube_interval_4" units="1" var_name="cube_interval_4">
<cube dtype="int32" long_name="cube_interval_4" units="unknown" var_name="cube_interval_4">
<coords>
<coord datadims="[1]">
<dimCoord id="4a0cb9d8" points="[0, 1]" shape="(2,)" standard_name="latitude" units="Unit('degrees')" value_type="int32" var_name="lat"/>
Expand All @@ -320,7 +320,7 @@
</cellMethods>
<data checksum="0xecbb4b55" dtype="int32" mask_checksum="0xf626d399" shape="(1, 2, 2)"/>
</cube>
<cube dtype="int32" long_name="cube_maximum" units="1" var_name="cube_maximum">
<cube dtype="int32" long_name="cube_maximum" units="unknown" var_name="cube_maximum">
<coords>
<coord datadims="[0]">
<dimCoord id="3a4420ff" points="[0]" shape="(1,)" standard_name="time" units="Unit('hours since 1970-1-1 00:00:00', calendar='gregorian')" value_type="int32" var_name="time"/>
Expand All @@ -333,7 +333,7 @@
</cellMethods>
<data checksum="0x2144df1c" dtype="int32" mask_checksum="0xa505df1b" shape="(1,)"/>
</cube>
<cube dtype="int32" long_name="cube_mean" units="1" var_name="cube_mean">
<cube dtype="int32" long_name="cube_mean" units="unknown" var_name="cube_mean">
<coords>
<coord datadims="[0]">
<dimCoord id="3a4420ff" points="[0]" shape="(1,)" standard_name="time" units="Unit('hours since 1970-1-1 00:00:00', calendar='gregorian')" value_type="int32" var_name="time"/>
Expand All @@ -346,7 +346,7 @@
</cellMethods>
<data checksum="0x2144df1c" dtype="int32" mask_checksum="0xa505df1b" shape="(1,)"/>
</cube>
<cube dtype="int32" long_name="cube_median" units="1" var_name="cube_median">
<cube dtype="int32" long_name="cube_median" units="unknown" var_name="cube_median">
<coords>
<coord datadims="[0]">
<dimCoord id="3a4420ff" points="[0]" shape="(1,)" standard_name="time" units="Unit('hours since 1970-1-1 00:00:00', calendar='gregorian')" value_type="int32" var_name="time"/>
Expand All @@ -359,7 +359,7 @@
</cellMethods>
<data checksum="0x2144df1c" dtype="int32" mask_checksum="0xa505df1b" shape="(1,)"/>
</cube>
<cube dtype="int32" long_name="cube_mid_range" units="1" var_name="cube_mid_range">
<cube dtype="int32" long_name="cube_mid_range" units="unknown" var_name="cube_mid_range">
<coords>
<coord datadims="[0]">
<dimCoord id="3a4420ff" points="[0]" shape="(1,)" standard_name="time" units="Unit('hours since 1970-1-1 00:00:00', calendar='gregorian')" value_type="int32" var_name="time"/>
Expand All @@ -372,7 +372,7 @@
</cellMethods>
<data checksum="0x2144df1c" dtype="int32" mask_checksum="0xa505df1b" shape="(1,)"/>
</cube>
<cube dtype="int32" long_name="cube_minimum" units="1" var_name="cube_minimum">
<cube dtype="int32" long_name="cube_minimum" units="unknown" var_name="cube_minimum">
<coords>
<coord datadims="[0]">
<dimCoord id="3a4420ff" points="[0]" shape="(1,)" standard_name="time" units="Unit('hours since 1970-1-1 00:00:00', calendar='gregorian')" value_type="int32" var_name="time"/>
Expand All @@ -385,7 +385,7 @@
</cellMethods>
<data checksum="0x2144df1c" dtype="int32" mask_checksum="0xa505df1b" shape="(1,)"/>
</cube>
<cube dtype="int32" long_name="cube_mix_0" units="1" var_name="cube_mix_0">
<cube dtype="int32" long_name="cube_mix_0" units="unknown" var_name="cube_mix_0">
<coords>
<coord datadims="[1]">
<dimCoord id="4a0cb9d8" points="[0, 1]" shape="(2,)" standard_name="latitude" units="Unit('degrees')" value_type="int32" var_name="lat"/>
Expand All @@ -404,7 +404,7 @@
</cellMethods>
<data checksum="0xecbb4b55" dtype="int32" mask_checksum="0xf626d399" shape="(1, 2, 2)"/>
</cube>
<cube dtype="int32" long_name="cube_mix_1" units="1" var_name="cube_mix_1">
<cube dtype="int32" long_name="cube_mix_1" units="unknown" var_name="cube_mix_1">
<coords>
<coord datadims="[1]">
<dimCoord id="4a0cb9d8" points="[0, 1]" shape="(2,)" standard_name="latitude" units="Unit('degrees')" value_type="int32" var_name="lat"/>
Expand All @@ -424,7 +424,7 @@
</cellMethods>
<data checksum="0xecbb4b55" dtype="int32" mask_checksum="0xf626d399" shape="(1, 2, 2)"/>
</cube>
<cube dtype="int32" long_name="cube_mix_2" units="1" var_name="cube_mix_2">
<cube dtype="int32" long_name="cube_mix_2" units="unknown" var_name="cube_mix_2">
<coords>
<coord datadims="[1]">
<dimCoord id="4a0cb9d8" points="[0, 1]" shape="(2,)" standard_name="latitude" units="Unit('degrees')" value_type="int32" var_name="lat"/>
Expand All @@ -447,7 +447,7 @@
</cellMethods>
<data checksum="0xecbb4b55" dtype="int32" mask_checksum="0xf626d399" shape="(1, 2, 2)"/>
</cube>
<cube dtype="int32" long_name="cube_mode" units="1" var_name="cube_mode">
<cube dtype="int32" long_name="cube_mode" units="unknown" var_name="cube_mode">
<coords>
<coord datadims="[0]">
<dimCoord id="3a4420ff" points="[0]" shape="(1,)" standard_name="time" units="Unit('hours since 1970-1-1 00:00:00', calendar='gregorian')" value_type="int32" var_name="time"/>
Expand All @@ -460,7 +460,7 @@
</cellMethods>
<data checksum="0x2144df1c" dtype="int32" mask_checksum="0xa505df1b" shape="(1,)"/>
</cube>
<cube dtype="int32" long_name="cube_point" units="1" var_name="cube_point">
<cube dtype="int32" long_name="cube_point" units="unknown" var_name="cube_point">
<coords>
<coord datadims="[0]">
<dimCoord id="3a4420ff" points="[0]" shape="(1,)" standard_name="time" units="Unit('hours since 1970-1-1 00:00:00', calendar='gregorian')" value_type="int32" var_name="time"/>
Expand All @@ -473,7 +473,7 @@
</cellMethods>
<data checksum="0x2144df1c" dtype="int32" mask_checksum="0xa505df1b" shape="(1,)"/>
</cube>
<cube dtype="int32" long_name="cube_standard_deviation" units="1" var_name="cube_standard_deviation">
<cube dtype="int32" long_name="cube_standard_deviation" units="unknown" var_name="cube_standard_deviation">
<coords>
<coord datadims="[0]">
<dimCoord id="3a4420ff" points="[0]" shape="(1,)" standard_name="time" units="Unit('hours since 1970-1-1 00:00:00', calendar='gregorian')" value_type="int32" var_name="time"/>
Expand All @@ -486,7 +486,7 @@
</cellMethods>
<data checksum="0x2144df1c" dtype="int32" mask_checksum="0xa505df1b" shape="(1,)"/>
</cube>
<cube dtype="int32" long_name="cube_sum" units="1" var_name="cube_sum">
<cube dtype="int32" long_name="cube_sum" units="unknown" var_name="cube_sum">
<coords>
<coord datadims="[0]">
<dimCoord id="3a4420ff" points="[0]" shape="(1,)" standard_name="time" units="Unit('hours since 1970-1-1 00:00:00', calendar='gregorian')" value_type="int32" var_name="time"/>
Expand All @@ -499,7 +499,7 @@
</cellMethods>
<data checksum="0x2144df1c" dtype="int32" mask_checksum="0xa505df1b" shape="(1,)"/>
</cube>
<cube dtype="int32" long_name="cube_variance" units="1" var_name="cube_variance">
<cube dtype="int32" long_name="cube_variance" units="unknown" var_name="cube_variance">
<coords>
<coord datadims="[0]">
<dimCoord id="3a4420ff" points="[0]" shape="(1,)" standard_name="time" units="Unit('hours since 1970-1-1 00:00:00', calendar='gregorian')" value_type="int32" var_name="time"/>
Expand Down
8 changes: 4 additions & 4 deletions lib/iris/tests/results/netcdf/netcdf_global_xyzt_gems.cml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
<dimCoord circular="True" id="c15a8e5b" long_name="longitude" points="[0.0, 1.0, 2.0, ..., 357.0, 358.0, 359.0]" shape="(360,)" standard_name="longitude" units="Unit('degrees')" value_type="float32" var_name="longitude"/>
</coord>
<coord datadims="[1]">
<dimCoord id="93a9a76c" long_name="model_level_number" points="[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
<dimCoord id="4bb21cba" long_name="model_level_number" points="[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
51, 52, 53, 54, 55, 56, 57, 58, 59, 60]" shape="(60,)" units="Unit('1')" value_type="int32" var_name="levelist"/>
51, 52, 53, 54, 55, 56, 57, 58, 59, 60]" shape="(60,)" units="Unit('unknown')" value_type="int32" var_name="levelist"/>
</coord>
<coord datadims="[0]">
<dimCoord id="90e644bf" long_name="time" points="[931344]" shape="(1,)" standard_name="time" units="Unit('hours since 1900-01-01 00:00:0.0', calendar='gregorian')" value_type="int32" var_name="time"/>
Expand All @@ -39,11 +39,11 @@
<dimCoord circular="True" id="c15a8e5b" long_name="longitude" points="[0.0, 1.0, 2.0, ..., 357.0, 358.0, 359.0]" shape="(360,)" standard_name="longitude" units="Unit('degrees')" value_type="float32" var_name="longitude"/>
</coord>
<coord datadims="[1]">
<dimCoord id="93a9a76c" long_name="model_level_number" points="[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
<dimCoord id="4bb21cba" long_name="model_level_number" points="[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
51, 52, 53, 54, 55, 56, 57, 58, 59, 60]" shape="(60,)" units="Unit('1')" value_type="int32" var_name="levelist"/>
51, 52, 53, 54, 55, 56, 57, 58, 59, 60]" shape="(60,)" units="Unit('unknown')" value_type="int32" var_name="levelist"/>
</coord>
<coord datadims="[0]">
<dimCoord id="90e644bf" long_name="time" points="[931344]" shape="(1,)" standard_name="time" units="Unit('hours since 1900-01-01 00:00:0.0', calendar='gregorian')" value_type="int32" var_name="time"/>
Expand Down
4 changes: 2 additions & 2 deletions lib/iris/tests/results/netcdf/netcdf_global_xyzt_gems_iter_0.cml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
<dimCoord circular="True" id="c15a8e5b" long_name="longitude" points="[0.0, 1.0, 2.0, ..., 357.0, 358.0, 359.0]" shape="(360,)" standard_name="longitude" units="Unit('degrees')" value_type="float32" var_name="longitude"/>
</coord>
<coord datadims="[1]">
<dimCoord id="93a9a76c" long_name="model_level_number" points="[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
<dimCoord id="4bb21cba" long_name="model_level_number" points="[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
51, 52, 53, 54, 55, 56, 57, 58, 59, 60]" shape="(60,)" units="Unit('1')" value_type="int32" var_name="levelist"/>
51, 52, 53, 54, 55, 56, 57, 58, 59, 60]" shape="(60,)" units="Unit('unknown')" value_type="int32" var_name="levelist"/>
</coord>
<coord datadims="[0]">
<dimCoord id="90e644bf" long_name="time" points="[931344]" shape="(1,)" standard_name="time" units="Unit('hours since 1900-01-01 00:00:0.0', calendar='gregorian')" value_type="int32" var_name="time"/>
Expand Down
4 changes: 2 additions & 2 deletions lib/iris/tests/results/netcdf/netcdf_global_xyzt_gems_iter_1.cml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
<dimCoord circular="True" id="c15a8e5b" long_name="longitude" points="[0.0, 1.0, 2.0, ..., 357.0, 358.0, 359.0]" shape="(360,)" standard_name="longitude" units="Unit('degrees')" value_type="float32" var_name="longitude"/>
</coord>
<coord datadims="[1]">
<dimCoord id="93a9a76c" long_name="model_level_number" points="[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
<dimCoord id="4bb21cba" long_name="model_level_number" points="[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
51, 52, 53, 54, 55, 56, 57, 58, 59, 60]" shape="(60,)" units="Unit('1')" value_type="int32" var_name="levelist"/>
51, 52, 53, 54, 55, 56, 57, 58, 59, 60]" shape="(60,)" units="Unit('unknown')" value_type="int32" var_name="levelist"/>
</coord>
<coord datadims="[0]">
<dimCoord id="90e644bf" long_name="time" points="[931344]" shape="(1,)" standard_name="time" units="Unit('hours since 1900-01-01 00:00:0.0', calendar='gregorian')" value_type="int32" var_name="time"/>
Expand Down
2 changes: 1 addition & 1 deletion ...cases/pp_to_cf_conversion/from_netcdf/002000000000.44.101.131200.1920.09.01.00.00.b_0.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="1" var_name="m__s44i101">
<cube dtype="float32" units="unknown" var_name="m__s44i101">
<attributes>
<attribute name="Conventions" value="CF-1.7"/>
<attribute name="STASH" value="m??s44i101"/>
Expand Down
Loading