Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🧲 Update vscalc() function and add to documentation #3520

Open
wants to merge 28 commits into
base: main
Choose a base branch
from

Conversation

chris-ashe
Copy link
Collaborator

@chris-ashe chris-ashe commented Jan 30, 2025

Description

The vscalc() function has now been improved and added to the documentation.

  • New unit types has been added to the style guide to cover magnetic fluxes. Now the prefix web_ or vs_ can be used depending what better suites the context
  • The style guide recommendation for inductance prefixes has been changed from h_ to ind_
  • Removed inputting the value of vacuum permeability in to the function and instead call from constants.f90
  • The docs for the plasma resistive heating section have been updated to show all steps of plasma_ohmic_heating(), this also includes a boundary fix for the neo-classical enhancement for the resistivity that is only true for $A = 2.5-4.0$.

Old output:

image

New output:

image

Namespace changes

Functions

vscalc() -> calculate_volt_second_requirements()


Variables

  • gamma -> ejima_coeff: Very generic name that provided no insight
  • phiint -> vs_plasma_internal : This has now been added to output.
  • vsbrn -> vs_plasma_burn_required
  • vsstt -> vs_plasma_total_required
  • lpulse -> i_pulsed_plant: Changed prefix to new i_ style
  • vsres -> vs_plasma_res_ramp : Didnt specify the flux in what system and when the consumption occured
  • vsind -> vs_plasma_ind_ramp: Didnt specify the flux in what system and when the consumption occured
  • vburn -> v_plasma_loop_burn: Didnt specify system or where the voltage was measured.
  • rlp -> ind_plasma: Very generic name that provided no insight
  • rli -> ind_plasma_internal_norm: Very generic name that provided no insight
  • rpfac -> f_plasma_res_neo

✨ New additions

  • v_plasma_loop_burn: Wascalculated directly in the output section. Is now a tracked variable in physics_variables.f90. Value is returned in calculate_volt_second_requirements() and has been added to test_calculate_volt_second_requirements()

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.

@chris-ashe chris-ashe added the Physics Relating to the physics models label Jan 30, 2025
@chris-ashe chris-ashe self-assigned this Jan 30, 2025
@codecov-commenter
Copy link

codecov-commenter commented Jan 30, 2025

Codecov Report

Attention: Patch coverage is 61.70213% with 18 lines in your changes missing coverage. Please review.

Project coverage is 31.26%. Comparing base (95128e9) to head (01708b9).
Report is 1 commits behind head on main.

Files with missing lines Patch % Lines
process/physics.py 58.82% 14 Missing ⚠️
process/pfcoil.py 0.00% 2 Missing ⚠️
process/io/plot_proc.py 0.00% 1 Missing ⚠️
process/plasma_geometry.py 0.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #3520      +/-   ##
==========================================
+ Coverage   31.20%   31.26%   +0.05%     
==========================================
  Files          81       81              
  Lines       19440    19445       +5     
==========================================
+ Hits         6066     6079      +13     
+ Misses      13374    13366       -8     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@chris-ashe chris-ashe force-pushed the update_vscalc_function_and_add_to_docs branch from aa1f2c8 to 12d8b00 Compare January 31, 2025 10:57
@chris-ashe chris-ashe force-pushed the update_vscalc_function_and_add_to_docs branch 2 times, most recently from 0e2978d to bad7f47 Compare February 11, 2025 08:43
@chris-ashe chris-ashe force-pushed the update_vscalc_function_and_add_to_docs branch 2 times, most recently from 1c7f5cb to 0deb114 Compare February 11, 2025 10:35
@chris-ashe chris-ashe force-pushed the update_vscalc_function_and_add_to_docs branch from 0deb114 to fe4d28e Compare February 11, 2025 10:37
@chris-ashe chris-ashe marked this pull request as ready for review February 11, 2025 10:41
Copy link
Collaborator

@j-a-foster j-a-foster left a comment

Choose a reason for hiding this comment

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

One minor spelling correction but otherwise happy with the docs.

@chris-ashe chris-ashe requested review from j-a-foster and jonmaddock and removed request for timothy-nunn February 13, 2025 15:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Physics Relating to the physics models
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants