diff --git a/documentation/eng-models/tf-coil.md b/documentation/eng-models/tf-coil.md
index 4724bad96f..6dbff33993 100644
--- a/documentation/eng-models/tf-coil.md
+++ b/documentation/eng-models/tf-coil.md
@@ -27,9 +27,9 @@ Two shapes can be selected using the `i_tf_shape` integer switch:
Resistive coils can benefit in having a larger outboard conductor area than
the inboard one, to reduce resistive heating without increasing the plasma
major radius or increasing its aspect ratio. For this reason, thicker outboard
-can be set using the tfootfi user input defined as the ratio between
+can be set using the f_dr_tf_outboard_inboard user input defined as the ratio between
ouboard and inboard TF coil legs. The possibility of having different coil
-thicknesses is only available for resistive coils and tfootfi
+thicknesses is only available for resistive coils and f_dr_tf_outboard_inboard
would have no effect if superconducting coils are selected (`i_tf_sup = 1`)
@@ -932,7 +932,7 @@ considered/implemented in PROCESS.
| --------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------ | ------------------------------------ | ---- |
| `i_tf_inside_cs` | TF coil inboard leg radial placement switch.
- 0 : Outside of central solenoid
- 1 : Inside of central solenoid | - | 0 | - |
| `dr_tf_inboard` | TF coil maximum radial size
calculated if `dr_tf_wp_with_insulation` is used as iteration variable | ixc = 13 | No default | m |
-| `tfootfi` | Outboard/inboard TF coil thickness ratio | - | 1 | - |
+| `f_dr_tf_outboard_inboard` | Outboard/inboard TF coil thickness ratio | - | 1 | - |
| `dr_tf_wp_with_insulation` | Winding pack radial thickness
calculated if `dr_tf_inboard` is used as iteration variable. Include the ground insulation and the insertion gap. | ixc = 140 | No default | m |
| `dr_tf_nose_case` | Nose/inner case radial thickness | ixc = 57 | 0.3 | m |
| `dx_tf_side_case_min` | Minimal sidewall casing thickness | - | - | m |
@@ -947,7 +947,7 @@ considered/implemented in PROCESS.
| - | - | - | - | - |
| `i_tf_inside_cs` | TF coil inboard leg radial placement switch.
- 0 : Outside of central solenoid
- 1 : Inside of central solenoid | - | 0 | - |
| `dr_tf_inboard` | TF coil maximum radial size
calculated if `dr_tf_wp_with_insulation` is used as iteration variable | ixc = 13 | No default | m |
-| `tfootfi` | Outboard/inboard TF coil thickness ratio | - | 1 | - |
+| `f_dr_tf_outboard_inboard` | Outboard/inboard TF coil thickness ratio | - | 1 | - |
| `dr_tf_wp_with_insulation` | Winding pack radial thickness
calculated if `dr_tf_inboard` is used as iteration variable. Include the ground insulation and the insertion gap. | ixc = 140 | No default | m |
| `dr_tf_nose_case` | Nose/inner case radial thickness | ixc = 57 | 0.3 | m |
| `dx_tf_side_case_min` | Minimal sidewall casing thickness | - | - | m |
diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT
index 6c3897e735..03c9456106 100644
--- a/examples/data/csv_output_large_tokamak_MFILE.DAT
+++ b/examples/data/csv_output_large_tokamak_MFILE.DAT
@@ -614,7 +614,7 @@
Plasma_geometric_centre,_vertical_(m)___________________________________ (0.0)_________________________ 0.0000E+00
Plasma_lower_physics_variables.triangularity____________________________ (tril)________________________ 5.0000E-01
Plasma_elongation_______________________________________________________ (physics_variables.kappa.)____ 1.8500E+00
- TF_coil_vertical_offset_(m)_____________________________________________ (tfoffset)____________________ -6.1694E-01
+ TF_coil_vertical_offset_(m)_____________________________________________ (dz_tf_plasma_centre_offset)____________________ -6.1694E-01
Plasma_outer_arc_radius_of_curvature_(m)________________________________ (rco)_________________________ 5.0422E+00
Plasma_inner_arc_radius_of_curvature_(m)________________________________ (rci)_________________________ 9.7933E+00
Plasma_lower_X-pt,_radial_(m)___________________________________________ (rxpt)________________________ 6.6667E+00
diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT
index 48c8d55834..48711cb7b0 100644
--- a/examples/data/large_tokamak_1_MFILE.DAT
+++ b/examples/data/large_tokamak_1_MFILE.DAT
@@ -611,7 +611,7 @@
Plasma_geometric_centre,_vertical_(m)___________________________________ (0.0)_________________________ 0.0000E+00
Plasma_lower_physics_variables.triangularity____________________________ (tril)________________________ 5.0000E-01
Plasma_elongation_______________________________________________________ (physics_variables.kappa.)____ 1.8500E+00
- TF_coil_vertical_offset_(m)_____________________________________________ (tfoffset)____________________ -6.1694E-01
+ TF_coil_vertical_offset_(m)_____________________________________________ (dz_tf_plasma_centre_offset)____________________ -6.1694E-01
Plasma_outer_arc_radius_of_curvature_(m)________________________________ (rco)_________________________ 5.0422E+00
Plasma_inner_arc_radius_of_curvature_(m)________________________________ (rci)_________________________ 9.7933E+00
Plasma_lower_X-pt,_radial_(m)___________________________________________ (rxpt)________________________ 6.6667E+00
diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT
index cb66441dcf..da82e9aa8a 100644
--- a/examples/data/large_tokamak_2_MFILE.DAT
+++ b/examples/data/large_tokamak_2_MFILE.DAT
@@ -611,7 +611,7 @@
Plasma_geometric_centre,_vertical_(m)___________________________________ (0.0)_________________________ 0.0000E+00
Plasma_lower_physics_variables.triangularity____________________________ (tril)________________________ 5.0000E-01
Plasma_elongation_______________________________________________________ (physics_variables.kappa.)____ 1.8500E+00
- TF_coil_vertical_offset_(m)_____________________________________________ (tfoffset)____________________ -6.1694E-01
+ TF_coil_vertical_offset_(m)_____________________________________________ (dz_tf_plasma_centre_offset)____________________ -6.1694E-01
Plasma_outer_arc_radius_of_curvature_(m)________________________________ (rco)_________________________ 5.0422E+00
Plasma_inner_arc_radius_of_curvature_(m)________________________________ (rci)_________________________ 9.7933E+00
Plasma_lower_X-pt,_radial_(m)___________________________________________ (rxpt)________________________ 6.6667E+00
diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT
index 1a6e66fdd5..2f188ff2ee 100644
--- a/examples/data/large_tokamak_3_MFILE.DAT
+++ b/examples/data/large_tokamak_3_MFILE.DAT
@@ -611,7 +611,7 @@
Plasma_geometric_centre,_vertical_(m)___________________________________ (0.0)_________________________ 0.0000E+00
Plasma_lower_physics_variables.triangularity____________________________ (tril)________________________ 5.0000E-01
Plasma_elongation_______________________________________________________ (physics_variables.kappa.)____ 1.8500E+00
- TF_coil_vertical_offset_(m)_____________________________________________ (tfoffset)____________________ -6.1694E-01
+ TF_coil_vertical_offset_(m)_____________________________________________ (dz_tf_plasma_centre_offset)____________________ -6.1694E-01
Plasma_outer_arc_radius_of_curvature_(m)________________________________ (rco)_________________________ 5.0422E+00
Plasma_inner_arc_radius_of_curvature_(m)________________________________ (rci)_________________________ 9.7933E+00
Plasma_lower_X-pt,_radial_(m)___________________________________________ (rxpt)________________________ 6.6667E+00
diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT
index 83e7c3335d..3eff006a42 100644
--- a/examples/data/large_tokamak_4_MFILE.DAT
+++ b/examples/data/large_tokamak_4_MFILE.DAT
@@ -611,7 +611,7 @@
Plasma_geometric_centre,_vertical_(m)___________________________________ (0.0)_________________________ 0.0000E+00
Plasma_lower_physics_variables.triangularity____________________________ (tril)________________________ 5.0000E-01
Plasma_elongation_______________________________________________________ (physics_variables.kappa.)____ 1.8500E+00
- TF_coil_vertical_offset_(m)_____________________________________________ (tfoffset)____________________ -6.1694E-01
+ TF_coil_vertical_offset_(m)_____________________________________________ (dz_tf_plasma_centre_offset)____________________ -6.1694E-01
Plasma_outer_arc_radius_of_curvature_(m)________________________________ (rco)_________________________ 5.0422E+00
Plasma_inner_arc_radius_of_curvature_(m)________________________________ (rci)_________________________ 9.7933E+00
Plasma_lower_X-pt,_radial_(m)___________________________________________ (rxpt)________________________ 6.6667E+00
diff --git a/examples/data/large_tokamak_nof_2_MFILE.DAT b/examples/data/large_tokamak_nof_2_MFILE.DAT
index 0f631d4afb..795f3f263a 100644
--- a/examples/data/large_tokamak_nof_2_MFILE.DAT
+++ b/examples/data/large_tokamak_nof_2_MFILE.DAT
@@ -568,7 +568,7 @@
Plasma_geometric_centre,_vertical_(m)____________________________________ (0.0)__________________________ 0.00000000000000000e+00 OP
Plasma_lower_triangularity_______________________________________________ (tril)_________________________ 5.00000000000000000e-01 OP
Plasma_elongation________________________________________________________ (kappa.)_______________________ 1.85000000000000009e+00 OP
- TF_coil_vertical_offset_(m)______________________________________________ (tfoffset)_____________________ -6.16941915397079654e-01 OP
+ TF_coil_vertical_offset_(m)______________________________________________ (dz_tf_plasma_centre_offset)_____________________ -6.16941915397079654e-01 OP
Plasma_outer_arc_radius_of_curvature_(m)_________________________________ (rco)__________________________ 5.04222222222222261e+00 OP
Plasma_inner_arc_radius_of_curvature_(m)_________________________________ (rci)__________________________ 9.79333333333333300e+00 OP
Plasma_lower_X-pt,_radial_(m)____________________________________________ (rxpt)_________________________ 6.66666666666666696e+00 OP
diff --git a/examples/data/large_tokamak_nof_MFILE.DAT b/examples/data/large_tokamak_nof_MFILE.DAT
index fea055aaaf..5bc38e4a89 100644
--- a/examples/data/large_tokamak_nof_MFILE.DAT
+++ b/examples/data/large_tokamak_nof_MFILE.DAT
@@ -642,7 +642,7 @@
Plasma_geometric_centre,_vertical_(m)____________________________________ (0.0)__________________________ 0.00000000000000000e+00 OP
Plasma_lower_triangularity_______________________________________________ (tril)_________________________ 5.00000000000000000e-01 OP
Plasma_elongation________________________________________________________ (kappa.)_______________________ 1.85000000000000009e+00 OP
- TF_coil_vertical_offset_(m)______________________________________________ (tfoffset)_____________________ -6.16941915397079654e-01 OP
+ TF_coil_vertical_offset_(m)______________________________________________ (dz_tf_plasma_centre_offset)_____________________ -6.16941915397079654e-01 OP
Plasma_outer_arc_radius_of_curvature_(m)_________________________________ (rco)__________________________ 5.04222222222222261e+00 OP
Plasma_inner_arc_radius_of_curvature_(m)_________________________________ (rci)__________________________ 9.79333333333333300e+00 OP
Plasma_lower_X-pt,_radial_(m)____________________________________________ (rxpt)_________________________ 6.66666666666666696e+00 OP
diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT
index 164b2aff5e..10615faca3 100644
--- a/examples/data/scan_MFILE.DAT
+++ b/examples/data/scan_MFILE.DAT
@@ -464,7 +464,7 @@
Plasma_geometric_centre,_vertical_(m)___________________________________ (0.0)_________________________ 0.0000E+00
Plasma_lower_triangularity______________________________________________ (tril)________________________ 5.0000E-01
Plasma_elongation_______________________________________________________ (kappa.)______________________ 1.8480E+00
- TF_coil_vertical_offset_(m)_____________________________________________ (tfoffset)____________________ -7.5847E-01
+ TF_coil_vertical_offset_(m)_____________________________________________ (dz_tf_plasma_centre_offset)____________________ -7.5847E-01
Plasma_outer_arc_radius_of_curvature_(m)________________________________ (rco)_________________________ 5.5907E+00
Plasma_inner_arc_radius_of_curvature_(m)________________________________ (rci)_________________________ 1.0851E+01
Plasma_lower_X-pt,_radial_(m)___________________________________________ (rxpt)________________________ 7.6976E+00
@@ -1459,7 +1459,7 @@
Plasma_geometric_centre,_vertical_(m)___________________________________ (0.0)_________________________ 0.0000E+00
Plasma_lower_triangularity______________________________________________ (tril)________________________ 5.0000E-01
Plasma_elongation_______________________________________________________ (kappa.)______________________ 1.8480E+00
- TF_coil_vertical_offset_(m)_____________________________________________ (tfoffset)____________________ -7.5847E-01
+ TF_coil_vertical_offset_(m)_____________________________________________ (dz_tf_plasma_centre_offset)____________________ -7.5847E-01
Plasma_outer_arc_radius_of_curvature_(m)________________________________ (rco)_________________________ 5.5907E+00
Plasma_inner_arc_radius_of_curvature_(m)________________________________ (rci)_________________________ 1.0851E+01
Plasma_lower_X-pt,_radial_(m)___________________________________________ (rxpt)________________________ 7.6976E+00
@@ -2454,7 +2454,7 @@
Plasma_geometric_centre,_vertical_(m)___________________________________ (0.0)_________________________ 0.0000E+00
Plasma_lower_triangularity______________________________________________ (tril)________________________ 5.0000E-01
Plasma_elongation_______________________________________________________ (kappa.)______________________ 1.8480E+00
- TF_coil_vertical_offset_(m)_____________________________________________ (tfoffset)____________________ -7.5847E-01
+ TF_coil_vertical_offset_(m)_____________________________________________ (dz_tf_plasma_centre_offset)____________________ -7.5847E-01
Plasma_outer_arc_radius_of_curvature_(m)________________________________ (rco)_________________________ 5.5907E+00
Plasma_inner_arc_radius_of_curvature_(m)________________________________ (rci)_________________________ 1.0851E+01
Plasma_lower_X-pt,_radial_(m)___________________________________________ (rxpt)________________________ 7.6976E+00
@@ -3449,7 +3449,7 @@
Plasma_geometric_centre,_vertical_(m)___________________________________ (0.0)_________________________ 0.0000E+00
Plasma_lower_triangularity______________________________________________ (tril)________________________ 5.0000E-01
Plasma_elongation_______________________________________________________ (kappa.)______________________ 1.8480E+00
- TF_coil_vertical_offset_(m)_____________________________________________ (tfoffset)____________________ -7.5847E-01
+ TF_coil_vertical_offset_(m)_____________________________________________ (dz_tf_plasma_centre_offset)____________________ -7.5847E-01
Plasma_outer_arc_radius_of_curvature_(m)________________________________ (rco)_________________________ 5.5907E+00
Plasma_inner_arc_radius_of_curvature_(m)________________________________ (rci)_________________________ 1.0851E+01
Plasma_lower_X-pt,_radial_(m)___________________________________________ (rxpt)________________________ 7.6976E+00
@@ -4444,7 +4444,7 @@
Plasma_geometric_centre,_vertical_(m)___________________________________ (0.0)_________________________ 0.0000E+00
Plasma_lower_triangularity______________________________________________ (tril)________________________ 5.0000E-01
Plasma_elongation_______________________________________________________ (kappa.)______________________ 1.8480E+00
- TF_coil_vertical_offset_(m)_____________________________________________ (tfoffset)____________________ -7.5847E-01
+ TF_coil_vertical_offset_(m)_____________________________________________ (dz_tf_plasma_centre_offset)____________________ -7.5847E-01
Plasma_outer_arc_radius_of_curvature_(m)________________________________ (rco)_________________________ 5.5907E+00
Plasma_inner_arc_radius_of_curvature_(m)________________________________ (rci)_________________________ 1.0851E+01
Plasma_lower_X-pt,_radial_(m)___________________________________________ (rxpt)________________________ 7.6976E+00
@@ -5439,7 +5439,7 @@
Plasma_geometric_centre,_vertical_(m)___________________________________ (0.0)_________________________ 0.0000E+00
Plasma_lower_triangularity______________________________________________ (tril)________________________ 5.0000E-01
Plasma_elongation_______________________________________________________ (kappa.)______________________ 1.8480E+00
- TF_coil_vertical_offset_(m)_____________________________________________ (tfoffset)____________________ -7.5847E-01
+ TF_coil_vertical_offset_(m)_____________________________________________ (dz_tf_plasma_centre_offset)____________________ -7.5847E-01
Plasma_outer_arc_radius_of_curvature_(m)________________________________ (rco)_________________________ 5.5907E+00
Plasma_inner_arc_radius_of_curvature_(m)________________________________ (rci)_________________________ 1.0851E+01
Plasma_lower_X-pt,_radial_(m)___________________________________________ (rxpt)________________________ 7.6976E+00
@@ -6434,7 +6434,7 @@
Plasma_geometric_centre,_vertical_(m)___________________________________ (0.0)_________________________ 0.0000E+00
Plasma_lower_triangularity______________________________________________ (tril)________________________ 5.0000E-01
Plasma_elongation_______________________________________________________ (kappa.)______________________ 1.8480E+00
- TF_coil_vertical_offset_(m)_____________________________________________ (tfoffset)____________________ -7.5847E-01
+ TF_coil_vertical_offset_(m)_____________________________________________ (dz_tf_plasma_centre_offset)____________________ -7.5847E-01
Plasma_outer_arc_radius_of_curvature_(m)________________________________ (rco)_________________________ 5.5907E+00
Plasma_inner_arc_radius_of_curvature_(m)________________________________ (rci)_________________________ 1.0851E+01
Plasma_lower_X-pt,_radial_(m)___________________________________________ (rxpt)________________________ 7.6976E+00
@@ -7429,7 +7429,7 @@
Plasma_geometric_centre,_vertical_(m)___________________________________ (0.0)_________________________ 0.0000E+00
Plasma_lower_triangularity______________________________________________ (tril)________________________ 5.0000E-01
Plasma_elongation_______________________________________________________ (kappa.)______________________ 1.8480E+00
- TF_coil_vertical_offset_(m)_____________________________________________ (tfoffset)____________________ -7.5847E-01
+ TF_coil_vertical_offset_(m)_____________________________________________ (dz_tf_plasma_centre_offset)____________________ -7.5847E-01
Plasma_outer_arc_radius_of_curvature_(m)________________________________ (rco)_________________________ 5.5907E+00
Plasma_inner_arc_radius_of_curvature_(m)________________________________ (rci)_________________________ 1.0851E+01
Plasma_lower_X-pt,_radial_(m)___________________________________________ (rxpt)________________________ 7.6976E+00
@@ -8424,7 +8424,7 @@
Plasma_geometric_centre,_vertical_(m)___________________________________ (0.0)_________________________ 0.0000E+00
Plasma_lower_triangularity______________________________________________ (tril)________________________ 5.0000E-01
Plasma_elongation_______________________________________________________ (kappa.)______________________ 1.8480E+00
- TF_coil_vertical_offset_(m)_____________________________________________ (tfoffset)____________________ -7.5847E-01
+ TF_coil_vertical_offset_(m)_____________________________________________ (dz_tf_plasma_centre_offset)____________________ -7.5847E-01
Plasma_outer_arc_radius_of_curvature_(m)________________________________ (rco)_________________________ 5.5907E+00
Plasma_inner_arc_radius_of_curvature_(m)________________________________ (rci)_________________________ 1.0851E+01
Plasma_lower_X-pt,_radial_(m)___________________________________________ (rxpt)________________________ 7.6976E+00
diff --git a/process/build.py b/process/build.py
index 18ff3c962e..8d0d3411f3 100644
--- a/process/build.py
+++ b/process/build.py
@@ -473,7 +473,9 @@ def calculate_vertical_build(self, output: bool) -> None:
)
# To calculate vertical offset between TF coil centre and plasma centre
- build_variables.tfoffset = (vbuile1 + vertical_build_upper) / 2.0e0
+ build_variables.dz_tf_plasma_centre_offset = (
+ vbuile1 + vertical_build_upper
+ ) / 2.0e0
# End of Double null case
else:
@@ -785,7 +787,7 @@ def calculate_vertical_build(self, output: bool) -> None:
)
# To calculate vertical offset between TF coil centre and plasma centre
- build_variables.tfoffset = (vbuile1 + vbuild) / 2.0e0
+ build_variables.dz_tf_plasma_centre_offset = (vbuile1 + vbuild) / 2.0e0
# end of Single null case
@@ -1035,8 +1037,8 @@ def divgeom(self, output: bool):
po.ovarrf(
self.outfile,
"TF coil vertical offset (m)",
- "(tfoffset)",
- build_variables.tfoffset,
+ "(dz_tf_plasma_centre_offset)",
+ build_variables.dz_tf_plasma_centre_offset,
"OP ",
)
po.ovarrf(
@@ -1243,8 +1245,8 @@ def divgeom(self, output: bool):
po.ovarrf(
self.outfile,
"TF coil vertical offset (m)",
- "(tfoffset)",
- build_variables.tfoffset,
+ "(dz_tf_plasma_centre_offset)",
+ build_variables.dz_tf_plasma_centre_offset,
"OP ",
)
po.ovarrf(
@@ -1923,7 +1925,7 @@ def calculate_radial_build(self, output: bool) -> None:
# Thickness of outboard TF coil legs
if tfcoil_variables.i_tf_sup != 1:
build_variables.dr_tf_outboard = (
- build_variables.tfootfi * build_variables.dr_tf_inboard
+ build_variables.f_dr_tf_outboard_inboard * build_variables.dr_tf_inboard
)
else:
build_variables.dr_tf_outboard = build_variables.dr_tf_inboard
diff --git a/process/data_structure/build_variables.py b/process/data_structure/build_variables.py
index 6828986121..4a75fe5b51 100644
--- a/process/data_structure/build_variables.py
+++ b/process/data_structure/build_variables.py
@@ -323,11 +323,11 @@
"""
-tfoffset: float = None
-"""vertical distance between centre of TF coils and centre of plasma (m)"""
+dz_tf_plasma_centre_offset: float = None
+"""Vertical distance between centre of TF coils and centre of plasma (m)"""
-tfootfi: float = None
+f_dr_tf_outboard_inboard: float = None
"""TF coil outboard leg / inboard leg radial thickness
ratio (`i_tf_sup=0` only) (`iteration variable 75`)
"""
@@ -479,8 +479,8 @@ def init_build_variables():
global dz_shld_upper
global sigallpc
global dr_tf_inboard
- global tfoffset
- global tfootfi
+ global dz_tf_plasma_centre_offset
+ global f_dr_tf_outboard_inboard
global dr_tf_outboard
global dr_tf_shld_gap
global dr_shld_thermal_inboard
@@ -573,8 +573,8 @@ def init_build_variables():
dz_shld_upper = 0.6
sigallpc = 3.0e8
dr_tf_inboard = 0.0
- tfoffset = 0.0
- tfootfi = 1.19
+ dz_tf_plasma_centre_offset = 0.0
+ f_dr_tf_outboard_inboard = 1.19
dr_tf_outboard = 0.0
dr_tf_shld_gap = 0.05
dr_shld_thermal_inboard = 0.05
diff --git a/process/data_structure/numerics.py b/process/data_structure/numerics.py
index a4805e9c03..cace7d6905 100644
--- a/process/data_structure/numerics.py
+++ b/process/data_structure/numerics.py
@@ -271,7 +271,7 @@
* (72) fipir (f-value for equation 46)
* (73) dr_fw_plasma_gap_inboard
* (74) dr_fw_plasma_gap_outboard
-* (75) tfootfi
+* (75) f_dr_tf_outboard_inboard
* (76) NOT USED
* (77) NOT USED
* (78) NOT USED
diff --git a/process/input.py b/process/input.py
index c20690cecc..1ea521aed5 100644
--- a/process/input.py
+++ b/process/input.py
@@ -1712,7 +1712,9 @@ def __post_init__(self):
"dx_tf_wp_insertion_gap": InputVariable(
data_structure.tfcoil_variables, float, range=(1e-10, 0.1)
),
- "tfootfi": InputVariable(data_structure.build_variables, float, range=(0.2, 5.0)),
+ "f_dr_tf_outboard_inboard": InputVariable(
+ data_structure.build_variables, float, range=(0.2, 5.0)
+ ),
"tftmp": InputVariable(data_structure.tfcoil_variables, float, range=(0.01, 293.0)),
"tgain": InputVariable(data_structure.ife_variables, float, range=(1.0, 500.0)),
"th_joint_contact": InputVariable(
diff --git a/process/io/obsolete_vars.py b/process/io/obsolete_vars.py
index 9aadfe94ce..6a27444b89 100644
--- a/process/io/obsolete_vars.py
+++ b/process/io/obsolete_vars.py
@@ -469,6 +469,7 @@
"t_between_pulse": "t_plant_pulse_dwell",
"t_precharge": "t_plant_pulse_coil_precharge",
"t_burn": "t_plant_pulse_burn",
+ "tfootfi": "f_dr_tf_outboard_inboard",
}
OBS_VARS_HELP = {
diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py
index dd242c2bab..eb13f67875 100644
--- a/process/io/plot_proc.py
+++ b/process/io/plot_proc.py
@@ -9374,6 +9374,7 @@ def plot_tf_coil_structure(axis, mfile_data, scan, colour_scheme=1):
verticalalignment="center",
horizontalalignment="center",
bbox={"boxstyle": "round", "facecolor": "pink", "alpha": 1.0},
+ zorder=100, # Ensure label is on top of all plots
)
# =============================================================
@@ -9536,6 +9537,23 @@ def plot_tf_coil_structure(axis, mfile_data, scan, colour_scheme=1):
# ==============================================================
+ y_center = y2 - ((y2 - y4) / 2)
+ # also draw a red horizontal line at the same vertical centre
+ axis.axhline(y=y_center, color="red", linestyle="--", linewidth=1.0, zorder=5)
+
+ # Add a label the plasma and TF vertical centre distance offset
+ axis.text(
+ (r_tf_outboard_in + 2 * dr_tf_outboard),
+ -2.0,
+ f"$\\Delta Z$ coil centre to plasma centre = {mfile_data.data['dz_tf_plasma_centre_offset'].get_scan(scan):.3f} m",
+ fontsize=7,
+ color="black",
+ verticalalignment="center",
+ bbox={"boxstyle": "round", "facecolor": "pink", "alpha": 1.0},
+ )
+
+ # =============================================================
+
# Plot a red dot at (0,0)
axis.plot(0, 0, marker="o", color="red", markersize=7)
diff --git a/process/iteration_variables.py b/process/iteration_variables.py
index 07c59ec082..3214f3ffec 100644
--- a/process/iteration_variables.py
+++ b/process/iteration_variables.py
@@ -181,7 +181,9 @@ class IterationVariable:
74: IterationVariable(
"dr_fw_plasma_gap_outboard", data_structure.build_variables, 0.001, 10.00
),
- 75: IterationVariable("tfootfi", data_structure.build_variables, 0.200, 5.0),
+ 75: IterationVariable(
+ "f_dr_tf_outboard_inboard", data_structure.build_variables, 0.200, 5.0
+ ),
79: IterationVariable(
"fbeta_poloidal", data_structure.constraint_variables, 0.001, 1.0
),
diff --git a/process/stellarator.py b/process/stellarator.py
index 9d9291d288..448eceded1 100644
--- a/process/stellarator.py
+++ b/process/stellarator.py
@@ -5883,7 +5883,7 @@ def stinit():
build_variables.iohcl = 0
pfcoil_variables.f_z_cs_tf_internal = 0.0
build_variables.dr_cs_tf_gap = 0.0
- build_variables.tfootfi = 1.0
+ build_variables.f_dr_tf_outboard_inboard = 1.0
# Physics quantities
diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT
index 218cd3740b..09034b780b 100644
--- a/tests/integration/data/large_tokamak_1_MFILE.DAT
+++ b/tests/integration/data/large_tokamak_1_MFILE.DAT
@@ -610,7 +610,7 @@
Plasma_geometric_centre,_vertical_(m)___________________________________ (0.0)_________________________ 0.0000E+00
Plasma_lower_physics_variables.triangularity____________________________ (tril)________________________ 5.0000E-01
Plasma_elongation_______________________________________________________ (physics_variables.kappa.)____ 1.8500E+00
- TF_coil_vertical_offset_(m)_____________________________________________ (tfoffset)____________________ -6.1694E-01
+ TF_coil_vertical_offset_(m)_____________________________________________ (dz_tf_plasma_centre_offset)____________________ -6.1694E-01
Plasma_outer_arc_radius_of_curvature_(m)________________________________ (rco)_________________________ 5.0422E+00
Plasma_inner_arc_radius_of_curvature_(m)________________________________ (rci)_________________________ 9.7933E+00
Plasma_lower_X-pt,_radial_(m)___________________________________________ (rxpt)________________________ 6.6667E+00
diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT
index 8ef4b9e500..bb79b1d629 100644
--- a/tests/integration/data/large_tokamak_2_MFILE.DAT
+++ b/tests/integration/data/large_tokamak_2_MFILE.DAT
@@ -611,7 +611,7 @@
Plasma_geometric_centre,_vertical_(m)___________________________________ (0.0)_________________________ 0.0000E+00
Plasma_lower_physics_variables.triangularity____________________________ (tril)________________________ 5.0000E-01
Plasma_elongation_______________________________________________________ (physics_variables.kappa.)____ 1.8500E+00
- TF_coil_vertical_offset_(m)_____________________________________________ (tfoffset)____________________ -6.1694E-01
+ TF_coil_vertical_offset_(m)_____________________________________________ (dz_tf_plasma_centre_offset)____________________ -6.1694E-01
Plasma_outer_arc_radius_of_curvature_(m)________________________________ (rco)_________________________ 5.0422E+00
Plasma_inner_arc_radius_of_curvature_(m)________________________________ (rci)_________________________ 9.7933E+00
Plasma_lower_X-pt,_radial_(m)___________________________________________ (rxpt)________________________ 6.6667E+00
diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT
index bdac8fe1b7..fec8b7cda6 100644
--- a/tests/integration/data/large_tokamak_3_MFILE.DAT
+++ b/tests/integration/data/large_tokamak_3_MFILE.DAT
@@ -611,7 +611,7 @@
Plasma_geometric_centre,_vertical_(m)___________________________________ (0.0)_________________________ 0.0000E+00
Plasma_lower_physics_variables.triangularity____________________________ (tril)________________________ 5.0000E-01
Plasma_elongation_______________________________________________________ (physics_variables.kappa.)____ 1.8500E+00
- TF_coil_vertical_offset_(m)_____________________________________________ (tfoffset)____________________ -6.1694E-01
+ TF_coil_vertical_offset_(m)_____________________________________________ (dz_tf_plasma_centre_offset)____________________ -6.1694E-01
Plasma_outer_arc_radius_of_curvature_(m)________________________________ (rco)_________________________ 5.0422E+00
Plasma_inner_arc_radius_of_curvature_(m)________________________________ (rci)_________________________ 9.7933E+00
Plasma_lower_X-pt,_radial_(m)___________________________________________ (rxpt)________________________ 6.6667E+00
diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT
index eb2df14f17..4886ac92c6 100644
--- a/tests/integration/data/large_tokamak_4_MFILE.DAT
+++ b/tests/integration/data/large_tokamak_4_MFILE.DAT
@@ -611,7 +611,7 @@
Plasma_geometric_centre,_vertical_(m)___________________________________ (0.0)_________________________ 0.0000E+00
Plasma_lower_physics_variables.triangularity____________________________ (tril)________________________ 5.0000E-01
Plasma_elongation_______________________________________________________ (physics_variables.kappa.)____ 1.8500E+00
- TF_coil_vertical_offset_(m)_____________________________________________ (tfoffset)____________________ -6.1694E-01
+ TF_coil_vertical_offset_(m)_____________________________________________ (dz_tf_plasma_centre_offset)____________________ -6.1694E-01
Plasma_outer_arc_radius_of_curvature_(m)________________________________ (rco)_________________________ 5.0422E+00
Plasma_inner_arc_radius_of_curvature_(m)________________________________ (rci)_________________________ 9.7933E+00
Plasma_lower_X-pt,_radial_(m)___________________________________________ (rxpt)________________________ 6.6667E+00
diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT
index 5c0c08b03f..1b7d97ddae 100644
--- a/tests/integration/data/large_tokamak_MFILE.DAT
+++ b/tests/integration/data/large_tokamak_MFILE.DAT
@@ -823,7 +823,7 @@
Plasma_geometric_centre,_vertical_(m)____________________________________ (0.0)__________________________ 0.00000000000000000e+00 OP
Plasma_lower_triangularity_______________________________________________ (tril)_________________________ 5.00000000000000000e-01 OP
Plasma_elongation________________________________________________________ (kappa.)_______________________ 1.85000000000000009e+00 OP
- TF_coil_vertical_offset_(m)______________________________________________ (tfoffset)_____________________ -6.16941915397079654e-01 OP
+ TF_coil_vertical_offset_(m)______________________________________________ (dz_tf_plasma_centre_offset)_____________________ -6.16941915397079654e-01 OP
Plasma_outer_arc_radius_of_curvature_(m)_________________________________ (rco)__________________________ 5.04222222222222261e+00 OP
Plasma_inner_arc_radius_of_curvature_(m)_________________________________ (rci)__________________________ 9.79333333333333300e+00 OP
Plasma_lower_X-pt,_radial_(m)____________________________________________ (rxpt)_________________________ 6.66666666666666696e+00 OP
diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT
index b97ad7b12c..23d78ce0c5 100644
--- a/tests/integration/data/scan_2D_MFILE.DAT
+++ b/tests/integration/data/scan_2D_MFILE.DAT
@@ -612,7 +612,7 @@
Plasma_geometric_centre,_vertical_(m)___________________________________ (0.0)_________________________ 0.0000E+00
Plasma_lower_physics_variables.triangularity____________________________ (tril)________________________ 5.0000E-01
Plasma_elongation_______________________________________________________ (physics_variables.kappa.)____ 1.8500E+00
- TF_coil_vertical_offset_(m)_____________________________________________ (tfoffset)____________________ -6.1694E-01
+ TF_coil_vertical_offset_(m)_____________________________________________ (dz_tf_plasma_centre_offset)____________________ -6.1694E-01
Plasma_outer_arc_radius_of_curvature_(m)________________________________ (rco)_________________________ 5.0422E+00
Plasma_inner_arc_radius_of_curvature_(m)________________________________ (rci)_________________________ 9.7933E+00
Plasma_lower_X-pt,_radial_(m)___________________________________________ (rxpt)________________________ 6.6667E+00
@@ -1775,7 +1775,7 @@
Plasma_geometric_centre,_vertical_(m)___________________________________ (0.0)_________________________ 0.0000E+00
Plasma_lower_physics_variables.triangularity____________________________ (tril)________________________ 5.0000E-01
Plasma_elongation_______________________________________________________ (physics_variables.kappa.)____ 1.8500E+00
- TF_coil_vertical_offset_(m)_____________________________________________ (tfoffset)____________________ -6.1694E-01
+ TF_coil_vertical_offset_(m)_____________________________________________ (dz_tf_plasma_centre_offset)____________________ -6.1694E-01
Plasma_outer_arc_radius_of_curvature_(m)________________________________ (rco)_________________________ 5.0422E+00
Plasma_inner_arc_radius_of_curvature_(m)________________________________ (rci)_________________________ 9.7933E+00
Plasma_lower_X-pt,_radial_(m)___________________________________________ (rxpt)________________________ 6.6667E+00
@@ -2938,7 +2938,7 @@
Plasma_geometric_centre,_vertical_(m)___________________________________ (0.0)_________________________ 0.0000E+00
Plasma_lower_physics_variables.triangularity____________________________ (tril)________________________ 5.0000E-01
Plasma_elongation_______________________________________________________ (physics_variables.kappa.)____ 1.8500E+00
- TF_coil_vertical_offset_(m)_____________________________________________ (tfoffset)____________________ -6.1694E-01
+ TF_coil_vertical_offset_(m)_____________________________________________ (dz_tf_plasma_centre_offset)____________________ -6.1694E-01
Plasma_outer_arc_radius_of_curvature_(m)________________________________ (rco)_________________________ 5.0422E+00
Plasma_inner_arc_radius_of_curvature_(m)________________________________ (rci)_________________________ 9.7933E+00
Plasma_lower_X-pt,_radial_(m)___________________________________________ (rxpt)________________________ 6.6667E+00
@@ -4101,7 +4101,7 @@
Plasma_geometric_centre,_vertical_(m)___________________________________ (0.0)_________________________ 0.0000E+00
Plasma_lower_physics_variables.triangularity____________________________ (tril)________________________ 5.0000E-01
Plasma_elongation_______________________________________________________ (physics_variables.kappa.)____ 1.8500E+00
- TF_coil_vertical_offset_(m)_____________________________________________ (tfoffset)____________________ -6.1694E-01
+ TF_coil_vertical_offset_(m)_____________________________________________ (dz_tf_plasma_centre_offset)____________________ -6.1694E-01
Plasma_outer_arc_radius_of_curvature_(m)________________________________ (rco)_________________________ 5.0422E+00
Plasma_inner_arc_radius_of_curvature_(m)________________________________ (rci)_________________________ 9.7933E+00
Plasma_lower_X-pt,_radial_(m)___________________________________________ (rxpt)________________________ 6.6667E+00
@@ -5264,7 +5264,7 @@
Plasma_geometric_centre,_vertical_(m)___________________________________ (0.0)_________________________ 0.0000E+00
Plasma_lower_physics_variables.triangularity____________________________ (tril)________________________ 5.0000E-01
Plasma_elongation_______________________________________________________ (physics_variables.kappa.)____ 1.8500E+00
- TF_coil_vertical_offset_(m)_____________________________________________ (tfoffset)____________________ -6.1694E-01
+ TF_coil_vertical_offset_(m)_____________________________________________ (dz_tf_plasma_centre_offset)____________________ -6.1694E-01
Plasma_outer_arc_radius_of_curvature_(m)________________________________ (rco)_________________________ 5.0422E+00
Plasma_inner_arc_radius_of_curvature_(m)________________________________ (rci)_________________________ 9.7933E+00
Plasma_lower_X-pt,_radial_(m)___________________________________________ (rxpt)________________________ 6.6667E+00
@@ -6427,7 +6427,7 @@
Plasma_geometric_centre,_vertical_(m)___________________________________ (0.0)_________________________ 0.0000E+00
Plasma_lower_physics_variables.triangularity____________________________ (tril)________________________ 5.0000E-01
Plasma_elongation_______________________________________________________ (physics_variables.kappa.)____ 1.8500E+00
- TF_coil_vertical_offset_(m)_____________________________________________ (tfoffset)____________________ -6.1694E-01
+ TF_coil_vertical_offset_(m)_____________________________________________ (dz_tf_plasma_centre_offset)____________________ -6.1694E-01
Plasma_outer_arc_radius_of_curvature_(m)________________________________ (rco)_________________________ 5.0422E+00
Plasma_inner_arc_radius_of_curvature_(m)________________________________ (rci)_________________________ 9.7933E+00
Plasma_lower_X-pt,_radial_(m)___________________________________________ (rxpt)________________________ 6.6667E+00
@@ -7590,7 +7590,7 @@
Plasma_geometric_centre,_vertical_(m)___________________________________ (0.0)_________________________ 0.0000E+00
Plasma_lower_physics_variables.triangularity____________________________ (tril)________________________ 5.0000E-01
Plasma_elongation_______________________________________________________ (physics_variables.kappa.)____ 1.8500E+00
- TF_coil_vertical_offset_(m)_____________________________________________ (tfoffset)____________________ -6.1694E-01
+ TF_coil_vertical_offset_(m)_____________________________________________ (dz_tf_plasma_centre_offset)____________________ -6.1694E-01
Plasma_outer_arc_radius_of_curvature_(m)________________________________ (rco)_________________________ 5.0422E+00
Plasma_inner_arc_radius_of_curvature_(m)________________________________ (rci)_________________________ 9.7933E+00
Plasma_lower_X-pt,_radial_(m)___________________________________________ (rxpt)________________________ 6.6667E+00
@@ -8753,7 +8753,7 @@
Plasma_geometric_centre,_vertical_(m)___________________________________ (0.0)_________________________ 0.0000E+00
Plasma_lower_physics_variables.triangularity____________________________ (tril)________________________ 5.0000E-01
Plasma_elongation_______________________________________________________ (physics_variables.kappa.)____ 1.8500E+00
- TF_coil_vertical_offset_(m)_____________________________________________ (tfoffset)____________________ -6.1694E-01
+ TF_coil_vertical_offset_(m)_____________________________________________ (dz_tf_plasma_centre_offset)____________________ -6.1694E-01
Plasma_outer_arc_radius_of_curvature_(m)________________________________ (rco)_________________________ 5.0422E+00
Plasma_inner_arc_radius_of_curvature_(m)________________________________ (rci)_________________________ 9.7933E+00
Plasma_lower_X-pt,_radial_(m)___________________________________________ (rxpt)________________________ 6.6667E+00
@@ -9916,7 +9916,7 @@
Plasma_geometric_centre,_vertical_(m)___________________________________ (0.0)_________________________ 0.0000E+00
Plasma_lower_physics_variables.triangularity____________________________ (tril)________________________ 5.0000E-01
Plasma_elongation_______________________________________________________ (physics_variables.kappa.)____ 1.8500E+00
- TF_coil_vertical_offset_(m)_____________________________________________ (tfoffset)____________________ -6.1694E-01
+ TF_coil_vertical_offset_(m)_____________________________________________ (dz_tf_plasma_centre_offset)____________________ -6.1694E-01
Plasma_outer_arc_radius_of_curvature_(m)________________________________ (rco)_________________________ 5.0422E+00
Plasma_inner_arc_radius_of_curvature_(m)________________________________ (rci)_________________________ 9.7933E+00
Plasma_lower_X-pt,_radial_(m)___________________________________________ (rxpt)________________________ 6.6667E+00
@@ -11079,7 +11079,7 @@
Plasma_geometric_centre,_vertical_(m)___________________________________ (0.0)_________________________ 0.0000E+00
Plasma_lower_physics_variables.triangularity____________________________ (tril)________________________ 5.0000E-01
Plasma_elongation_______________________________________________________ (physics_variables.kappa.)____ 1.8500E+00
- TF_coil_vertical_offset_(m)_____________________________________________ (tfoffset)____________________ -6.1694E-01
+ TF_coil_vertical_offset_(m)_____________________________________________ (dz_tf_plasma_centre_offset)____________________ -6.1694E-01
Plasma_outer_arc_radius_of_curvature_(m)________________________________ (rco)_________________________ 5.0422E+00
Plasma_inner_arc_radius_of_curvature_(m)________________________________ (rci)_________________________ 9.7933E+00
Plasma_lower_X-pt,_radial_(m)___________________________________________ (rxpt)________________________ 6.6667E+00
@@ -12242,7 +12242,7 @@
Plasma_geometric_centre,_vertical_(m)___________________________________ (0.0)_________________________ 0.0000E+00
Plasma_lower_physics_variables.triangularity____________________________ (tril)________________________ 5.0000E-01
Plasma_elongation_______________________________________________________ (physics_variables.kappa.)____ 1.8500E+00
- TF_coil_vertical_offset_(m)_____________________________________________ (tfoffset)____________________ -6.1694E-01
+ TF_coil_vertical_offset_(m)_____________________________________________ (dz_tf_plasma_centre_offset)____________________ -6.1694E-01
Plasma_outer_arc_radius_of_curvature_(m)________________________________ (rco)_________________________ 5.0422E+00
Plasma_inner_arc_radius_of_curvature_(m)________________________________ (rci)_________________________ 9.7933E+00
Plasma_lower_X-pt,_radial_(m)___________________________________________ (rxpt)________________________ 6.6667E+00
@@ -13405,7 +13405,7 @@
Plasma_geometric_centre,_vertical_(m)___________________________________ (0.0)_________________________ 0.0000E+00
Plasma_lower_physics_variables.triangularity____________________________ (tril)________________________ 5.0000E-01
Plasma_elongation_______________________________________________________ (physics_variables.kappa.)____ 1.8500E+00
- TF_coil_vertical_offset_(m)_____________________________________________ (tfoffset)____________________ -6.1694E-01
+ TF_coil_vertical_offset_(m)_____________________________________________ (dz_tf_plasma_centre_offset)____________________ -6.1694E-01
Plasma_outer_arc_radius_of_curvature_(m)________________________________ (rco)_________________________ 5.0422E+00
Plasma_inner_arc_radius_of_curvature_(m)________________________________ (rci)_________________________ 9.7933E+00
Plasma_lower_X-pt,_radial_(m)___________________________________________ (rxpt)________________________ 6.6667E+00
@@ -14568,7 +14568,7 @@
Plasma_geometric_centre,_vertical_(m)___________________________________ (0.0)_________________________ 0.0000E+00
Plasma_lower_physics_variables.triangularity____________________________ (tril)________________________ 5.0000E-01
Plasma_elongation_______________________________________________________ (physics_variables.kappa.)____ 1.8500E+00
- TF_coil_vertical_offset_(m)_____________________________________________ (tfoffset)____________________ -6.1694E-01
+ TF_coil_vertical_offset_(m)_____________________________________________ (dz_tf_plasma_centre_offset)____________________ -6.1694E-01
Plasma_outer_arc_radius_of_curvature_(m)________________________________ (rco)_________________________ 5.0422E+00
Plasma_inner_arc_radius_of_curvature_(m)________________________________ (rci)_________________________ 9.7933E+00
Plasma_lower_X-pt,_radial_(m)___________________________________________ (rxpt)________________________ 6.6667E+00
@@ -15731,7 +15731,7 @@
Plasma_geometric_centre,_vertical_(m)___________________________________ (0.0)_________________________ 0.0000E+00
Plasma_lower_physics_variables.triangularity____________________________ (tril)________________________ 5.0000E-01
Plasma_elongation_______________________________________________________ (physics_variables.kappa.)____ 1.8500E+00
- TF_coil_vertical_offset_(m)_____________________________________________ (tfoffset)____________________ -6.1694E-01
+ TF_coil_vertical_offset_(m)_____________________________________________ (dz_tf_plasma_centre_offset)____________________ -6.1694E-01
Plasma_outer_arc_radius_of_curvature_(m)________________________________ (rco)_________________________ 5.0422E+00
Plasma_inner_arc_radius_of_curvature_(m)________________________________ (rci)_________________________ 9.7933E+00
Plasma_lower_X-pt,_radial_(m)___________________________________________ (rxpt)________________________ 6.6667E+00
@@ -16894,7 +16894,7 @@
Plasma_geometric_centre,_vertical_(m)___________________________________ (0.0)_________________________ 0.0000E+00
Plasma_lower_physics_variables.triangularity____________________________ (tril)________________________ 5.0000E-01
Plasma_elongation_______________________________________________________ (physics_variables.kappa.)____ 1.8500E+00
- TF_coil_vertical_offset_(m)_____________________________________________ (tfoffset)____________________ -6.1694E-01
+ TF_coil_vertical_offset_(m)_____________________________________________ (dz_tf_plasma_centre_offset)____________________ -6.1694E-01
Plasma_outer_arc_radius_of_curvature_(m)________________________________ (rco)_________________________ 5.0422E+00
Plasma_inner_arc_radius_of_curvature_(m)________________________________ (rci)_________________________ 9.7933E+00
Plasma_lower_X-pt,_radial_(m)___________________________________________ (rxpt)________________________ 6.6667E+00
diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT
index eab9fd4063..19a74809ff 100644
--- a/tests/integration/data/scan_MFILE.DAT
+++ b/tests/integration/data/scan_MFILE.DAT
@@ -464,7 +464,7 @@
Plasma_geometric_centre,_vertical_(m)___________________________________ (0.0)_________________________ 0.0000E+00
Plasma_lower_triangularity______________________________________________ (tril)________________________ 5.0000E-01
Plasma_elongation_______________________________________________________ (kappa.)______________________ 1.8480E+00
- TF_coil_vertical_offset_(m)_____________________________________________ (tfoffset)____________________ -7.5847E-01
+ TF_coil_vertical_offset_(m)_____________________________________________ (dz_tf_plasma_centre_offset)____________________ -7.5847E-01
Plasma_outer_arc_radius_of_curvature_(m)________________________________ (rco)_________________________ 5.5907E+00
Plasma_inner_arc_radius_of_curvature_(m)________________________________ (rci)_________________________ 1.0851E+01
Plasma_lower_X-pt,_radial_(m)___________________________________________ (rxpt)________________________ 7.6976E+00
@@ -1459,7 +1459,7 @@
Plasma_geometric_centre,_vertical_(m)___________________________________ (0.0)_________________________ 0.0000E+00
Plasma_lower_triangularity______________________________________________ (tril)________________________ 5.0000E-01
Plasma_elongation_______________________________________________________ (kappa.)______________________ 1.8480E+00
- TF_coil_vertical_offset_(m)_____________________________________________ (tfoffset)____________________ -7.5847E-01
+ TF_coil_vertical_offset_(m)_____________________________________________ (dz_tf_plasma_centre_offset)____________________ -7.5847E-01
Plasma_outer_arc_radius_of_curvature_(m)________________________________ (rco)_________________________ 5.5907E+00
Plasma_inner_arc_radius_of_curvature_(m)________________________________ (rci)_________________________ 1.0851E+01
Plasma_lower_X-pt,_radial_(m)___________________________________________ (rxpt)________________________ 7.6976E+00
@@ -2454,7 +2454,7 @@
Plasma_geometric_centre,_vertical_(m)___________________________________ (0.0)_________________________ 0.0000E+00
Plasma_lower_triangularity______________________________________________ (tril)________________________ 5.0000E-01
Plasma_elongation_______________________________________________________ (kappa.)______________________ 1.8480E+00
- TF_coil_vertical_offset_(m)_____________________________________________ (tfoffset)____________________ -7.5847E-01
+ TF_coil_vertical_offset_(m)_____________________________________________ (dz_tf_plasma_centre_offset)____________________ -7.5847E-01
Plasma_outer_arc_radius_of_curvature_(m)________________________________ (rco)_________________________ 5.5907E+00
Plasma_inner_arc_radius_of_curvature_(m)________________________________ (rci)_________________________ 1.0851E+01
Plasma_lower_X-pt,_radial_(m)___________________________________________ (rxpt)________________________ 7.6976E+00
@@ -3449,7 +3449,7 @@
Plasma_geometric_centre,_vertical_(m)___________________________________ (0.0)_________________________ 0.0000E+00
Plasma_lower_triangularity______________________________________________ (tril)________________________ 5.0000E-01
Plasma_elongation_______________________________________________________ (kappa.)______________________ 1.8480E+00
- TF_coil_vertical_offset_(m)_____________________________________________ (tfoffset)____________________ -7.5847E-01
+ TF_coil_vertical_offset_(m)_____________________________________________ (dz_tf_plasma_centre_offset)____________________ -7.5847E-01
Plasma_outer_arc_radius_of_curvature_(m)________________________________ (rco)_________________________ 5.5907E+00
Plasma_inner_arc_radius_of_curvature_(m)________________________________ (rci)_________________________ 1.0851E+01
Plasma_lower_X-pt,_radial_(m)___________________________________________ (rxpt)________________________ 7.6976E+00
@@ -4444,7 +4444,7 @@
Plasma_geometric_centre,_vertical_(m)___________________________________ (0.0)_________________________ 0.0000E+00
Plasma_lower_triangularity______________________________________________ (tril)________________________ 5.0000E-01
Plasma_elongation_______________________________________________________ (kappa.)______________________ 1.8480E+00
- TF_coil_vertical_offset_(m)_____________________________________________ (tfoffset)____________________ -7.5847E-01
+ TF_coil_vertical_offset_(m)_____________________________________________ (dz_tf_plasma_centre_offset)____________________ -7.5847E-01
Plasma_outer_arc_radius_of_curvature_(m)________________________________ (rco)_________________________ 5.5907E+00
Plasma_inner_arc_radius_of_curvature_(m)________________________________ (rci)_________________________ 1.0851E+01
Plasma_lower_X-pt,_radial_(m)___________________________________________ (rxpt)________________________ 7.6976E+00
@@ -5439,7 +5439,7 @@
Plasma_geometric_centre,_vertical_(m)___________________________________ (0.0)_________________________ 0.0000E+00
Plasma_lower_triangularity______________________________________________ (tril)________________________ 5.0000E-01
Plasma_elongation_______________________________________________________ (kappa.)______________________ 1.8480E+00
- TF_coil_vertical_offset_(m)_____________________________________________ (tfoffset)____________________ -7.5847E-01
+ TF_coil_vertical_offset_(m)_____________________________________________ (dz_tf_plasma_centre_offset)____________________ -7.5847E-01
Plasma_outer_arc_radius_of_curvature_(m)________________________________ (rco)_________________________ 5.5907E+00
Plasma_inner_arc_radius_of_curvature_(m)________________________________ (rci)_________________________ 1.0851E+01
Plasma_lower_X-pt,_radial_(m)___________________________________________ (rxpt)________________________ 7.6976E+00
@@ -6434,7 +6434,7 @@
Plasma_geometric_centre,_vertical_(m)___________________________________ (0.0)_________________________ 0.0000E+00
Plasma_lower_triangularity______________________________________________ (tril)________________________ 5.0000E-01
Plasma_elongation_______________________________________________________ (kappa.)______________________ 1.8480E+00
- TF_coil_vertical_offset_(m)_____________________________________________ (tfoffset)____________________ -7.5847E-01
+ TF_coil_vertical_offset_(m)_____________________________________________ (dz_tf_plasma_centre_offset)____________________ -7.5847E-01
Plasma_outer_arc_radius_of_curvature_(m)________________________________ (rco)_________________________ 5.5907E+00
Plasma_inner_arc_radius_of_curvature_(m)________________________________ (rci)_________________________ 1.0851E+01
Plasma_lower_X-pt,_radial_(m)___________________________________________ (rxpt)________________________ 7.6976E+00
@@ -7429,7 +7429,7 @@
Plasma_geometric_centre,_vertical_(m)___________________________________ (0.0)_________________________ 0.0000E+00
Plasma_lower_triangularity______________________________________________ (tril)________________________ 5.0000E-01
Plasma_elongation_______________________________________________________ (kappa.)______________________ 1.8480E+00
- TF_coil_vertical_offset_(m)_____________________________________________ (tfoffset)____________________ -7.5847E-01
+ TF_coil_vertical_offset_(m)_____________________________________________ (dz_tf_plasma_centre_offset)____________________ -7.5847E-01
Plasma_outer_arc_radius_of_curvature_(m)________________________________ (rco)_________________________ 5.5907E+00
Plasma_inner_arc_radius_of_curvature_(m)________________________________ (rci)_________________________ 1.0851E+01
Plasma_lower_X-pt,_radial_(m)___________________________________________ (rxpt)________________________ 7.6976E+00
@@ -8424,7 +8424,7 @@
Plasma_geometric_centre,_vertical_(m)___________________________________ (0.0)_________________________ 0.0000E+00
Plasma_lower_triangularity______________________________________________ (tril)________________________ 5.0000E-01
Plasma_elongation_______________________________________________________ (kappa.)______________________ 1.8480E+00
- TF_coil_vertical_offset_(m)_____________________________________________ (tfoffset)____________________ -7.5847E-01
+ TF_coil_vertical_offset_(m)_____________________________________________ (dz_tf_plasma_centre_offset)____________________ -7.5847E-01
Plasma_outer_arc_radius_of_curvature_(m)________________________________ (rco)_________________________ 5.5907E+00
Plasma_inner_arc_radius_of_curvature_(m)________________________________ (rci)_________________________ 1.0851E+01
Plasma_lower_X-pt,_radial_(m)___________________________________________ (rxpt)________________________ 7.6976E+00
diff --git a/tests/regression/input_files/spherical_tokamak_eval.IN.DAT b/tests/regression/input_files/spherical_tokamak_eval.IN.DAT
index 9072984433..1f2efb76e3 100644
--- a/tests/regression/input_files/spherical_tokamak_eval.IN.DAT
+++ b/tests/regression/input_files/spherical_tokamak_eval.IN.DAT
@@ -77,7 +77,7 @@ dr_shld_inboard = 0.39314459807893426 * inboard shield thickness (m) (`iteratio
dz_shld_lower = 0.6 * lower (under divertor) shield thickness (m)
dr_shld_outboard = 0.3 * outboard shield thickness (m) (`iteration variable 94`)
dz_shld_upper = 0.3 * upper/lower shield thickness (m); calculated if `blktmodel > 0` (= dz_shld_lower if double-null)
-tfootfi = 1.0 * TF coil outboard leg / inboard leg radial thickness
+f_dr_tf_outboard_inboard = 1.0 * TF coil outboard leg / inboard leg radial thickness
dr_tf_shld_gap = 0.01 * Minimum metal-to-metal gap between TF coil and thermal shield (m)
dr_shld_thermal_inboard = 0.05 * TF-VV thermal shield thickness; inboard (m)
dr_shld_thermal_outboard = 0.07 * TF-VV thermal shield thickness; outboard (m)
diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT
index e1b581b887..f6ce9d1792 100644
--- a/tests/regression/input_files/st_regression.IN.DAT
+++ b/tests/regression/input_files/st_regression.IN.DAT
@@ -2086,7 +2086,7 @@ gapomin = 0.0
* JUSTIFICATION: Gap is set by the ripple, no need to set minimum
*ixc = 75
-tfootfi = 1.0
+f_dr_tf_outboard_inboard = 1.0
*boundl(75) =
*boundu(75) =
* DESCRIPTION: TF coil outboard leg / inboard leg radial thickness
diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT
index 8ec2171097..3690f70012 100644
--- a/tests/unit/data/large_tokamak_MFILE.DAT
+++ b/tests/unit/data/large_tokamak_MFILE.DAT
@@ -609,7 +609,7 @@
Plasma_geometric_centre,_vertical_(m)___________________________________ (0.0)_________________________ 0.0000E+00
Plasma_lower_physics_variables.triangularity____________________________ (tril)________________________ 5.0000E-01
Plasma_elongation_______________________________________________________ (physics_variables.kappa.)____ 1.8500E+00
- TF_coil_vertical_offset_(m)_____________________________________________ (tfoffset)____________________ -6.1694E-01
+ TF_coil_vertical_offset_(m)_____________________________________________ (dz_tf_plasma_centre_offset)____________________ -6.1694E-01
Plasma_outer_arc_radius_of_curvature_(m)________________________________ (rco)_________________________ 5.0422E+00
Plasma_inner_arc_radius_of_curvature_(m)________________________________ (rci)_________________________ 9.7933E+00
Plasma_lower_X-pt,_radial_(m)___________________________________________ (rxpt)________________________ 6.6667E+00
diff --git a/tests/unit/test_build.py b/tests/unit/test_build.py
index 93f37b16e2..6abd4fa73c 100644
--- a/tests/unit/test_build.py
+++ b/tests/unit/test_build.py
@@ -26,7 +26,7 @@ class DivgeomParam(NamedTuple):
plleno: Any = None
- tfoffset: Any = None
+ dz_tf_plasma_centre_offset: Any = None
plsepi: Any = None
@@ -103,7 +103,7 @@ class RippleAmplitudeParam(NamedTuple):
DivgeomParam(
rspo=8.2125352340518898,
plleno=1,
- tfoffset=0,
+ dz_tf_plasma_centre_offset=0,
plsepi=1,
plleni=1,
plsepo=1.5,
@@ -122,7 +122,7 @@ class RippleAmplitudeParam(NamedTuple):
DivgeomParam(
rspo=8.2125352340518898,
plleno=1,
- tfoffset=0,
+ dz_tf_plasma_centre_offset=0,
plsepi=1,
plleni=1,
plsepo=1.5,
@@ -160,7 +160,11 @@ def test_divgeom(divgeomparam, monkeypatch, build):
monkeypatch.setattr(build_variables, "plleno", divgeomparam.plleno)
- monkeypatch.setattr(build_variables, "tfoffset", divgeomparam.tfoffset)
+ monkeypatch.setattr(
+ build_variables,
+ "dz_tf_plasma_centre_offset",
+ divgeomparam.dz_tf_plasma_centre_offset,
+ )
monkeypatch.setattr(build_variables, "plsepi", divgeomparam.plsepi)