-
Notifications
You must be signed in to change notification settings - Fork 11
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
3385 Update the plasma composition docs to include all new models #3386
Open
chris-ashe
wants to merge
46
commits into
main
Choose a base branch
from
3385-update-the-plasma-composition-docs-to-include-all-new-models
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
3385 Update the plasma composition docs to include all new models #3386
chris-ashe
wants to merge
46
commits into
main
from
3385-update-the-plasma-composition-docs-to-include-all-new-models
Conversation
This file contains 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
chris-ashe
changed the title
3385 update the plasma composition docs to include all new models
🚧 3385 update the plasma composition docs to include all new models
Nov 8, 2024
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #3386 +/- ##
=======================================
Coverage 30.41% 30.41%
=======================================
Files 80 80
Lines 19389 19373 -16
=======================================
- Hits 5897 5893 -4
+ Misses 13492 13480 -12 ☔ View full report in Codecov by Sentry. |
chris-ashe
force-pushed
the
3385-update-the-plasma-composition-docs-to-include-all-new-models
branch
from
January 7, 2025 15:18
229400e
to
80e5a83
Compare
chris-ashe
added
Documentation
Improvements or additions to documentation
Impurities
Plasma impurities
labels
Jan 7, 2025
chris-ashe
force-pushed
the
3385-update-the-plasma-composition-docs-to-include-all-new-models
branch
2 times, most recently
from
January 8, 2025 11:21
d0adab7
to
b24d113
Compare
chris-ashe
changed the title
🚧 3385 update the plasma composition docs to include all new models
🚧 3385 Update the plasma composition and radiation docs to include all new models
Jan 8, 2025
…t into its own file and update references
…r consistency across documentation and code
…cross the codebase
…ity and maintainability
…mpurities section
…across the codebase
…tency across the codebase
…tency across the codebase
…one function docstring for clarity
…tended. Value was fixed to 2.0
…eplace with physics_variables.kappa for clarity
…e Physics class for better organization
… the density weighted calculation
…harge with constants for improved accuracy
chris-ashe
force-pushed
the
3385-update-the-plasma-composition-docs-to-include-all-new-models
branch
from
January 24, 2025 14:45
c98dec3
to
e4c93b2
Compare
chris-ashe
changed the title
🚧 3385 Update the plasma composition and radiation docs to include all new models
🚧 3385 Update the plasma composition docs to include all new models
Jan 24, 2025
…y across data files and code
chris-ashe
changed the title
🚧 3385 Update the plasma composition docs to include all new models
3385 Update the plasma composition docs to include all new models
Jan 24, 2025
… in calculations and documentation
…code and documentation
…cs_functions.py and use new values from constants.f90
…ctrons in obsolete_vars.py
…ces and iteration variables
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
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
This PR was originally meant to cover the radiation section of the code as well but will be put into a separate issue to prevent conflicts.
zeffai
now added to output.Namespace changes
Functions
radpwr()
->calculate_radiation_powers()
Variables
Plasma Composition
afuel
->m_fuel_amu
: This has now been added to outputabeam
->m_beam_amu
: This has now been added to outputdnalp
->nd_alphas
dnprot
->nd_protons
protium
->f_nd_protium_electrons
dnbeam
->nd_beam_ions
dnitot
->nd_ions_total
dnz
->nd_impurities
aion
->m_ions_total_amu
ralpne
->f_nd_alpha_electron
rnbeam
->f_nd_beam_electron
deni
->nd_fuel_ions
⚡ Radiation
pradpv
->pden_plasma_rad_mw
pradmw
->p_plasma_rad_mw
peakfactrad
->f_fw_rad_max
pouterzoneradmw
->p_plasma_outer_rad_mw
pinnerzoneradmw
->p_plasma_inner_rad_mw
photon_wall
->pflux_fw_rad_mw
peakradwallload
->pflux_fw_rad_max_mw
psyncpv
->pden_plasma_sync_mw
ssync
->f_sync_reflect
✨ New additions
The new constants have been added to
constants.f90
for the different fuel species atomic masses from NIST. These updated mass values caused the plasma composition and first wall heating unit tests to fail.m_deuteron_amu
: 2.0 -> 2.013553212544m_helion_amu
: 3.0 -> 3.014932246932m_triton_amu
: 3.0 -> 3.01550071597m_alpha_amu
: 4.0 -> 4.001506179129m_proton_amu
:1.0 -> 1.0072764665789The
ATOMIC_MASS_DEUTERIUM
andATOMIC_MASS_TRITIUM
local variables inphysics_functions.py
has been replaced with the values above.The same has been done for the impurity species taking in
impurity_radiation.py
:m_protium_amu
: 1.01 -> 1.00782503223m_helium_amu
: 4.003 -> 4.002602m_beryllium_amu
: 9.01 -> 9.0121831m_carbon_amu
: 12.01 -> 12.0096m_nitrogen_amu
: 14.01 -> 14.00643m_oxygen_amu
: 15.999 -> 15.99903m_neon_amu
: 20.18 -> 20.1797m_silicon_amu
: 28.09 -> 28.084m_argon_amu
: 39.95 -> 39.948m_iron_amu
: 55.85 -> 55.845m_nickel_amu
: 58.70 -> 58.6934m_krypton_amu
: 83.80 -> 83.798m_xenon_amu
: 131.30 -> 131.293m_tungsten_amu
: 183.85 -> 183.84🐛 Bugs
psync_albajar_fidone()
the temperature profile parametertbeta
was not used as intended by the model authors but was just fixed to a value of 2.0.psync_albajar_fidone()
the plasma elongationkappa
is not given to the function as intded, instead it was calculated internally as follows:plasma_composition()
the proton density was not multiplied by its true mass value and was just set to 1.0.zeffai
) did not use the true masses of the particles in atomic mass units. Impleneting the true masses causes a change in unit tests as such:Checklist
I confirm that I have completed the following checks: