Skip to content

Conversation

larsbarring
Copy link
Contributor

🚀 Pull Request

@jamesp
Copy link
Member

jamesp commented Oct 13, 2021

Thanks for your contribution @larsbarring! I've added a test that failed without your addition, and passes with it.

@bjlittle - would you mind giving this a once-over and if you're a happy then pressing the button?

@jamesp jamesp requested review from bjlittle and jamesp October 13, 2021 15:06
# Perfect sphere (semi_major_axis only)? (1 0 0)
elif semi_major_axis is not None and (
semi_minor_axis is None and inverse_flattening is None
semi_minor_axis is None and not inverse_flattening
Copy link
Member

Choose a reason for hiding this comment

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

This means that all of the following are now identical ellipsoid specifications for a sphere:

  • GeogCS(major_semi_axis=1.0, inverse_flattening=0)
  • GeogCS(major_semi_axis=1.0, inverse_flattening=None)
  • GeogCS(major_semi_axis=1.0)
  • GeogCS(1.0)

I think that this new behaviour will be quite natural to users 👍

Copy link
Member

@bjlittle bjlittle left a comment

Choose a reason for hiding this comment

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

Another lovely contribution, thanks @larsbarring 👍

@bjlittle bjlittle merged commit 13f49e6 into SciTools:main Oct 18, 2021
@larsbarring larsbarring deleted the fix_spherical_ellipsoid branch October 18, 2021 16:02
tkknight added a commit to tkknight/iris that referenced this pull request Nov 3, 2021
* main: (44 commits)
  [pre-commit.ci] pre-commit autoupdate (SciTools#4395)
  min pin for numpy (nep29) (SciTools#4386)
  Updated environment lockfiles (SciTools#4393)
  Extend stock.mesh api (SciTools#4389)
  Updated environment lockfiles (SciTools#4388)
  Integrate ASV with Nox (SciTools#4378)
  NetCDF save - stream ALL lazy arrays. (SciTools#4375)
  adopt flake8 maccabe complexity metric (SciTools#4380)
  Accept inverse_flattening = 0 for spherical ellipsoid (closes SciTools#4146) (SciTools#4368)
  Updated environment lockfiles (SciTools#4379)
  Prevent warning in `test_Saver` (SciTools#4376)
  drop pyugrid in site.cfg (SciTools#4373)
  `flake8` dependency (SciTools#4371)
  update latest whosnew (SciTools#4372)
  Allow `check_graphic` to be more flexible (SciTools#4370)
  [pre-commit.ci] pre-commit autoupdate (SciTools#4365)
  Updated environment lockfiles (SciTools#4364)
  Update latest.rst (SciTools#4362)
  More clarity on setting `iris-test-data` location. (SciTools#4359)
  update whatsnew (SciTools#4361)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Error when reading file having spherical ellipsoid and inverse_flattening=0. GeogCS case (1 0 0)

3 participants