Add specific dr_cs_bore variable#4437
Conversation
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #4437 +/- ##
=======================================
Coverage 48.62% 48.62%
=======================================
Files 151 151
Lines 29705 29705
=======================================
+ Hits 14443 14445 +2
+ Misses 15262 15260 -2 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
|
Given the logic change in |
| + 2.0 * self.data.build.dr_cs_tf_gap | ||
| + self.data.build.dr_cs | ||
| ) | ||
| * (2.0 * self.data.build.dr_cs_bore + self.data.build.dr_cs) |
There was a problem hiding this comment.
Is dr_cs_bore being used here before it is set?
| @@ -1723,6 +1687,22 @@ def calculate_radial_build(self, output: bool): | |||
| + self.data.build.dr_cs_precomp | |||
There was a problem hiding this comment.
dr_cs_precomp is being used here but calculated below!
|
@j-a-foster sorry to ask for another, could you just check the re-ordering in |
timothy-nunn
left a comment
There was a problem hiding this comment.
Happy once merge conflicts are fixed
…ess and use dr_cs_bore instead
8fb90bc to
c08dde6
Compare
This pull request refactors the codebase to consistently use a new variable,
dr_cs_bore, to represent the central solenoid (CS) bore radius, replacing the previous use ofdr_borefor this purpose. The changes improve clarity and accuracy in the modeling of the CS geometry, update all related calculations, plotting routines, and tests, and provide more precise documentation for these variables.Variable refactoring and improved clarity:
dr_cs_boreinBuildDatato explicitly represent the CS bore radius, updated its documentation, and ensured it is set appropriately in the radial build calculations (process/data_structure/build_variables.py,process/models/build.py).dr_cs_boreinstead ofdr_borewhen referring to the CS bore, including function signatures, calculations, and docstrings (process/models/geometry/pfcoil.py,process/models/pfcoil.py,process/core/io/plot/summary.py).dr_cs_borewhere appropriate (process/models/pfcoil.py).Testing updates:
dr_cs_boreinstead ofdr_borefor the CS bore radius, ensuring test consistency with the new variable naming and logic (tests/unit/models/test_pfcoil.py).Plotting improvements:
process/core/io/plot/summary.py).These changes make the codebase more maintainable and reduce ambiguity around the meaning of the bore radius variables, ensuring that the CS bore and other bore-related quantities are clearly distinguished.## Description
Checklist
I confirm that I have completed the following checks: