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.

Sign up for GitHub

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

Jump to bottom

L/H-mode confinement time consistent with fLH #70

Merged
merged 3 commits into from
Aug 2, 2024
Merged

L/H-mode confinement time consistent with fLH #70

merged 3 commits into from
Aug 2, 2024

Conversation

AudreySaltzman
Copy link
Contributor

@AudreySaltzman AudreySaltzman commented Jul 24, 2024 •
edited
Loading

  • add switch_to_L_mode_confinement_below_threshold function in switch_confinement_scaling_on_threshold.py
  • re-orders algorithms in SPARC_PRD/input.yaml to calculate fLH before finalizing the energy confinement time
  • adds tau_e_L_mode_scaling variable

@AudreySaltzman AudreySaltzman force-pushed the L-H-confinement-split branch 2 times, most recently from d553da3 to de611d1 Compare July 24, 2024 20:14
@tbody-cfs tbody-cfs self-requested a review July 24, 2024 20:44
@AudreySaltzman AudreySaltzman changed the title L h confinement split (try 3) L/H-mode confinement time consistent with fLH Jul 25, 2024
@AudreySaltzman AudreySaltzman force-pushed the L-H-confinement-split branch from de611d1 to af0a5a2 Compare August 2, 2024 17:46
@AudreySaltzman AudreySaltzman force-pushed the L-H-confinement-split branch from af0a5a2 to d84a510 Compare August 2, 2024 17:51
@tbody-cfs
Copy link
Collaborator

Can you add a test for the new function?

tbody-cfs
tbody-cfs approved these changes Aug 2, 2024
View reviewed changes
cfspopcon/formulas/energy_confinement/switch_confinement_scaling_on_threshold.py Show resolved Hide resolved
tests/test_confinement_switch.py
Copy link
Collaborator

Choose a reason for hiding this comment

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

Thanks for adding the test!

@tbody-cfs tbody-cfs merged commit 2de8437 into cfs-energy:main Aug 2, 2024
8 checks passed
@AudreySaltzman AudreySaltzman deleted the L-H-confinement-split branch August 2, 2024 19:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tbody-cfs tbody-cfs tbody-cfs approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@AudreySaltzman @tbody-cfs