-
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
3388 update the beta limit section of the docs to be up to date and include all models #3389
Merged
timothy-nunn
merged 52 commits into
main
from
3388-update-the-beta-limit-section-of-the-docs-to-be-up-to-date-and-include-all-models
Jan 7, 2025
Merged
Changes from all commits
Commits
Show all changes
52 commits
Select commit
Hold shift + click to select a range
6f7fc48
Refactor culblm function to calculate_beta_limit with enhanced docume…
chris-ashe efed2dc
Update navigation structure in mkdocs.yml for Beta Limit section. Mov…
chris-ashe 3cbbb23
Rename betaft to beta_fast_alpha across the codebase for consistency …
chris-ashe 77a09f2
Rename switch variable iculbl to i_beta_component for clarity in beta…
chris-ashe 605b29f
Rename betalim to beta_limit_upper for clarity and consistency across…
chris-ashe 7906aa9
Rename betalim_lower to beta_limit_lower for consistency and clarity …
chris-ashe e5ef4fd
Initial input of beta type constraint equations to docs
chris-ashe d0b8d15
Rename betpmx to beta_poloidal_max for clarity and consistency across…
chris-ashe 5eedafc
Rename fbetap to fbeta_poloidal for clarity and consistency across th…
chris-ashe 480b79d
Rename betap to beta_poloidal for clarity and consistency across the …
chris-ashe 9338af9
Rename betat to beta_toroidal and add it as a proper physics variable…
chris-ashe b9aa615
Add comment for normalised total beta calculation and update output l…
chris-ashe cbed206
Rename betath to beta_thermal and add it as a proper physics variable…
chris-ashe 40eeb88
Add beta_thermal_poloidal and beta_thermal_toroidal variables for the…
chris-ashe 84009f3
Add norm_beta_thermal variable and update output for normalised therm…
chris-ashe 7b8f4cf
Rename normalised_total_beta to norm_beta_total and add norm_beta_tor…
chris-ashe f4eeaf4
Enhance plasma beta documentation and update fast alpha beta calculat…
chris-ashe 85cc16b
Add more detail for the alpha beta second model and add graph
chris-ashe 9cea2e0
Merge branch 'main' into 3388-update-the-beta-limit-section-of-the-do…
chris-ashe be43a4e
Rename 'betap' to 'beta_poloidal' in BootstrapFraction parameter clas…
chris-ashe d44c275
Merge branch 'main' into 3388-update-the-beta-limit-section-of-the-do…
chris-ashe 6daf8c5
:memo: Update plasma beta documentation to clarify relationships and …
chris-ashe c429df2
Merge branch 'main' into 3388-update-the-beta-limit-section-of-the-do…
chris-ashe deb4580
Rename norm_beta_thermal to beta_norm_thermal in Python and Fortran f…
chris-ashe 0c404a5
Rename norm_beta_toroidal to beta_norm_toroidal in Python and Fortran…
chris-ashe 6ed6133
Rename norm_beta_poloidal to beta_norm_poloidal in Python and Fortran…
chris-ashe f1db19f
Rename norm_beta_total to beta_norm_total in Python and Fortran files…
chris-ashe 2761fbe
🔄 Rename dnbeta to beta_norm_limit_upper for consistency across data …
chris-ashe fa1fc76
🔄 Rename gammaft to f_beta_alpha_beam_thermal for consistency in Fort…
chris-ashe a0cdf6b
🔄 Rename epbetmax to beta_poloidal_eps_max for consistency across fil…
chris-ashe b7fbabf
🔄 Add beta_poloidal_eps calculation and documentation for poloidal be…
chris-ashe 3deffdb
🔄 Rename fbetatry to fbeta_max for consistency across data files and …
chris-ashe a3bc522
🔄 Rename ifalphap to i_beta_fast_alpha for consistency across data fi…
chris-ashe aee23af
🔄 Rename beta_limit_upper to beta_max for consistency across codebase…
chris-ashe 2e12caf
🔄 Rename beta_norm_limit_upper to beta_norm_max for consistency acros…
chris-ashe be9b4c3
🔄 Update obsolete_vars.py to rename variables for consistency across …
chris-ashe 3a629bf
🔄 Rename beta_limit_lower to beta_min for consistency across the code…
chris-ashe 43eba4d
🔄 Rename fbetatry_lower to fbeta_min for consistency across the codebase
chris-ashe 9510a25
:bug: Update minimum beta constraint to work on the total beta and no…
chris-ashe 63850d5
🔄 Rename fbeta to fbeta_poloidal_eps for consistency across the codebase
chris-ashe df4e969
:art: Update plasma_beta.md for clarity and consistency in beta limit…
chris-ashe f0955d1
:bug: Fix Tholerus pressure peaking parameter and expand docs
chris-ashe 906dddb
Merge branch 'main' into 3388-update-the-beta-limit-section-of-the-do…
chris-ashe 1023e2d
Merge branch 'main' into 3388-update-the-beta-limit-section-of-the-do…
chris-ashe 8a9f514
Add Menard normalized beta limit plotting script
chris-ashe 6ba9406
Add original normalized beta limit plotting script and fix spacing in…
chris-ashe 21bc7de
Add beta_poloidal_max and beta_min to the output file
chris-ashe d9132ae
:sparkle: Add calculation for plasma thermal energy derived from ther…
chris-ashe 189fdef
Rename total_plasma_internal_energy to e_plasma_beta and update refer…
chris-ashe 6093659
Update output descriptions for plasma thermal energy and total beta e…
chris-ashe 8ec0907
:art: Refactor plasma thermal energy calculation and remove duplicate…
chris-ashe 0f448c3
Update bokeh version requirement to 3.4.0 in development dependencies
chris-ashe File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
176 changes: 176 additions & 0 deletions
176
...ntation/proc-pages/physics-models/plasma_beta/plasma_alpha_beta_contribution.md
Large diffs are not rendered by default.
Oops, something went wrong.
413 changes: 413 additions & 0 deletions
413
documentation/proc-pages/physics-models/plasma_beta/plasma_beta.md
Large diffs are not rendered by default.
Oops, something went wrong.
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
24 changes: 24 additions & 0 deletions
24
documentation/proc-pages/scripts/plotting_scripts/menard_beta_norm_plot.py
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
import numpy as np | ||
from bokeh.models import ColumnDataSource | ||
from bokeh.plotting import figure, output_file, save | ||
|
||
|
||
x = np.linspace(1.0, 5, 500) | ||
y = 3.12 + 3.5 * (1 / x) ** 1.7 | ||
source = ColumnDataSource(data=dict(x=x, y=y)) | ||
|
||
plot = figure( | ||
x_range=(1, 5), | ||
y_range=(2, 8), | ||
width=400, | ||
height=400, | ||
title="Menard Normalized Beta Limit", | ||
) | ||
plot.xaxis.axis_label = r"Aspect ratio, \ $$[A]$$" | ||
plot.yaxis.axis_label = r"Normalized beta limit, \ $$[\beta_N]$$" | ||
|
||
plot.line("x", "y", source=source, line_width=3, line_alpha=0.6) | ||
|
||
# Save the plot as HTML | ||
output_file("menard_beta_norm.html", title="Menard Normalized Beta Limit") | ||
save(plot) |
24 changes: 24 additions & 0 deletions
24
documentation/proc-pages/scripts/plotting_scripts/original_beta_norm_plot.py
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
import numpy as np | ||
from bokeh.models import ColumnDataSource | ||
from bokeh.plotting import figure, output_file, save | ||
|
||
|
||
x = np.linspace(1.0, 5, 500) | ||
y = 2.7 * (1 + 5 * (1 / x) ** 3.5) | ||
source = ColumnDataSource(data=dict(x=x, y=y)) | ||
|
||
plot = figure( | ||
x_range=(1, 5), | ||
y_range=(2, 15), | ||
width=400, | ||
height=400, | ||
title="Original Normalized Beta Limit", | ||
) | ||
plot.xaxis.axis_label = r"Aspect ratio, \ $$[A]$$" | ||
plot.yaxis.axis_label = r"Normalized beta limit, \ $$[\beta_N]$$" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. As above, labels are not rendering properly |
||
|
||
plot.line("x", "y", source=source, line_width=3, line_alpha=0.6) | ||
|
||
# Save the plot as HTML | ||
output_file("original_beta_norm.html", title="Original Normalized Beta Limit") | ||
save(plot) |
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure your labels are working?