Update blanket variables to new style#3544
Merged
timothy-nunn merged 74 commits intomainfrom Mar 20, 2025
Merged
Conversation
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #3544 +/- ##
=======================================
Coverage 31.59% 31.59%
=======================================
Files 84 84
Lines 20112 20112
=======================================
Hits 6355 6355
Misses 13757 13757 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
c6a1612 to
81f95ff
Compare
2d0d015 to
93b20e8
Compare
e63d2c2 to
77ec621
Compare
timothy-nunn
requested changes
Mar 19, 2025
Collaborator
timothy-nunn
left a comment
There was a problem hiding this comment.
Only comment is regarding obsolete variables
timothy-nunn
approved these changes
Mar 20, 2025
…oss the codebase
…ult units for lifetimes
…oss the codebase
…consistency across the codebase
…ncy across the codebase
…y across the codebase
…ross the codebase
… across the codebase
…y across the codebase
…sistency across the codebase
…ross the codebase
…across the codebase
… across the codebase
…cross the codebase
…cross the codebase
…cross the codebase
…ify magnetic field strength prefix
…cy across the codebase
…sistency across the codebase
…istency across the codebase
… across the codebase
…onsistency across the codebase
…stency across the codebase
…y across the codebase
… across the codebase
…onsistency across the codebase
…consistency across the codebase
d6485c2 to
2f7a0f6
Compare
timothy-nunn
approved these changes
Mar 20, 2025
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
The changes cover the
fwbs_variables.f90andblanket_library.f90filesUpdate the blanket (
blkt) variables to be more verbose and meet the new style guide. This should make the code easier to understand.Added new unit type in the style guide to cover solid angles,
ster_. Short for steradians.Updated the lifetime section of the style guide to say that the default units is years
Namespace changes
Functions
Variables
bktlife_cal->life_blktcoolmass->m_fw_blkt_div_coolant_totalfwbsshape->i_fw_blkt_vv_shapecoolwh->i_blkt_coolant_typevolblkt->vol_blkt_totalvolblkti->vol_blkt_inboardvolblkto->vol_blkt_outboardpnucblkt->p_blkt_nuclear_heat_total_mwwhtblkt->m_blkt_totalwhtblss->m_blkt_steel_totalblpressure->pres_blkt_coolantinlet_temp->temp_blkt_coolant_inoutlet_temp->temp_blkt_coolant_outnblktmodpo->n_blkt_outboard_modules_poloidalnblktmodpi->n_blkt_inboard_modules_poloidalnblktmodti->n_blkt_inboard_modules_toroidalnblktmodto->n_blkt_outboard_modules_toroidalipump->i_fw_blkt_shared_coolantrhof_bl->den_blkt_coolantvisc_bl->visc_blkt_coolantpnucblkti->p_blkt_nuclear_heat_inboard_mwpnucblkto->p_blkt_nuclear_heat_outboard_mwmfblkto->mflow_blkt_outboard_coolantmfblkti->mflow_blkt_inboard_coolantmfblkt->mflow_blkt_coolant_totalbzfllengi->len_blkt_inboard_channel_totalbzfllengo->len_blkt_outboard_channel_totalvelblkti->vel_blkt_inboard_coolantvelblkto->vel_blkt_outboard_coolantnpblkti->n_blkt_inboard_channelsnpblkto->n_blkt_outboard_channelsfblli2sio4->f_vol_blkt_li4sio4fbltibe12->f_vol_blkt_tibe12fblss_ccfe->f_vol_blkt_steelwhtbltibe12->m_blkt_tibe12whtblli4sio4->m_blkt_li4sio4whtblbe->m_blkt_berylliumwtblli2o->m_blkt_li2owhtblvd->m_blkt_vanadiumwhtblli->m_blkt_lithiumli6enrich->f_blkt_li6_enrichmenticooldual->i_blkt_dual_coolantifci->i_blkt_liquid_breeder_channel_typei_bb_liq->i_blkt_liquid_breeder_typeFirst Wall
npfwo->n_fw_outboard_channelsnpfwi->n_fw_inboard_channelsmffwi->mflow_fw_inboard_coolant_totalmffwo->mflow_fw_outboard_coolant_totalmffw->mflow_fw_coolant_totalp_fw_nuclear_mw->p_fw_nuclear_heat_total_mwpradfw->p_fw_rad_total_mwpnucfwo->p_fw_outboard_nuclear_heat_mwpnucfwi->p_fw_inboard_nuclear_heat_mwmffwpo->mflow_fw_outboard_coolant_channelmffwpi->mflow_fw_inboard_coolant_channeltpeakfwi->temp_fw_inboard_peaktpeakfwo->temp_fw_outboard_peakVacuum Vessel
vdewin->vol_vvvolvvi->vol_vv_inboardvolvvo->vol_vv_outboardvvmass->m_vvDivertor
pnucdiv->p_div_nuclear_heat_total_mwpraddiv->p_div_rad_total_mwfdiv->f_ster_div_singleGeneral
fhcd->f_a_fw_hcdpnuchcd->p_fw_hcd_nuclear_heat_mwpradhcd->p_fw_hcd_rad_total_mwprimary_pumping->i_coolant_pumpingsecondary_cycle->i_thermal_electric_conversion✨ New additions
🐛 Bugs
fblli2sio4which represented the fraction of volume taken up by lithium oerthosilicate should have beenfblli4sio4Checklist
I confirm that I have completed the following checks: