Update first wall variables for clarity#3502
Merged
timothy-nunn merged 34 commits intomainfrom Feb 18, 2025
Merged
Conversation
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #3502 +/- ##
=======================================
Coverage 31.55% 31.55%
=======================================
Files 82 82
Lines 19565 19565
=======================================
Hits 6173 6173
Misses 13392 13392 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
c630b67 to
6ea5011
Compare
a43a614 to
e007996
Compare
f78c311 to
20cba43
Compare
b086d77 to
140fed0
Compare
timothy-nunn
requested changes
Feb 18, 2025
Collaborator
timothy-nunn
left a comment
There was a problem hiding this comment.
Just one thing missing from the obsolete_variables I think
8aa4efe to
261c375
Compare
timothy-nunn
approved these changes
Feb 18, 2025
26c592c to
9109f45
Compare
timothy-nunn
approved these changes
Feb 18, 2025
…lace denw in fwbs variables
…y across the codebase
…ncy across the codebase
…y across the codebase
…oss the codebase
…ross the codebase
…cy across the codebase
…oss the codebase
…ross the codebase
… and consistency
…nd naming conventions
…ross the codebase
…istency across the codebase
…oss the codebase
…ross the codebase
…cross the codebase
…across the codebase
…d consistency across the codebase
…y across the codebase
9109f45 to
724c025
Compare
timothy-nunn
approved these changes
Feb 18, 2025
Contributor
|
(Typo on iblanket? (iblnaket)) |
Collaborator
Author
Yes, small typo. Have corrected |
ajpearcey
pushed a commit
that referenced
this pull request
Feb 26, 2025
* ❇️ Create new den_tungsten variable in constants and implement to replace denw in fwbs variables * 🔥 Remove `denw` variable and its references for tungsten density from the codebase * 🔄 Rename `iblanket` to `i_blanket_type` for consistency across multiple files * 🔄 Rename `fwinlet` to `temp_fw_coolant_in` for clarity and consistency across the codebase * 🔄 Rename `fwoutlet` to `temp_fw_coolant_out` for clarity and consistency across the codebase * 🔄 Rename `fwpressure` to `pres_fw_coolant` for clarity and consistency across the codebase * 🔄 Rename `fwareaib` to `a_fw_inboard` for clarity and consistency across the codebase * 🔄 Rename `fwareaob` to `a_fw_outboard` for clarity and consistency across the codebase * 🔄 Rename `fwarea` to `a_fw_total` for clarity and consistency across the codebase * 🔄 Rename `volfw` to `vol_fw_total` for clarity and consistency across the codebase * 🔄 Rename `vffwo` to `f_a_fw_coolant_outboard` for clarity and consistency across the codebase * 🔄 Rename `vffwi` to `f_a_fw_coolant_inboard` for clarity and consistency across the codebase * 🔄 Rename `fwmass` to `m_fw_total` for clarity and consistency across the codebase * 🔄 Rename `fwcoolant` to `i_fw_coolant_type` for clarity and consistency across the codebase * 🔄 Rename `afw` to `radius_fw_channel` for clarity and consistency across the codebase * 🔄 Rename `fw_wall` to `dr_fw_wall` for clarity and consistency across the codebase * 🔄 Rename `pitch` to `dx_fw_module` for clarity and consistency across the codebase * 🔄 Update description of `dx_fw_module` for clarity and consistency across the codebase * 🔄 Refactor `fw_temp` method parameters and variable names for clarity and consistency * Fix unit tests * 📝 Update documentation to include standards for component lifetimes and naming conventions * 🔄 Rename `fwlife` to `life_fw_fpy` for clarity and consistency across the codebase * 🔄 Rename `pnucfw` to `p_fw_nuclear_mw` for clarity and consistency across the codebase * 🔄 Rename `fw_channel_length` to `len_fw_channel` for clarity and consistency across the codebase * 🔄 Rename `tpeak` to `temp_fw_peak` for clarity and consistency across the codebase * 🔄 Rename `tfwmatmax` to `temp_fw_max` for clarity and consistency across the codebase * 🔄 Rename `rhof_fw` to `den_fw_coolant` for clarity and consistency across the codebase * 📝 Update documentation to include standards for viscosity variable naming * 🔄 Rename `visc_fw` to `visc_fw_coolant` for clarity and consistency across the codebase * 🔄 Rename `peaking_factor` to `f_fw_peak` for clarity and consistency across the codebase * 🔄 Rename obsolete variables for clarity and consistency across the codebase * 🔄 Rename p_fw_nuclear_mw to p_fw_nuclear_heat_total_mw for clarity and consistency across the codebase * 🔄 Add obsolete variable 'denw' to OBS_VARS for clarity and consistency across the codebase * Update ST tests
6 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Update the First Wall (FW) variables to be more verbose and meet the new style guide. This should make the code easier to understand.
life_prefix.visc_prefix.Namespace changes
Functions
Variables
afw->radius_fw_channelfw_wall->dr_fw_wallpitch->dx_fw_module: Since this is the distance between adjacent FW cooling pipes or more simply the width of each seperate FW cooled segment thedx_prefix has been used as the direction is not in a single dimension.fwith->dr_fw_inboard: Now more clearly shows that it is the radial thicknessfwoth->dr_fw_outboard: Now more clearly shows that it is the radial thicknessdenw: Removed fromfwbs_variablesand added as new variableden_tungstenintoconstants.pyiblanket->i_blanket_type: More explicitly shows that this is the type of blanket system chosen instead of possible being a switch for the presence of a blanket.fwinlet->temp_fw_coolant_in: Makes this more explicit that this is the coolant temperature instead of the FW structurefwoutlet->temp_fw_coolant_out: Makes this more explicit that this is the coolant temperature instead of the FW structurefwpressure->pres_fw_coolant: Makes this more explicit that this is the coolant pressurefwareaib->a_fw_inboard: Changed to meet new style guidefwareaob->a_fw_outboard: Changed to meet new style guidefwarea->a_fw_total: Changed to make it more explicit that it is the sum of the inboard and outboard FW areas.volfw->vol_fw_total: Changed to make it more explicit that it is the sum of the inboard and outboard FW volumes.vffwo->f_a_fw_coolant_outboard: Make it easier to show that this is the fraction of the FW cross-sectional area taken by the coolant pipes.vffwi->f_a_fw_coolant_inboard: Make it easier to show that this is the fraction of the FW cross-sectional area taken by the coolant pipes.fwmass->m_fw_total: Make it easier to show that this is the total mass of both first walls.fwcoolant->i_fw_coolant_type: Add switchi_prefix and make it easier to discern if this is choosing the presence of a FW coolant or its type (incase an inertially cooled FW is a future option).fwlife->life_fw_fpypnucfw->p_fw_nuclear_heat_total_mwfw_channel_length->len_fw_channeltpeak->temp_fw_peaktfwmatmax->temp_fw_maxrhof_fw->den_fw_coolantvisc_fw->visc_fw_coolantpeaking_factor->f_fw_peak✨ New additions
den_tungsten: Now added toconstants.f90🐛 Bugs
Checklist
I confirm that I have completed the following checks: