Skip to content

Varff#619

Merged
pelson merged 2 commits intoSciTools:masterfrom
marqh:varff
Aug 21, 2013
Merged

Varff#619
pelson merged 2 commits intoSciTools:masterfrom
marqh:varff

Conversation

@marqh
Copy link
Member

@marqh marqh commented Jul 17, 2013

The Fields file loader is enhanced to capture data stored and referenced by pointers.

The row and column dependent constants, if present, are added to the PPHeader instance as x and y vectors

rules are updated to recognise missing data values for bdx and bdy

@marqh
Copy link
Member Author

marqh commented Jul 17, 2013

addresses #604

Copy link
Member

Choose a reason for hiding this comment

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

Sorry, but what's this for?

Copy link
Member Author

Choose a reason for hiding this comment

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

this unique merge was running during orography processing and for a number of files it made the whole load process fail. The Fields file contained two orography fields which appeared the same to merge.

This seemed an odd error to get so I tweaked the merge conditions so the file would load.

This code change is not central to this pull request, but it does highlight that the processing of orography can trip up the whole load process for some files.

@rhattersley
Copy link
Member

As mentioned in SciTools/iris-test-data#14, this could do with tests for the three sub-grids.

@marqh
Copy link
Member Author

marqh commented Jul 26, 2013

arakawa c grid staggering for the test data was an excellent idea

this and https://groups.google.com/forum/#!topic/scitools-iris/5nsb8O_dSho highlighted that the logic for arakawa staggering is flawed

this will need a code update to fix

@marqh
Copy link
Member Author

marqh commented Aug 7, 2013

arakawa staggering is now handled

pull request on code-generators:
https://github.com/SciTools/iris-code-generators/pull/10
and test data:
SciTools/iris-test-data#15

Copy link
Member

Choose a reason for hiding this comment

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

I'd rather not have the extra indirection of using a dict - we should just store the grid directly in the stash_refs mapping:

stash_refs = {'m01s00i001': 1, ...}

If we need to extend at a later date, then we can do so at a later date ... that's what later dates are for. 😉

Copy link
Member Author

Choose a reason for hiding this comment

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

no problem, I have updated here and in iris-code-generators.

I have changed the name of the dict to stash_grid to improve clarity

@marqh
Copy link
Member Author

marqh commented Aug 13, 2013

hopefully this addresses the review feedback

test now pass apart from data file missing

@marqh
Copy link
Member Author

marqh commented Aug 15, 2013

https://groups.google.com/forum/#!topic/scitools-iris/5nsb8O_dSho

''' Martin Dix 2:28 AM (5 hours ago)
Thanks Mark. This works properly in my tests.'''

@pelson
Copy link
Member

pelson commented Aug 20, 2013

I'm going to take this under my wing as I think this will be useful to a number of people.

Relevant PRs:
SciTools/iris-test-data#15
https://github.com/SciTools/iris-code-generators/pull/10

@pelson
Copy link
Member

pelson commented Aug 20, 2013

P.S. - this works properly for my tests too...

Copy link
Member

Choose a reason for hiding this comment

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

Needs To be restored.

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.

6 participants