🔄 Rename variable 'q' to 'q95' for clarity and consistency across mul…

…tiple data files
ukaea · Feb 18, 2025 · 26c592c · 26c592c
1 parent 9109f45
commit 26c592c
Show file tree

Hide file tree

Showing 22 changed files with 27 additions and 27 deletions.
diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT
@@ -1425,7 +1425,7 @@ dr_cs = 0.5
 * q
 ixc = 18
 boundl(18) = 3.0
-q = 3.5
+q95 =  3.5
 
 * Machine dr_bore [m]
 ixc = 29

diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT
@@ -1419,7 +1419,7 @@ dr_cs = 0.5
 * q
 ixc = 18
 boundl(18) = 3.0
-q = 3.5
+q95 = 3.5
 
 * Machine dr_bore [m]
 ixc = 29

diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT
@@ -1419,7 +1419,7 @@ dr_cs = 0.5
 * q
 ixc = 18
 boundl(18) = 3.0
-q = 3.5
+q95 = 3.5
 
 * Machine dr_bore [m]
 ixc = 29

diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT
@@ -1419,7 +1419,7 @@ dr_cs = 0.5
 * q
 ixc = 18
 boundl(18) = 3.0
-q = 3.5
+q95 = 3.5
 
 * Machine dr_bore [m]
 ixc = 29

diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT
@@ -1419,7 +1419,7 @@ dr_cs = 0.5
 * q
 ixc = 18
 boundl(18) = 3.0
-q = 3.5
+q95 = 3.5
 
 * Machine dr_bore [m]
 ixc = 29

diff --git a/examples/data/large_tokamak_IN.DAT b/examples/data/large_tokamak_IN.DAT
@@ -229,7 +229,7 @@ dr_cs = 0.5
 * q
 ixc = 18
 boundl(18) = 3.0
-q = 3.5
+q95 = 3.5
 
 * Machine dr_bore [m]
 ixc = 29

diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT
@@ -9259,7 +9259,7 @@ i_plasma_geometry   = 0 * Switch for plasma cross-sectional shape calculation: u
 *kappa = 1.7808
 kappa = 1.848
 triang   = 0.5 * Plasma separatrix triangularity (calculated if i_plasma_geometry=1; 3 or 4)
-q        = 3.247 * Safety factor 'near' plasma edge (iteration variable 18);
+q95        = 3.247 * Safety factor 'near' plasma edge (iteration variable 18);
 q0       = 1.0 * Safety factor on axis
 rmajor   = 9.072 * Plasma major radius (m) (iteration variable 3)
 i_single_null    = 1 * Switch for single null / double null plasma;
@@ -9323,7 +9323,7 @@ t_burn    = 1.0d4 * Burn time (s) (calculated if i_pulsed_plant=1)
                      dr_tf_inboard          =  1.2080E+00
                      fwalld         =  1.3100E-01
                      dr_cs          =  5.5242E-01
-                     q              =  3.5000E+00
+                     q95              =  3.5000E+00
                      dr_bore           =  2.3322E+00
                      fbeta_max       =  4.8251E-01
                      coheof         =  2.0726E+07

diff --git a/examples/data/scan_example_file_IN.DAT b/examples/data/scan_example_file_IN.DAT
@@ -229,7 +229,7 @@ dr_cs = 0.5
 * Safety factor near plasma edge
 ixc = 18
 boundl(18) = 3.0
-q = 3.5
+q95 = 3.5
 
 * Machine dr_bore [m]
 ixc = 29

diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT
@@ -1418,7 +1418,7 @@ dr_cs = 0.5
 * q
 ixc = 18
 boundl(18) = 3.0
-q = 3.5
+q95 = 3.5
 
 * Machine dr_bore [m]
 ixc = 29

diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT
@@ -1419,7 +1419,7 @@ dr_cs = 0.5
 * q
 ixc = 18
 boundl(18) = 3.0
-q = 3.5
+q95 = 3.5
 
 * Machine dr_bore [m]
 ixc = 29

diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT
@@ -1419,7 +1419,7 @@ dr_cs = 0.5
 * q
 ixc = 18
 boundl(18) = 3.0
-q = 3.5
+q95 = 3.5
 
 * Machine dr_bore [m]
 ixc = 29

diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT
@@ -1419,7 +1419,7 @@ dr_cs = 0.5
 * q
 ixc = 18
 boundl(18) = 3.0
-q = 3.5
+q95 = 3.5
 
 * Machine dr_bore [m]
 ixc = 29

diff --git a/tests/integration/data/large_tokamak_IN.DAT b/tests/integration/data/large_tokamak_IN.DAT
@@ -229,7 +229,7 @@ dr_cs = 0.5
 * q
 ixc = 18
 boundl(18) = 3.0
-q = 3.5
+q95 = 3.5
 
 * Machine dr_bore [m]
 ixc = 29

diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT
@@ -1420,7 +1420,7 @@ dr_cs = 0.5
 * q
 ixc = 18
 boundl(18) = 3.0
-q = 3.5
+q95 = 3.5
 
 * Machine dr_bore [m]
 ixc = 29

diff --git a/tests/integration/data/large_tokamak_once_through.IN.DAT b/tests/integration/data/large_tokamak_once_through.IN.DAT
@@ -342,7 +342,7 @@ iprofile = 1 * switch for current profile consistency;
 i_confinement_time      = 34 * switch for energy confinement time scaling law (see description in `labels_confinement_scalings`)
 i_plasma_geometry   = 0 * switch for plasma cross-sectional shape calculation;
 kappa    = 1.85 * plasma separatrix elongation (calculated if `i_plasma_geometry = 1-5; 7 or 9-10`)
-q        = 3.7339078193128556 * Safety factor 'near' plasma edge (`iteration variable 18`) equal to q95
+q95        = 3.7339078193128556 * Safety factor 'near' plasma edge (`iteration variable 18`) equal to q95
 q0       = 1.0 * safety factor on axis
 f_nd_alpha_electron   = 0.060238763988650204 * thermal alpha density/electron density (`iteration variable 109`)
 rmajor   = 8.0 * plasma major radius (m) (`iteration variable 3`)

diff --git a/tests/integration/data/ref_IN.DAT b/tests/integration/data/ref_IN.DAT
@@ -280,7 +280,7 @@ i_plasma_geometry   = 0 * Switch for plasma cross-sectional shape calculation: u
 *kappa = 1.7808
 kappa = 1.848
 triang   = 0.5 * Plasma separatrix triangularity (calculated if i_plasma_geometry=1; 3 or 4)
-q        = 3.247 * Safety factor 'near' plasma edge (iteration variable 18);
+q95        = 3.247 * Safety factor 'near' plasma edge (iteration variable 18);
 q0       = 1.0 * Safety factor on axis
 rmajor   = 9.072 * Plasma major radius (m) (iteration variable 3)
 i_single_null    = 1 * Switch for single null / double null plasma;
@@ -343,7 +343,7 @@ t_burn    = 1.0d4 * Burn time (s) (calculated if i_pulsed_plant=1)
                      dr_tf_inboard          =  1.2080E+00
                      fwalld         =  1.3100E-01
                      dr_cs          =  5.5242E-01
-                     q              =  3.5000E+00
+                     q95              =  3.5000E+00
                      dr_bore           =  2.3322E+00
                      fbeta_max       =  4.8251E-01
                      coheof         =  2.0726E+07

diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT
@@ -17705,7 +17705,7 @@ dr_cs = 0.5
 * q
 ixc = 18
 boundl(18) = 3.0
-q = 3.5
+q95 = 3.5
 
 * Machine dr_bore [m]
 ixc = 29

diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT
@@ -9259,7 +9259,7 @@ i_plasma_geometry   = 0 * Switch for plasma cross-sectional shape calculation: u
 *kappa = 1.7808
 kappa = 1.848
 triang   = 0.5 * Plasma separatrix triangularity (calculated if i_plasma_geometry=1; 3 or 4)
