Skip to content

Update blanket variables to new style#3544

Merged
timothy-nunn merged 74 commits intomainfrom
update_blkt_variables_to_new_style
Mar 20, 2025
Merged

Update blanket variables to new style#3544
timothy-nunn merged 74 commits intomainfrom
update_blkt_variables_to_new_style

Conversation

@chris-ashe
Copy link
Copy Markdown
Collaborator

@chris-ashe chris-ashe commented Feb 17, 2025

Description

The changes cover the fwbs_variables.f90 and blanket_library.f90 files

Update 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_blkt
  • coolmass -> m_fw_blkt_div_coolant_total
  • fwbsshape -> i_fw_blkt_vv_shape
  • coolwh -> i_blkt_coolant_type
  • volblkt -> vol_blkt_total
  • volblkti -> vol_blkt_inboard
  • volblkto -> vol_blkt_outboard
  • pnucblkt -> p_blkt_nuclear_heat_total_mw
  • whtblkt -> m_blkt_total
  • whtblss -> m_blkt_steel_total
  • blpressure -> pres_blkt_coolant
  • inlet_temp -> temp_blkt_coolant_in
  • outlet_temp -> temp_blkt_coolant_out
  • nblktmodpo -> n_blkt_outboard_modules_poloidal
  • nblktmodpi -> n_blkt_inboard_modules_poloidal
  • nblktmodti -> n_blkt_inboard_modules_toroidal
  • nblktmodto -> n_blkt_outboard_modules_toroidal
  • ipump -> i_fw_blkt_shared_coolant
  • rhof_bl -> den_blkt_coolant
  • visc_bl -> visc_blkt_coolant
  • pnucblkti -> p_blkt_nuclear_heat_inboard_mw
  • pnucblkto -> p_blkt_nuclear_heat_outboard_mw
  • mfblkto -> mflow_blkt_outboard_coolant
  • mfblkti -> mflow_blkt_inboard_coolant
  • mfblkt -> mflow_blkt_coolant_total
  • bzfllengi -> len_blkt_inboard_channel_total
  • bzfllengo -> len_blkt_outboard_channel_total
  • velblkti -> vel_blkt_inboard_coolant
  • velblkto -> vel_blkt_outboard_coolant
  • npblkti -> n_blkt_inboard_channels
  • npblkto -> n_blkt_outboard_channels
  • fblli2sio4 -> f_vol_blkt_li4sio4
  • fbltibe12 -> f_vol_blkt_tibe12
  • fblss_ccfe -> f_vol_blkt_steel
  • whtbltibe12 -> m_blkt_tibe12
  • whtblli4sio4 -> m_blkt_li4sio4
  • whtblbe -> m_blkt_beryllium
  • wtblli2o -> m_blkt_li2o
  • whtblvd -> m_blkt_vanadium
  • whtblli -> m_blkt_lithium
  • li6enrich -> f_blkt_li6_enrichment
  • icooldual -> i_blkt_dual_coolant
  • ifci -> i_blkt_liquid_breeder_channel_type
  • i_bb_liq -> i_blkt_liquid_breeder_type

First Wall

  • npfwo -> n_fw_outboard_channels
  • npfwi -> n_fw_inboard_channels
  • mffwi -> mflow_fw_inboard_coolant_total
  • mffwo -> mflow_fw_outboard_coolant_total
  • mffw -> mflow_fw_coolant_total
  • p_fw_nuclear_mw -> p_fw_nuclear_heat_total_mw
  • pradfw -> p_fw_rad_total_mw
  • pnucfwo -> p_fw_outboard_nuclear_heat_mw
  • pnucfwi -> p_fw_inboard_nuclear_heat_mw
  • mffwpo -> mflow_fw_outboard_coolant_channel
  • mffwpi -> mflow_fw_inboard_coolant_channel
  • tpeakfwi -> temp_fw_inboard_peak
  • tpeakfwo -> temp_fw_outboard_peak

