Skip to content

updated q definition #3107

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

Merged
chris-ashe merged 1 commit into from
Mar 18, 2024
Merged

updated q definition #3107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/a_scan_input_file_IN.DAT
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ ixc = 16
boundl(16) = 0.3
ohcth = 0.5

* q
* Safety factor near plasma edge
ixc = 18
boundl(18) = 3.0
q = 3.5
Expand Down
2 changes: 1 addition & 1 deletion source/fortran/input.f90
View file
Open in desktop
Copy link
Copy Markdown
Collaborator

@mkovari mkovari Mar 18, 2024

Choose a reason for hiding this comment

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

I think "near plasma edge"is a little vague.

Original file line number Diff line number Diff line change
Expand Up @@ -704,7 +704,7 @@ subroutine parse_input_file(in_file,out_file,show_changes)
'Plasma resistivity pre-factor')
case ('q')
call parse_real_variable('q', q, 1.00D0, 50.0D0, &
'Edge safety factor')
'Safety factor near plasma edge')
case ('q0')
call parse_real_variable('q0', q0, 0.01D0, 20.0D0, &
'Safety factor on axis')
Expand Down
2 changes: 1 addition & 1 deletion source/fortran/physics_variables.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -727,7 +727,7 @@ module physics_variables
!! ion transport power per volume (MW/m3)

real(dp) :: q
!! safety factor 'near' plasma edge (`iteration variable 18`) equal to q95
!! Safety factor 'near' plasma edge (`iteration variable 18`) equal to q95
!! (unless `icurr=2` (ST current scaling), in which case q = mean edge safety factor qbar)

real(dp) :: q0
Expand Down
2 changes: 1 addition & 1 deletion tests/regression/scenarios/large-tokamak/IN.DAT
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ ixc = 16
boundl(16) = 0.3
ohcth = 0.5

* q
* Safety factor near plasma edge
ixc = 18
boundl(18) = 3.0
q = 3.5
Expand Down