-q        = 3.247 * Safety factor 'near' plasma edge (iteration variable 18);
+q95        = 3.247 * Safety factor 'near' plasma edge (iteration variable 18);
 q0       = 1.0 * Safety factor on axis
 rmajor   = 9.072 * Plasma major radius (m) (iteration variable 3)
 i_single_null    = 1 * Switch for single null / double null plasma;
@@ -9323,7 +9323,7 @@ t_burn    = 1.0d4 * Burn time (s) (calculated if i_pulsed_plant=1)
                      dr_tf_inboard          =  1.2080E+00
                      fwalld         =  1.3100E-01
                      dr_cs          =  5.5242E-01
-                     q              =  3.5000E+00
+                     q95              =  3.5000E+00
                      dr_bore           =  2.3322E+00
                      fbeta_max       =  4.8251E-01
                      coheof         =  2.0726E+07

diff --git a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT
@@ -280,7 +280,7 @@ i_plasma_geometry   = 0 * Switch for plasma cross-sectional shape calculation: u
 *kappa = 1.7808
 kappa = 1.848
 triang   = 0.5 * Plasma separatrix triangularity (calculated if i_plasma_geometry=1; 3 or 4)
-q        = 3.247 * Safety factor 'near' plasma edge (iteration variable 18);
+q95        = 3.247 * Safety factor 'near' plasma edge (iteration variable 18);
 q0       = 1.0 * Safety factor on axis
 rmajor   = 9.072 * Plasma major radius (m) (iteration variable 3)
 i_single_null    = 1 * Switch for single null / double null plasma;
@@ -343,7 +343,7 @@ t_burn    = 1.0d4 * Burn time (s) (calculated if i_pulsed_plant=1)
                      dr_tf_inboard          =  1.2080E+00
                      fwalld         =  1.3100E-01
                      dr_cs          =  5.5242E-01
-                     q              =  3.5000E+00
+                     q95              =  3.5000E+00
                      dr_bore           =  2.3322E+00
                      fbeta_max       =  4.8251E-01
                      coheof         =  2.0726E+07

diff --git a/tests/integration/data/uncertainties_ref_IN.DAT b/tests/integration/data/uncertainties_ref_IN.DAT
@@ -280,7 +280,7 @@ i_plasma_geometry   = 0 * Switch for plasma cross-sectional shape calculation: u
 *kappa = 1.7808
 kappa = 1.848
 triang   = 0.5 * Plasma separatrix triangularity (calculated if i_plasma_geometry=1; 3 or 4)
-q        = 3.247 * Safety factor 'near' plasma edge (iteration variable 18);
+q95        = 3.247 * Safety factor 'near' plasma edge (iteration variable 18);
 q0       = 1.0 * Safety factor on axis
 rmajor   = 9.072 * Plasma major radius (m) (iteration variable 3)
 i_single_null    = 1 * Switch for single null / double null plasma;
@@ -343,7 +343,7 @@ t_burn    = 1.0d4 * Burn time (s) (calculated if i_pulsed_plant=1)
                      dr_tf_inboard          =  1.2080E+00
                      fwalld         =  1.3100E-01
                      dr_cs          =  5.5242E-01
-                     q              =  3.5000E+00
+                     q95              =  3.5000E+00
                      dr_bore           =  2.3322E+00
                      fbeta_max       =  4.8251E-01
                      coheof         =  2.0726E+07

diff --git a/tests/unit/data/large_tokamak_IN.DAT b/tests/unit/data/large_tokamak_IN.DAT
@@ -229,7 +229,7 @@ dr_cs = 0.5
 * q
 ixc = 18
 boundl(18) = 3.0
-q = 3.5
+q95 = 3.5
 
 * Machine dr_bore [m]
 ixc = 29

diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT
@@ -1420,7 +1420,7 @@ dr_cs = 0.5
 * q
 ixc = 18
 boundl(18) = 3.0
-q = 3.5
+q95 = 3.5
 
 * Machine dr_bore [m]
 ixc = 29