Vacuum Vessel

  • vdewin -> vol_vv
  • volvvi -> vol_vv_inboard
  • volvvo -> vol_vv_outboard
  • vvmass -> m_vv

Divertor

  • pnucdiv -> p_div_nuclear_heat_total_mw
  • praddiv -> p_div_rad_total_mw
  • fdiv -> f_ster_div_single

General

  • fhcd -> f_a_fw_hcd
  • pnuchcd -> p_fw_hcd_nuclear_heat_mw
  • pradhcd -> p_fw_hcd_rad_total_mw
  • primary_pumping -> i_coolant_pumping
  • secondary_cycle -> i_thermal_electric_conversion

✨ New additions


🐛 Bugs

  • fblli2sio4 which represented the fraction of volume taken up by lithium oerthosilicate should have been fblli4sio4

Checklist

I confirm that I have completed the following checks:

  • My changes follow the PROCESS style guide
  • I have justified any large differences in the regression tests caused by this pull request in the comments.
  • I have added new tests where appropriate for the changes I have made.
  • If I have had to change any existing unit or integration tests, I have justified this change in the pull request comments.
  • If I have made documentation changes, I have checked they render correctly.
  • I have added documentation for my change, if appropriate.

@codecov-commenter
Copy link
Copy Markdown

codecov-commenter commented Feb 17, 2025

Codecov Report

❌ Patch coverage is 28.11594% with 248 lines in your changes missing coverage. Please review.
✅ Project coverage is 31.59%. Comparing base (32083c7) to head (5fb7504).
⚠️ Report is 457 commits behind head on main.

Files with missing lines Patch % Lines
process/blanket_library.py 10.43% 103 Missing ⚠️
process/stellarator.py 0.00% 46 Missing ⚠️
process/power.py 2.63% 37 Missing ⚠️
process/io/sankey_funcs.py 0.00% 19 Missing ⚠️
process/dcll.py 52.17% 11 Missing ⚠️
process/costs.py 35.71% 9 Missing ⚠️
process/hcpb.py 77.14% 8 Missing ⚠️
process/costs_2015.py 14.28% 6 Missing ⚠️
process/availability.py 85.71% 4 Missing ⚠️
process/build.py 0.00% 2 Missing ⚠️
... and 2 more
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.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@chris-ashe chris-ashe changed the title Update blanket variables to new style 🚧 Update blanket variables to new style Feb 17, 2025
@chris-ashe chris-ashe force-pushed the update_blkt_variables_to_new_style branch 3 times, most recently from c6a1612 to 81f95ff Compare February 17, 2025 15:24
@chris-ashe chris-ashe self-assigned this Feb 18, 2025
@chris-ashe chris-ashe force-pushed the update_blkt_variables_to_new_style branch from 2d0d015 to 93b20e8 Compare February 19, 2025 11:38
@chris-ashe chris-ashe marked this pull request as ready for review March 11, 2025 10:06
@chris-ashe chris-ashe changed the title 🚧 Update blanket variables to new style Update blanket variables to new style Mar 19, 2025
@chris-ashe chris-ashe force-pushed the update_blkt_variables_to_new_style branch from e63d2c2 to 77ec621 Compare March 19, 2025 10:23
Copy link
Copy Markdown
Collaborator

@timothy-nunn timothy-nunn left a comment

Choose a reason for hiding this comment

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

Only comment is regarding obsolete variables

Comment thread source/fortran/input.f90
@chris-ashe chris-ashe removed the request for review from j-a-foster March 20, 2025 09:44
@chris-ashe chris-ashe force-pushed the update_blkt_variables_to_new_style branch from d6485c2 to 2f7a0f6 Compare March 20, 2025 09:52
@timothy-nunn timothy-nunn merged commit 404f96a into main Mar 20, 2025
@timothy-nunn timothy-nunn deleted the update_blkt_variables_to_new_style branch March 20, 2025 14:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants