🔄 Rename classic physics variables 2#3886
Merged
timothy-nunn merged 30 commits intomainfrom Oct 21, 2025
Merged
Conversation
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #3886 +/- ##
==========================================
- Coverage 46.42% 45.72% -0.70%
==========================================
Files 123 123
Lines 28212 28664 +452
==========================================
+ Hits 13098 13108 +10
- Misses 15114 15556 +442 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
…m across the codebase for consistency
…sistency across the codebase
…l_helium3 for consistency across the codebase
…stency across the codebase
…tency across the codebase
…vg for consistency across the codebase
… consistency across the codebase
chris-ashe
force-pushed
the
rename_classic_physics_variables_2
branch
from
59b14bb to
c7fd39c
Compare
…ressure across multiple files
…ssure in current drive and physics modules
…olume averaged beta equations
…files for consistency in plasma density calculations.
…lume averaged temperature in physics module
…asma pressure variable descriptions
…ity and consistency in plasma temperature calculations
…vol_avg` across multiple files to enhance clarity and maintain consistency in the codebase.
…l_vol_avg` across multiple files, including data files, physics calculations, and tests.
…on_line` across multiple files to enhance clarity and maintain consistency in the codebase.
…tiple files for clarity and consistency in plasma impurity density calculations.
…larity and consistency in plasma beta calculations.
…larity and consistency in plasma beta calculations.
…cross multiple files for clarity and consistency in plasma beta calculations.
…cross multiple files for clarity and consistency in plasma beta calculations.
…iles for clarity and consistency in plasma density limit calculations.
… for clarity and consistency in plasma density limit calculations.
…sistency in plasma beta calculations.
j-a-foster
approved these changes
Oct 20, 2025
Collaborator
j-a-foster
left a comment
j-a-foster
left a comment
There was a problem hiding this comment.
Happy with the doc changes.
timothy-nunn
requested changes
Oct 21, 2025
|
|
||
| dlimit: list[float] = None | ||
| """density limit (/m3) as calculated using various models""" | ||
| nd_plasma_electron_max_array: list[float] = None |
Collaborator
There was a problem hiding this comment.
Is there a reason that some variables are ..._electron_... and others are ..._electrons_...?
| dlimit: list[float] = None | ||
| """density limit (/m3) as calculated using various models""" | ||
| nd_plasma_electron_max_array: list[float] = None | ||
| """Plasma electron density max limit model array (/m3)""" |
Collaborator
There was a problem hiding this comment.
I think this description is a little unclear
Collaborator
There was a problem hiding this comment.
You have updated the old mappings but have not included any of the new mappings
Collaborator
|
Missing beta rename in one of the input files: https://github.com/ukaea/PROCESS/actions/runs/18678790288/job/53254859273?pr=3886#step:6:39793 |
timothy-nunn
approved these changes
Oct 21, 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
4 participants
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
🔄 Renames
Fuel fractions have been made more clear to show that they explicitly represent the plasma fuel
f_deuterium->f_plasma_fuel_deuteriumf_tritium->f_plasma_fuel_tritiumf_helium3->f_plasma_fuel_helium3beta->beta_total_vol_avgbeta_toroidal->beta_toroidal_vol_avgbeta_poloidal->beta_poloidal_vol_avgbeta_thermal->beta_thermal_vol_avgbeta_max->beta_vol_avg_maxbeta_min->beta_vol_avg_minbeta_thermal_poloidal->beta_thermal_poloidal_vol_avgbeta_thermal_toroidal->beta_thermal_toroidal_vol_avgThe plasma pressures have been re-done to make it more verbose that they are the thermal pressures and not the total which includes fast particles and beam pressure
pres_plasma_vol_avg->pres_plasma_thermal_vol_avgpres_plasma_on_axis->pres_plasma_thermal_on_axisPlasma number densities have been redone to make them more verbose. It is now clear they belong to the plasma and that they represent the volume averaged densities
nd_alphas->nd_plasma_alphas_vol_avgnd_protons->nd_plasma_protons_vol_avgnd_fuel_ions->nd_plasma_fuel_ions_vol_avgnd_ions_total->nd_plasma_ions_total_vol_avgnd_impurities->nd_plasma_impurities_vol_avgdlimt->nd_plasma_electron_max_arraydnelimt->nd_plasma_electrons_maxnd_electron_line->nd_plasma_electron_linepcoef->f_temp_plasma_electron_density_vol_avgChecklist
I confirm that I have completed the following checks: