From d31b16fb996feeff8649ee6e57d47ca0c0429dff Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 14 Mar 2024 15:32:32 +0000 Subject: [PATCH] updated q definition --- examples/a_scan_input_file_IN.DAT | 2 +- source/fortran/input.f90 | 2 +- source/fortran/physics_variables.f90 | 2 +- tests/regression/scenarios/large-tokamak/IN.DAT | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/a_scan_input_file_IN.DAT b/examples/a_scan_input_file_IN.DAT index 5d38dad819..5f06f25fa6 100644 --- a/examples/a_scan_input_file_IN.DAT +++ b/examples/a_scan_input_file_IN.DAT @@ -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 diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index 3fbd87482f..a2409addce 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -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') diff --git a/source/fortran/physics_variables.f90 b/source/fortran/physics_variables.f90 index 00ef13fcd8..3404b511dd 100644 --- a/source/fortran/physics_variables.f90 +++ b/source/fortran/physics_variables.f90 @@ -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 diff --git a/tests/regression/scenarios/large-tokamak/IN.DAT b/tests/regression/scenarios/large-tokamak/IN.DAT index 33d839febf..3810d6c24a 100644 --- a/tests/regression/scenarios/large-tokamak/IN.DAT +++ b/tests/regression/scenarios/large-tokamak/IN.DAT @@ -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