Skip to content

Conversation

@davidhassell
Copy link
Collaborator

@davidhassell davidhassell commented Dec 19, 2022

Fixes test_Field_collapse in test_FIeld.py, and test_collapse.py.

  • Makes graph culling the default in all concatenate methods.
  • Fixes a bug in data._parse_weights.
  • Tidies up redundent (LAMA) _preserve keywords.
  • Refactors the scale keyword to Field.collapse. This wasn't necessary, but at one stage I though it might solve some problems. Left it in because it's nicer and more efficient.
  • Forward ports dask: Reinstate netCDF lock #531 to prove that it stops the seg faults. Edit 2023-01-03: dask: Reinstate netCDF lock #531 has now been accepted into lama-to-dask and pulled in to here from there.

@davidhassell davidhassell added low priority dask Relating to the use of Dask labels Dec 19, 2022
@davidhassell davidhassell added this to the 3.14.0 milestone Dec 19, 2022
@davidhassell davidhassell changed the title dask: Data.cull_graph, concateante and Field.collapse dask: Data.cull_graph, concatenate and Field.collapse Dec 20, 2022
Copy link
Member

@sadielbartholomew sadielbartholomew left a comment

Choose a reason for hiding this comment

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

(Pressed 'approve' pre-maturely, sorry - one more comment to add.)

Overall, achieves the aims listed in the opening comment and results in passing collapse-related tests (at least for me locally) as promised. I've included some questions and minor comments, but this is ready to merge once you've considered them in my eyes. Thanks.

davidhassell and others added 3 commits January 27, 2023 08:38
Co-authored-by: Sadie L. Bartholomew <sadie.bartholomew@ncas.ac.uk>
Co-authored-by: Sadie L. Bartholomew <sadie.bartholomew@ncas.ac.uk>
@davidhassell davidhassell merged commit 25b8970 into NCAS-CMS:lama-to-dask Jan 27, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

dask Relating to the use of Dask high priority

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants