Skip to content
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

2455 DynDofmaps split & rename #2457

Merged
merged 29 commits into from
Feb 29, 2024
Merged

2455 DynDofmaps split & rename #2457

merged 29 commits into from
Feb 29, 2024

Conversation

oakleybrunt
Copy link
Collaborator

Closes #2455

@oakleybrunt oakleybrunt self-assigned this Jan 5, 2024
Copy link

codecov bot commented Jan 5, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (699ceb2) 99.85% compared to head (73278ea) 99.85%.

❗ Current head 73278ea differs from pull request most recent head 79d80bf. Consider uploading reports for the commit 79d80bf to get more accurate results

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #2457   +/-   ##
=======================================
  Coverage   99.85%   99.85%           
=======================================
  Files         352      353    +1     
  Lines       47334    47342    +8     
=======================================
+ Hits        47264    47273    +9     
+ Misses         70       69    -1     

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

@oakleybrunt oakleybrunt changed the title 2245 dyn dof maps split rename 2445 dyn dof maps split rename Jan 8, 2024
@oakleybrunt oakleybrunt changed the title 2445 dyn dof maps split rename 2445 DynDofmaps split & rename Jan 8, 2024
@oakleybrunt oakleybrunt changed the title 2445 DynDofmaps split & rename 2455 DynDofmaps split & rename Jan 9, 2024
@arporter
Copy link
Member

Hi @hiker, this could be one for you to review if Oakley is happy?

@oakleybrunt
Copy link
Collaborator Author

Hi @hiker, this could be one for you to review if Oakley is happy?

Fine with me :)

Copy link
Collaborator

@hiker hiker left a comment

Choose a reason for hiding this comment

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

Very nice work (I am especially happy about how the number of lines and pylint warnings for dynamo_0p3 has decreased. I am aware that this is not just this PR but a lot of earlier work :), but still, really nice to see).
A few minor things. But I have one question, and might need @arporter 's opinion: typically we should have (at least one) test file that covers the corresponding source file. In this case, I would have expected a file .../tests/domain/lfric/lfric_dofmaps_test.py. As far as I can see, the tests are atm in .../tests/dynamo0p3_cma.py , the only test modified here ;) And indeed, this file does cover 100% of lfric_dofmaps.py, but I'd guess it covers actually more. So, @arporter , do we expect this to be done as part of the refactor?

src/psyclone/domain/lfric/__init__.py Show resolved Hide resolved
src/psyclone/domain/lfric/lfric_dofmaps.py Show resolved Hide resolved
src/psyclone/domain/lfric/lfric_dofmaps.py Outdated Show resolved Hide resolved
src/psyclone/domain/lfric/lfric_invoke.py Outdated Show resolved Hide resolved
src/psyclone/domain/lfric/lfric_invoke.py Show resolved Hide resolved
src/psyclone/domain/lfric/lfric_kern.py Show resolved Hide resolved
src/psyclone/tests/dynamo0p3_cma_test.py Outdated Show resolved Hide resolved
@hiker hiker added enhancement reviewed with actions LFRic Issue relates to the LFRic domain and removed under review labels Jan 16, 2024
@arporter
Copy link
Member

So, @arporter , do we expect this to be done as part of the refactor?

Yes please.

@hiker
Copy link
Collaborator

hiker commented Feb 22, 2024

So, @arporter , do we expect this to be done as part of the refactor?

Yes please.

It looks all good, except I still get lines not covered by the corresponding test:

psyclone/src/psyclone/tests$ pytest --cov-report term-missing --cov psyclone.domain.lfric.lfric_dofmaps  ./domain/lfric/lfric_dofmaps_test.py
...
domain/lfric/lfric_dofmaps_test.py ......                                                                                                                                    [100%]

---------- coverage: platform linux, python 3.10.12-final-0 ----------
Name                                                                   Stmts   Miss  Cover   Missing
----------------------------------------------------------------------------------------------------
/home/joerg/work/psyclone/src/psyclone/domain/lfric/lfric_dofmaps.py      94      4    96%   279, 281, 287-290

If I add test/dynamo0p3_cma.py to the list of tests to run, you have 100% coverage, so it might just require to maybe move one test from one file to the other (since dynamo0p3.py is not at all covered by tests/dynamo*py anyway :) ).

@hiker
Copy link
Collaborator

hiker commented Feb 22, 2024

I've also triggered the integration tests, since everything else is fine!

@hiker
Copy link
Collaborator

hiker commented Feb 29, 2024

Last outstanding issue addressed, CI and integration tests all successful. Proceeding to merge

Copy link
Collaborator

@hiker hiker left a comment

Choose a reason for hiding this comment

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

All issues addressed. CI/Integration green, no need to rebuild docs. Proceeding to merge

@hiker hiker merged commit 77510b9 into master Feb 29, 2024
11 checks passed
@hiker hiker deleted the 2245_DynDofMaps_split_rename branch February 29, 2024 12:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement LFRic Issue relates to the LFRic domain ready to be merged
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Splitting and renaming DynDofMaps from dynamo0p3.py
4 participants