Skip to content

Fixes for tests where we expect a masked array but get a NaN array #2760

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
pp-mo merged 1 commit into from
Oct 17, 2017
+146 −151
Merged

Fixes for tests where we expect a masked array but get a NaN array #2760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions lib/iris/tests/results/analysis/regrid/linear_circular_grid.cml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
</attributes>
<coords>
<coord datadims="[0, 1]">
<auxCoord id="9041e969" points="[[--, --, 260.259246826, 260.259246826],
[--, --, 377.580688477, 374.184997559],
[--, --, 494.902130127, 488.110778809],
[--, --, 612.223571777, 602.036560059]]" shape="(4, 4)" standard_name="altitude" units="Unit('m')" value_type="float64">
<auxCoord id="9041e969" points="[[nan, nan, 260.259246826, 260.259246826],
[nan, nan, 377.580688477, 374.184997559],
[nan, nan, 494.902130127, 488.110778809],
[nan, nan, 612.223571777, 602.036560059]]" shape="(4, 4)" standard_name="altitude" units="Unit('m')" value_type="float64">
<attributes>
<attribute name="positive" value="up"/>
</attributes>
Expand Down
62 changes: 31 additions & 31 deletions lib/iris/tests/results/analysis/regrid/linear_masked_altitude.cml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,60 +8,60 @@
<coord datadims="[1, 2, 3]">
<auxCoord bounds="[[[[403.764, 416.477],
[377.318, 390.072],
[--, --],
[--, --],
[--, --]],
[nan, nan],
[nan, nan],
[nan, nan]],

[[347.89, 360.689],
[323.018, 335.855],
[--, --],
[--, --],
[--, --]],
[nan, nan],
[nan, nan],
[nan, nan]],

[[354.309, 367.098],
[327.01, 339.841],
[--, --],
[--, --],
[--, --]],
[nan, nan],
[nan, nan],
[nan, nan]],

[[425.557, 438.236],
[393.536, 406.265],
[--, --],
[--, --],
[--, --]]],
[nan, nan],
[nan, nan],
[nan, nan]]],


[[[416.477, 435.548],
[390.072, 409.203],
[--, --],
[--, --],
[--, --]],
[nan, nan],
[nan, nan],
[nan, nan]],

[[360.689, 379.888],
[335.855, 355.111],
[--, --],
[--, --],
[--, --]],
[nan, nan],
[nan, nan],
[nan, nan]],

[[367.098, 386.282],
[339.841, 359.088],
[--, --],
[--, --],
[--, --]],
[nan, nan],
[nan, nan],
[nan, nan]],

[[438.236, 457.257],
[406.265, 425.359],
[--, --],
[--, --],
[--, --]]]]" id="9041e969" points="[[[408.531, 382.101, --, --, --],
[352.689, 327.832, --, --, --],
[359.105, 331.822, --, --, --],
[430.311, 398.309, --, --, --]],
[nan, nan],
[nan, nan],
[nan, nan]]]]" id="9041e969" points="[[[408.531, 382.101, nan, nan, nan],
[352.689, 327.832, nan, nan, nan],
[359.105, 331.822, nan, nan, nan],
[430.311, 398.309, nan, nan, nan]],

[[424.423, 398.043, --, --, --],
[368.688, 343.878, --, --, --],
[375.091, 347.861, --, --, --],
[446.161, 414.22, --, --, --]]]" shape="(2, 4, 5)" standard_name="altitude" units="Unit('m')" value_type="float32">
[[424.423, 398.043, nan, nan, nan],
[368.688, 343.878, nan, nan, nan],
[375.091, 347.861, nan, nan, nan],
[446.161, 414.22, nan, nan, nan]]]" shape="(2, 4, 5)" standard_name="altitude" units="Unit('m')" value_type="float32">
<attributes>
<attribute name="positive" value="up"/>
</attributes>
Expand Down
8 changes: 4 additions & 4 deletions lib/iris/tests/results/analysis/regrid/linear_non_circular.cml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
</attributes>
<coords>
<coord datadims="[0, 1]">
<auxCoord id="9041e969" points="[[--, --, 260.259246826, 260.259246826],
[--, --, 377.580688477, 374.184997559],
[--, --, 494.902130127, 488.110778809],
[--, --, 612.223571777, 602.036560059]]" shape="(4, 4)" standard_name="altitude" units="Unit('m')" value_type="float64">
<auxCoord id="9041e969" points="[[nan, nan, 260.259246826, 260.259246826],
[nan, nan, 377.580688477, 374.184997559],
[nan, nan, 494.902130127, 488.110778809],
[nan, nan, 612.223571777, 602.036560059]]" shape="(4, 4)" standard_name="altitude" units="Unit('m')" value_type="float64">
<attributes>
<attribute name="positive" value="up"/>
</attributes>
Expand Down
48 changes: 24 additions & 24 deletions lib/iris/tests/results/analysis/regrid/linear_partial_overlap.cml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,54 +6,54 @@
</attributes>
<coords>
<coord datadims="[1, 2, 3]">
<auxCoord bounds="[[[[--, --],
[--, --],
<auxCoord bounds="[[[[nan, nan],
[nan, nan],
[346.925, 359.725],
[334.798, 347.617]],

[[--, --],
[--, --],
[[nan, nan],
[nan, nan],
[319.574, 332.417],
[386.873, 399.612]],

[[--, --],
[--, --],
[[nan, nan],
[nan, nan],
[315.723, 328.571],
[398.421, 411.142]],

[[--, --],
[--, --],
[[nan, nan],
[nan, nan],
[355.611, 368.398],
[320.153, 332.995]]],


[[[--, --],
[--, --],
[[[nan, nan],
[nan, nan],
[359.725, 378.926],
[347.617, 366.847]],

[[--, --],
[--, --],
[[nan, nan],
[nan, nan],
[332.417, 351.681],
[399.612, 418.722]],

[[--, --],
[--, --],
[[nan, nan],
[nan, nan],
[328.571, 347.845],
[411.142, 430.225]],

[[--, --],
[--, --],
[[nan, nan],
[nan, nan],
[368.398, 387.579],
[332.995, 352.258]]]]" id="9041e969" points="[[[--, --, 351.725, 339.605],
[--, --, 324.39, 391.65],
[--, --, 320.541, 403.191],
[--, --, 360.406, 324.969]],
[332.995, 352.258]]]]" id="9041e969" points="[[[nan, nan, 351.725, 339.605],
[nan, nan, 324.39, 391.65],
[nan, nan, 320.541, 403.191],
[nan, nan, 360.406, 324.969]],

[[--, --, 367.726, 355.63],
[--, --, 340.443, 407.574],
[--, --, 336.602, 419.093],
[--, --, 376.39, 341.021]]]" shape="(2, 4, 4)" standard_name="altitude" units="Unit('m')" value_type="float32">
[[nan, nan, 367.726, 355.63],
[nan, nan, 340.443, 407.574],
[nan, nan, 336.602, 419.093],
[nan, nan, 376.39, 341.021]]]" shape="(2, 4, 4)" standard_name="altitude" units="Unit('m')" value_type="float32">
<attributes>
<attribute name="positive" value="up"/>
</attributes>
Expand Down
8 changes: 4 additions & 4 deletions lib/iris/tests/results/analysis/regrid/nearest_circular_grid.cml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
</attributes>
<coords>
<coord datadims="[0, 1]">
<auxCoord id="9041e969" points="[[--, --, 260.259246826, 260.259246826],
[--, --, 260.259246826, 260.259246826],
[--, --, 260.259246826, 260.259246826],
[--, --, 260.259246826, 260.259246826]]" shape="(4, 4)" standard_name="altitude" units="Unit('m')" value_type="float64">
<auxCoord id="9041e969" points="[[nan, nan, 260.259246826, 260.259246826],
[nan, nan, 260.259246826, 260.259246826],
[nan, nan, 260.259246826, 260.259246826],
[nan, nan, 260.259246826, 260.259246826]]" shape="(4, 4)" standard_name="altitude" units="Unit('m')" value_type="float64">
<attributes>
<attribute name="positive" value="up"/>
</attributes>
Expand Down
24 changes: 12 additions & 12 deletions lib/iris/tests/results/analysis/regrid/nearest_masked_altitude.cml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@

[[325.116, 337.95],
[289.584, 302.472],
[--, --],
[--, --],
[nan, nan],
[nan, nan],
[424.168, 436.85]],

[[325.116, 337.95],
[289.584, 302.472],
[--, --],
[--, --],
[nan, nan],
[nan, nan],
[424.168, 436.85]],

[[440.66, 453.316],
Expand All @@ -39,28 +39,28 @@

[[337.95, 357.202],
[302.472, 321.806],
[--, --],
[--, --],
[nan, nan],
[nan, nan],
[436.85, 455.873]],

[[337.95, 357.202],
[302.472, 321.806],
[--, --],
[--, --],
[nan, nan],
[nan, nan],
[436.85, 455.873]],

[[453.316, 472.302],
[406.928, 426.02],
[315.637, 334.94],
[315.637, 334.94],
[272.726, 292.128]]]]" id="9041e969" points="[[[418.698, 379.592, 202.986, 202.986, 333.61],
[329.929, 294.417, --, --, 428.923],
[329.929, 294.417, --, --, 428.923],
[329.929, 294.417, nan, nan, 428.923],
[329.929, 294.417, nan, nan, 428.923],
[445.406, 398.973, 307.595, 307.595, 264.642]],

[[434.57, 395.539, 219.272, 219.272, 349.646],
[345.971, 310.528, --, --, 444.776],
[345.971, 310.528, --, --, 444.776],
[345.971, 310.528, nan, nan, 444.776],
[345.971, 310.528, nan, nan, 444.776],
[461.227, 414.883, 323.68, 323.68, 280.81]]]" shape="(2, 4, 5)" standard_name="altitude" units="Unit('m')" value_type="float32">
<attributes>
<attribute name="positive" value="up"/>
Expand Down
8 changes: 4 additions & 4 deletions lib/iris/tests/results/analysis/regrid/nearest_non_circular.cml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
</attributes>
<coords>
<coord datadims="[0, 1]">
<auxCoord id="9041e969" points="[[--, --, 260.259246826, 260.259246826],
[--, --, 260.259246826, 260.259246826],
[--, --, 260.259246826, 260.259246826],
[--, --, 260.259246826, 260.259246826]]" shape="(4, 4)" standard_name="altitude" units="Unit('m')" value_type="float64">
<auxCoord id="9041e969" points="[[nan, nan, 260.259246826, 260.259246826],
[nan, nan, 260.259246826, 260.259246826],
[nan, nan, 260.259246826, 260.259246826],
[nan, nan, 260.259246826, 260.259246826]]" shape="(4, 4)" standard_name="altitude" units="Unit('m')" value_type="float64">
<attributes>
<attribute name="positive" value="up"/>
</attributes>
Expand Down
48 changes: 24 additions & 24 deletions lib/iris/tests/results/analysis/regrid/nearest_partial_overlap.cml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,54 +6,54 @@
</attributes>
<coords>
<coord datadims="[1, 2, 3]">
<auxCoord bounds="[[[[--, --],
[--, --],
<auxCoord bounds="[[[[nan, nan],
[nan, nan],
[374.808, 387.565],
[328.8, 341.628]],

[[--, --],
[--, --],
[[nan, nan],
[nan, nan],
[289.584, 302.472],
[424.168, 436.85]],

[[--, --],
[--, --],
[[nan, nan],
[nan, nan],
[289.584, 302.472],
[424.168, 436.85]],

[[--, --],
[--, --],
[[nan, nan],
[nan, nan],
[394.2, 406.928],
[259.792, 272.726]]],


[[[--, --],
[--, --],
[[[nan, nan],
[nan, nan],
[387.565, 406.703],
[341.628, 360.871]],

[[--, --],
[--, --],
[[nan, nan],
[nan, nan],
[302.472, 321.806],
[436.85, 455.873]],

[[--, --],
[--, --],
[[nan, nan],
[nan, nan],
[302.472, 321.806],
[436.85, 455.873]],

[[--, --],
[--, --],
[[nan, nan],
[nan, nan],
[406.928, 426.02],
[272.726, 292.128]]]]" id="9041e969" points="[[[--, --, 379.592, 333.61],
[--, --, 294.417, 428.923],
[--, --, 294.417, 428.923],
[--, --, 398.973, 264.642]],
[272.726, 292.128]]]]" id="9041e969" points="[[[nan, nan, 379.592, 333.61],
[nan, nan, 294.417, 428.923],
[nan, nan, 294.417, 428.923],
[nan, nan, 398.973, 264.642]],

[[--, --, 395.539, 349.646],
[--, --, 310.528, 444.776],
[--, --, 310.528, 444.776],
[--, --, 414.883, 280.81]]]" shape="(2, 4, 4)" standard_name="altitude" units="Unit('m')" value_type="float32">
[[nan, nan, 395.539, 349.646],
[nan, nan, 310.528, 444.776],
[nan, nan, 310.528, 444.776],
[nan, nan, 414.883, 280.81]]]" shape="(2, 4, 4)" standard_name="altitude" units="Unit('m')" value_type="float32">
<attributes>
<attribute name="positive" value="up"/>
</attributes>
Expand Down
Loading