-
Notifications
You must be signed in to change notification settings - Fork 300
Add support for multiple coord_systems #6536
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.
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
trexfeathers
merged 61 commits into
SciTools:FEATURE_wkt
from
ukmo-ccbunney:mutli_coord_systems
Jul 21, 2025
Merged
Changes from all commits
Commits
Show all changes
61 commits
Select commit
Hold shift + click to select a range
219d4a4
Added ability to load multiple coordinate systems for a cube.
ukmo-ccbunney b71beaf
Check for existence of grid_mapping attr
ukmo-ccbunney 07a2d93
Merge remote-tracking branch 'upstream/main' into mutli_coord_systems
ukmo-ccbunney 94585fa
Fix for failing tests for case where no coord systems found
ukmo-ccbunney b57e268
Some new tests for extended grid mapping `in test__grid_mappings.py`
ukmo-ccbunney 03a5654
Added some validators to the grid_mapping parser
ukmo-ccbunney fcf6be8
Merge branch 'FEATURE_wkt' into mutli_coord_systems
trexfeathers 92ed35a
Save cubes with multiple coord_systems using extended grid mapping sy…
ukmo-ccbunney a6c8f48
Merge remote-tracking branch 'origin/mutli_coord_systems' into mutli_…
ukmo-ccbunney 9a50380
Typo in function name
ukmo-ccbunney 2ac5c96
Ignore for ruff fmt
ukmo-ccbunney 6beb20d
More idiomatic list unpacking syntax
ukmo-ccbunney 08b8985
Made return value of _parse_grid_mapping a dict. Added type hints.
ukmo-ccbunney 001b0b4
Added link to regex101 playground
ukmo-ccbunney fd35592
Refactored to store grid_mapping parsing results in CFReader.
ukmo-ccbunney baa91ef
Small update to keep tests working with Mocks
ukmo-ccbunney bd401c9
Changed cs_mapping to return dict of `{coord: cs}` rather than `{cs: …
ukmo-ccbunney 8fd4f0c
Added sorting of coordinates in grid mapping to saver. Also addes Future
ukmo-ccbunney 46edf1a
Fixed typo
ukmo-ccbunney ed0e703
Removed redundant line
ukmo-ccbunney 7af31ed
Inverted conditional for clarity.
ukmo-ccbunney 2a54669
MpPy type hinting.
ukmo-ccbunney e80a6b4
Use .get rather than indexing on engine.cube_parts
ukmo-ccbunney a7b8817
Fix broken function signature
ukmo-ccbunney 09952c8
Fix Mocks for Saver.py
ukmo-ccbunney fea5d70
Changed grid_mappings to dict in saver.py
ukmo-ccbunney 4791e84
Missing category keyword on warning.
ukmo-ccbunney 564c37c
Removed Future flag and added Cube.ordered_axes property instead.
ukmo-ccbunney 0499eec
Prefer use of `_get_coord_variable_name` over
ukmo-ccbunney 3bdb100
Updated URL to CF Conventions document
ukmo-ccbunney 113aaf3
Fixed spurious match group in extended grid mapping regex
ukmo-ccbunney cd5c9b6
Ensure WKT is only written out if cube.ordered_axes=True
ukmo-ccbunney d501f13
Updated `Test_create_cf_grid_mapping` to test grid_mapping generation
ukmo-ccbunney b9e64ec
Revert Future tests.
ukmo-ccbunney bd361ec
Use `_name_coord_map` to get coord var name
ukmo-ccbunney 2c59010
Update _name_coord_map if no cfvar name found for coord
ukmo-ccbunney c37d1fb
Added some tests for multi-coordinate system saving
ukmo-ccbunney ff9041d
Added assert on existence of coord system in test__grid_mappings.py
ukmo-ccbunney 54c4393
Added multi coord system loading tests
ukmo-ccbunney 4c693c0
Only create CFGridMappingVariable if at least one referenced coord ex…
ukmo-ccbunney bf6dbd6
New CFParseError exception
ukmo-ccbunney 3839b01
Move setting of ordered_axes property to loader.py + added tests.
ukmo-ccbunney 418549f
Removed the WKT attr from the CDL of some tests
ukmo-ccbunney 8776d2c
Remove expected WKT output from CDL of most tests.
ukmo-ccbunney fd1ffcd
What's New
ukmo-ccbunney c60eb34
Update Docs
ukmo-ccbunney bec7613
Renamed ordered_coords -> extended_grid_mapping and store as an attri…
ukmo-ccbunney 6d36cb8
Fixed some typos and references to ordered_coords in latest.rst
ukmo-ccbunney 3e3a758
Expanded section in docs on mutliple coord systems
ukmo-ccbunney e4d07fb
Fixed emphasis split over two lines (sphinx doesn't like this)
ukmo-ccbunney 7a8ab8f
Small typo and emphasis fix
ukmo-ccbunney 9f3fb48
Typo iris.coord.Coord => iris.coords.Coord
ukmo-ccbunney dda23fc
Extended grid_mapping integration tests to test multi coord systems
ukmo-ccbunney 5cd4da4
Revert unnecessary change to attr saving.
ukmo-ccbunney 44d171d
Removed confusing coordinates entry in example CDL.
ukmo-ccbunney 3e8dd24
Fixed rendering of latest.rst entry.
ukmo-ccbunney 8132357
Converted test_coord_systes.py::TestCoordSystem to pytest
ukmo-ccbunney af5d104
Updated remainder of test_coord_systems.py to pytest
ukmo-ccbunney 12e575b
Removed context manager for tmp_path filename - deprecated in python3.13
ukmo-ccbunney 4379b41
Fixed x and y variable data in multi_cs_osgb_wkt CDL.
ukmo-ccbunney 8478bf5
Modernised TestLoadMinimalGeostationary tests
ukmo-ccbunney File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.