Skip to content

Commit

Permalink
Rename betap to beta_poloidal for clarity and consistency across the …
Browse files Browse the repository at this point in the history
…codebase
  • Loading branch information
chris-ashe committed Nov 8, 2024
1 parent 5eedafc commit 480b79d
Show file tree
Hide file tree
Showing 27 changed files with 133 additions and 131 deletions.
4 changes: 2 additions & 2 deletions examples/data/csv_output_large_tokamak_MFILE.DAT
Original file line number Diff line number Diff line change
Expand Up @@ -343,15 +343,15 @@
Safety_factor_at_95%_flux_surface_______________________________________ (q95)_________________________ 3.4251E+00 ITV
Cylindrical_safety_factor_(qcyl)________________________________________ (qstar)_______________________ 2.8387E+00
Total_plasma_beta_______________________________________________________ (beta)________________________ 3.6055E-02 ITV
Total_poloidal_beta_____________________________________________________ (betap)_______________________ 1.2531E+00 OP
Total_poloidal_beta_____________________________________________________ (beta_poloidal)_______________________ 1.2531E+00 OP
Total_toroidal_beta_____________________________________________________ ______________________________ 3.7123E-02 OP
Fast_alpha_beta_________________________________________________________ (betaft)______________________ 4.4814E-03 OP
Beam_ion_beta___________________________________________________________ (betanb)______________________ 0.0000E+00 OP
(Fast_alpha_+_beam_beta)/(thermal_beta)_________________________________ (gammaft)_____________________ 1.4194E-01 OP
Thermal_beta____________________________________________________________ ______________________________ 3.1574E-02 OP
Thermal_poloidal_beta___________________________________________________ ______________________________ 1.0974E+00 OP
Thermal_toroidal_beta_(=_beta-exp)______________________________________ ______________________________ 3.2509E-02 OP
2nd_stability_beta_:_beta_p_/_(R/a)_____________________________________ (eps*betap)___________________ 4.1770E-01
2nd_stability_beta_:_beta_p_/_(R/a)_____________________________________ (eps*beta_poloidal)___________________ 4.1770E-01
2nd_stability_beta_upper_limit__________________________________________ (epbetmax)____________________ 1.3800E+00
Beta_g_coefficient______________________________________________________ (dnbeta)______________________ 4.7593E+00
Normalised_thermal_beta_________________________________________________ ______________________________ 2.5527E+00
Expand Down
4 changes: 2 additions & 2 deletions examples/data/large_tokamak_1_MFILE.DAT
Original file line number Diff line number Diff line change
Expand Up @@ -344,15 +344,15 @@
Safety_factor_at_95%_flux_surface_______________________________________ (q95)_________________________ 3.5961E+00 ITV
Cylindrical_safety_factor_(qcyl)________________________________________ (qstar)_______________________ 2.9805E+00
Total_plasma_beta_______________________________________________________ (beta)________________________ 3.3648E-02 ITV
Total_poloidal_beta_____________________________________________________ (betap)_______________________ 1.2857E+00 OP
Total_poloidal_beta_____________________________________________________ (beta_poloidal)_______________________ 1.2857E+00 OP
Total_toroidal_beta_____________________________________________________ ______________________________ 3.4553E-02 OP
Fast_alpha_beta_________________________________________________________ (betaft)______________________ 4.2236E-03 OP
Beam_ion_beta___________________________________________________________ (betanb)______________________ 0.0000E+00 OP
(Fast_alpha_+_beam_physics_variables.beta)/(thermal_physics_variables.be (gammaft)_____________________ 1.4354E-01 OP
Thermal_beta____________________________________________________________ ______________________________ 2.9425E-02 OP
Thermal_poloidal_beta___________________________________________________ ______________________________ 1.1243E+00 OP
Thermal_toroidal_physics_variables.beta_(=_beta-exp)____________________ ______________________________ 3.0215E-02 OP
2nd_stability_physics_variables.beta_:_beta_p_/_(R/a)___________________ (eps*betap)___________________ 4.2857E-01
2nd_stability_physics_variables.beta_:_beta_p_/_(R/a)___________________ (eps*beta_poloidal)___________________ 4.2857E-01
2nd_stability_physics_variables.beta_upper_limit________________________ (epbetmax)____________________ 1.3800E+00
Beta_g_coefficient______________________________________________________ (dnbeta)______________________ 4.9099E+00
Normalised_thermal_beta_________________________________________________ ______________________________ 2.4977E+00
Expand Down
4 changes: 2 additions & 2 deletions examples/data/large_tokamak_2_MFILE.DAT
Original file line number Diff line number Diff line change
Expand Up @@ -344,15 +344,15 @@
Safety_factor_at_95%_flux_surface_______________________________________ (q95)_________________________ 3.5961E+00 ITV
Cylindrical_safety_factor_(qcyl)________________________________________ (qstar)_______________________ 2.9805E+00
Total_plasma_beta_______________________________________________________ (beta)________________________ 3.3648E-02 ITV
Total_poloidal_beta_____________________________________________________ (betap)_______________________ 1.2857E+00 OP
Total_poloidal_beta_____________________________________________________ (beta_poloidal)_______________________ 1.2857E+00 OP
Total_toroidal_beta_____________________________________________________ ______________________________ 3.4553E-02 OP
Fast_alpha_beta_________________________________________________________ (betaft)______________________ 4.2236E-03 OP
Beam_ion_beta___________________________________________________________ (betanb)______________________ 0.0000E+00 OP
(Fast_alpha_+_beam_physics_variables.beta)/(thermal_physics_variables.be (gammaft)_____________________ 1.4354E-01 OP
Thermal_beta____________________________________________________________ ______________________________ 2.9425E-02 OP
Thermal_poloidal_beta___________________________________________________ ______________________________ 1.1243E+00 OP
Thermal_toroidal_physics_variables.beta_(=_beta-exp)____________________ ______________________________ 3.0215E-02 OP
2nd_stability_physics_variables.beta_:_beta_p_/_(R/a)___________________ (eps*betap)___________________ 4.2857E-01
2nd_stability_physics_variables.beta_:_beta_p_/_(R/a)___________________ (eps*beta_poloidal)___________________ 4.2857E-01
2nd_stability_physics_variables.beta_upper_limit________________________ (epbetmax)____________________ 1.3800E+00
Beta_g_coefficient______________________________________________________ (dnbeta)______________________ 4.9099E+00
Normalised_thermal_beta_________________________________________________ ______________________________ 2.4977E+00
Expand Down
4 changes: 2 additions & 2 deletions examples/data/large_tokamak_3_MFILE.DAT
Original file line number Diff line number Diff line change
Expand Up @@ -344,15 +344,15 @@
Safety_factor_at_95%_flux_surface_______________________________________ (q95)_________________________ 3.5961E+00 ITV
Cylindrical_safety_factor_(qcyl)________________________________________ (qstar)_______________________ 2.9805E+00
Total_plasma_beta_______________________________________________________ (beta)________________________ 3.3648E-02 ITV
Total_poloidal_beta_____________________________________________________ (betap)_______________________ 1.2857E+00 OP
Total_poloidal_beta_____________________________________________________ (beta_poloidal)_______________________ 1.2857E+00 OP
Total_toroidal_beta_____________________________________________________ ______________________________ 3.4553E-02 OP
Fast_alpha_beta_________________________________________________________ (betaft)______________________ 4.2236E-03 OP
Beam_ion_beta___________________________________________________________ (betanb)______________________ 0.0000E+00 OP
(Fast_alpha_+_beam_physics_variables.beta)/(thermal_physics_variables.be (gammaft)_____________________ 1.4354E-01 OP
Thermal_beta____________________________________________________________ ______________________________ 2.9425E-02 OP
Thermal_poloidal_beta___________________________________________________ ______________________________ 1.1243E+00 OP
Thermal_toroidal_physics_variables.beta_(=_beta-exp)____________________ ______________________________ 3.0215E-02 OP
2nd_stability_physics_variables.beta_:_beta_p_/_(R/a)___________________ (eps*betap)___________________ 4.2857E-01
2nd_stability_physics_variables.beta_:_beta_p_/_(R/a)___________________ (eps*beta_poloidal)___________________ 4.2857E-01
2nd_stability_physics_variables.beta_upper_limit________________________ (epbetmax)____________________ 1.3800E+00
Beta_g_coefficient______________________________________________________ (dnbeta)______________________ 4.9099E+00
Normalised_thermal_beta_________________________________________________ ______________________________ 2.4977E+00
Expand Down
4 changes: 2 additions & 2 deletions examples/data/large_tokamak_4_MFILE.DAT
Original file line number Diff line number Diff line change
Expand Up @@ -344,15 +344,15 @@
Safety_factor_at_95%_flux_surface_______________________________________ (q95)_________________________ 3.5961E+00 ITV
Cylindrical_safety_factor_(qcyl)________________________________________ (qstar)_______________________ 2.9805E+00
Total_plasma_beta_______________________________________________________ (beta)________________________ 3.3648E-02 ITV
Total_poloidal_beta_____________________________________________________ (betap)_______________________ 1.2857E+00 OP
Total_poloidal_beta_____________________________________________________ (beta_poloidal)_______________________ 1.2857E+00 OP
Total_toroidal_beta_____________________________________________________ ______________________________ 3.4553E-02 OP
Fast_alpha_beta_________________________________________________________ (betaft)______________________ 4.2236E-03 OP
Beam_ion_beta___________________________________________________________ (betanb)______________________ 0.0000E+00 OP
(Fast_alpha_+_beam_physics_variables.beta)/(thermal_physics_variables.be (gammaft)_____________________ 1.4354E-01 OP
Thermal_beta____________________________________________________________ ______________________________ 2.9425E-02 OP
Thermal_poloidal_beta___________________________________________________ ______________________________ 1.1243E+00 OP
Thermal_toroidal_physics_variables.beta_(=_beta-exp)____________________ ______________________________ 3.0215E-02 OP
2nd_stability_physics_variables.beta_:_beta_p_/_(R/a)___________________ (eps*betap)___________________ 4.2857E-01
2nd_stability_physics_variables.beta_:_beta_p_/_(R/a)___________________ (eps*beta_poloidal)___________________ 4.2857E-01
2nd_stability_physics_variables.beta_upper_limit________________________ (epbetmax)____________________ 1.3800E+00
Beta_g_coefficient______________________________________________________ (dnbeta)______________________ 4.9099E+00
Normalised_thermal_beta_________________________________________________ ______________________________ 2.4977E+00
Expand Down
Loading

0 comments on commit 480b79d

Please sign in to comment.