Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
125 changes: 70 additions & 55 deletions documentation/proc-pages/eng-models/tf-coil.md

Large diffs are not rendered by default.

5 changes: 0 additions & 5 deletions examples/data/large_tokamak_IN.DAT
Original file line number Diff line number Diff line change
Expand Up @@ -216,11 +216,6 @@ te = 12.0
ixc = 10
boundu(10) = 1.2

* dr_tf_inboard [m]
ixc = 13
boundl(13) = 0.7
dr_tf_inboard = 1.2

* dr_cs [m]
ixc = 16
boundl(16) = 0.3
Expand Down
5 changes: 0 additions & 5 deletions examples/data/scan_example_file_IN.DAT
Original file line number Diff line number Diff line change
Expand Up @@ -216,11 +216,6 @@ te = 12.0
ixc = 10
boundu(10) = 1.2

* dr_tf_inboard [m]
ixc = 13
boundl(13) = 0.7
dr_tf_inboard = 1.2

* dr_cs [m]
ixc = 16
boundl(16) = 0.3
Expand Down
8 changes: 8 additions & 0 deletions process/init.py
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,14 @@ def check_process(inputs): # noqa: ARG001
nvar=fortran.numerics.nvar,
)

# Check that dr_tf_wp (ixc = 140) and dr_tf_inboard (ixc = 13) are not being used simultaneously as iteration variables
if (fortran.numerics.ixc[: fortran.numerics.nvar] == 13).any() and (
fortran.numerics.ixc[: fortran.numerics.nvar] == 140
).any():
raise ProcessValidationError(
"Iteration variables 13 and 140 cannot be used simultaneously",
)

if (
fortran.numerics.icc[: fortran.numerics.neqns + fortran.numerics.nineqns] == 0
).any():
Expand Down
5 changes: 0 additions & 5 deletions tests/integration/data/large_tokamak_IN.DAT
Original file line number Diff line number Diff line change
Expand Up @@ -216,11 +216,6 @@ te = 12.0
ixc = 10
boundu(10) = 1.2

* dr_tf_inboard [m]
ixc = 13
boundl(13) = 0.7
dr_tf_inboard = 1.2

* dr_cs [m]
ixc = 16
boundl(16) = 0.3
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/data/large_tokamak_eval.IN.DAT
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ tdmptf = 17.97282589344206 * fast discharge time for TF coil in event of quenc
n_tf_coils = 16 * Number of TF coils (default = 50 for stellarators); Number of TF coils outer legs for ST
tftmp = 4.75 * peak helium coolant temperature in TF coils and PF coils (K)
dr_tf_nose_case = 0.2816873221155309 * inboard TF coil case outer (non-plasma side) thickness (m) (`iteration variable 57`)
dr_tf_wp = 0.5153787768966674 * radial thickness of winding pack (m) (`iteration variable 140`) (issue #514)
dr_tf_wp = 0.5153787768966674 * radial thickness of winding pack (m) (issue #514)
thwcndut = 0.008012110032981922 * TF coil conduit case thickness (m) (`iteration variable 58`)
tinstf = 0.008 * Thickness of the ground insulation layer surrounding (m)
tmargmin_cs = 1.5 * minimum allowable temperature margin ; CS (K)
Expand Down
5 changes: 0 additions & 5 deletions tests/regression/input_files/large_tokamak.IN.DAT
Original file line number Diff line number Diff line change
Expand Up @@ -216,11 +216,6 @@ te = 12.0
ixc = 10
boundu(10) = 1.2

* dr_tf_inboard [m]
ixc = 13
boundl(13) = 0.7
dr_tf_inboard = 1.2

* dr_cs [m]
ixc = 16
boundl(16) = 0.3
Expand Down
2 changes: 1 addition & 1 deletion tests/regression/input_files/large_tokamak_eval.IN.DAT
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ tdmptf = 17.97282589344206 * fast discharge time for TF coil in event of quenc
n_tf_coils = 16 * Number of TF coils (default = 50 for stellarators); Number of TF coils outer legs for ST
tftmp = 4.75 * peak helium coolant temperature in TF coils and PF coils (K)
dr_tf_nose_case = 0.2816873221155309 * inboard TF coil case outer (non-plasma side) thickness (m) (`iteration variable 57`)
dr_tf_wp = 0.5153787768966674 * radial thickness of winding pack (m) (`iteration variable 140`) (issue #514)
dr_tf_wp = 0.5153787768966674 * radial thickness of winding pack (m) (issue #514)
thwcndut = 0.008012110032981922 * TF coil conduit case thickness (m) (`iteration variable 58`)
tinstf = 0.008 * Thickness of the ground insulation layer surrounding (m)
tmargmin_cs = 1.5 * minimum allowable temperature margin ; CS (K)
Expand Down
5 changes: 0 additions & 5 deletions tests/regression/input_files/large_tokamak_nof.IN.DAT
Original file line number Diff line number Diff line change
Expand Up @@ -198,11 +198,6 @@ te = 12.0
ixc = 10
boundu(10) = 1.2

* dr_tf_inboard [m]
ixc = 13
boundl(13) = 0.7
dr_tf_inboard = 1.2

* dr_cs [m]
ixc = 16
boundl(16) = 0.3
Expand Down
5 changes: 0 additions & 5 deletions tests/unit/data/large_tokamak_IN.DAT
Original file line number Diff line number Diff line change
Expand Up @@ -216,11 +216,6 @@ te = 12.0
ixc = 10
boundu(10) = 1.2

* dr_tf_inboard [m]
ixc = 13
boundl(13) = 0.7
dr_tf_inboard = 1.2

* dr_cs [m]
ixc = 16
boundl(16) = 0.3
Expand Down
Loading