Separate shield, vacuum vessel, and blanket calculations#4064
Separate shield, vacuum vessel, and blanket calculations#4064timothy-nunn merged 26 commits intomainfrom
Conversation
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #4064 +/- ##
=======================================
Coverage 46.46% 46.47%
=======================================
Files 122 123 +1
Lines 28838 28902 +64
=======================================
+ Hits 13401 13432 +31
- Misses 15437 15470 +33 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
d09316b to
8181f19
Compare
… tests for elliptical vessel volumes
…treamline component handling
eb35413 to
d788dcb
Compare
d788dcb to
c6b1da3
Compare
cfe9a8a to
472208a
Compare
667e84e to
dde3844
Compare
timothy-nunn
left a comment
There was a problem hiding this comment.
I still think that these new models need to be added into output.py (essentially a copy of the caller that ensures output is written to the MFile)
| return vol_vv_inboard, vol_vv_outboard, vol_vv | ||
|
|
||
| @staticmethod | ||
| def calculate_elliptical_vessel_volumes( |
I feel at this time it would be best to leave this until I have all of the systems properly separated out and we know that nothing is doing double calcs etc. Still need to do a few more PR's to sort out what goes in the blanket base class and what goes into the distinct models. Then we can start making things properly like |
This issue is that |
This pull request makes significant changes to the blanket and shield modeling in
process/blanket_library.py, primarily removing the calculation and handling of shield and vacuum vessel components from the blanket library. The shield and vacuum vessel are now modeled separately, as evidenced by their initialization and execution inprocess/main.pyandprocess/caller.py. This refactoring simplifies the blanket library, making it responsible only for blanket calculations.Key changes include:
Blanket Library Refactor
blanket_library.py, including their half-height, surface area, and volume calculations. The blanket library now exclusively handles blanket components.Separation of Shield and Vacuum Vessel Models
Added new model classes for the shield and vacuum vessel (
Shield,VacuumVessel) and initialized them in the main process class (process/main.py).Modified the process caller to run the shield and vacuum vessel models as independent steps, decoupled from the blanket calculations.
These changes improve the modularity and maintainability of the code by clearly separating the responsibilities of the blanket, shield, and vacuum vessel models.## Description
Checklist
I confirm that I have completed the following checks: