Skip to content

Tighten some assertCMLApproxData rtols. #2224

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
merged 1 commit into from
Nov 14, 2016
Merged

Tighten some assertCMLApproxData rtols. #2224

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
25 changes: 15 additions & 10 deletions lib/iris/tests/test_cdm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1056,24 +1056,24 @@ def test_multi_d(self):
self.collapse_test_common(cube, 'grid_longitude', 'time', rtol=1e-05)

self.collapse_test_common(cube, 'grid_latitude', 'model_level_number',
rtol=1e-03)
rtol=5e-04)
self.collapse_test_common(cube, 'model_level_number', 'grid_latitude',
rtol=1e-03)
rtol=5e-04)

self.collapse_test_common(cube, 'grid_longitude', 'model_level_number',
rtol=1e-03)
rtol=5e-04)
self.collapse_test_common(cube, 'model_level_number', 'grid_longitude',
rtol=1e-03)
rtol=5e-04)

self.collapse_test_common(cube, 'time', 'model_level_number',
rtol=1e-03)
rtol=5e-04)
self.collapse_test_common(cube, 'model_level_number', 'time',
rtol=1e-03)
rtol=5e-04)

self.collapse_test_common(cube, 'model_level_number', 'time',
rtol=1e-03)
rtol=5e-04)
self.collapse_test_common(cube, 'time', 'model_level_number',
rtol=1e-03)
rtol=5e-04)

# Collapse 3 things at once.
triple_collapse = cube.collapsed(['model_level_number',
Expand All @@ -1082,15 +1082,20 @@ def test_multi_d(self):
self.assertCMLApproxData(triple_collapse, ('cube_collapsed',
('triple_collapse_ml_pt_'
'lon.cml')),
rtol=1e-03)
rtol=5e-04)

triple_collapse = cube.collapsed(['grid_latitude',
'model_level_number', 'time'],
iris.analysis.MEAN)
self.assertCMLApproxData(triple_collapse, ('cube_collapsed',
('triple_collapse_lat_ml'
'_pt.cml')),
rtol=1)
rtol=0.05)
# KNOWN PROBLEM: the previous 'rtol' is very large.
# Numpy 1.10 and 1.11 give significantly different results here.
# This may relate to known problems with summing over large arrays,
# which were largely fixed in numpy 1.9 but still occur in some cases,
# as-of numpy 1.11.

# Ensure no side effects
self.assertCML(cube, ('cube_collapsed', 'original.cml'))
Expand Down