Skip to content

Commit a09747f

Browse files
committed
make optimum solutions comparison notebook, add necessary 2nd mfile, update the examples LT in.dat to match the one in integration tests
1 parent d962004 commit a09747f

6 files changed

Lines changed: 38748 additions & 161 deletions

examples/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@
66
*.csv
77
*.png
88
data/README.txt
9+
!large_tokamak_varied_min_net_electric_MFILE.DAT
10+
!large_tokamak_MFILE.DAT

examples/data/large_tokamak_IN.DAT

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ icc = 15
5858
* Net electric power lower limit *
5959
*--------------------------------*
6060
icc = 16
61-
* Minimum allowable value for net eletric power [MW]
61+
* Minimum allowable value for net electric power [MW]
6262
p_plant_electric_net_required_mw = 400.0
6363

6464
* Beta upper limit *
@@ -74,15 +74,18 @@ b_tf_inboard_max = 14.0
7474
* Central solenoid EOF current density upper limit *
7575
*--------------------------------------------------*
7676
icc = 26
77+
fjohc = 0.7
7778

7879
* Central solenoid BOP current density upper limit *
7980
*--------------------------------------------------*
8081
icc = 27
8182
f_j_cs_start_pulse_end_flat_top = 1.0
83+
fjohc = 0.7
8284

8385
* I_op/I_Crit TF coil limit *
8486
*---------------------------*
8587
icc = 33
88+
fiooic = 0.70 * margin for TF coil operating current / critical current ratio
8689

8790
* Dump voltage upper limit *
8891
*--------------------------*
@@ -142,6 +145,7 @@ sig_tf_wp_max = 7.5E8 * Allowable maximum shear stress in TF coil conduit (Tr
142145
*---------------------*
143146
icc = 5
144147
ixc = 6 * nd_plasma_electrons_vol_avg [m-3]
148+
fdene = 1.2 * density limit constraint scale (constraint equation 5)
145149
nd_plasma_electrons_vol_avg = 7.5E19
146150

147151
* Neutron wall load upper limit *
@@ -273,7 +277,7 @@ dz_vv_upper = 0.3
273277
* Underside vacuum vessel radial thickness [m]
274278
dz_vv_lower = 0.3
275279

276-
* Inboard shield thickness [m]
280+
* Inboard radiation shield radial thickness [m]
277281
dr_shld_inboard = 0.3
278282

279283
* Gap between vacuum vessel and blanket [m]

0 commit comments

Comments
 (0)