Skip to content

Conversation

trexfeathers
Copy link
Contributor

Merge via merge-commit

(Not via squash-commit)

trexfeathers and others added 2 commits June 18, 2025 15:19
* Save crs_wkt, and update test outputs

* Extra test fixes

* What's new

* Update tests.

* What's New updates.

* Correct use of mocking.

---------

Co-authored-by: Will Benfold <[email protected]>
Copy link

codecov bot commented Jun 27, 2025

Codecov Report

Attention: Patch coverage is 83.21168% with 46 lines in your changes missing coverage. Please review.

Project coverage is 89.94%. Comparing base (d4489d1) to head (edc82bb).
Report is 5 commits behind head on main.

Files with missing lines Patch % Lines
lib/iris/fileformats/netcdf/saver.py 77.77% 22 Missing and 16 partials ⚠️
lib/iris/fileformats/_nc_load_rules/helpers.py 83.33% 2 Missing and 1 partial ⚠️
lib/iris/fileformats/cf.py 92.50% 0 Missing and 3 partials ⚠️
lib/iris/fileformats/_nc_load_rules/actions.py 92.30% 0 Missing and 2 partials ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #6537      +/-   ##
==========================================
+ Coverage   89.93%   89.94%   +0.01%     
==========================================
  Files          90       90              
  Lines       24166    24302     +136     
  Branches     4502     4546      +44     
==========================================
+ Hits        21733    21859     +126     
- Misses       1672     1674       +2     
- Partials      761      769       +8     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

ukmo-ccbunney and others added 2 commits July 21, 2025 07:25
* Added ability to load multiple coordinate systems for a cube.

* Check for existence of grid_mapping attr

* Fix for failing tests for case where no coord systems found

* Some new tests for extended grid mapping `in test__grid_mappings.py`

* Added some validators to the grid_mapping parser

* Save cubes with multiple coord_systems using extended grid mapping syntax

* Typo in function name

* Ignore for ruff fmt

* More idiomatic list unpacking syntax

* Made return value of _parse_grid_mapping a dict. Added type hints.

* Added link to regex101 playground

* Refactored to store grid_mapping parsing results in CFReader.

* Small update to keep tests working with Mocks

* Changed cs_mapping to return dict of `{coord: cs}` rather than `{cs: [coords, ...]}`

* Added sorting of coordinates in grid mapping to saver. Also addes Future
flag for extended grid mapping saving.

* Fixed typo

* Removed redundant line

* Inverted conditional for clarity.

* MpPy type hinting.

* Use .get rather than indexing on engine.cube_parts

* Fix broken function signature

* Fix Mocks for Saver.py

* Changed grid_mappings to dict in saver.py

* Missing category keyword on warning.

* Removed Future flag and added Cube.ordered_axes property instead.

* Prefer use of `_get_coord_variable_name` over

* Updated URL to CF Conventions document

* Fixed spurious match group in extended grid mapping regex

* Ensure WKT is only written out if cube.ordered_axes=True

* Updated `Test_create_cf_grid_mapping` to test grid_mapping generation
with and without ordered coordinates.

* Revert Future tests.

* Use `_name_coord_map` to get coord var name

* Update _name_coord_map if no cfvar name found for coord

* Added some tests for multi-coordinate system saving

* Added assert on existence of coord system in test__grid_mappings.py

* Added multi coord system loading tests

* Only create CFGridMappingVariable if at least one referenced coord exists

* New CFParseError exception

* Move setting of ordered_axes property to loader.py + added tests.

* Removed the WKT attr from the CDL of some tests

* Remove expected WKT output from CDL of most tests.

* What's New

* Update Docs

* Renamed ordered_coords -> extended_grid_mapping and store as an attribute

* Fixed some typos and references to ordered_coords in latest.rst

* Expanded section in docs on mutliple coord systems

* Fixed emphasis split over two lines (sphinx doesn't like this)

* Small typo and emphasis fix

* Typo iris.coord.Coord => iris.coords.Coord

* Extended grid_mapping integration tests to test multi coord systems

* Revert unnecessary change to attr saving.

* Removed confusing coordinates entry in example CDL.

* Fixed rendering of latest.rst entry.

* Converted test_coord_systes.py::TestCoordSystem to pytest

* Updated remainder of test_coord_systems.py to pytest

* Removed context manager for tmp_path filename - deprecated in python3.13

* Fixed x and y variable data in multi_cs_osgb_wkt CDL.

* Modernised TestLoadMinimalGeostationary tests

---------

Co-authored-by: Martin Yeo <[email protected]>
@trexfeathers trexfeathers added the benchmark_this Request that this pull request be benchmarked to check if it introduces performance shifts label Jul 21, 2025
Copy link
Contributor

⏱️ Performance Benchmark Report: e962419

Performance shifts

Full benchmark results

Benchmarks that have stayed the same:

| Change   | Before [d4489d17]    | After [e9624194]    |   Ratio | Benchmark (Parameter)                                                                       |
|----------|----------------------|---------------------|---------|---------------------------------------------------------------------------------------------|
|          | 20.7±0.5ms           | 21.6±0.4ms          |    1.05 | aggregate_collapse.Aggregation.time_aggregated_by_COUNT(False)                              |
|          | 52.8±1ms             | 53.3±1ms            |    1.01 | aggregate_collapse.Aggregation.time_aggregated_by_COUNT(True)                               |
|          | 35.2±0.3ms           | 35.4±0.5ms          |    1.01 | aggregate_collapse.Aggregation.time_aggregated_by_FAST_PERCENTILE(False)                    |
|          | 168±2ms              | 175±5ms             |    1.04 | aggregate_collapse.Aggregation.time_aggregated_by_FAST_PERCENTILE(True)                     |
|          | 23.6±0.1ms           | 23.3±0.4ms          |    0.99 | aggregate_collapse.Aggregation.time_aggregated_by_GMEAN(False)                              |
|          | 31.8±0.3ms           | 32.3±0.6ms          |    1.01 | aggregate_collapse.Aggregation.time_aggregated_by_GMEAN(True)                               |
|          | 23.5±0.2ms           | 23.9±0.2ms          |    1.02 | aggregate_collapse.Aggregation.time_aggregated_by_HMEAN(False)                              |
|          | 31.5±0.3ms           | 32.8±0.4ms          |    1.04 | aggregate_collapse.Aggregation.time_aggregated_by_HMEAN(True)                               |
|          | 20.9±0.2ms           | 21.2±0.3ms          |    1.01 | aggregate_collapse.Aggregation.time_aggregated_by_MAX(False)                                |
|          | 45.2±1ms             | 45.9±2ms            |    1.02 | aggregate_collapse.Aggregation.time_aggregated_by_MAX(True)                                 |
|          | 126±1ms              | 126±2ms             |    1    | aggregate_collapse.Aggregation.time_aggregated_by_MAX_RUN(False)                            |
|          | 128±2ms              | 130±2ms             |    1.01 | aggregate_collapse.Aggregation.time_aggregated_by_MAX_RUN(True)                             |
|          | 22.5±0.2ms           | 22.2±0.4ms          |    0.99 | aggregate_collapse.Aggregation.time_aggregated_by_MEAN(False)                               |
|          | 48.9±1ms             | 50.0±1ms            |    1.02 | aggregate_collapse.Aggregation.time_aggregated_by_MEAN(True)                                |
|          | 23.3±0.1ms           | 23.6±0.2ms          |    1.01 | aggregate_collapse.Aggregation.time_aggregated_by_MEDIAN(False)                             |
|          | 58.6±0.8ms           | 58.6±1ms            |    1    | aggregate_collapse.Aggregation.time_aggregated_by_MEDIAN(True)                              |
|          | 21.4±0.3ms           | 21.2±0.6ms          |    0.99 | aggregate_collapse.Aggregation.time_aggregated_by_MIN(False)                                |
|          | 44.6±0.8ms           | 44.9±0.9ms          |    1.01 | aggregate_collapse.Aggregation.time_aggregated_by_MIN(True)                                 |
|          | 1.08±0.01s           | 1.08±0.01s          |    1    | aggregate_collapse.Aggregation.time_aggregated_by_PEAK(False)                               |
|          | 1.07±0.01s           | 1.06±0.02s          |    0.99 | aggregate_collapse.Aggregation.time_aggregated_by_PEAK(True)                                |
|          | 216±2ms              | 213±2ms             |    0.98 | aggregate_collapse.Aggregation.time_aggregated_by_PERCENTILE(False)                         |
|          | 342±10ms             | 350±6ms             |    1.02 | aggregate_collapse.Aggregation.time_aggregated_by_PERCENTILE(True)                          |
|          | 22.3±0.4ms           | 22.5±0.5ms          |    1.01 | aggregate_collapse.Aggregation.time_aggregated_by_PROPORTION(False)                         |
|          | 30.0±0.5ms           | 31.4±1ms            |    1.05 | aggregate_collapse.Aggregation.time_aggregated_by_PROPORTION(True)                          |
|          | 22.5±0.09ms          | 22.7±0.2ms          |    1.01 | aggregate_collapse.Aggregation.time_aggregated_by_RMS(False)                                |
|          | 59.6±0.6ms           | 61.6±2ms            |    1.03 | aggregate_collapse.Aggregation.time_aggregated_by_RMS(True)                                 |
|          | 23.6±0.4ms           | 23.9±0.3ms          |    1.01 | aggregate_collapse.Aggregation.time_aggregated_by_STD_DEV(False)                            |
|          | 62.2±0.3ms           | 62.5±1ms            |    1.01 | aggregate_collapse.Aggregation.time_aggregated_by_STD_DEV(True)                             |
|          | 22.9±0.3ms           | 23.1±0.4ms          |    1.01 | aggregate_collapse.Aggregation.time_aggregated_by_VARIANCE(False)                           |
|          | 58.3±0.5ms           | 58.4±1ms            |    1    | aggregate_collapse.Aggregation.time_aggregated_by_VARIANCE(True)                            |
|          | 7.96±0.08ms          | 7.93±0.06ms         |    1    | aggregate_collapse.Aggregation.time_collapsed_by_COUNT(False)                               |
|          | 21.7±0.7ms           | 22.7±0.4ms          |    1.05 | aggregate_collapse.Aggregation.time_collapsed_by_COUNT(True)                                |
|          | 20.0±0.3ms           | 20.1±0.3ms          |    1.01 | aggregate_collapse.Aggregation.time_collapsed_by_FAST_PERCENTILE(False)                     |
|          | 123±1ms              | 128±3ms             |    1.04 | aggregate_collapse.Aggregation.time_collapsed_by_FAST_PERCENTILE(True)                      |
|          | 8.20±0.07ms          | 8.37±0.04ms         |    1.02 | aggregate_collapse.Aggregation.time_collapsed_by_GMEAN(False)                               |
|          | 20.5±0.9ms           | 21.0±0.7ms          |    1.02 | aggregate_collapse.Aggregation.time_collapsed_by_GMEAN(True)                                |
|          | 8.33±0.09ms          | 8.36±0.1ms          |    1    | aggregate_collapse.Aggregation.time_collapsed_by_HMEAN(False)                               |
|          | 20.1±0.6ms           | 20.9±0.7ms          |    1.04 | aggregate_collapse.Aggregation.time_collapsed_by_HMEAN(True)                                |
|          | 7.80±0.08ms          | 7.83±0.1ms          |    1    | aggregate_collapse.Aggregation.time_collapsed_by_MAX(False)                                 |
|          | 20.7±0.5ms           | 21.4±0.7ms          |    1.03 | aggregate_collapse.Aggregation.time_collapsed_by_MAX(True)                                  |
|          | 24.4±0.07ms          | 24.3±0.3ms          |    1    | aggregate_collapse.Aggregation.time_collapsed_by_MAX_RUN(False)                             |
|          | 34.8±0.9ms           | 35.7±1ms            |    1.03 | aggregate_collapse.Aggregation.time_collapsed_by_MAX_RUN(True)                              |
|          | 8.01±0.06ms          | 8.10±0.2ms          |    1.01 | aggregate_collapse.Aggregation.time_collapsed_by_MEAN(False)                                |
|          | 20.8±0.5ms           | 21.4±0.7ms          |    1.03 | aggregate_collapse.Aggregation.time_collapsed_by_MEAN(True)                                 |
|          | 9.23±0.2ms           | 9.19±0.03ms         |    1    | aggregate_collapse.Aggregation.time_collapsed_by_MEDIAN(False)                              |
|          | 23.0±0.6ms           | 23.6±0.7ms          |    1.02 | aggregate_collapse.Aggregation.time_collapsed_by_MEDIAN(True)                               |
|          | 7.82±0.06ms          | 7.88±0.05ms         |    1.01 | aggregate_collapse.Aggregation.time_collapsed_by_MIN(False)                                 |
|          | 20.5±0.5ms           | 21.2±0.6ms          |    1.03 | aggregate_collapse.Aggregation.time_collapsed_by_MIN(True)                                  |
|          | 531±90ms             | 535±5ms             |    1.01 | aggregate_collapse.Aggregation.time_collapsed_by_PEAK(False)                                |
|          | 542±90ms             | 543±4ms             |    1    | aggregate_collapse.Aggregation.time_collapsed_by_PEAK(True)                                 |
|          | 46.6±0.6ms           | 45.6±0.7ms          |    0.98 | aggregate_collapse.Aggregation.time_collapsed_by_PERCENTILE(False)                          |
|          | 133±2ms              | 137±4ms             |    1.03 | aggregate_collapse.Aggregation.time_collapsed_by_PERCENTILE(True)                           |
|          | 8.20±0.02ms          | 8.19±0.1ms          |    1    | aggregate_collapse.Aggregation.time_collapsed_by_PROPORTION(False)                          |
|          | 19.6±0.5ms           | 20.3±0.6ms          |    1.03 | aggregate_collapse.Aggregation.time_collapsed_by_PROPORTION(True)                           |
|          | 8.10±0.2ms           | 8.10±0.05ms         |    1    | aggregate_collapse.Aggregation.time_collapsed_by_RMS(False)                                 |
|          | 22.7±0.8ms           | 23.3±0.8ms          |    1.03 | aggregate_collapse.Aggregation.time_collapsed_by_RMS(True)                                  |
|          | 8.20±0.1ms           | 8.51±0.1ms          |    1.04 | aggregate_collapse.Aggregation.time_collapsed_by_STD_DEV(False)                             |
|          | 22.3±0.5ms           | 22.9±0.6ms          |    1.03 | aggregate_collapse.Aggregation.time_collapsed_by_STD_DEV(True)                              |
|          | 8.44±0.2ms           | 8.36±0.1ms          |    0.99 | aggregate_collapse.Aggregation.time_collapsed_by_VARIANCE(False)                            |
|          | 21.7±0.5ms           | 22.3±0.6ms          |    1.03 | aggregate_collapse.Aggregation.time_collapsed_by_VARIANCE(True)                             |
|          | 22.9±0.2ms           | 22.7±0.1ms          |    0.99 | aggregate_collapse.WeightedAggregation.time_w_aggregated_by_MEAN(False)                     |
|          | 83.8±1ms             | 84.4±2ms            |    1.01 | aggregate_collapse.WeightedAggregation.time_w_aggregated_by_MEAN(True)                      |
|          | 22.5±0.2ms           | 23.1±0.2ms          |    1.02 | aggregate_collapse.WeightedAggregation.time_w_aggregated_by_RMS(False)                      |
|          | 95.6±1ms             | 96.4±1ms            |    1.01 | aggregate_collapse.WeightedAggregation.time_w_aggregated_by_RMS(True)                       |
|          | 21.6±0.3ms           | 21.4±0.1ms          |    0.99 | aggregate_collapse.WeightedAggregation.time_w_aggregated_by_SUM(False)                      |
|          | 56.1±1ms             | 56.7±2ms            |    1.01 | aggregate_collapse.WeightedAggregation.time_w_aggregated_by_SUM(True)                       |
|          | 8.45±0.1ms           | 8.43±0.1ms          |    1    | aggregate_collapse.WeightedAggregation.time_w_collapsed_by_MEAN(False)                      |
|          | 27.6±1ms             | 27.5±0.8ms          |    1    | aggregate_collapse.WeightedAggregation.time_w_collapsed_by_MEAN(True)                       |
|          | 8.25±0.08ms          | 8.28±0.1ms          |    1    | aggregate_collapse.WeightedAggregation.time_w_collapsed_by_RMS(False)                       |
|          | 28.9±0.7ms           | 29.6±0.6ms          |    1.02 | aggregate_collapse.WeightedAggregation.time_w_collapsed_by_RMS(True)                        |
|          | 8.19±0.05ms          | 8.01±0.1ms          |    0.98 | aggregate_collapse.WeightedAggregation.time_w_collapsed_by_SUM(False)                       |
|          | 23.0±0.6ms           | 23.3±0.6ms          |    1.01 | aggregate_collapse.WeightedAggregation.time_w_collapsed_by_SUM(True)                        |
|          | 222±3ms              | 219±1ms             |    0.99 | aggregate_collapse.WeightedAggregation.time_w_collapsed_by_WPERCENTILE(False)               |
|          | 279±5ms              | 278±4ms             |    0.99 | aggregate_collapse.WeightedAggregation.time_w_collapsed_by_WPERCENTILE(True)                |
|          | 1.16±0.01ms          | 1.15±0.01ms         |    0.99 | cube.CubeCreation.time_create(False, 'construct')                                           |
|          | 398±2μs              | 408±4μs             |    1.02 | cube.CubeCreation.time_create(False, 'instantiate')                                         |
|          | 2.02±0.03ms          | 2.02±0.02ms         |    1    | cube.CubeCreation.time_create(True, 'construct')                                            |
|          | 1.42±0.03ms          | 1.41±0.03ms         |    1    | cube.CubeCreation.time_create(True, 'instantiate')                                          |
|          | 92.9±1ms             | 94.7±3ms            |    1.02 | cube.CubeEquality.time_equality(False, False, 'all_equal')                                  |
|          | 24.7±0.8ms           | 25.7±1ms            |    1.04 | cube.CubeEquality.time_equality(False, False, 'coord_inequality')                           |
|          | 107±2ms              | 108±6ms             |    1.01 | cube.CubeEquality.time_equality(False, False, 'data_inequality')                            |
|          | 17.4±0.2μs           | 18.2±0.2μs          |    1.05 | cube.CubeEquality.time_equality(False, False, 'metadata_inequality')                        |
|          | 97.7±3ms             | 95.1±5ms            |    0.97 | cube.CubeEquality.time_equality(False, True, 'all_equal')                                   |
|          | 28.3±1ms             | 28.6±0.6ms          |    1.01 | cube.CubeEquality.time_equality(False, True, 'coord_inequality')                            |
|          | 112±3ms              | 112±5ms             |    1    | cube.CubeEquality.time_equality(False, True, 'data_inequality')                             |
|          | 17.5±0.1μs           | 17.3±0.3μs          |    0.99 | cube.CubeEquality.time_equality(False, True, 'metadata_inequality')                         |
|          | 179±2ms              | 176±8ms             |    0.98 | cube.CubeEquality.time_equality(True, False, 'all_equal')                                   |
|          | 66.7±1ms             | 67.9±2ms            |    1.02 | cube.CubeEquality.time_equality(True, False, 'coord_inequality')                            |
|          | 211±5ms              | 207±8ms             |    0.98 | cube.CubeEquality.time_equality(True, False, 'data_inequality')                             |
|          | 52.9±0.5μs           | 53.4±0.6μs          |    1.01 | cube.CubeEquality.time_equality(True, False, 'metadata_inequality')                         |
|          | 253±8ms              | 247±10ms            |    0.98 | cube.CubeEquality.time_equality(True, True, 'all_equal')                                    |
|          | 138±5ms              | 140±6ms             |    1.01 | cube.CubeEquality.time_equality(True, True, 'coord_inequality')                             |
|          | 282±8ms              | 280±20ms            |    0.99 | cube.CubeEquality.time_equality(True, True, 'data_inequality')                              |
|          | 375±6μs              | 370±3μs             |    0.99 | cube.CubeEquality.time_equality(True, True, 'metadata_inequality')                          |
|          | 788±3μs              | 783±20μs            |    0.99 | import_iris.Iris.time__concatenate                                                          |
|          | 185±2μs              | 187±3μs             |    1.01 | import_iris.Iris.time__constraints                                                          |
|          | 113±1μs              | 114±1μs             |    1.01 | import_iris.Iris.time__data_manager                                                         |
|          | 91.8±1μs             | 92.0±0.6μs          |    1    | import_iris.Iris.time__deprecation                                                          |
|          | 163±2μs              | 163±1μs             |    1    | import_iris.Iris.time__lazy_data                                                            |
|          | 901±8μs              | 902±20μs            |    1    | import_iris.Iris.time__merge                                                                |
|          | 74.1±0.5μs           | 74.3±1μs            |    1    | import_iris.Iris.time__representation                                                       |
|          | 610±8μs              | 610±20μs            |    1    | import_iris.Iris.time_analysis                                                              |
|          | 139±0.7μs            | 139±2μs             |    1    | import_iris.Iris.time_analysis__area_weighted                                               |
|          | 106±0.7μs            | 106±2μs             |    1.01 | import_iris.Iris.time_analysis__grid_angles                                                 |
|          | 248±3μs              | 249±5μs             |    1    | import_iris.Iris.time_analysis__interpolation                                               |
|          | 187±3μs              | 190±3μs             |    1.02 | import_iris.Iris.time_analysis__regrid                                                      |
|          | 110±0.9μs            | 109±1μs             |    0.99 | import_iris.Iris.time_analysis__scipy_interpolate                                           |
|          | 135±1μs              | 135±1μs             |    1    | import_iris.Iris.time_analysis_calculus                                                     |
|          | 322±4μs              | 323±2μs             |    1    | import_iris.Iris.time_analysis_cartography                                                  |
|          | 91.5±0.4μs           | 92.2±2μs            |    1.01 | import_iris.Iris.time_analysis_geomerty                                                     |
|          | 208±2μs              | 215±1μs             |    1.03 | import_iris.Iris.time_analysis_maths                                                        |
|          | 93.0±0.4μs           | 94.0±0.8μs          |    1.01 | import_iris.Iris.time_analysis_stats                                                        |
|          | 171±0.6μs            | 173±2μs             |    1.01 | import_iris.Iris.time_analysis_trajectory                                                   |
|          | 316±2μs              | 314±5μs             |    0.99 | import_iris.Iris.time_aux_factory                                                           |
|          | 80.7±0.5μs           | 81.4±0.4μs          |    1.01 | import_iris.Iris.time_common                                                                |
|          | 159±2μs              | 160±2μs             |    1    | import_iris.Iris.time_common_lenient                                                        |
|          | 1.33±0.01ms          | 1.34±0.01ms         |    1.01 | import_iris.Iris.time_common_metadata                                                       |
|          | 169±0.6μs            | 166±1μs             |    0.99 | import_iris.Iris.time_common_mixin                                                          |
|          | 1.16±0.01ms          | 1.16±0.02ms         |    1    | import_iris.Iris.time_common_resolve                                                        |
|          | 200±2μs              | 198±1μs             |    0.99 | import_iris.Iris.time_config                                                                |
|          | 125±1μs              | 126±0.7μs           |    1.01 | import_iris.Iris.time_coord_categorisation                                                  |
|          | 378±4μs              | 379±4μs             |    1    | import_iris.Iris.time_coord_systems                                                         |
|          | 751±6μs              | 755±3μs             |    1    | import_iris.Iris.time_coords                                                                |
|          | 674±20μs             | 674±5μs             |    1    | import_iris.Iris.time_cube                                                                  |
|          | 239±2μs              | 246±4μs             |    1.03 | import_iris.Iris.time_exceptions                                                            |
|          | 73.9±0.6μs           | 76.4±0.4μs          |    1.03 | import_iris.Iris.time_experimental                                                          |
|          | 180±1μs              | 178±1μs             |    0.99 | import_iris.Iris.time_fileformats                                                           |
|          | 255±2μs              | 254±2μs             |    1    | import_iris.Iris.time_fileformats__ff                                                       |
|          | 2.56±0.02ms          | 2.57±0.03ms         |    1    | import_iris.Iris.time_fileformats__ff_cross_references                                      |
|          | 75.6±0.4μs           | 76.4±0.2μs          |    1.01 | import_iris.Iris.time_fileformats__pp_lbproc_pairs                                          |
|          | 113±1μs              | 112±0.9μs           |    1    | import_iris.Iris.time_fileformats_abf                                                       |
|          | 425±4μs              | 437±6μs             |    1.03 | import_iris.Iris.time_fileformats_cf                                                        |
|          | 4.73±0.04ms          | 4.70±0.03ms         |    0.99 | import_iris.Iris.time_fileformats_dot                                                       |
|          | 71.5±1μs             | 71.5±0.3μs          |    1    | import_iris.Iris.time_fileformats_name                                                      |
|          | 251±3μs              | 249±0.9μs           |    0.99 | import_iris.Iris.time_fileformats_name_loaders                                              |
|          | 113±1μs              | 114±0.5μs           |    1    | import_iris.Iris.time_fileformats_netcdf                                                    |
|          | 120±2μs              | 122±3μs             |    1.02 | import_iris.Iris.time_fileformats_nimrod                                                    |
|          | 208±2μs              | 210±2μs             |    1.01 | import_iris.Iris.time_fileformats_nimrod_load_rules                                         |
|          | 795±7μs              | 785±20μs            |    0.99 | import_iris.Iris.time_fileformats_pp                                                        |
|          | 178±2μs              | 179±3μs             |    1    | import_iris.Iris.time_fileformats_pp_load_rules                                             |
|          | 136±1μs              | 137±1μs             |    1.01 | import_iris.Iris.time_fileformats_pp_save_rules                                             |
|          | 540±4μs              | 541±3μs             |    1    | import_iris.Iris.time_fileformats_rules                                                     |
|          | 221±1μs              | 221±1μs             |    1    | import_iris.Iris.time_fileformats_structured_array_identification                           |
|          | 82.0±1μs             | 80.5±1μs            |    0.98 | import_iris.Iris.time_fileformats_um                                                        |
|          | 155±1μs              | 159±1μs             |    1.02 | import_iris.Iris.time_fileformats_um__fast_load                                             |
|          | 139±3μs              | 138±1μs             |    0.99 | import_iris.Iris.time_fileformats_um__fast_load_structured_fields                           |
|          | 72.7±1μs             | 72.8±0.6μs          |    1    | import_iris.Iris.time_fileformats_um__ff_replacement                                        |
|          | 78.8±0.8μs           | 79.6±0.3μs          |    1.01 | import_iris.Iris.time_fileformats_um__optimal_array_structuring                             |
|          | 940±5μs              | 955±6μs             |    1.02 | import_iris.Iris.time_fileformats_um_cf_map                                                 |
|          | 138±1μs              | 137±2μs             |    0.99 | import_iris.Iris.time_io                                                                    |
|          | 174±2μs              | 175±1μs             |    1.01 | import_iris.Iris.time_io_format_picker                                                      |
|          | 214±3μs              | 212±2μs             |    0.99 | import_iris.Iris.time_iris                                                                  |
|          | 125±2μs              | 126±1μs             |    1.01 | import_iris.Iris.time_iterate                                                               |
|          | 8.28±0.07ms          | 8.29±0.03ms         |    1    | import_iris.Iris.time_palette                                                               |
|          | 1.75±0.01ms          | 1.77±0.01ms         |    1.01 | import_iris.Iris.time_plot                                                                  |
|          | 218±2μs              | 220±1μs             |    1.01 | import_iris.Iris.time_quickplot                                                             |
|          | 2.10±0.04ms          | 2.14±0.05ms         |    1.02 | import_iris.Iris.time_std_names                                                             |
|          | 1.83±0.01ms          | 1.82±0.01ms         |    1    | import_iris.Iris.time_symbols                                                               |
|          | 14.4±0.8ms           | 14.4±0.6ms          |    1    | import_iris.Iris.time_tests                                                                 |
|          | 252±6μs              | 255±3μs             |    1.01 | import_iris.Iris.time_third_party_cartopy                                                   |
|          | 5.02±0.05ms          | 5.08±0.06ms         |    1.01 | import_iris.Iris.time_third_party_cf_units                                                  |
|          | 117±0.7μs            | 118±0.5μs           |    1.01 | import_iris.Iris.time_third_party_cftime                                                    |
|          | 2.73±0.03ms          | 2.76±0.01ms         |    1.01 | import_iris.Iris.time_third_party_matplotlib                                                |
|          | 1.30±0.01ms          | 1.31±0.01ms         |    1.01 | import_iris.Iris.time_third_party_numpy                                                     |
|          | 168±3μs              | 168±2μs             |    1    | import_iris.Iris.time_third_party_scipy                                                     |
|          | 97.3±0.5μs           | 98.6±1μs            |    1.01 | import_iris.Iris.time_time                                                                  |
|          | 361±3μs              | 351±1μs             |    0.97 | import_iris.Iris.time_util                                                                  |
|          | 72.3±0.8μs           | 72.8±0.7μs          |    1.01 | iterate.IZip.time_izip                                                                      |
|          | 10.1±0.1ms           | 10.1±0.2ms          |    0.99 | load.LoadAndRealise.time_load((1280, 960, 5), False, 'FF')                                  |
|          | 15.9±0.4ms           | 15.6±1ms            |    0.99 | load.LoadAndRealise.time_load((1280, 960, 5), False, 'NetCDF')                              |
|          | 10.1±0.04ms          | 9.94±0.04ms         |    0.99 | load.LoadAndRealise.time_load((1280, 960, 5), False, 'PP')                                  |
|          | 9.96±0.05ms          | 9.96±0.04ms         |    1    | load.LoadAndRealise.time_load((1280, 960, 5), True, 'FF')                                   |
|          | 13.3±0.06ms          | 13.5±0.1ms          |    1.01 | load.LoadAndRealise.time_load((1280, 960, 5), True, 'NetCDF')                               |
|          | 10.0±0.05ms          | 9.97±0.06ms         |    0.99 | load.LoadAndRealise.time_load((1280, 960, 5), True, 'PP')                                   |
|          | 1.53±0.01s           | 1.49±0.01s          |    0.98 | load.LoadAndRealise.time_load((2, 2, 1000), False, 'FF')                                    |
|          | 12.2±0.2ms           | 12.4±0.3ms          |    1.01 | load.LoadAndRealise.time_load((2, 2, 1000), False, 'NetCDF')                                |
|          | 1.54±0.03s           | 1.50±0.03s          |    0.98 | load.LoadAndRealise.time_load((2, 2, 1000), False, 'PP')                                    |
|          | 1.52±0.01s           | 1.48±0.03s          |    0.97 | load.LoadAndRealise.time_load((2, 2, 1000), True, 'FF')                                     |
|          | 12.3±0.06ms          | 12.3±0.09ms         |    1    | load.LoadAndRealise.time_load((2, 2, 1000), True, 'NetCDF')                                 |
|          | 1.53±0.01s           | 1.51±0.02s          |    0.99 | load.LoadAndRealise.time_load((2, 2, 1000), True, 'PP')                                     |
|          | 5.41±0.02ms          | 5.37±0.03ms         |    0.99 | load.LoadAndRealise.time_load((50, 50, 2), False, 'FF')                                     |
|          | 11.8±0.08ms          | 12.2±0.1ms          |    1.04 | load.LoadAndRealise.time_load((50, 50, 2), False, 'NetCDF')                                 |
|          | 5.38±0.02ms          | 5.36±0.03ms         |    1    | load.LoadAndRealise.time_load((50, 50, 2), False, 'PP')                                     |
|          | 5.37±0.03ms          | 5.40±0.09ms         |    1.01 | load.LoadAndRealise.time_load((50, 50, 2), True, 'FF')                                      |
|          | 12.1±0.1ms           | 12.4±0.2ms          |    1.03 | load.LoadAndRealise.time_load((50, 50, 2), True, 'NetCDF')                                  |
|          | 5.30±0.05ms          | 5.31±0.07ms         |    1    | load.LoadAndRealise.time_load((50, 50, 2), True, 'PP')                                      |
|          | 22.8±3ms             | 24.4±1ms            |    1.07 | load.LoadAndRealise.time_realise((1280, 960, 5), False, 'FF')                               |
|          | 24.7±2ms             | 23.1±2ms            |    0.93 | load.LoadAndRealise.time_realise((1280, 960, 5), False, 'NetCDF')                           |
|          | 12.5±2ms             | 12.5±1ms            |    0.99 | load.LoadAndRealise.time_realise((1280, 960, 5), False, 'PP')                               |
|          | 28.7±1ms             | 28.1±2ms            |    0.98 | load.LoadAndRealise.time_realise((1280, 960, 5), True, 'FF')                                |
|          | 83.3±2ms             | 82.9±1ms            |    1    | load.LoadAndRealise.time_realise((1280, 960, 5), True, 'NetCDF')                            |
|          | 28.7±1ms             | 27.7±1ms            |    0.96 | load.LoadAndRealise.time_realise((1280, 960, 5), True, 'PP')                                |
|          | 610±3ms              | 591±10ms            |    0.97 | load.LoadAndRealise.time_realise((2, 2, 1000), False, 'FF')                                 |
|          | 3.54±0.2ms           | 3.42±0.1ms          |    0.97 | load.LoadAndRealise.time_realise((2, 2, 1000), False, 'NetCDF')                             |
|          | 606±6ms              | 595±10ms            |    0.98 | load.LoadAndRealise.time_realise((2, 2, 1000), False, 'PP')                                 |
|          | 622±6ms              | 605±10ms            |    0.97 | load.LoadAndRealise.time_realise((2, 2, 1000), True, 'FF')                                  |
|          | 3.61±0.1ms           | 3.41±0.2ms          |    0.95 | load.LoadAndRealise.time_realise((2, 2, 1000), True, 'NetCDF')                              |
|          | 621±10ms             | 599±9ms             |    0.96 | load.LoadAndRealise.time_realise((2, 2, 1000), True, 'PP')                                  |
|          | 2.10±0.06ms          | 2.02±0.03ms         |    0.96 | load.LoadAndRealise.time_realise((50, 50, 2), False, 'FF')                                  |
|          | 3.39±0.2ms           | 3.34±0.05ms         |    0.98 | load.LoadAndRealise.time_realise((50, 50, 2), False, 'NetCDF')                              |
|          | 2.01±0.06ms          | 2.01±0.05ms         |    1    | load.LoadAndRealise.time_realise((50, 50, 2), False, 'PP')                                  |
|          | 2.05±0.05ms          | 2.04±0.02ms         |    0.99 | load.LoadAndRealise.time_realise((50, 50, 2), True, 'FF')                                   |
|          | 3.47±0.1ms           | 3.47±0.08ms         |    1    | load.LoadAndRealise.time_realise((50, 50, 2), True, 'NetCDF')                               |
|          | 2.08±0.07ms          | 2.15±0.06ms         |    1.03 | load.LoadAndRealise.time_realise((50, 50, 2), True, 'PP')                                   |
|          | 346±8ms              | 340±3ms             |    0.98 | load.ManyCubes.time_many_cube_load                                                          |
|          | 91.2±1ms             | 90.1±1ms            |    0.99 | load.ManyVars.time_many_var_load                                                            |
|          | 10.2±0.1ms           | 10.2±0.1ms          |    1.01 | load.STASHConstraint.time_stash_constraint((1280, 960, 5), 'FF')                            |
|          | 10.2±0.07ms          | 10.2±0.04ms         |    1    | load.STASHConstraint.time_stash_constraint((1280, 960, 5), 'PP')                            |
|          | 1.52±0.02s           | 1.51±0.02s          |    1    | load.STASHConstraint.time_stash_constraint((2, 2, 1000), 'FF')                              |
|          | 1.53±0s              | 1.50±0.03s          |    0.98 | load.STASHConstraint.time_stash_constraint((2, 2, 1000), 'PP')                              |
|          | 5.41±0.03ms          | 5.42±0.05ms         |    1    | load.STASHConstraint.time_stash_constraint((2, 2, 2), 'FF')                                 |
|          | 5.39±0.01ms          | 5.47±0.03ms         |    1.01 | load.STASHConstraint.time_stash_constraint((2, 2, 2), 'PP')                                 |
|          | 9.11±0.08ms          | 9.09±0.09ms         |    1    | load.StructuredFF.time_structured_load((1280, 960, 5), False)                               |
|          | 5.70±0.06ms          | 5.59±0.02ms         |    0.98 | load.StructuredFF.time_structured_load((1280, 960, 5), True)                                |
|          | 1.50±0s              | 1.50±0s             |    1    | load.StructuredFF.time_structured_load((2, 2, 1000), False)                                 |
|          | 426±5ms              | 413±5ms             |    0.97 | load.StructuredFF.time_structured_load((2, 2, 1000), True)                                  |
|          | 4.44±0.01ms          | 4.44±0.06ms         |    1    | load.StructuredFF.time_structured_load((2, 2, 2), False)                                    |
|          | 4.25±0.01ms          | 4.28±0.03ms         |    1.01 | load.StructuredFF.time_structured_load((2, 2, 2), True)                                     |
|          | 169±2ms              | 167±2ms             |    0.99 | load.TimeConstraint.time_time_constraint(20, 'FF')                                          |
|          | 15.1±0.1ms           | 15.4±0.1ms          |    1.01 | load.TimeConstraint.time_time_constraint(20, 'NetCDF')                                      |
|          | 168±2ms              | 165±2ms             |    0.98 | load.TimeConstraint.time_time_constraint(20, 'PP')                                          |
|          | 33.3±0.3ms           | 32.8±0.1ms          |    0.99 | load.TimeConstraint.time_time_constraint(3, 'FF')                                           |
|          | 15.2±0.2ms           | 14.9±0.05ms         |    0.98 | load.TimeConstraint.time_time_constraint(3, 'NetCDF')                                       |
|          | 34.1±1ms             | 33.3±0.6ms          |    0.98 | load.TimeConstraint.time_time_constraint(3, 'PP')                                           |
|          | 19.4±0.4ms           | 19.2±0.5ms          |    0.99 | load.ugrid.BasicLoading.time_load_file(1)                                                   |
|          | 49.7±0.9ms           | 48.8±1ms            |    0.98 | load.ugrid.BasicLoading.time_load_file(200000)                                              |
|          | 8.96±0.2ms           | 8.90±0.2ms          |    0.99 | load.ugrid.BasicLoading.time_load_mesh(1)                                                   |
|          | 16.9±0.3ms           | 16.5±1ms            |    0.98 | load.ugrid.BasicLoading.time_load_mesh(200000)                                              |
|          | 19.6±0.6ms           | 18.9±1ms            |    0.97 | load.ugrid.BasicLoadingTime.time_load_file(1)                                               |
|          | 18.7±0.9ms           | 19.7±1ms            |    1.05 | load.ugrid.BasicLoadingTime.time_load_file(200000)                                          |
|          | 8.81±0.1ms           | 9.24±0.3ms          |    1.05 | load.ugrid.BasicLoadingTime.time_load_mesh(1)                                               |
|          | 11.7±0.6ms           | 11.8±0.4ms          |    1.01 | load.ugrid.BasicLoadingTime.time_load_mesh(200000)                                          |
|          | 21.3±0.5ms           | 20.8±0.5ms          |    0.98 | load.ugrid.Callback.time_load_file_callback(1)                                              |
|          | 62.3±2ms             | 60.8±2ms            |    0.98 | load.ugrid.Callback.time_load_file_callback(200000)                                         |
|          | 21.5±0.3ms           | 21.7±0.7ms          |    1.01 | load.ugrid.CallbackTime.time_load_file_callback(1)                                          |
|          | 22.4±0.6ms           | 22.3±0.8ms          |    1    | load.ugrid.CallbackTime.time_load_file_callback(200000)                                     |
|          | 3.71±0.2ms           | 3.41±0.2ms          |    0.92 | load.ugrid.DataRealisation.time_realise_data(10000)                                         |
|          | 6.37±0.3ms           | 6.26±0.5ms          |    0.98 | load.ugrid.DataRealisation.time_realise_data(200000)                                        |
|          | 37.3±3ms             | 36.4±6ms            |    0.98 | load.ugrid.DataRealisationTime.time_realise_data(10000)                                     |
|          | 847±200ms            | 774±70ms            |    0.91 | load.ugrid.DataRealisationTime.time_realise_data(200000)                                    |
|          | 1.44±0.04s           | 1.44±0.1s           |    1.01 | merge_concat.Concatenate.time_concatenate(False)                                            |
|          | 438±7ms              | 434±6ms             |    0.99 | merge_concat.Concatenate.time_concatenate(True)                                             |
|          | 2.42±0G              | 2.42±0G             |    1    | merge_concat.Concatenate.tracemalloc_concatenate(False)                                     |
|          | 110±4M               | 110±3M              |    1    | merge_concat.Concatenate.tracemalloc_concatenate(True)                                      |
|          | 37.6±2ms             | 39.9±1ms            |    1.06 | merge_concat.Merge.time_merge                                                               |
|          | 126±0.03M            | 126±0.03M           |    1    | merge_concat.Merge.tracemalloc_merge                                                        |
|          | 363±2ns              | 361±2ns             |    0.99 | mesh.utils.regions_combine.CombineRegionsComputeRealData.time_compute_data(50)              |
|          | 199±2ms              | 195±2ms             |    0.98 | mesh.utils.regions_combine.CombineRegionsComputeRealData.time_compute_data(500)             |
|          | 771±0.5k             | 772±0.5k            |    1    | mesh.utils.regions_combine.CombineRegionsComputeRealData.tracemalloc_compute_data(50)       |
|          | 60.2±0M              | 60.2±0M             |    1    | mesh.utils.regions_combine.CombineRegionsComputeRealData.tracemalloc_compute_data(500)      |
|          | 19.4±0.2ms           | 18.6±0.1ms          |    0.96 | mesh.utils.regions_combine.CombineRegionsCreateCube.time_create_combined_cube(50)           |
|          | 22.5±0.5ms           | 22.5±0.6ms          |    1    | mesh.utils.regions_combine.CombineRegionsCreateCube.time_create_combined_cube(500)          |
|          | 1.27±0.04M           | 1.27±0.04M          |    1    | mesh.utils.regions_combine.CombineRegionsCreateCube.tracemalloc_create_combined_cube(50)    |
|          | 25±0.04M             | 25±0.04M            |    1    | mesh.utils.regions_combine.CombineRegionsCreateCube.tracemalloc_create_combined_cube(500)   |
|          | 122±2ms              | 118±3ms             |    0.97 | mesh.utils.regions_combine.CombineRegionsFileStreamedCalc.time_stream_file2file(50)         |
|          | 593±3ms              | 575±10ms            |    0.97 | mesh.utils.regions_combine.CombineRegionsFileStreamedCalc.time_stream_file2file(500)        |
|          | 1.49±0.02M           | 1.44±0.1M           |    0.97 | mesh.utils.regions_combine.CombineRegionsFileStreamedCalc.tracemalloc_stream_file2file(50)  |
|          | 96.5±0.03M           | 96.5±0.1M           |    1    | mesh.utils.regions_combine.CombineRegionsFileStreamedCalc.tracemalloc_stream_file2file(500) |
|          | 80.5±2ms             | 78.5±0.8ms          |    0.97 | mesh.utils.regions_combine.CombineRegionsSaveData.time_save(50)                             |
|          | 549±10ms             | 534±20ms            |    0.97 | mesh.utils.regions_combine.CombineRegionsSaveData.time_save(500)                            |
|          | 1.43±0.03M           | 1.41±0.03M          |    0.99 | mesh.utils.regions_combine.CombineRegionsSaveData.tracemalloc_save(50)                      |
|          | 96.5±0.04M           | 96.5±0.02M          |    1    | mesh.utils.regions_combine.CombineRegionsSaveData.tracemalloc_save(500)                     |
|          | 2.1752849999999997   | 2.1752849999999997  |    1    | mesh.utils.regions_combine.CombineRegionsSaveData.track_filesize_saved(50)                  |
|          | 216.01528499999998   | 216.01528499999998  |    1    | mesh.utils.regions_combine.CombineRegionsSaveData.track_filesize_saved(500)                 |
|          | 6.66±0.06ms          | 6.66±0.02ms         |    1    | plot.AuxSort.time_aux_sort                                                                  |
|          | 80.2±3ms             | 81.6±3ms            |    1.02 | regridding.CurvilinearRegridding.time_regrid_pic                                            |
|          | 136±3M               | 136±3M              |    1    | regridding.CurvilinearRegridding.tracemalloc_regrid_pic                                     |
|          | 107±6ms              | 105±5ms             |    0.98 | regridding.HorizontalChunkedRegridding.time_regrid_area_w                                   |
|          | 68.8±6ms             | 63.1±2ms            |    0.92 | regridding.HorizontalChunkedRegridding.time_regrid_area_w_new_grid                          |
|          | 107±0.08M            | 107±0.08M           |    1    | regridding.HorizontalChunkedRegridding.tracemalloc_regrid_area_w                            |
|          | 147±0.04M            | 147±0.04M           |    1    | regridding.HorizontalChunkedRegridding.tracemalloc_regrid_area_w_new_grid                   |
|          | 4.75±0.05ms          | 4.64±0.01ms         |    0.98 | save.NetcdfSave.time_netcdf_save_cube(50, False)                                            |
|          | 82.9±2ms             | 82.8±1ms            |    1    | save.NetcdfSave.time_netcdf_save_cube(50, True)                                             |
|          | 42.7±2ms             | 42.3±0.6ms          |    0.99 | save.NetcdfSave.time_netcdf_save_cube(600, False)                                           |
|          | 482±20ms             | 477±20ms            |    0.99 | save.NetcdfSave.time_netcdf_save_cube(600, True)                                            |
|          | 87.3±0.4ns           | 85.9±2ns            |    0.98 | save.NetcdfSave.time_netcdf_save_mesh(50, False)                                            |
|          | 62.1±2ms             | 61.8±0.6ms          |    0.99 | save.NetcdfSave.time_netcdf_save_mesh(50, True)                                             |
|          | 88.1±1ns             | 87.0±3ns            |    0.99 | save.NetcdfSave.time_netcdf_save_mesh(600, False)                                           |
|          | 419±10ms             | 417±20ms            |    0.99 | save.NetcdfSave.time_netcdf_save_mesh(600, True)                                            |
|          | 31.6±0.3k            | 31.7±0.2k           |    1    | save.NetcdfSave.tracemalloc_netcdf_save(50, False)                                          |
|          | 1.76±0.2M            | 1.86±0.08M          |    1.06 | save.NetcdfSave.tracemalloc_netcdf_save(50, True)                                           |
|          | 31.6±0.3k            | 31.6±0.2k           |    1    | save.NetcdfSave.tracemalloc_netcdf_save(600, False)                                         |
|          | 191±30M              | 225±30M             |    1.18 | save.NetcdfSave.tracemalloc_netcdf_save(600, True)                                          |
|          | 40.3±0.7ms           | 39.2±0.5ms          |    0.97 | stats.PearsonR.time_lazy                                                                    |
|          | 9.68±0.2ms           | 9.25±0.4ms          |    0.96 | stats.PearsonR.time_real                                                                    |
|          | 29.4±0.6M            | 29.5±0.5M           |    1    | stats.PearsonR.tracemalloc_lazy                                                             |
|          | 18.3±0.01M           | 18.3±0.01M          |    1    | stats.PearsonR.tracemalloc_real                                                             |
|          | 25.1±0.6ms           | 25.1±0.6ms          |    1    | trajectory.TrajectoryInterpolation.time_trajectory_linear                                   |
|          | 61.3±1ms             | 60.8±0.6ms          |    0.99 | trajectory.TrajectoryInterpolation.time_trajectory_nearest                                  |
|          | 17.6±0.02M           | 17.6±0.02M          |    1    | trajectory.TrajectoryInterpolation.tracemalloc_trajectory_linear                            |
|          | 7.75±0.02M           | 7.75±0.02M          |    1    | trajectory.TrajectoryInterpolation.tracemalloc_trajectory_nearest                           |

Generated by GHA run 16410093929

@trexfeathers trexfeathers marked this pull request as ready for review July 21, 2025 07:17
Copy link
Contributor

@ukmo-ccbunney ukmo-ccbunney left a comment

Choose a reason for hiding this comment

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

Looking good.
Most of the coverage report is due to refactoring of existing code.
LGTM.

@ukmo-ccbunney ukmo-ccbunney merged commit 68a9b9a into main Jul 21, 2025
32 checks passed
@ukmo-ccbunney ukmo-ccbunney deleted the FEATURE_wkt branch July 21, 2025 07:45
@scitools-ci scitools-ci bot removed this from 🚴 Peloton Aug 19, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
benchmark_this Request that this pull request be benchmarked to check if it introduces performance shifts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants