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

Simplify logic in output to handle multiple code and fix ITER cylinder SDDR #310

Merged
merged 9 commits into from
Oct 4, 2024

Conversation

dodu94
Copy link
Member

@dodu94 dodu94 commented Jul 25, 2024

Description

This PR should be reviewed after PR #308

The PR addresses two issues:

  1. the if-else statements across the output.py did not allow to perform post-process of d1s benchmarks. While correcting them, the logic has been simplified a little bit but there may be still optimizations to be done (out of scope of this PR)
  2. adress some issues specific of ITER cylinder. After the introduction of F4Enix, a couple of edge cases that where handled by JADE were not transposed into F4Enix and they had to be restored here.

Type of change

Please select what type of change this is.

  • Bug fix (non-breaking change which fixes an issue)
  • New benchmark
    • Non-breaking change which entirely uses exisiting classes, structure etc
    • Breaking change which has implemented new/modified classes etc
  • New feature
    • Non-breaking change which adds functionality
    • Breaking change fix or feature that would cause existing functionality to not work as expected

Testing

Manual testing + CI test added for at least the single pp of ITER cyl. the test is a bit slow but necessary

Checklist:

  • My code follows the style guidelines of this project
  • I have performed a self-review of my code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • General testing
    • New and existing unit tests pass locally with my changes
    • Coverage is >80%

@dodu94 dodu94 marked this pull request as ready for review July 29, 2024 08:38
@dodu94 dodu94 requested a review from alexvalentine94 July 29, 2024 08:38
Copy link
Collaborator

Choose a reason for hiding this comment

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

As previously discussed, there is an error in the SA2 scenario here. The impact is minimal and conservative (we found the impact on time correction factors to be a few %). I dont think it is in the documentation, but if the SA2 scenario is referenced it should be noted or at least flagged (as issue) for future update.

Copy link
Member Author

Choose a reason for hiding this comment

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

I opened an issue about this #321

Copy link
Collaborator

Choose a reason for hiding this comment

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

This is a lot neater for handling multiple codes. We should implement this also in sphereoutput.py

Copy link
Collaborator

Choose a reason for hiding this comment

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

can remove

Copy link
Member Author

Choose a reason for hiding this comment

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

removed

Copy link
Collaborator

Choose a reason for hiding this comment

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

can remove

Copy link
Member Author

Choose a reason for hiding this comment

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

Using new F4Enix parsing capabilities JADE looks both in the .out and output file for the name (version of MCNP or D1SUNED) of the code used to be inserted in the metadata files

Copy link
Collaborator

Choose a reason for hiding this comment

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

can remove

Copy link
Member Author

Choose a reason for hiding this comment

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

removed

Copy link
Collaborator

Choose a reason for hiding this comment

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

can remove

Copy link
Member Author

Choose a reason for hiding this comment

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

see previous comment

Copy link
Collaborator

Choose a reason for hiding this comment

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

Do we need this?

Copy link
Member Author

Choose a reason for hiding this comment

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

see previous comment

Copy link
Collaborator

Choose a reason for hiding this comment

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

Do we need this?

Copy link
Member Author

Choose a reason for hiding this comment

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

see previous comment

Copy link

codecov bot commented Oct 4, 2024

Codecov Report

Attention: Patch coverage is 96.36364% with 14 lines in your changes missing coverage. Please review.

Files with missing lines Patch % Lines
jade/gui.py 76.19% 10 Missing ⚠️
jade/sphereoutput.py 97.14% 2 Missing ⚠️
jade/input_fetch.py 66.66% 1 Missing ⚠️
jade/output.py 98.66% 1 Missing ⚠️
Files with missing lines Coverage Δ
jade/acepyne.py 9.76% <100.00%> (ø)
jade/expoutput.py 92.15% <100.00%> (ø)
jade/inputfile.py 85.95% <100.00%> (ø)
jade/main.py 77.57% <100.00%> (ø)
jade/plotter.py 96.05% <100.00%> (ø)
jade/testrun.py 65.82% <100.00%> (ø)
jade/utilitiesgui.py 57.04% <100.00%> (ø)
tests/computational_test.py 98.55% <100.00%> (ø)
tests/expoutput_test.py 100.00% <100.00%> (ø)
tests/input_fetch_test.py 100.00% <100.00%> (ø)
... and 8 more

@alexvalentine94 alexvalentine94 merged commit 9086fc0 into developing Oct 4, 2024
9 checks passed
@alexvalentine94 alexvalentine94 deleted the fix-ITER-cyl-pp branch October 4, 2024 14:32
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.

2 participants