diff --git a/documentation/proc-pages/eng-models/machine-build.md b/documentation/proc-pages/eng-models/machine-build.md index c93a35e9fe..0be1534cdc 100644 --- a/documentation/proc-pages/eng-models/machine-build.md +++ b/documentation/proc-pages/eng-models/machine-build.md @@ -66,19 +66,19 @@ case the machine is not symmetric about the midplane. TF coil 1.576 9.862 (dr_tf_inboard) Gap 0.050 8.286 (dr_tf_shld_gap) Thermal shield 0.050 8.236 (thshield) - Gap 0.050 8.186 (vgap_vv_thermalshield) - Vacuum vessel (and shielding) 0.600 8.136 (d_vv_top+shldtth) + Gap 0.050 8.186 (dz_shld_vv_gap) + Vacuum vessel (and shielding) 0.600 8.136 (dz_vv_upper+dz_shld_upper) Gap 0.020 7.536 (dr_shld_blkt_gap) - Top blanket 0.869 7.516 (blnktth) - Top first wall 0.018 6.647 (fwtth) - Top scrape-off 0.600 6.629 (vgaptop) - Plasma top 6.029 6.029 (rminor*kappa) + Top blanket 0.869 7.516 (dz_blkt_upper) + Top first wall 0.018 6.647 (dz_fw_upper) + Top scrape-off 0.600 6.629 (dz_fw_plasma_gap) + Plasma top 6.029 6.029 (z_plasma_xpoint_upper) Midplane 0.000 -0.000 - Plasma bottom 6.029 -6.029 (rminor*kappa) + Plasma bottom 6.029 -6.029 (z_plasma_xpoint_upper) Lower scrape-off 2.002 -8.031 (vgap) - Divertor structure 0.621 -8.652 (divfix) - Vacuum vessel (and shielding) 1.000 -9.652 (d_vv_bot+shldlth) - Gap 0.050 -9.702 (vgap_vv_thermalshield) + Divertor structure 0.621 -8.652 (dz_divertor) + Vacuum vessel (and shielding) 1.000 -9.652 (dz_vv_lower+dz_shld_lower) + Gap 0.050 -9.702 (dz_shld_vv_gap) Thermal shield 0.050 -9.752 (thshield) Gap 0.050 -9.802 (dr_tf_shld_gap) TF coil 1.576 -11.379 (dr_tf_inboard) @@ -99,4 +99,4 @@ these two possibilities is set using input parameter `fwbsshape`, which should b !!! Info "TF coil placement" The radial build can vary from the figures above dependant on the placement of the inboard TF - coil leg when using the `tf_in_cs` switch. See [TF coil page](tf-coil.md)** + coil leg when using the `i_tf_inside_cs` switch. See [TF coil page](tf-coil.md)** diff --git a/documentation/proc-pages/eng-models/tf-coil.md b/documentation/proc-pages/eng-models/tf-coil.md index 6cc9b659e3..59b29d22e5 100644 --- a/documentation/proc-pages/eng-models/tf-coil.md +++ b/documentation/proc-pages/eng-models/tf-coil.md @@ -6,8 +6,8 @@ The engineering models are based on a topology like that used in ITER: the centr However, an option does exist wich permits the alternative topology, in which the inboard legs of the TF coils pass through the middle of the central solenoid. This layout is used in MAST, where the copper TF coils can be dismantled to allow the central solenoid to be inserted or removed. The topology is set as follows: -- `tf_in_cs = 0` (default) ITER-like topology: the central solenoid and the TF coils are not linked. -- `tf_in_cs = 1` The inboard legs of the TF coils pass through the middle of the central solenoid. Note that this model does not provide a physically self-consistent result for superconducting coils. +- `i_tf_inside_cs = 0` (default) ITER-like topology: the central solenoid and the TF coils are not linked. +- `i_tf_inside_cs = 1` The inboard legs of the TF coils pass through the middle of the central solenoid. Note that this model does not provide a physically self-consistent result for superconducting coils. ## Coil type Two major types of toroidal field (TF) coils can be considered in PROCESS: Resistive magnets or Superconducting magnets. The choice of conductor type is made using the following integer switch: @@ -1255,7 +1255,7 @@ Another subroutine, `tfspcall` is called outside `stfcoil` to estimate to check | Parameter | description | Iteration variable | Default | Unit | | - | - | - | - | - | -| `tf_in_cs` | TF coil inboard leg radial placement switch.
- 0 : Outside of central solenoid
- 1 : Inside of central solenoid | - | 0 | - | +| `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` is used as iteration variable | ixc = 13 | No default | m | | `tfootfi` | Outboard/inboard TF coil thickness ratio | - | 1 | - | | `dr_tf_wp` | 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 | diff --git a/documentation/proc-pages/fusion-devices/stellarator.md b/documentation/proc-pages/fusion-devices/stellarator.md index b2bc51e616..83db25bd7d 100644 --- a/documentation/proc-pages/fusion-devices/stellarator.md +++ b/documentation/proc-pages/fusion-devices/stellarator.md @@ -285,7 +285,7 @@ dr_fw_plasma_gap_inboard = 0.15 *Gap between plasma and first wall; inboard side dr_fw_plasma_gap_outboard = 0.2 *Gap between plasma and first wall; outboard side (m) dr_shld_inboard = 0.2 *Inboard shield thickness (m) dr_shld_outboard = 0.2 *Outboard shield thickness (m) -shldtth = 0.2 *Upper/lower shield thickness (m) +dz_shld_upper = 0.2 *Upper/lower shield thickness (m) vgap = 0. *Vertical gap between x-point and divertor (m) ``` diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 02e170d3c5..f66ca04139 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -566,8 +566,8 @@ Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8441E+03 OP kallenbach_switch_______________________________________________________ (kallenbach_switch)___________ 0 # Radial Build # - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 2.0588E+00 ITV CS_radial_thickness_(m)_________________________________________________ (dr_cs)_______________________ 5.5551E-01 ITV CS_precompression_(m)___________________________________________________ (dr_cs_precomp)_____________________ 6.6224E-02 @@ -594,16 +594,16 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 - Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 + Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -1487,7 +1487,7 @@ dr_tf_wp = 0.5 * Thermal shield radial thickness [m] dr_shld_thermal_inboard = 0.050 dr_shld_thermal_outboard = 0.050 -thshield_vb = 0.050 +dz_shld_thermal = 0.050 * Gap between thermal shield and vacuum vessel [m] dr_shld_vv_gap_inboard = 0.02 @@ -1499,10 +1499,10 @@ dr_vv_inboard = 0.3 dr_vv_outboard = 0.3 * Topside vacuum vessel radial thickness [m] -d_vv_top = 0.3 +dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] -d_vv_bot = 0.3 +dz_vv_lower = 0.3 * Inboard vacuum vessel thickness [m] dr_shld_inboard = 0.3 @@ -1529,7 +1529,7 @@ dr_cryostat = 0.15 dr_shld_outboard = 0.800 * Divertor structure vertical thickness [m] -divfix = 0.62 +dz_divertor = 0.62 * Coolant void fraction in shield vfshld = 0.60 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 10e487f9b1..d9d5b0d50c 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -563,8 +563,8 @@ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8463E+03 OP # Radial Build # - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 1.9854E+00 ITV CS_radial_thickness_(m)_________________________________________________ (dr_cs)_______________________ 5.7587E-01 ITV CS_precompression_(m)___________________________________________________ (dr_cs_precomp)_____________________ 6.8064E-02 @@ -591,16 +591,16 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 - Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 + Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -1481,7 +1481,7 @@ dr_tf_wp = 0.5 * Thermal shield radial thickness [m] dr_shld_thermal_inboard = 0.050 dr_shld_thermal_outboard = 0.050 -thshield_vb = 0.050 +dz_shld_thermal = 0.050 * Gap between thermal shield and vacuum vessel [m] dr_shld_vv_gap_inboard = 0.02 @@ -1493,10 +1493,10 @@ dr_vv_inboard = 0.3 dr_vv_outboard = 0.3 * Topside vacuum vessel radial thickness [m] -d_vv_top = 0.3 +dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] -d_vv_bot = 0.3 +dz_vv_lower = 0.3 * Inboard vacuum vessel thickness [m] dr_shld_inboard = 0.3 @@ -1523,7 +1523,7 @@ dr_cryostat = 0.15 dr_shld_outboard = 0.800 * Divertor structure vertical thickness [m] -divfix = 0.62 +dz_divertor = 0.62 * Coolant void fraction in shield vfshld = 0.60 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 847e86c95c..8981febd92 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -563,8 +563,8 @@ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8463E+03 OP # Radial Build # - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 1.9854E+00 ITV CS_radial_thickness_(m)_________________________________________________ (dr_cs)_______________________ 5.7587E-01 ITV CS_precompression_(m)___________________________________________________ (dr_cs_precomp)_____________________ 6.8064E-02 @@ -591,16 +591,16 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 - Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 + Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -1481,7 +1481,7 @@ dr_tf_wp = 0.5 * Thermal shield radial thickness [m] dr_shld_thermal_inboard = 0.050 dr_shld_thermal_outboard = 0.050 -thshield_vb = 0.050 +dz_shld_thermal = 0.050 * Gap between thermal shield and vacuum vessel [m] dr_shld_vv_gap_inboard = 0.02 @@ -1493,10 +1493,10 @@ dr_vv_inboard = 0.3 dr_vv_outboard = 0.3 * Topside vacuum vessel radial thickness [m] -d_vv_top = 0.3 +dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] -d_vv_bot = 0.3 +dz_vv_lower = 0.3 * Inboard vacuum vessel thickness [m] dr_shld_inboard = 0.3 @@ -1523,7 +1523,7 @@ dr_cryostat = 0.15 dr_shld_outboard = 0.800 * Divertor structure vertical thickness [m] -divfix = 0.62 +dz_divertor = 0.62 * Coolant void fraction in shield vfshld = 0.60 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 396c1613e0..38d21b4817 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -563,8 +563,8 @@ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8463E+03 OP # Radial Build # - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 1.9854E+00 ITV CS_radial_thickness_(m)_________________________________________________ (dr_cs)_______________________ 5.7587E-01 ITV CS_precompression_(m)___________________________________________________ (dr_cs_precomp)_____________________ 6.8064E-02 @@ -591,16 +591,16 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 - Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 + Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -1481,7 +1481,7 @@ dr_tf_wp = 0.5 * Thermal shield radial thickness [m] dr_shld_thermal_inboard = 0.050 dr_shld_thermal_outboard = 0.050 -thshield_vb = 0.050 +dz_shld_thermal = 0.050 * Gap between thermal shield and vacuum vessel [m] dr_shld_vv_gap_inboard = 0.02 @@ -1493,10 +1493,10 @@ dr_vv_inboard = 0.3 dr_vv_outboard = 0.3 * Topside vacuum vessel radial thickness [m] -d_vv_top = 0.3 +dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] -d_vv_bot = 0.3 +dz_vv_lower = 0.3 * Inboard vacuum vessel thickness [m] dr_shld_inboard = 0.3 @@ -1523,7 +1523,7 @@ dr_cryostat = 0.15 dr_shld_outboard = 0.800 * Divertor structure vertical thickness [m] -divfix = 0.62 +dz_divertor = 0.62 * Coolant void fraction in shield vfshld = 0.60 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index a6bdf2d151..c5c662c1ff 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -563,8 +563,8 @@ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8463E+03 OP # Radial Build # - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 1.9854E+00 ITV CS_radial_thickness_(m)_________________________________________________ (dr_cs)_______________________ 5.7587E-01 ITV CS_precompression_(m)___________________________________________________ (dr_cs_precomp)_____________________ 6.8064E-02 @@ -591,16 +591,16 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 - Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 + Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -1481,7 +1481,7 @@ dr_tf_wp = 0.5 * Thermal shield radial thickness [m] dr_shld_thermal_inboard = 0.050 dr_shld_thermal_outboard = 0.050 -thshield_vb = 0.050 +dz_shld_thermal = 0.050 * Gap between thermal shield and vacuum vessel [m] dr_shld_vv_gap_inboard = 0.02 @@ -1493,10 +1493,10 @@ dr_vv_inboardnboard = 0.3 dr_vv_outboard = 0.3 * Topside vacuum vessel radial thickness [m] -d_vv_top = 0.3 +dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] -d_vv_bot = 0.3 +dz_vv_lower = 0.3 * Inboard vacuum vessel thickness [m] dr_shld_inboard = 0.3 @@ -1523,7 +1523,7 @@ dr_cryostat = 0.15 dr_shld_outboard = 0.800 * Divertor structure vertical thickness [m] -divfix = 0.62 +dz_divertor = 0.62 * Coolant void fraction in shield vfshld = 0.60 diff --git a/examples/data/large_tokamak_IN.DAT b/examples/data/large_tokamak_IN.DAT index 95029ac392..4fb4347585 100644 --- a/examples/data/large_tokamak_IN.DAT +++ b/examples/data/large_tokamak_IN.DAT @@ -291,7 +291,7 @@ dr_tf_wp = 0.5 * Thermal shield radial thickness [m] dr_shld_thermal_inboard = 0.050 dr_shld_thermal_outboard = 0.050 -thshield_vb = 0.050 +dz_shld_thermal = 0.050 * Gap between thermal shield and vacuum vessel [m] dr_shld_vv_gap_inboard = 0.02 @@ -303,10 +303,10 @@ dr_vv_inboard = 0.3 dr_vv_outboard = 0.3 * Topside vacuum vessel radial thickness [m] -d_vv_top = 0.3 +dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] -d_vv_bot = 0.3 +dz_vv_lower = 0.3 * Inboard radiation shield radial thickness [m] dr_shld_inboard = 0.3 @@ -333,7 +333,7 @@ dr_cryostat = 0.15 dr_shld_outboard = 0.800 * Divertor structure vertical thickness [m] -divfix = 0.62 +dz_divertor = 0.62 * Coolant void fraction in shield vfshld = 0.60 diff --git a/examples/data/mfile_to_csv_vars.json b/examples/data/mfile_to_csv_vars.json index 1e089ba71c..01c82202d4 100644 --- a/examples/data/mfile_to_csv_vars.json +++ b/examples/data/mfile_to_csv_vars.json @@ -17,7 +17,7 @@ "dr_tf_wp", "dr_cryostat", "dr_shld_outboard", - "divfix", + "dz_divertor", "rmajor" ] } diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 916cf5431a..7dad954a41 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -444,16 +444,16 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.6850E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -1439,16 +1439,16 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.6850E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -2434,16 +2434,16 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.6850E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -3429,16 +3429,16 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.6850E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -4424,16 +4424,16 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.6850E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -5419,16 +5419,16 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.6850E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -6414,16 +6414,16 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.6850E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -7409,16 +7409,16 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.6850E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -8404,16 +8404,16 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.6850E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -9084,8 +9084,8 @@ dr_bore = 2.483 * Central solenoid inboard radius (m) dr_cryostat = 0.15 * Cryostat thickness (m) dr_vv_inboard = 0.30 * Inboard vacuum vessel thickness (tf coil / shield) (m) dr_vv_outboard = 0.30 * Outboard vacuum vessel thickness (tf coil / shield) (m) -d_vv_top = 0.30 * Topside vacuum vessel thickness (tf coil / shield) (m) -d_vv_bot = 0.30 * Underside vacuum vessel thickness (tf coil / shield) (m) +dz_vv_upper = 0.30 * Topside vacuum vessel thickness (tf coil / shield) (m) +dz_vv_lower = 0.30 * Underside vacuum vessel thickness (tf coil / shield) (m) dr_shld_vv_gap_inboard = 0.12 * Gap between inboard vacuum vessel and tf coil (m) dr_cs_tf_gap = 0.05 * Gap between central solenoid and tf coil (m) gapomin = 0.20 * Minimum gap between outboard vacuum vessel and tf coil (m) @@ -9095,7 +9095,7 @@ dr_fw_plasma_gap_inboard = 0.225 * Gap between plasma and first wall; inboard s dr_fw_plasma_gap_outboard = 0.225 * Gap between plasma and first wall; outboard side (m) dr_shld_inboard = 0.30 * Inboard shield thickness (m) dr_shld_outboard = 0.80 * Outboard shield thickness (m) -shldtth = 0.30 * Upper/lower shield thickness (m); +dz_shld_upper = 0.30 * Upper/lower shield thickness (m); dr_tf_inboard = 1.05 * Inboard tf coil thickness; (centrepost for st) (m) dr_tf_shld_gap = 0.05 * manufacturing/thermal expansion gap between TF and thermal shield (m) vgap2 = 0.05 * Vertical gap between vacuum vessel and tf coil (m) @@ -9154,7 +9154,7 @@ pheat = 50.0 *----------------Divertor Variables----------------* divdum = 1 * Switch for divertor zeff model; 0=calc; 1=input -divfix = 0.621 * Divertor structure vertical thickness (m) +dz_divertor = 0.621 * Divertor structure vertical thickness (m) hldivlim = 10 * Heat load limit (mw/m2) ksic = 1.4 * Power fraction for outboard double-null scrape-off plasma prn1 = 0.4 * N-scrape-off / n-average plasma; diff --git a/examples/data/scan_example_file_IN.DAT b/examples/data/scan_example_file_IN.DAT index cf10665c88..87fe4c212c 100644 --- a/examples/data/scan_example_file_IN.DAT +++ b/examples/data/scan_example_file_IN.DAT @@ -291,7 +291,7 @@ dr_tf_wp = 0.5 * Thermal shield radial thickness [m] dr_shld_thermal_inboard = 0.050 dr_shld_thermal_outboard = 0.050 -thshield_vb = 0.050 +dz_shld_thermal = 0.050 * Gap between thermal shield and vacuum vessel [m] dr_shld_vv_gap_inboard = 0.02 @@ -303,10 +303,10 @@ dr_vv_inboard = 0.3 dr_vv_outboard = 0.3 * Topside vacuum vessel radial thickness [m] -d_vv_top = 0.3 +dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] -d_vv_bot = 0.3 +dz_vv_lower = 0.3 * Inboard vacuum vessel thickness [m] dr_shld_inboard = 0.3 @@ -333,7 +333,7 @@ dr_cryostat = 0.15 dr_shld_outboard = 0.800 * Divertor structure vertical thickness [m] -divfix = 0.62 +dz_divertor = 0.62 * Coolant void fraction in shield vfshld = 0.60 diff --git a/process/blanket_library.py b/process/blanket_library.py index d9479e2606..68f7f1de3c 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -96,24 +96,24 @@ def component_half_height(self, icomponent: int): # Blanket if icomponent == 0: hbot = ( - physics_variables.rminor * physics_variables.kappa - + build_variables.vgap_xpoint_divertor - + divertor_variables.divfix - - build_variables.blnktth + build_variables.z_plasma_xpoint_lower + + build_variables.dz_xpoint_divertor + + divertor_variables.dz_divertor + - build_variables.dz_blkt_upper ) # Sheild elif icomponent == 1: hbot = ( - physics_variables.rminor * physics_variables.kappa - + build_variables.vgap_xpoint_divertor - + divertor_variables.divfix + build_variables.z_plasma_xpoint_lower + + build_variables.dz_xpoint_divertor + + divertor_variables.dz_divertor ) # Vacuum vessel elif icomponent == 2: hbot = ( build_variables.hmax - - build_variables.vgap_vv_thermalshield - - build_variables.d_vv_bot + - build_variables.dz_shld_vv_gap + - build_variables.dz_vv_lower ) else: raise ValueError(f"{icomponent=} is invalid, it must be either 0,1,2") @@ -124,7 +124,7 @@ def component_half_height(self, icomponent: int): htop = hbot else: # Blanket - htop = physics_variables.rminor * physics_variables.kappa + 0.5 * ( + htop = build_variables.z_plasma_xpoint_upper + 0.5 * ( build_variables.dr_fw_plasma_gap_inboard + build_variables.dr_fw_plasma_gap_outboard + build_variables.dr_fw_inboard @@ -132,10 +132,12 @@ def component_half_height(self, icomponent: int): ) # Shield if icomponent == 1: - htop = htop + build_variables.blnktth + htop = htop + build_variables.dz_blkt_upper # Vacuum Vessel if icomponent == 2: - htop = htop + build_variables.blnktth + build_variables.shldtth + htop = ( + htop + build_variables.dz_blkt_upper + build_variables.dz_shld_upper + ) # Average of top and bottom (m) return 0.5 * (htop + hbot) @@ -199,7 +201,7 @@ def dshaped_component(self, icomponent: int): blanket_library.hblnkt, build_variables.dr_blkt_inboard, build_variables.dr_blkt_outboard, - build_variables.blnktth, + build_variables.dz_blkt_upper, ) elif icomponent == 1: ( @@ -212,7 +214,7 @@ def dshaped_component(self, icomponent: int): blanket_library.hshld, build_variables.dr_shld_inboard, build_variables.dr_shld_outboard, - build_variables.shldtth, + build_variables.dz_shld_upper, ) elif icomponent == 2: ( @@ -225,7 +227,7 @@ def dshaped_component(self, icomponent: int): blanket_library.hvv, build_variables.dr_vv_inboard, build_variables.dr_vv_outboard, - (build_variables.d_vv_top + build_variables.d_vv_bot) / 2, + (build_variables.dz_vv_upper + build_variables.dz_vv_lower) / 2, ) def elliptical_component(self, icomponent: int): @@ -290,7 +292,7 @@ def elliptical_component(self, icomponent: int): blanket_library.hblnkt, build_variables.dr_blkt_inboard, build_variables.dr_blkt_outboard, - build_variables.blnktth, + build_variables.dz_blkt_upper, ) if icomponent == 1: ( @@ -304,7 +306,7 @@ def elliptical_component(self, icomponent: int): blanket_library.hshld, build_variables.dr_shld_inboard, build_variables.dr_shld_outboard, - build_variables.shldtth, + build_variables.dz_shld_upper, ) if icomponent == 2: ( @@ -318,7 +320,7 @@ def elliptical_component(self, icomponent: int): blanket_library.hvv, build_variables.dr_vv_inboard, build_variables.dr_vv_outboard, - (build_variables.d_vv_top + build_variables.d_vv_bot) / 2, + (build_variables.dz_vv_upper + build_variables.dz_vv_lower) / 2, ) def apply_coverage_factors(self): diff --git a/process/build.py b/process/build.py index ac633ae4b3..a82e7e58ff 100644 --- a/process/build.py +++ b/process/build.py @@ -104,18 +104,25 @@ def portsz(self): def calculate_vertical_build(self, output: bool) -> None: """ - This method determines the vertical build of the machine. - It calculates various parameters related to the build of the machine, - such as thicknesses, radii, and areas. - Results can be outputted with the `output` flag. + Determines the vertical build of the machine. - Args: - output (bool): Flag indicating whether to output results - - Returns: - None + This method calculates various parameters related to the vertical build of the machine, + such as thicknesses, radii, and areas. Results can be outputted with the `output` flag. + :param output: Flag indicating whether to output results + :type output: bool + :returns: None """ + + # Set the X-point heights for the top and bottom of the plasma + # Assumes top-down plasma symmetry + build_variables.z_plasma_xpoint_upper = ( + physics_variables.rminor * physics_variables.kappa + ) + build_variables.z_plasma_xpoint_lower = ( + physics_variables.rminor * physics_variables.kappa + ) + if output: po.oheadr(self.outfile, "Vertical Build") @@ -135,13 +142,13 @@ def calculate_vertical_build(self, output: bool) -> None: buildings_variables.dz_tf_cryostat + build_variables.dr_tf_inboard + build_variables.dr_tf_shld_gap - + build_variables.thshield_vb - + build_variables.vgap_vv_thermalshield - + build_variables.d_vv_top - + build_variables.shldtth - + divertor_variables.divfix - + build_variables.vgaptop - + physics_variables.rminor * physics_variables.kappa + + build_variables.dz_shld_thermal + + build_variables.dz_shld_vv_gap + + build_variables.dz_vv_upper + + build_variables.dz_shld_upper + + divertor_variables.dz_divertor + + build_variables.dz_fw_plasma_gap + + build_variables.z_plasma_xpoint_upper ) # To calculate vertical offset between TF coil centre and plasma centre @@ -186,180 +193,182 @@ def calculate_vertical_build(self, output: bool) -> None: po.obuild( self.outfile, "Thermal shield, vertical", - build_variables.thshield_vb, + build_variables.dz_shld_thermal, vbuild, - "(thshield_vb)", + "(dz_shld_thermal)", ) po.ovarre( self.mfile, "Thermal shield, vertical (m)", - "(thshield_vb)", - build_variables.thshield_vb, + "(dz_shld_thermal)", + build_variables.dz_shld_thermal, ) - vbuild = vbuild - build_variables.thshield_vb + vbuild = vbuild - build_variables.dz_shld_thermal po.obuild( self.outfile, "Gap", - build_variables.vgap_vv_thermalshield, + build_variables.dz_shld_vv_gap, vbuild, - "(vgap_vv_thermalshield)", + "(dz_shld_vv_gap)", ) po.ovarre( self.mfile, "Vessel - TF coil vertical gap (m)", - "(vgap_vv_thermalshield)", - build_variables.vgap_vv_thermalshield, + "(dz_shld_vv_gap)", + build_variables.dz_shld_vv_gap, ) - vbuild = vbuild - build_variables.vgap_vv_thermalshield + vbuild = vbuild - build_variables.dz_shld_vv_gap po.obuild( self.outfile, "Vacuum vessel (and shielding)", - build_variables.d_vv_top + build_variables.shldtth, + build_variables.dz_vv_upper + build_variables.dz_shld_upper, vbuild, - "(d_vv_top+shldtth)", + "(dz_vv_upper+dz_shld_upper)", + ) + vbuild = ( + vbuild - build_variables.dz_vv_upper - build_variables.dz_shld_upper ) - vbuild = vbuild - build_variables.d_vv_top - build_variables.shldtth po.ovarre( self.mfile, "Topside vacuum vessel radial thickness (m)", - "(d_vv_top)", - build_variables.d_vv_top, + "(dz_vv_upper)", + build_variables.dz_vv_upper, ) po.ovarre( self.mfile, "Top radiation shield thickness (m)", - "(shldtth)", - build_variables.shldtth, + "(dz_shld_upper)", + build_variables.dz_shld_upper, ) po.obuild( self.outfile, "Divertor structure", - divertor_variables.divfix, + divertor_variables.dz_divertor, vbuild, - "(divfix)", + "(dz_divertor)", ) po.ovarre( self.mfile, "Divertor structure vertical thickness (m)", - "(divfix)", - divertor_variables.divfix, + "(dz_divertor)", + divertor_variables.dz_divertor, ) - vbuild = vbuild - divertor_variables.divfix + vbuild = vbuild - divertor_variables.dz_divertor po.obuild( self.outfile, "Top scrape-off", - build_variables.vgaptop, + build_variables.dz_fw_plasma_gap, vbuild, - "(vgaptop)", + "(dz_fw_plasma_gap)", ) po.ovarre( self.mfile, "Top scrape-off vertical thickness (m)", - "(vgaptop)", - build_variables.vgaptop, + "(dz_fw_plasma_gap)", + build_variables.dz_fw_plasma_gap, ) - vbuild = vbuild - build_variables.vgaptop + vbuild = vbuild - build_variables.dz_fw_plasma_gap po.obuild( self.outfile, - "Plasma top", - physics_variables.rminor * physics_variables.kappa, + "Plasma upper X-point height (m)", + build_variables.z_plasma_xpoint_upper, vbuild, - "(rminor*kappa)", + "(z_plasma_xpoint_upper)", ) po.ovarre( self.mfile, - "Plasma half-height (m)", - "(rminor*kappa)", - physics_variables.rminor * physics_variables.kappa, + "Plasma upper X-point height (m)", + "(z_plasma_xpoint_upper)", + build_variables.z_plasma_xpoint_upper, ) - vbuild = vbuild - physics_variables.rminor * physics_variables.kappa + vbuild = vbuild - build_variables.z_plasma_xpoint_upper po.obuild(self.outfile, "Midplane", 0.0e0, vbuild) - vbuild = vbuild - physics_variables.rminor * physics_variables.kappa + vbuild = vbuild - build_variables.z_plasma_xpoint_lower po.obuild( self.outfile, - "Plasma bottom", - physics_variables.rminor * physics_variables.kappa, + "Plasma lower X-point height (m)", + build_variables.z_plasma_xpoint_lower, vbuild, - "(rminor*kappa)", + "(z_plasma_xpoint_lower)", ) - vbuild = vbuild - build_variables.vgap_xpoint_divertor + vbuild = vbuild - build_variables.dz_xpoint_divertor po.obuild( self.outfile, "Lower scrape-off", - build_variables.vgap_xpoint_divertor, + build_variables.dz_xpoint_divertor, vbuild, - "(vgap_xpoint_divertor)", + "(dz_xpoint_divertor)", ) po.ovarre( self.mfile, "Bottom scrape-off vertical thickness (m)", - "(vgap_xpoint_divertor)", - build_variables.vgap_xpoint_divertor, + "(dz_xpoint_divertor)", + build_variables.dz_xpoint_divertor, ) - vbuild = vbuild - divertor_variables.divfix + vbuild = vbuild - divertor_variables.dz_divertor po.obuild( self.outfile, "Divertor structure", - divertor_variables.divfix, + divertor_variables.dz_divertor, vbuild, - "(divfix)", + "(dz_divertor)", ) po.ovarre( self.mfile, "Divertor structure vertical thickness (m)", - "(divfix)", - divertor_variables.divfix, + "(dz_divertor)", + divertor_variables.dz_divertor, ) - vbuild = vbuild - build_variables.shldlth + vbuild = vbuild - build_variables.dz_shld_lower - vbuild = vbuild - build_variables.d_vv_bot + vbuild = vbuild - build_variables.dz_vv_lower po.obuild( self.outfile, "Vacuum vessel (and shielding)", - build_variables.d_vv_bot + build_variables.shldlth, + build_variables.dz_vv_lower + build_variables.dz_shld_lower, vbuild, - "(d_vv_bot+shldlth)", + "(dz_vv_lower+dz_shld_lower)", ) po.ovarre( self.mfile, "Bottom radiation shield thickness (m)", - "(shldlth)", - build_variables.shldlth, + "(dz_shld_lower)", + build_variables.dz_shld_lower, ) po.ovarre( self.mfile, "Underside vacuum vessel radial thickness (m)", - "(d_vv_bot)", - build_variables.d_vv_bot, + "(dz_vv_lower)", + build_variables.dz_vv_lower, ) - vbuild = vbuild - build_variables.vgap_vv_thermalshield + vbuild = vbuild - build_variables.dz_shld_vv_gap po.obuild( self.outfile, "Gap", - build_variables.vgap_vv_thermalshield, + build_variables.dz_shld_vv_gap, vbuild, - "(vgap_vv_thermalshield)", + "(dz_shld_vv_gap)", ) - vbuild = vbuild - build_variables.thshield_vb + vbuild = vbuild - build_variables.dz_shld_thermal po.obuild( self.outfile, "Thermal shield, vertical", - build_variables.thshield_vb, + build_variables.dz_shld_thermal, vbuild, - "(thshield_vb)", + "(dz_shld_thermal)", ) vbuild = vbuild - build_variables.dr_tf_shld_gap @@ -408,16 +417,17 @@ def calculate_vertical_build(self, output: bool) -> None: buildings_variables.dz_tf_cryostat + build_variables.dr_tf_inboard + build_variables.dr_tf_shld_gap - + build_variables.thshield_vb - + build_variables.vgap_vv_thermalshield - + 0.5e0 * (build_variables.d_vv_top + build_variables.d_vv_bot) + + build_variables.dz_shld_thermal + + build_variables.dz_shld_vv_gap + + 0.5e0 + * (build_variables.dz_vv_upper + build_variables.dz_vv_lower) + build_variables.dr_shld_blkt_gap - + build_variables.shldtth - + build_variables.blnktth + + build_variables.dz_shld_upper + + build_variables.dz_blkt_upper + 0.5e0 * (build_variables.dr_fw_inboard + build_variables.dr_fw_outboard) - + build_variables.vgaptop - + physics_variables.rminor * physics_variables.kappa + + build_variables.dz_fw_plasma_gap + + build_variables.z_plasma_xpoint_upper ) # To calculate vertical offset between TF coil centre and plasma centre @@ -462,52 +472,54 @@ def calculate_vertical_build(self, output: bool) -> None: po.obuild( self.outfile, "Thermal shield, vertical", - build_variables.thshield_vb, + build_variables.dz_shld_thermal, vbuild, - "(thshield_vb)", + "(dz_shld_thermal)", ) po.ovarre( self.mfile, "Thermal shield, vertical (m)", - "(thshield_vb)", - build_variables.thshield_vb, + "(dz_shld_thermal)", + build_variables.dz_shld_thermal, ) - vbuild = vbuild - build_variables.thshield_vb + vbuild = vbuild - build_variables.dz_shld_thermal po.obuild( self.outfile, "Gap", - build_variables.vgap_vv_thermalshield, + build_variables.dz_shld_vv_gap, vbuild, - "(vgap_vv_thermalshield)", + "(dz_shld_vv_gap)", ) po.ovarre( self.mfile, "Vessel - TF coil vertical gap (m)", - "(vgap_vv_thermalshield)", - build_variables.vgap_vv_thermalshield, + "(dz_shld_vv_gap)", + build_variables.dz_shld_vv_gap, ) - vbuild = vbuild - build_variables.vgap_vv_thermalshield + vbuild = vbuild - build_variables.dz_shld_vv_gap po.obuild( self.outfile, "Vacuum vessel (and shielding)", - build_variables.d_vv_top + build_variables.shldtth, + build_variables.dz_vv_upper + build_variables.dz_shld_upper, vbuild, - "(d_vv_top+shldtth)", + "(dz_vv_upper+dz_shld_upper)", + ) + vbuild = ( + vbuild - build_variables.dz_vv_upper - build_variables.dz_shld_upper ) - vbuild = vbuild - build_variables.d_vv_top - build_variables.shldtth po.ovarre( self.mfile, "Topside vacuum vessel radial thickness (m)", - "(d_vv_top)", - build_variables.d_vv_top, + "(dz_vv_upper)", + build_variables.dz_vv_upper, ) po.ovarre( self.mfile, "Top radiation shield thickness (m)", - "(shldtth)", - build_variables.shldtth, + "(dz_shld_upper)", + build_variables.dz_shld_upper, ) po.obuild( @@ -522,140 +534,142 @@ def calculate_vertical_build(self, output: bool) -> None: po.obuild( self.outfile, "Top blanket", - build_variables.blnktth, + build_variables.dz_blkt_upper, vbuild, - "(blnktth)", + "(dz_blkt_upper)", ) po.ovarre( self.mfile, "Top blanket vertical thickness (m)", - "(blnktth)", - build_variables.blnktth, + "(dz_blkt_upper)", + build_variables.dz_blkt_upper, ) - vbuild = vbuild - build_variables.blnktth + vbuild = vbuild - build_variables.dz_blkt_upper - fwtth = 0.5e0 * ( + dz_fw_upper = 0.5e0 * ( build_variables.dr_fw_inboard + build_variables.dr_fw_outboard ) - po.obuild(self.outfile, "Top first wall", fwtth, vbuild, "(fwtth)") + po.obuild( + self.outfile, "Top first wall", dz_fw_upper, vbuild, "(dz_fw_upper)" + ) po.ovarre( self.mfile, "Top first wall vertical thickness (m)", - "(fwtth)", - fwtth, + "(dz_fw_upper)", + dz_fw_upper, ) - vbuild = vbuild - fwtth + vbuild = vbuild - dz_fw_upper po.obuild( self.outfile, "Top scrape-off", - build_variables.vgaptop, + build_variables.dz_fw_plasma_gap, vbuild, - "(vgaptop)", + "(dz_fw_plasma_gap)", ) po.ovarre( self.mfile, "Top scrape-off vertical thickness (m)", - "(vgaptop)", - build_variables.vgaptop, + "(dz_fw_plasma_gap)", + build_variables.dz_fw_plasma_gap, ) - vbuild = vbuild - build_variables.vgaptop + vbuild = vbuild - build_variables.dz_fw_plasma_gap po.obuild( self.outfile, - "Plasma top", - physics_variables.rminor * physics_variables.kappa, + "Plasma upper X-point height (m)", + build_variables.z_plasma_xpoint_upper, vbuild, - "(rminor*kappa)", + "(z_plasma_xpoint_upper)", ) po.ovarre( self.mfile, - "Plasma half-height (m)", - "(rminor*kappa)", - physics_variables.rminor * physics_variables.kappa, + "Plasma upper X-point height (m)", + "(z_plasma_xpoint_upper)", + build_variables.z_plasma_xpoint_upper, ) - vbuild = vbuild - physics_variables.rminor * physics_variables.kappa + vbuild = vbuild - build_variables.z_plasma_xpoint_upper po.obuild(self.outfile, "Midplane", 0.0e0, vbuild) - vbuild = vbuild - physics_variables.rminor * physics_variables.kappa + vbuild = vbuild - build_variables.z_plasma_xpoint_lower po.obuild( self.outfile, - "Plasma bottom", - physics_variables.rminor * physics_variables.kappa, + "Plasma lower X-point height (m)", + build_variables.z_plasma_xpoint_lower, vbuild, - "(rminor*kappa)", + "(z_plasma_xpoint_upper)", ) - vbuild = vbuild - build_variables.vgap_xpoint_divertor + vbuild = vbuild - build_variables.dz_xpoint_divertor po.obuild( self.outfile, "Lower scrape-off", - build_variables.vgap_xpoint_divertor, + build_variables.dz_xpoint_divertor, vbuild, - "(vgap_xpoint_divertor)", + "(dz_xpoint_divertor)", ) po.ovarre( self.mfile, "Bottom scrape-off vertical thickness (m)", - "(vgap_xpoint_divertor)", - build_variables.vgap_xpoint_divertor, + "(dz_xpoint_divertor)", + build_variables.dz_xpoint_divertor, ) - vbuild = vbuild - divertor_variables.divfix + vbuild = vbuild - divertor_variables.dz_divertor po.obuild( self.outfile, "Divertor structure", - divertor_variables.divfix, + divertor_variables.dz_divertor, vbuild, - "(divfix)", + "(dz_divertor)", ) po.ovarre( self.mfile, "Divertor structure vertical thickness (m)", - "(divfix)", - divertor_variables.divfix, + "(dz_divertor)", + divertor_variables.dz_divertor, ) - vbuild = vbuild - build_variables.shldlth + vbuild = vbuild - build_variables.dz_shld_lower - vbuild = vbuild - build_variables.d_vv_bot + vbuild = vbuild - build_variables.dz_vv_lower po.obuild( self.outfile, "Vacuum vessel (and shielding)", - build_variables.d_vv_bot + build_variables.shldlth, + build_variables.dz_vv_lower + build_variables.dz_shld_lower, vbuild, - "(d_vv_bot+shldlth)", + "(dz_vv_lower+dz_shld_lower)", ) po.ovarre( self.mfile, "Bottom radiation shield thickness (m)", - "(shldlth)", - build_variables.shldlth, + "(dz_shld_lower)", + build_variables.dz_shld_lower, ) po.ovarre( self.mfile, "Underside vacuum vessel radial thickness (m)", - "(d_vv_bot)", - build_variables.d_vv_bot, + "(dz_vv_lower)", + build_variables.dz_vv_lower, ) - vbuild = vbuild - build_variables.vgap_vv_thermalshield + vbuild = vbuild - build_variables.dz_shld_vv_gap po.obuild( self.outfile, "Gap", - build_variables.vgap_vv_thermalshield, + build_variables.dz_shld_vv_gap, vbuild, - "(vgap_vv_thermalshield)", + "(dz_shld_vv_gap)", ) - vbuild = vbuild - build_variables.thshield_vb + vbuild = vbuild - build_variables.dz_shld_thermal po.obuild( self.outfile, "Thermal shield, vertical", - build_variables.thshield_vb, + build_variables.dz_shld_thermal, vbuild, - "(thshield_vb)", + "(dz_shld_thermal)", ) vbuild = vbuild - build_variables.dr_tf_shld_gap @@ -717,21 +731,21 @@ def calculate_vertical_build(self, output: bool) -> None: # Output the cdivertor geometry divht = self.divgeom(output) # Issue #481 Remove build_variables.vgaptf - if build_variables.vgap_xpoint_divertor < 0.00001e0: - build_variables.vgap_xpoint_divertor = divht + if build_variables.dz_xpoint_divertor < 0.00001e0: + build_variables.dz_xpoint_divertor = divht - # If build_variables.vgap_xpoint_divertor /= 0 use the value set by the user. + # If build_variables.dz_xpoint_divertor /= 0 use the value set by the user. # Height to inside edge of TF coil. TF coils are assumed to be symmetrical. # Therefore this applies to single and double null cases. build_variables.hmax = ( - physics_variables.rminor * physics_variables.kappa - + build_variables.vgap_xpoint_divertor - + divertor_variables.divfix - + build_variables.shldlth - + build_variables.d_vv_bot - + build_variables.vgap_vv_thermalshield - + build_variables.thshield_vb + build_variables.z_plasma_xpoint_upper + + build_variables.dz_xpoint_divertor + + divertor_variables.dz_divertor + + build_variables.dz_shld_lower + + build_variables.dz_vv_lower + + build_variables.dz_shld_vv_gap + + build_variables.dz_shld_thermal + build_variables.dr_tf_shld_gap ) @@ -743,16 +757,16 @@ def calculate_vertical_build(self, output: bool) -> None: build_variables.hpfu = ( build_variables.dr_tf_inboard + build_variables.dr_tf_shld_gap - + build_variables.thshield_vb - + build_variables.vgap_vv_thermalshield - + build_variables.d_vv_top - + build_variables.shldtth + + build_variables.dz_shld_thermal + + build_variables.dz_shld_vv_gap + + build_variables.dz_vv_upper + + build_variables.dz_shld_upper + build_variables.dr_shld_blkt_gap - + build_variables.blnktth + + build_variables.dz_blkt_upper + 0.5e0 * (build_variables.dr_fw_inboard + build_variables.dr_fw_outboard) - + build_variables.vgaptop - + physics_variables.rminor * physics_variables.kappa + + build_variables.dz_fw_plasma_gap + + build_variables.z_plasma_xpoint_upper ) build_variables.hpfdif = ( build_variables.hpfu @@ -1658,24 +1672,24 @@ def calculate_radial_build(self, output: bool) -> None: + build_variables.blbmoth + build_variables.blbpoth ) - build_variables.shldtth = 0.5e0 * ( + build_variables.dz_shld_upper = 0.5e0 * ( build_variables.dr_shld_inboard + build_variables.dr_shld_outboard ) # Top/bottom blanket thickness - build_variables.blnktth = 0.5e0 * ( + build_variables.dz_blkt_upper = 0.5e0 * ( build_variables.dr_blkt_inboard + build_variables.dr_blkt_outboard ) if physics_variables.i_single_null == 1: - # Check if build_variables.vgaptop has been set too small - build_variables.vgaptop = max( + # Check if build_variables.dz_fw_plasma_gap has been set too small + build_variables.dz_fw_plasma_gap = max( 0.5e0 * ( build_variables.dr_fw_plasma_gap_inboard + build_variables.dr_fw_plasma_gap_outboard ), - build_variables.vgaptop, + build_variables.dz_fw_plasma_gap, ) # Calculate pre-compression structure thickness is build_variables.i_cs_precomp=1 @@ -1694,7 +1708,7 @@ def calculate_radial_build(self, output: bool) -> None: else: build_variables.dr_cs_precomp = 0.0e0 - if build_variables.tf_in_cs == 1: + if build_variables.i_tf_inside_cs == 1: build_variables.r_tf_inboard_in = ( build_variables.dr_bore - build_variables.dr_tf_inboard @@ -1837,7 +1851,7 @@ def calculate_radial_build(self, output: bool) -> None: ): error_handling.fdiags[0] = build_variables.r_cp_top error_handling.report_error(256) - if build_variables.tf_in_cs == 1: + if build_variables.i_tf_inside_cs == 1: # Radial position of vacuum vessel [m] build_variables.r_vv_inboard_out = ( build_variables.r_tf_inboard_out @@ -1966,18 +1980,17 @@ def calculate_radial_build(self, output: bool) -> None: # Half-height of first wall (internal surface) hbot = ( - physics_variables.rminor * physics_variables.kappa - + build_variables.vgap_xpoint_divertor - + divertor_variables.divfix - - build_variables.blnktth + build_variables.z_plasma_xpoint_lower + + build_variables.dz_xpoint_divertor + + divertor_variables.dz_divertor + - build_variables.dz_blkt_upper - 0.5e0 * (build_variables.dr_fw_inboard + build_variables.dr_fw_outboard) ) if physics_variables.idivrt == 2: # (i.e. physics_variables.i_single_null=0) htop = hbot else: htop = ( - physics_variables.rminor * physics_variables.kappa - + build_variables.vgaptop + build_variables.z_plasma_xpoint_upper + build_variables.dz_fw_plasma_gap ) hfw = 0.5e0 * (htop + hbot) @@ -2105,8 +2118,8 @@ def calculate_radial_build(self, output: bool) -> None: po.ovarin( self.outfile, "TF coil radial placement switch", - "(tf_in_cs)", - build_variables.tf_in_cs, + "(i_tf_inside_cs)", + build_variables.i_tf_inside_cs, ) po.ovarrf( self.outfile, @@ -2116,7 +2129,7 @@ def calculate_radial_build(self, output: bool) -> None: "OP ", ) - if build_variables.tf_in_cs == 1: + if build_variables.i_tf_inside_cs == 1: po.ocmmnt( self.outfile, ( @@ -2129,7 +2142,10 @@ def calculate_radial_build(self, output: bool) -> None: "the true dr_bore size used for calculations is dr_bore + dr_tf_inboard + dr_cs_tf_gap)\n" ), ) - if build_variables.tf_in_cs == 1 and tfcoil_variables.i_tf_bucking >= 2: + if ( + build_variables.i_tf_inside_cs == 1 + and tfcoil_variables.i_tf_bucking >= 2 + ): po.ocmmnt( self.outfile, "(Bore hollow space has been filled with a solid metal cyclinder to act as wedge support)\n", @@ -2141,7 +2157,10 @@ def calculate_radial_build(self, output: bool) -> None: radius = 0.0e0 radial_build_data.append(["Device centreline", None, 0.0, radius]) - if build_variables.tf_in_cs == 1 and tfcoil_variables.i_tf_bucking >= 2: + if ( + build_variables.i_tf_inside_cs == 1 + and tfcoil_variables.i_tf_bucking >= 2 + ): radius = ( radius + build_variables.dr_bore @@ -2157,7 +2176,10 @@ def calculate_radial_build(self, output: bool) -> None: - build_variables.dr_cs_tf_gap, radius, ]) - elif build_variables.tf_in_cs == 1 and tfcoil_variables.i_tf_bucking < 2: + elif ( + build_variables.i_tf_inside_cs == 1 + and tfcoil_variables.i_tf_bucking < 2 + ): radius = ( radius + build_variables.dr_bore @@ -2180,7 +2202,7 @@ def calculate_radial_build(self, output: bool) -> None: build_variables.dr_bore, radius, ]) - if build_variables.tf_in_cs == 1: + if build_variables.i_tf_inside_cs == 1: radius += build_variables.dr_tf_inboard radial_build_data.append([ "TF coil inboard leg (in dr_bore)", @@ -2212,7 +2234,7 @@ def calculate_radial_build(self, output: bool) -> None: build_variables.dr_cs_precomp, radius, ]) - if build_variables.tf_in_cs == 0: + if build_variables.i_tf_inside_cs == 0: radius = radius + build_variables.dr_cs_tf_gap radial_build_data.append([ "CS precompresion to TF coil radial gap", diff --git a/process/buildings.py b/process/buildings.py index c7f2df7cfb..3dafebe309 100644 --- a/process/buildings.py +++ b/process/buildings.py @@ -83,9 +83,9 @@ def run(self, output: bool = False): tfcoil_variables.n_tf_coils, build_variables.rsldo, build_variables.rsldi, - 2.0e0 * (build_variables.hmax - build_variables.vgap_vv_thermalshield) - - build_variables.d_vv_top - - build_variables.d_vv_bot, + 2.0e0 * (build_variables.hmax - build_variables.dz_shld_vv_gap) + - build_variables.dz_vv_upper + - build_variables.dz_vv_lower, fwbs_variables.whtshld, fwbs_variables.r_cryostat_inboard, heat_transport_variables.helpow, @@ -542,8 +542,8 @@ def bldgs_sizes(self, output, tf_radial_dim, tf_vertical_dim): - ( build_variables.dr_tf_inboard + build_variables.dr_tf_shld_gap - + build_variables.thshield_vb - + build_variables.vgap_vv_thermalshield + + build_variables.dz_shld_thermal + + build_variables.dz_shld_vv_gap ) ) hcomp_rad_thk = ( @@ -587,8 +587,8 @@ def bldgs_sizes(self, output, tf_radial_dim, tf_vertical_dim): - ( build_variables.dr_tf_inboard + build_variables.dr_tf_shld_gap - + build_variables.thshield_vb - + build_variables.vgap_vv_thermalshield + + build_variables.dz_shld_thermal + + build_variables.dz_shld_vv_gap ) ) hcomp_rad_thk = ( @@ -627,7 +627,7 @@ def bldgs_sizes(self, output, tf_radial_dim, tf_vertical_dim): # Divertor # Note: this estimation developed before the divertor design has been finalised if cost_variables.divlife != 0.0e0: - hcomp_height = divertor_variables.divfix + hcomp_height = divertor_variables.dz_divertor hcomp_rad_thk = 2 * physics_variables.rminor hcomp_tor_thk = physics_variables.rmajor + physics_variables.rminor hcomp_footprint = (hcomp_height + buildings_variables.hot_sepdist) * ( diff --git a/process/caller.py b/process/caller.py index b0fac5fac1..d7d56e6cb7 100644 --- a/process/caller.py +++ b/process/caller.py @@ -249,7 +249,7 @@ def _call_models_once(self, xc: np.ndarray) -> None: # Machine Build Model # Radial build - if ft.build_variables.tf_in_cs == 1: + if ft.build_variables.i_tf_inside_cs == 1: self.models.build.tf_in_cs_bore_calc() self.models.build.calculate_radial_build(output=False) diff --git a/process/divertor.py b/process/divertor.py index 8bb6ff47f4..02bac08915 100644 --- a/process/divertor.py +++ b/process/divertor.py @@ -39,7 +39,7 @@ def run(self, output: bool) -> None: pv.rminor, pv.triang, bv.dr_fw_plasma_gap_inboard, - bv.vgap_xpoint_divertor, + bv.dz_xpoint_divertor, pv.pdivt, output=output, ) @@ -753,7 +753,7 @@ def divtart( rminor: float, triang: float, dr_fw_plasma_gap_inboard: float, - vgap_xpoint_divertor: float, + dz_xpoint_divertor: float, pdivt: float, output: bool, ) -> float: @@ -778,8 +778,8 @@ def divtart( :param dr_fw_plasma_gap_inboard: inboard scrape-off width (m) :type dr_fw_plasma_gap_inboard: float - :param vgap_xpoint_divertor: top scrape-off width (m) - :type vgap_xpoint_divertor: float + :param dz_xpoint_divertor: top scrape-off width (m) + :type dz_xpoint_divertor: float :param pdivt: power to the divertor (MW) :type pdivt: float @@ -801,15 +801,15 @@ def divtart( # Angle of diagonal divertor plate from horizontal - if vgap_xpoint_divertor <= 0.0e0: - eh.fdiags[0] = vgap_xpoint_divertor + if dz_xpoint_divertor <= 0.0e0: + eh.fdiags[0] = dz_xpoint_divertor eh.report_error(22) - theta = math.atan(vgap_xpoint_divertor / (r2 - r1)) + theta = math.atan(dz_xpoint_divertor / (r2 - r1)) # Vertical plate area - a1 = 2.0e0 * constants.pi * r1 * vgap_xpoint_divertor + a1 = 2.0e0 * constants.pi * r1 * dz_xpoint_divertor # Horizontal plate area diff --git a/process/geometry/blanket_geometry.py b/process/geometry/blanket_geometry.py index 4f58536331..f87d146163 100644 --- a/process/geometry/blanket_geometry.py +++ b/process/geometry/blanket_geometry.py @@ -16,7 +16,7 @@ def blanket_geometry_single_null( cumulative_upper: dict, triang: float, cumulative_lower: dict, - blnktth: float, + dz_blkt_upper: float, c_shldith: float, c_blnkoth: float, dr_blkt_inboard: float, @@ -38,8 +38,8 @@ def blanket_geometry_single_null( :type triang: float :param cumulative_lower: cumulative vertical thicknesses of components below the midplane :type cumulative_lower: dict - :param blnktth: top blanket vertical thickness - :type blnktth: float + :param dz_blkt_upper: top blanket vertical thickness + :type dz_blkt_upper: float :param c_shldith: inboard shield thickness :type c_shldith: float :param c_blnkoth: outboard blanket radial thickness @@ -52,19 +52,19 @@ def blanket_geometry_single_null( :rtype: ArbitraryGeometry """ # Upper blanket outer surface - kapx = cumulative_upper["blnktth"] / rminx_outer + kapx = cumulative_upper["dz_blkt_upper"] / rminx_outer rs_upper_outboard, zs_upper_outboard = dh_vertices( radx_outer, rminx_outer, triang, kapx ) # Upper blanket inner surface - kapx = cumulative_upper["fwtth"] / rminx_inner + kapx = cumulative_upper["dz_fw_upper"] / rminx_inner rs_upper_inboard, zs_upper_inboard = dh_vertices( radx_inner, rminx_inner, triang, kapx ) # Lower blanket - divgap = cumulative_lower["divfix"] + divgap = cumulative_lower["dz_divertor"] ( rs_lower_outboard, @@ -73,7 +73,7 @@ def blanket_geometry_single_null( zs_lower_inboard, ) = blanket_geometry_lower( triang=triang, - blnktth=blnktth, + dz_blkt_upper=dz_blkt_upper, c_shldith=c_shldith, c_blnkoth=c_blnkoth, dr_blkt_inboard=dr_blkt_inboard, @@ -99,7 +99,7 @@ def blanket_geometry_single_null( def blanket_geometry_lower( triang: float, - blnktth: float, + dz_blkt_upper: float, c_shldith: float, c_blnkoth: float, dr_blkt_inboard: float, @@ -110,8 +110,8 @@ def blanket_geometry_lower( :param triang: plasma triangularity :type triang: float - :param blnktth: top blanket vertical thickness - :type blnktth: float + :param dz_blkt_upper: top blanket vertical thickness + :type dz_blkt_upper: float :param c_shldith: inboard shield thickness :type c_shldith: float :param c_blnkoth: outboard blanket radial thickness @@ -132,7 +132,7 @@ def blanket_geometry_lower( dr_blkt_inboard, dr_blkt_outboard, divgap, - -blnktth, + -dz_blkt_upper, triang, ) # outboard radial and vertical coordinates @@ -148,7 +148,7 @@ def blanket_geometry_lower( def blanket_geometry_double_null( cumulative_lower: dict, triang: float, - blnktth: float, + dz_blkt_upper: float, c_shldith: float, c_blnkoth: float, dr_blkt_inboard: float, @@ -161,8 +161,8 @@ def blanket_geometry_double_null( :type cumulative_lower: dict :param triang: plasma triangularity :type triang: float - :param blnktth: top blanket vertical thickness - :type blnktth: float + :param dz_blkt_upper: top blanket vertical thickness + :type dz_blkt_upper: float :param c_shldith: inboard shield thickness :type c_shldith: float :param c_blnkoth: outboard blanket radial thickness @@ -175,7 +175,7 @@ def blanket_geometry_double_null( :rtype: ArbitraryGeometry """ # Lower blanket - divgap = cumulative_lower["divfix"] + divgap = cumulative_lower["dz_divertor"] ( rs_lower_outboard, @@ -184,7 +184,7 @@ def blanket_geometry_double_null( zs_lower_inboard, ) = blanket_geometry_lower( triang=triang, - blnktth=blnktth, + dz_blkt_upper=dz_blkt_upper, c_shldith=c_shldith, c_blnkoth=c_blnkoth, dr_blkt_inboard=dr_blkt_inboard, @@ -202,7 +202,7 @@ def blanket_geometry_double_null( zs_upper_inboard, ) = blanket_geometry_lower( triang=triang, - blnktth=blnktth, + dz_blkt_upper=dz_blkt_upper, c_shldith=c_shldith, c_blnkoth=c_blnkoth, dr_blkt_inboard=dr_blkt_inboard, diff --git a/process/geometry/firstwall_geometry.py b/process/geometry/firstwall_geometry.py index 0b83d78a42..f9f7df6710 100644 --- a/process/geometry/firstwall_geometry.py +++ b/process/geometry/firstwall_geometry.py @@ -16,7 +16,7 @@ def first_wall_geometry_single_null( cumulative_upper: dict, triang: float, cumulative_lower: dict, - blnktth: float, + dz_blkt_upper: float, c_blnkith: float, c_fwoth: float, dr_fw_inboard: float, @@ -39,8 +39,8 @@ def first_wall_geometry_single_null( :type triang: float :param cumulative_lower: cumulative vertical thicknesses of components below the midplane :type cumulative_lower: dict - :param blnktth: top blanket vertical thickness - :type blnktth: float + :param dz_blkt_upper: top blanket vertical thickness + :type dz_blkt_upper: float :param c_blnkith: inboard blanket vertical thickness :type c_blnkith: float :param c_fwoth: outboard first wall vertical thickness @@ -55,7 +55,7 @@ def first_wall_geometry_single_null( :rtype: ArbitraryGeometry """ # Upper first wall: outer surface - kapx = cumulative_upper["fwtth"] / rminx_outer + kapx = cumulative_upper["dz_fw_upper"] / rminx_outer rs_upper_outboard, zs_upper_outboard = dh_vertices( radx_outer, rminx_outer, triang, kapx ) @@ -66,8 +66,8 @@ def first_wall_geometry_single_null( ) # Lower first wall - divgap = cumulative_lower["divfix"] - top_point = divgap + blnktth + divgap = cumulative_lower["dz_divertor"] + top_point = divgap + dz_blkt_upper ( rs_lower_outboard, zs_lower_outboard, @@ -150,7 +150,7 @@ def first_wall_geometry_lower( def first_wall_geometry_double_null( cumulative_lower: dict, triang: float, - blnktth: float, + dz_blkt_upper: float, c_blnkith: float, c_fwoth: float, dr_fw_inboard: float, @@ -164,8 +164,8 @@ def first_wall_geometry_double_null( :type cumulative_lower: dict :param triang: plasma triangularity :type triang: float - :param blnktth: top blanket vertical thickness - :type blnktth: float + :param dz_blkt_upper: top blanket vertical thickness + :type dz_blkt_upper: float :param c_blnkith: inboard blanket vertical thickness :type c_blnkith: float :param c_fwoth: outboard first wall vertical thickness @@ -180,8 +180,8 @@ def first_wall_geometry_double_null( :rtype: ArbitraryGeometry """ # Lower first wall - divgap = cumulative_lower["divfix"] - top_point = divgap + blnktth + divgap = cumulative_lower["dz_divertor"] + top_point = divgap + dz_blkt_upper ( rs_lower_outboard, zs_lower_outboard, diff --git a/process/geometry/shield_geometry.py b/process/geometry/shield_geometry.py index cb3da54f62..40d4e5d4e8 100644 --- a/process/geometry/shield_geometry.py +++ b/process/geometry/shield_geometry.py @@ -38,7 +38,7 @@ def shield_geometry_single_null( """ # Upper shield # Side furthest from plasma - kapx = cumulative_upper["shldtth"] / rminx_far + kapx = cumulative_upper["dz_shld_upper"] / rminx_far rs_upper_outboard, zs_upper_outboard = dh_vertices( radx_far, rminx_far, triang, kapx ) @@ -108,13 +108,13 @@ def shield_geometry_lower( :rtype: Tuple[np.ndarray, np.ndarray, np.ndarray, np.ndarray] """ # Side furthest from plasma - kapx = cumulative_lower["shldlth"] / rminx_far + kapx = cumulative_lower["dz_shld_lower"] / rminx_far rs_lower_outboard, zs_lower_outboard = dh_vertices( radx_far, rminx_far, triang, kapx ) # Side nearest to plasma - kapx = (cumulative_lower["divfix"]) / rminx_near + kapx = (cumulative_lower["dz_divertor"]) / rminx_near rs_lower_inboard, zs_lower_inboard = dh_vertices( radx_near, rminx_near, triang, kapx ) diff --git a/process/geometry/vacuum_vessel_geometry.py b/process/geometry/vacuum_vessel_geometry.py index e9f89c959a..a80b1eec66 100644 --- a/process/geometry/vacuum_vessel_geometry.py +++ b/process/geometry/vacuum_vessel_geometry.py @@ -43,13 +43,13 @@ def vacuum_vessel_geometry_single_null( :rtype: ArbitraryGeometry """ # Upper vacuum vessel - kapx = cumulative_upper["d_vv_top"] / rminx_outer + kapx = cumulative_upper["dz_vv_upper"] / rminx_outer rs_upper_outboard, zs_upper_outboard = dh_vertices( radx_outer, rminx_outer, triang, kapx ) kapx = ( - float(cumulative_upper["d_vv_top"]) - float(upper["d_vv_top"]) + float(cumulative_upper["dz_vv_upper"]) - float(upper["dz_vv_upper"]) ) / rminx_inner rs_upper_inboard, zs_upper_inboard = dh_vertices( radx_inner, rminx_inner, triang, kapx @@ -117,13 +117,13 @@ def vacuum_vessel_geometry_lower( :return: tuple containing the R coordinates for the outboard, Z coordinates for the outboard, R coordinates for the inboard, Z coordinates for the inboard of the vacuum vessel geometry below the midplane :rtype: Tuple[np.ndarray, np.ndarray, np.ndarray, np.ndarray] """ - kapx = cumulative_lower["d_vv_bot"] / rminx_outer + kapx = cumulative_lower["dz_vv_lower"] / rminx_outer rs_lower_outboard, zs_lower_outboard = dh_vertices( radx_outer, rminx_outer, triang, kapx ) kapx = ( - float(cumulative_lower["d_vv_bot"]) + float(lower["d_vv_bot"]) + float(cumulative_lower["dz_vv_lower"]) + float(lower["dz_vv_lower"]) ) / rminx_inner rs_lower_inboard, zs_lower_inboard = dh_vertices( radx_inner, rminx_inner, triang, kapx diff --git a/process/hcpb.py b/process/hcpb.py index 307bac4ad6..2158620ea4 100644 --- a/process/hcpb.py +++ b/process/hcpb.py @@ -67,7 +67,7 @@ def run(self, output: bool): ) # Half height of the CP at the largest shield radius [m] - h_sh_max_r = physics_variables.rminor * physics_variables.kappa + h_sh_max_r = build_variables.z_plasma_xpoint_upper # Solid angle fraction of neutrons that hit the centrepost shield [-] # Calculating the CP solid angle coverage fraction diff --git a/process/init.py b/process/init.py index 25b559c673..0730304e2a 100644 --- a/process/init.py +++ b/process/init.py @@ -658,9 +658,11 @@ def check_process(): if fortran.physics_variables.i_single_null == 0: fortran.physics_variables.idivrt = 2 - fortran.build_variables.vgaptop = fortran.build_variables.vgap_xpoint_divertor - fortran.build_variables.shldtth = fortran.build_variables.shldlth - fortran.build_variables.d_vv_top = fortran.build_variables.d_vv_bot + fortran.build_variables.dz_fw_plasma_gap = ( + fortran.build_variables.dz_xpoint_divertor + ) + fortran.build_variables.dz_shld_upper = fortran.build_variables.dz_shld_lower + fortran.build_variables.dz_vv_upper = fortran.build_variables.dz_vv_lower warn("Double-null: Upper vertical build forced to match lower", stacklevel=2) else: # i_single_null == 1 fortran.physics_variables.idivrt = 1 @@ -930,9 +932,11 @@ def check_process(): # CS which is now outside it if ( fortran.tfcoil_variables.i_tf_bucking >= 2 - and fortran.build_variables.tf_in_cs == 1 + and fortran.build_variables.i_tf_inside_cs == 1 ): - raise ProcessValidationError("Cannot have i_tf_bucking >= 2 when tf_in_cs = 1") + raise ProcessValidationError( + "Cannot have i_tf_bucking >= 2 when i_tf_inside_cs = 1" + ) # Ensure that no pre-compression structure # is used for bucked and wedged design diff --git a/process/io/mfile_comparison.py b/process/io/mfile_comparison.py index b6e705ebd1..83fb1aedff 100644 --- a/process/io/mfile_comparison.py +++ b/process/io/mfile_comparison.py @@ -151,12 +151,12 @@ "deltf", "dr_shld_thermal_inboard", "dr_shld_thermal_outboard", - "thshield_vb", + "dz_shld_thermal", "dr_shld_vv_gap_inboard", "dr_vv_inboard", "dr_vv_outboard", - "d_vv_top", - "d_vv_bot", + "dz_vv_upper", + "dz_vv_lower", "dr_shld_inboard", "dr_shld_blkt_gap", "dr_blkt_inboard", @@ -244,7 +244,7 @@ "dr_tf_shld_gap", "dr_shld_thermal_inboard", "dr_shld_thermal_outboard", - "thshield_vb", + "dz_shld_thermal", "dr_shld_vv_gap_inboard", "dr_vv_inboard", "dr_shld_inboard", @@ -260,11 +260,11 @@ "dr_shld_vv_gap_outboard", "dr_tf_shld_gap", "dr_tf_outboard", - "vgap_xpoint_divertor", - "divfix", - "d_vv_bot", - "shldlth", - "vgap_vv_thermalshield", + "dz_xpoint_divertor", + "dz_divertor", + "dz_vv_lower", + "dz_shld_lower", + "dz_shld_vv_gap", ] diff --git a/process/io/mfile_to_csv_vars.json b/process/io/mfile_to_csv_vars.json index 1e089ba71c..01c82202d4 100644 --- a/process/io/mfile_to_csv_vars.json +++ b/process/io/mfile_to_csv_vars.json @@ -17,7 +17,7 @@ "dr_tf_wp", "dr_cryostat", "dr_shld_outboard", - "divfix", + "dz_divertor", "rmajor" ] } diff --git a/process/io/obsolete_vars.py b/process/io/obsolete_vars.py index e783474086..cdd849b9d4 100644 --- a/process/io/obsolete_vars.py +++ b/process/io/obsolete_vars.py @@ -73,7 +73,11 @@ "pcoreradmw": "p_plasma_inner_rad_mw", "pedgeradmw": "p_plasma_outer_rad_mw", "rad_fraction_core": "rad_fraction_LCFS", - "thshield": ["dr_shld_thermal_inboard", "dr_shld_thermal_outboard", "thshield_vb"], + "thshield": [ + "dr_shld_thermal_inboard", + "dr_shld_thermal_outboard", + "dz_shld_thermal", + ], "igeom": None, "fgamp": None, "divleg_profile_inner": None, @@ -110,6 +114,7 @@ "fvolcry": None, "idhe3": "f_helium3", "blnktth": None, + "dz_blkt_upper": None, "theat": "t_fusion_ramp", "ieped": None, "eped_sf": None, @@ -119,8 +124,8 @@ "ips": "i_pfirsch_schluter_current", "bootipf": "bootstrap_current_fraction", "bscfmax": "bootstrap_current_fraction_max", - "vgap2": "vgap_vv_thermalshield", - "vgap": "vgap_xpoint_divertor", + "vgap2": "dz_shld_vv_gap", + "vgap": "dz_xpoint_divertor", "ftritbm": "f_tritium_bream", "enbeam": "beam_energy", "fdeut": "f_deuterium", @@ -237,11 +242,21 @@ "ncls": "n_pf_coils_in_group", "cptdin": "c_pf_coil_turn_peak_input", "ipfloc": "i_pf_location", + "tf_in_cs": "i_tf_inside_cs", + "shldtth": "dz_shld_upper", + "shldlth": "dz_shld_lower", + "vgap_vv_thermalshield": "dz_shld_vv_gap", + "thshield_vb": "dz_shld_thermal", + "vgaptop": "dz_fw_plasma_gap", + "vgap_xpoint_divertor": "dz_xpoint_divertor", + "d_vv_top": "dz_vv_upper", + "d_vv_bot": "dz_vv_lower", + "divfix": "dz_divertor", } OBS_VARS_HELP = { "iculdl": "(use IDENSL=3 for equivalent model to ICULDL=0). ", - "blnktth": "WARNING. BLNKTTH is now always calculated rather than input - please remove it from the input file. ", + "dz_blkt_upper": "WARNING. BLNKTTH is now always calculated rather than input - please remove it from the input file. ", } kallenbach_list = [ diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index 098ae4d6ec..1f27920226 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -152,13 +152,13 @@ def parse_args(args): ] vertical_lower = [ - "rminor*kappa", - "vgap_xpoint_divertor", - "divfix", - "shldlth", - "d_vv_bot", - "vgap_vv_thermalshield", - "thshield_vb", + "z_plasma_xpoint_lower", + "dz_xpoint_divertor", + "dz_divertor", + "dz_shld_lower", + "dz_vv_lower", + "dz_shld_vv_gap", + "dz_shld_thermal", "dr_tf_shld_gap", "dr_tf_inboard", ] @@ -1376,9 +1376,9 @@ def plot_blanket(axis, mfile_data, scan, colour_scheme) -> None: i_single_null = mfile_data.data["i_single_null"].get_scan(scan) triang_95 = mfile_data.data["triang95"].get_scan(scan) if int(i_single_null) == 1: - blnktth = mfile_data.data["blnktth"].get_scan(scan) + dz_blkt_upper = mfile_data.data["dz_blkt_upper"].get_scan(scan) else: - blnktth = 0.0 + dz_blkt_upper = 0.0 c_shldith = cumulative_radial_build("dr_shld_inboard", mfile_data, scan) c_blnkoth = cumulative_radial_build("dr_blkt_outboard", mfile_data, scan) @@ -1411,7 +1411,7 @@ def plot_blanket(axis, mfile_data, scan, colour_scheme) -> None: cumulative_upper=cumulative_upper, triang=triang_95, cumulative_lower=cumulative_lower, - blnktth=blnktth, + dz_blkt_upper=dz_blkt_upper, c_shldith=c_shldith, c_blnkoth=c_blnkoth, dr_blkt_inboard=dr_blkt_inboard, @@ -1437,7 +1437,7 @@ def plot_blanket(axis, mfile_data, scan, colour_scheme) -> None: bg_double_null = blanket_geometry_double_null( cumulative_lower=cumulative_lower, triang=triang_95, - blnktth=blnktth, + dz_blkt_upper=dz_blkt_upper, c_shldith=c_shldith, c_blnkoth=c_blnkoth, dr_blkt_inboard=dr_blkt_inboard, @@ -1478,10 +1478,10 @@ def plot_firstwall(axis, mfile_data, scan, colour_scheme): i_single_null = mfile_data.data["i_single_null"].get_scan(scan) triang_95 = mfile_data.data["triang95"].get_scan(scan) if int(i_single_null) == 1: - blnktth = mfile_data.data["blnktth"].get_scan(scan) - tfwvt = mfile_data.data["fwtth"].get_scan(scan) + dz_blkt_upper = mfile_data.data["dz_blkt_upper"].get_scan(scan) + tfwvt = mfile_data.data["dz_fw_upper"].get_scan(scan) else: - blnktth = tfwvt = 0.0 + dz_blkt_upper = tfwvt = 0.0 c_blnkith = cumulative_radial_build("dr_blkt_inboard", mfile_data, scan) c_fwoth = cumulative_radial_build("dr_fw_outboard", mfile_data, scan) @@ -1515,7 +1515,7 @@ def plot_firstwall(axis, mfile_data, scan, colour_scheme): cumulative_upper=cumulative_upper, triang=triang_95, cumulative_lower=cumulative_lower, - blnktth=blnktth, + dz_blkt_upper=dz_blkt_upper, c_blnkith=c_blnkith, c_fwoth=c_fwoth, dr_fw_inboard=dr_fw_inboard, @@ -1536,7 +1536,7 @@ def plot_firstwall(axis, mfile_data, scan, colour_scheme): fwg_double_null = first_wall_geometry_double_null( cumulative_lower=cumulative_lower, triang=triang_95, - blnktth=blnktth, + dz_blkt_upper=dz_blkt_upper, c_blnkith=c_blnkith, c_fwoth=c_fwoth, dr_fw_inboard=dr_fw_inboard, @@ -3643,27 +3643,27 @@ def main(args=None): global vertical_upper if int(m_file.data["i_single_null"].get_scan(scan)) == 0: vertical_upper = [ - "rminor*kappa", - "vgaptop", - "divfix", - "shldtth", - "d_vv_top", - "vgap_vv_thermalshield", - "thshield_vb", + "z_plasma_xpoint_upper", + "dz_fw_plasma_gap", + "dz_divertor", + "dz_shld_upper", + "dz_vv_upper", + "dz_shld_vv_gap", + "dz_shld_thermal", "dr_tf_shld_gap", "dr_tf_inboard", ] else: vertical_upper = [ - "rminor*kappa", - "vgaptop", - "fwtth", - "blnktth", + "z_plasma_xpoint_upper", + "dz_fw_plasma_gap", + "dz_fw_upper", + "dz_blkt_upper", "dr_shld_blkt_gap", - "shldtth", - "d_vv_top", - "vgap_vv_thermalshield", - "thshield_vb", + "dz_shld_upper", + "dz_vv_upper", + "dz_shld_vv_gap", + "dz_shld_thermal", "dr_tf_shld_gap", "dr_tf_inboard", ] diff --git a/process/io/plot_radial_build.py b/process/io/plot_radial_build.py index dc118e75d4..2245bd5dd8 100644 --- a/process/io/plot_radial_build.py +++ b/process/io/plot_radial_build.py @@ -109,7 +109,7 @@ def get_radial_build(m_file): "dr_tf_shld_gap", "dr_tf_outboard", ] - if int(m_file.data["tf_in_cs"].get_scan(-1)) == 1: + if int(m_file.data["i_tf_inside_cs"].get_scan(-1)) == 1: radial_labels[1] = "dr_tf_inboard" radial_labels[2] = "dr_cs_tf_gap" radial_labels[3] = "dr_cs" @@ -264,7 +264,7 @@ def main(args=None): "Gap", "TF Coil Outboard Leg", ] - if int(m_file.data["tf_in_cs"].get_scan(-1)) == 1: + if int(m_file.data["i_tf_inside_cs"].get_scan(-1)) == 1: radial_labels[1] = "TF Coil Inboard Leg" radial_labels[2] = "CS Coil gap" radial_labels[3] = "Central Solenoid" @@ -297,7 +297,7 @@ def main(args=None): "white", "blue", ] - if int(m_file.data["tf_in_cs"].get_scan(-1)) == 1: + if int(m_file.data["i_tf_inside_cs"].get_scan(-1)) == 1: radial_color[1] = "blue" radial_color[2] = "white" radial_color[3] = "green" diff --git a/process/sctfcoil.py b/process/sctfcoil.py index 22d59c9483..4624d1474e 100644 --- a/process/sctfcoil.py +++ b/process/sctfcoil.py @@ -1268,7 +1268,7 @@ def sctfcoil(self, output: bool): build_variables.hmax, pfcoil_variables.f_z_cs_tf_internal, build_variables.dr_cs, - build_variables.tf_in_cs, + build_variables.i_tf_inside_cs, build_variables.dr_tf_inboard, build_variables.dr_cs_tf_gap, pfcoil_variables.i_pf_conductor, @@ -1511,8 +1511,7 @@ def tf_global_geometry(self): # Vertical distance from the midplane to the top of the tapered section [m] if physics_variables.itart == 1: sctfcoil_module.h_cp_top = ( - physics_variables.rminor * physics_variables.kappa - + tfcoil_variables.dztop + build_variables.z_plasma_xpoint_upper + tfcoil_variables.dztop ) # --- @@ -2322,11 +2321,11 @@ def vv_stress_on_quench(self): rm_coil = build_variables.r_tf_inboard_out + tfcoil_variables.tfa[0] H_vv = ( - physics_variables.rminor * physics_variables.kappa - + build_variables.vgap_xpoint_divertor - + divertor_variables.divfix - + build_variables.shldtth - + (build_variables.d_vv_top / 2) + build_variables.z_plasma_xpoint_upper + + build_variables.dz_xpoint_divertor + + divertor_variables.dz_divertor + + build_variables.dz_shld_upper + + (build_variables.dz_vv_upper / 2) ) # ri and ro for VV dont consider the shield widths # because it is assumed the shield is on the plasma side @@ -3583,7 +3582,7 @@ def stresscl( hmax, f_z_cs_tf_internal, dr_cs, - tf_in_cs, + i_tf_inside_cs, dr_tf_inboard, dr_cs_tf_gap, i_pf_conductor, @@ -3765,8 +3764,8 @@ def stresscl( jeff[0] = 0.0e0 # Inner radius of the CS - if tf_in_cs == 1: - # CS not used as wedge support tf_in_cs = 1 + if i_tf_inside_cs == 1: + # CS not used as wedge support i_tf_inside_cs = 1 radtf[0] = 0.001 else: radtf[0] = dr_bore @@ -3778,7 +3777,7 @@ def stresscl( # -# # CS vertical cross-section area [m2] - if tf_in_cs == 1: + if i_tf_inside_cs == 1: a_oh = 2.0e0 * hmax * f_z_cs_tf_internal * (dr_bore - dr_tf_inboard) else: a_oh = 2.0e0 * hmax * f_z_cs_tf_internal * dr_cs @@ -3888,7 +3887,7 @@ def stresscl( jeff[1] = 0.0e0 # Outer radius of the CS - if tf_in_cs == 1: + if i_tf_inside_cs == 1: radtf[1] = dr_bore - dr_tf_inboard - dr_cs_tf_gap else: radtf[1] = dr_bore + dr_cs @@ -4560,13 +4559,19 @@ def outtf(self, peaktfflag): else: po.ocmmnt(self.outfile, " -> Bucking cylinder") - elif tfcoil_variables.i_tf_bucking in (2, 3) and build_variables.tf_in_cs == 1: + elif ( + tfcoil_variables.i_tf_bucking in (2, 3) + and build_variables.i_tf_inside_cs == 1 + ): po.ocmmnt( self.outfile, " -> TF in contact with dr_bore filler support (bucked and weged design)", ) - elif tfcoil_variables.i_tf_bucking in (2, 3) and build_variables.tf_in_cs == 0: + elif ( + tfcoil_variables.i_tf_bucking in (2, 3) + and build_variables.i_tf_inside_cs == 0 + ): po.ocmmnt( self.outfile, " -> TF in contact with CS (bucked and weged design)" ) diff --git a/process/stellarator.py b/process/stellarator.py index f31662c669..3eceb1b9d5 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -333,13 +333,13 @@ def stbild(self, output: bool): + build_variables.blbmoth + build_variables.blbpoth ) - build_variables.shldtth = 0.5e0 * ( + build_variables.dz_shld_upper = 0.5e0 * ( build_variables.dr_shld_inboard + build_variables.dr_shld_outboard ) # Top/bottom blanket thickness - build_variables.blnktth = 0.5e0 * ( + build_variables.dz_blkt_upper = 0.5e0 * ( build_variables.dr_blkt_inboard + build_variables.dr_blkt_outboard ) @@ -1911,8 +1911,8 @@ def stfwbs(self, output: bool): po.ovarre( self.outfile, "Top shield thickness (m)", - "(shldtth)", - build_variables.shldtth, + "(dz_shld_upper)", + build_variables.dz_shld_upper, ) if fwbs_variables.blktmodel > 0: @@ -1970,8 +1970,8 @@ def stfwbs(self, output: bool): po.ovarre( self.outfile, "Top blanket thickness (m)", - "(blnktth)", - build_variables.blnktth, + "(dz_blkt_upper)", + build_variables.dz_blkt_upper, ) if (heat_transport_variables.ipowerflow == 0) and ( diff --git a/process/utilities/errorlist.json b/process/utilities/errorlist.json index 2dd809addb..7efcc5c46d 100644 --- a/process/utilities/errorlist.json +++ b/process/utilities/errorlist.json @@ -118,7 +118,7 @@ { "no": 22, "level": 3, - "message": "DIVCALL: Non-positive vgap_xpoint_divertor" + "message": "DIVCALL: Non-positive dz_xpoint_divertor" }, { "no": 23, @@ -1413,7 +1413,7 @@ { "no": 281, "level": 3, - "message": "CHECK: Cannot have i_tf_bucking >= 2 when tf_in_cs = 1" + "message": "CHECK: Cannot have i_tf_bucking >= 2 when i_tf_inside_cs = 1" }, { "no": 282, diff --git a/source/fortran/build_variables.f90 b/source/fortran/build_variables.f90 index 26789fa2e2..a71f1f2048 100644 --- a/source/fortran/build_variables.f90 +++ b/source/fortran/build_variables.f90 @@ -54,7 +54,7 @@ module build_variables real(dp) :: dr_blkt_outboard !! outboard blanket thickness (m); calculated if `blktmodel>0` - real(dp) :: blnktth + real(dp) :: dz_blkt_upper !! top blanket thickness (m), = mean of inboard and outboard blanket thicknesses real(dp) :: dr_bore @@ -72,10 +72,10 @@ module build_variables real(dp) :: dr_vv_outboard !! vacuum vessel outboard thickness (TF coil / shield) (m) - real(dp) :: d_vv_top - !! vacuum vessel topside thickness (TF coil / shield) (m) (= d_vv_bot if double-null) + real(dp) :: dz_vv_upper + !! vacuum vessel topside thickness (TF coil / shield) (m) (= dz_vv_lower if double-null) - real(dp) :: d_vv_bot + real(dp) :: dz_vv_lower !! vacuum vessel underside thickness (TF coil / shield) (m) real(dp) :: f_avspace @@ -139,7 +139,7 @@ module build_variables !! - =0 no pre-compression structure !! - =1 calculated pre-compression structure - integer :: tf_in_cs + integer :: i_tf_inside_cs !! Switch for placing the TF coil inside the CS !! !! - = 0 TF coil is outside the CS (default) @@ -228,14 +228,14 @@ module build_variables real(dp) :: dr_shld_inboard !! inboard shield thickness (m) (`iteration variable 93`) - real(dp) :: shldlth + real(dp) :: dz_shld_lower !! lower (under divertor) shield thickness (m) real(dp) :: dr_shld_outboard !! outboard shield thickness (m) (`iteration variable 94`) - real(dp) :: shldtth - !! upper/lower shield thickness (m); calculated if `blktmodel > 0` (= shldlth if double-null) + real(dp) :: dz_shld_upper + !! upper/lower shield thickness (m); calculated if `blktmodel > 0` (= dz_shld_lower if double-null) real(dp) :: sigallpc !! allowable stress in CSpre-compression structure (Pa) @@ -264,17 +264,17 @@ module build_variables real(dp) :: dr_shld_thermal_outboard !! TF-VV thermal shield thickness, outboard (m) - real(dp) :: thshield_vb + real(dp) :: dz_shld_thermal !! TF-VV thermal shield thickness, vertical build (m) - real(dp) :: vgap_vv_thermalshield + real(dp) :: dz_shld_vv_gap !! vertical gap between vacuum vessel and thermal shields (m) - real(dp) :: vgap_xpoint_divertor + real(dp) :: dz_xpoint_divertor !! vertical gap between x-point and divertor (m) (if = 0, it is calculated) - real(dp) :: vgaptop - !! vertical gap between top of plasma and first wall (m) (= vgap_xpoint_divertor if double-null) + real(dp) :: dz_fw_plasma_gap + !! vertical gap between top of plasma and first wall (m) (= dz_xpoint_divertor if double-null) real(dp) :: dr_shld_blkt_gap !! gap between vacuum vessel and blanket (m) @@ -294,6 +294,12 @@ module build_variables real(dp) :: rspo !! outboard strike point radius (m) + real(dp) :: z_plasma_xpoint_upper + !! Vertical height of the upper plasma x-point (m) + + real(dp) :: z_plasma_xpoint_lower + !! Vertical height of the lower plasma x-point (m) + contains subroutine init_build_variables @@ -313,14 +319,14 @@ subroutine init_build_variables blbuoth = 0.465D0 dr_blkt_inboard = 0.115D0 dr_blkt_outboard = 0.235D0 - blnktth = 0.0D0 + dz_blkt_upper = 0.0D0 dr_bore = 1.42D0 f_z_cryostat = 4.268D0 dr_cryostat = 0.07D0 dr_vv_inboard = 0.07D0 dr_vv_outboard = 0.07D0 - d_vv_top = 0.07D0 - d_vv_bot = 0.07D0 + dz_vv_upper = 0.07D0 + dz_vv_lower = 0.07D0 f_avspace = 1.0D0 fcspc = 0.6D0 fseppc = 3.5D8 @@ -339,7 +345,7 @@ subroutine init_build_variables hr1 = 0.0D0 iohcl = 1 i_cs_precomp = 1 - tf_in_cs = 0 + i_tf_inside_cs = 0 dr_cs = 0.811D0 dr_cs_precomp = 0.0D0 rbld = 0.0D0 @@ -364,9 +370,9 @@ subroutine init_build_variables shareaib = 0.0D0 shareaob = 0.0D0 dr_shld_inboard = 0.69D0 - shldlth = 0.7D0 + dz_shld_lower = 0.7D0 dr_shld_outboard = 1.05D0 - shldtth = 0.6D0 + dz_shld_upper = 0.6D0 sigallpc = 3.0D8 dr_tf_inboard = 0.0D0 tfoffset = 0.0D0 @@ -375,10 +381,10 @@ subroutine init_build_variables dr_tf_shld_gap = 0.05D0 dr_shld_thermal_inboard = 0.05D0 dr_shld_thermal_outboard = 0.05D0 - thshield_vb = 0.05D0 - vgap_vv_thermalshield = 0.163D0 - vgap_xpoint_divertor= 0.0D0 - vgaptop = 0.60D0 + dz_shld_thermal = 0.05D0 + dz_shld_vv_gap = 0.163D0 + dz_xpoint_divertor= 0.0D0 + dz_fw_plasma_gap = 0.60D0 dr_shld_blkt_gap = 0.05D0 plleni = 1.0D0 plleno = 1.0D0 @@ -386,5 +392,7 @@ subroutine init_build_variables plsepo = 1.5D0 rspo = 0.0D0 r_sh_inboard_in = 0.0D0 + z_plasma_xpoint_upper = 0.0D0 + z_plasma_xpoint_lower = 0.0D0 end subroutine init_build_variables end module build_variables diff --git a/source/fortran/constraint_equations.f90 b/source/fortran/constraint_equations.f90 index e4759fa7f1..d55242194b 100755 --- a/source/fortran/constraint_equations.f90 +++ b/source/fortran/constraint_equations.f90 @@ -2762,7 +2762,7 @@ subroutine constraint_eqn_072(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) use constraint_variables, only: foh_stress use pfcoil_variables, only: alstroh, s_shear_cs_peak use tfcoil_variables, only: sig_tf_cs_bucked, i_tf_bucking - use build_variables, only: tf_in_cs + use build_variables, only: i_tf_inside_cs implicit none real(dp), intent(out) :: tmp_cc real(dp), intent(out) :: tmp_con @@ -2771,7 +2771,7 @@ subroutine constraint_eqn_072(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) character(len=10), intent(out) :: tmp_units ! bucked and wedged desing (see subroutine comment) - if ( i_tf_bucking >= 2 .and. tf_in_cs == 0 ) then + if ( i_tf_bucking >= 2 .and. i_tf_inside_cs == 0 ) then tmp_cc = 1.0d0 - foh_stress * alstroh / max(s_shear_cs_peak, sig_tf_cs_bucked) tmp_err = alstroh - max(s_shear_cs_peak, sig_tf_cs_bucked) ! Free standing CS diff --git a/source/fortran/divertor_variables.f90 b/source/fortran/divertor_variables.f90 index 68fd2d4a34..c150eade29 100644 --- a/source/fortran/divertor_variables.f90 +++ b/source/fortran/divertor_variables.f90 @@ -72,7 +72,7 @@ module divertor_variables !! - =1 input !#TODO: switch name should be changed to i_ - real(dp) :: divfix + real(dp) :: dz_divertor !! divertor structure vertical thickness (m) real(dp) :: divmas @@ -194,7 +194,7 @@ subroutine init_divertor_variables divclfr = 0.3D0 divdens = 1.0D4 divdum = 0 - divfix = 0.2D0 + dz_divertor = 0.2D0 divmas = 0.0D0 divplt = 0.035D0 divsur = 0.0D0 diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index 90ad844640..cff8ea301b 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -190,15 +190,15 @@ subroutine parse_input_file(in_file,out_file,show_changes) use constants, only: dcopper, dalu use global_variables, only: run_tests, verbose, maxcal, runtitle - use build_variables, only: tf_in_cs, blbmoth, blbuith, dr_shld_outboard, & - shldtth, shldlth, vgap_vv_thermalshield, plleni, dr_fw_outboard, dr_shld_blkt_gap, & - dr_shld_thermal_inboard, dr_shld_thermal_outboard, thshield_vb, i_cs_precomp, & + use build_variables, only: i_tf_inside_cs, blbmoth, blbuith, dr_shld_outboard, & + dz_shld_upper, dz_shld_lower, dz_shld_vv_gap, plleni, dr_fw_outboard, dr_shld_blkt_gap, & + dr_shld_thermal_inboard, dr_shld_thermal_outboard, dz_shld_thermal, i_cs_precomp, & blbpith, aplasmin, blbuoth, dr_tf_inboard, & iohcl, dr_tf_shld_gap, f_z_cryostat, dr_bore, plleno, dr_fw_plasma_gap_inboard, gapomin, dr_cryostat, & rinboard, dr_blkt_outboard, fseppc, plsepo, dr_blkt_inboard, & - dr_cs, plsepi, blbmith, dr_cs_tf_gap, fcspc, dr_fw_plasma_gap_outboard, vgaptop, & - blbpoth, dr_shld_vv_gap_inboard, dr_fw_inboard, vgap_xpoint_divertor, dr_shld_inboard, sigallpc, tfootfi, f_avspace,& - r_cp_top, dr_vv_inboard, dr_vv_outboard, d_vv_top, d_vv_bot, f_r_cp, i_r_cp_top + dr_cs, plsepi, blbmith, dr_cs_tf_gap, fcspc, dr_fw_plasma_gap_outboard, dz_fw_plasma_gap, & + blbpoth, dr_shld_vv_gap_inboard, dr_fw_inboard, dz_xpoint_divertor, dr_shld_inboard, sigallpc, tfootfi, f_avspace,& + r_cp_top, dr_vv_inboard, dr_vv_outboard, dz_vv_upper, dz_vv_lower, f_r_cp, i_r_cp_top use buildings_variables, only: hcwt, conv, wgt, trcl, rbwt, & esbldgm3, fndt, row, wgt2, pibv, dz_tf_cryostat, stcl, clh2, & tfcbv, hccl, rbrt, triv, shov, admv, i_bldgs_v, i_bldgs_size, & @@ -262,7 +262,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) use divertor_variables, only: fdfs, anginc, divdens, divclfr, c4div, & c5div, ksic, fififi, flux_exp, divplt, delld, c2div, beta_div, betao, divdum, tdiv, c6div, & omegan, prn1, frrp, xpertin, c1div, betai, bpsout, xparain, fdiva, & - zeffdiv, hldivlim, rlenmax, divfix, c3div, & + zeffdiv, hldivlim, rlenmax, dz_divertor, c3div, & hldiv, i_hldiv use fwbs_variables, only: fblhebpo, vfblkt, fdiv, fvolso, i_fw_coolant_type, & dx_fw_module, i_blanket_type, blktmodel, afwi, fblli2o, nphcdin, breeder_multiplier, & @@ -1194,8 +1194,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('divdum') call parse_int_variable('divdum', divdum, 0, 1, & 'Switch for divertor Zeff value') - case ('divfix') - call parse_real_variable('divfix', divfix, 0.1D0, 5.0D0, & + case ('dz_divertor') + call parse_real_variable('dz_divertor', dz_divertor, 0.1D0, 5.0D0, & 'Divertor structure vertical extent (m)') case ('divplt') call parse_real_variable('divplt', divplt, 0.01D0, 1.0D0, & @@ -1320,11 +1320,11 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('dr_vv_outboard') call parse_real_variable('dr_vv_outboard', dr_vv_outboard, 0.0D0, 10.0D0, & 'Outboard vacuum vessel thickness (m)') - case ('d_vv_top') - call parse_real_variable('d_vv_top', d_vv_top, 0.0D0, 10.0D0, & + case ('dz_vv_upper') + call parse_real_variable('dz_vv_upper', dz_vv_upper, 0.0D0, 10.0D0, & 'Topside vacuum vessel thickness (m)') - case ('d_vv_bot') - call parse_real_variable('d_vv_bot', d_vv_bot, 0.0D0, 10.0D0, & + case ('dz_vv_lower') + call parse_real_variable('dz_vv_lower', dz_vv_lower, 0.0D0, 10.0D0, & 'Underside vacuum vessel thickness (m)') case ('fcspc') call parse_real_variable('fcspc', fcspc, 0.0D0, 1.0D0, & @@ -1359,8 +1359,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('i_cs_precomp') call parse_int_variable('i_cs_precomp', i_cs_precomp, 0, 1, & 'Switch for existence of Central Solenoid pre-compression structure') - case ('tf_in_cs') - call parse_int_variable('tf_in_cs', tf_in_cs, 0, 1, & + case ('i_tf_inside_cs') + call parse_int_variable('i_tf_inside_cs', i_tf_inside_cs, 0, 1, & 'Switch for placing TF coils inside of the CS') case ('dr_cs') call parse_real_variable('dr_cs', dr_cs, 0.0D0, 10.0D0, & @@ -1389,14 +1389,14 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('dr_shld_inboard') call parse_real_variable('dr_shld_inboard', dr_shld_inboard, 0.0D0, 10.0D0, & 'Inboard shield thickness (m)') - case ('shldlth') - call parse_real_variable('shldlth', shldlth, 0.0D0, 10.0D0, & + case ('dz_shld_lower') + call parse_real_variable('dz_shld_lower', dz_shld_lower, 0.0D0, 10.0D0, & 'Lower (divertor) shield thickness (m)') case ('dr_shld_outboard') call parse_real_variable('dr_shld_outboard', dr_shld_outboard, 0.0D0, 10.0D0, & 'Outboard shield thickness (m)') - case ('shldtth') - call parse_real_variable('shldtth', shldtth, 0.0D0, 10.0D0, & + case ('dz_shld_upper') + call parse_real_variable('dz_shld_upper', dz_shld_upper, 0.0D0, 10.0D0, & 'Top shield thickness (m)') case ('sigallpc') call parse_real_variable('sigallpc', sigallpc, 0.0D1, 1.0D9, & @@ -1422,17 +1422,17 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('dr_shld_thermal_outboard') call parse_real_variable('dr_shld_thermal_outboard', dr_shld_thermal_outboard, 0.0D0, 10.0D0, & 'TF/VV thermal shield thickness, outboard (m)') - case ('thshield_vb') - call parse_real_variable('thshield_vb', thshield_vb, 0.0D0, 10.0D0, & + case ('dz_shld_thermal') + call parse_real_variable('dz_shld_thermal', dz_shld_thermal, 0.0D0, 10.0D0, & 'TF/VV thermal shield thickness, vertical build (m)') - case ('vgap_xpoint_divertor') - call parse_real_variable('vgap_xpoint_divertor', vgap_xpoint_divertor, 0.0D0, 10.0D0, & + case ('dz_xpoint_divertor') + call parse_real_variable('dz_xpoint_divertor', dz_xpoint_divertor, 0.0D0, 10.0D0, & 'Vert gap between x-pnt and divertor (m)') - case ('vgap_vv_thermalshield') - call parse_real_variable('vgap_vv_thermalshield', vgap_vv_thermalshield, 0.0D0, 10.0D0, & + case ('dz_shld_vv_gap') + call parse_real_variable('dz_shld_vv_gap', dz_shld_vv_gap, 0.0D0, 10.0D0, & 'Vert gap between TF coil and shield (m)') - case ('vgaptop') - call parse_real_variable('vgaptop', vgaptop, 0.0D0, 10.0D0, & + case ('dz_fw_plasma_gap') + call parse_real_variable('dz_fw_plasma_gap', dz_fw_plasma_gap, 0.0D0, 10.0D0, & 'Top vert gap between plasma and first wall (m)') case ('dr_shld_blkt_gap') call parse_real_variable('dr_shld_blkt_gap', dr_shld_blkt_gap, 0.0D0, 5.0D0, & diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 69aa4555d7..36b22e5499 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -562,8 +562,8 @@ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8463E+03 OP # Radial Build # - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 1.9854E+00 ITV CS_radial_thickness_(m)_________________________________________________ (dr_cs)_______________________ 5.7587E-01 ITV CS_precompression_(m)___________________________________________________ (dr_cs_precomp)_____________________ 6.8064E-02 @@ -590,16 +590,16 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 - Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 + Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -1480,7 +1480,7 @@ dr_tf_wp = 0.5 * Thermal shield radial thickness [m] dr_shld_thermal_inboard = 0.050 dr_shld_thermal_outboard = 0.050 -thshield_vb = 0.050 +dz_shld_thermal = 0.050 * Gap between thermal shield and vacuum vessel [m] dr_shld_vv_gap_inboard = 0.02 @@ -1492,10 +1492,10 @@ dr_vv_inboard = 0.3 dr_vv_outboard = 0.3 * Topside vacuum vessel radial thickness [m] -d_vv_top = 0.3 +dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] -d_vv_bot = 0.3 +dz_vv_lower = 0.3 * Inboard vacuum vessel thickness [m] dr_shld_inboard = 0.3 @@ -1522,7 +1522,7 @@ dr_cryostat = 0.15 dr_shld_outboard = 0.800 * Divertor structure vertical thickness [m] -divfix = 0.62 +dz_divertor = 0.62 * Coolant void fraction in shield vfshld = 0.60 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index c5d9624dc5..a71044ae8b 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -563,8 +563,8 @@ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8463E+03 OP # Radial Build # - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 1.9854E+00 ITV CS_radial_thickness_(m)_________________________________________________ (dr_cs)_______________________ 5.7587E-01 ITV CS_precompression_(m)___________________________________________________ (dr_cs_precomp)_____________________ 6.8064E-02 @@ -591,16 +591,16 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 - Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 + Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -1481,7 +1481,7 @@ dr_tf_wp = 0.5 * Thermal shield radial thickness [m] dr_shld_thermal_inboard = 0.050 dr_shld_thermal_outboard = 0.050 -thshield_vb = 0.050 +dz_shld_thermal = 0.050 * Gap between thermal shield and vacuum vessel [m] dr_shld_vv_gap_inboard = 0.02 @@ -1493,10 +1493,10 @@ dr_vv_inboard = 0.3 dr_vv_outboard = 0.3 * Topside vacuum vessel radial thickness [m] -d_vv_top = 0.3 +dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] -d_vv_bot = 0.3 +dz_vv_lower = 0.3 * Inboard vacuum vessel thickness [m] dr_shld_inboard = 0.3 @@ -1523,7 +1523,7 @@ dr_cryostat = 0.15 dr_shld_outboard = 0.800 * Divertor structure vertical thickness [m] -divfix = 0.62 +dz_divertor = 0.62 * Coolant void fraction in shield vfshld = 0.60 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index ab5512a4e0..77bc68da72 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -563,8 +563,8 @@ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8463E+03 OP # Radial Build # - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 1.9854E+00 ITV CS_radial_thickness_(m)_________________________________________________ (dr_cs)_______________________ 5.7587E-01 ITV CS_precompression_(m)___________________________________________________ (dr_cs_precomp)_____________________ 6.8064E-02 @@ -591,16 +591,16 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 - Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 + Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -1481,7 +1481,7 @@ dr_tf_wp = 0.5 * Thermal shield radial thickness [m] dr_shld_thermal_inboard = 0.050 dr_shld_thermal_outboard = 0.050 -thshield_vb = 0.050 +dz_shld_thermal = 0.050 * Gap between thermal shield and vacuum vessel [m] dr_shld_vv_gap_inboard = 0.02 @@ -1493,10 +1493,10 @@ dr_vv_inboard = 0.3 dr_vv_outboard = 0.3 * Topside vacuum vessel radial thickness [m] -d_vv_top = 0.3 +dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] -d_vv_bot = 0.3 +dz_vv_lower = 0.3 * Inboard vacuum vessel thickness [m] dr_shld_inboard = 0.3 @@ -1523,7 +1523,7 @@ dr_cryostat = 0.15 dr_shld_outboard = 0.800 * Divertor structure vertical thickness [m] -divfix = 0.62 +dz_divertor = 0.62 * Coolant void fraction in shield vfshld = 0.60 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index ee13b45f9d..c77c972c53 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -563,8 +563,8 @@ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8463E+03 OP # Radial Build # - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 1.9854E+00 ITV CS_radial_thickness_(m)_________________________________________________ (dr_cs)_______________________ 5.7587E-01 ITV CS_precompression_(m)___________________________________________________ (dr_cs_precomp)_____________________ 6.8064E-02 @@ -591,16 +591,16 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 - Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 + Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -1481,7 +1481,7 @@ dr_tf_wp = 0.5 * Thermal shield radial thickness [m] dr_shld_thermal_inboard = 0.050 dr_shld_thermal_outboard = 0.050 -thshield_vb = 0.050 +dz_shld_thermal = 0.050 * Gap between thermal shield and vacuum vessel [m] dr_shld_vv_gap_inboard = 0.02 @@ -1493,10 +1493,10 @@ dr_vv_inboard = 0.3 dr_vv_outboard = 0.3 * Topside vacuum vessel radial thickness [m] -d_vv_top = 0.3 +dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] -d_vv_bot = 0.3 +dz_vv_lower = 0.3 * Inboard vacuum vessel thickness [m] dr_shld_inboard = 0.3 @@ -1523,7 +1523,7 @@ dr_cryostat = 0.15 dr_shld_outboard = 0.800 * Divertor structure vertical thickness [m] -divfix = 0.62 +dz_divertor = 0.62 * Coolant void fraction in shield vfshld = 0.60 diff --git a/tests/integration/data/large_tokamak_IN.DAT b/tests/integration/data/large_tokamak_IN.DAT index be8c6b964f..2ca5ff9023 100644 --- a/tests/integration/data/large_tokamak_IN.DAT +++ b/tests/integration/data/large_tokamak_IN.DAT @@ -291,7 +291,7 @@ dr_tf_wp = 0.5 * Thermal shield radial thickness [m] dr_shld_thermal_inboard = 0.050 dr_shld_thermal_outboard = 0.050 -thshield_vb = 0.050 +dz_shld_thermal = 0.050 * Gap between thermal shield and vacuum vessel [m] dr_shld_vv_gap_inboard = 0.02 @@ -303,10 +303,10 @@ dr_vv_inboard = 0.3 dr_vv_outboard = 0.3 * Topside vacuum vessel radial thickness [m] -d_vv_top = 0.3 +dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] -d_vv_bot = 0.3 +dz_vv_lower = 0.3 * Inboard radiation shield radial thickness [m] dr_shld_inboard = 0.3 @@ -333,7 +333,7 @@ dr_cryostat = 0.15 dr_shld_outboard = 0.800 * Divertor structure vertical thickness [m] -divfix = 0.62 +dz_divertor = 0.62 * Coolant void fraction in shield vfshld = 0.60 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index d8c0c6aef6..3d8871cd90 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -560,8 +560,8 @@ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8377E+03 OP # Radial Build # - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 1.9704E+00 ITV CS_radial_thickness_(m)_________________________________________________ (dr_cs)_______________________ 5.7696E-01 ITV CS_precompression_(m)___________________________________________________ (dr_cs_precomp)_____________________ 6.8501E-02 @@ -589,16 +589,16 @@ Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Cryostat_roof_structure*________________________________________________ (dz_tf_cryostat)________________________ 5.6032E+00 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 - Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 + Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(excludes_structure)_(m)____________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_Solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -1482,7 +1482,7 @@ dr_tf_wp = 0.5 * Thermal shield radial thickness [m] dr_shld_thermal_inboard = 0.050 dr_shld_thermal_outboard = 0.050 -thshield_vb = 0.050 +dz_shld_thermal = 0.050 * Gap between thermal shield and vacuum vessel [m] dr_shld_vv_gap_inboard = 0.02 @@ -1494,10 +1494,10 @@ dr_vv_inboard = 0.3 dr_vv_outboard = 0.3 * Topside vacuum vessel radial thickness [m] -d_vv_top = 0.3 +dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] -d_vv_bot = 0.3 +dz_vv_lower = 0.3 * Inboard vacuum vessel thickness [m] dr_shld_inboard = 0.3 @@ -1524,7 +1524,7 @@ dr_cryostat = 0.15 dr_shld_outboard = 0.800 * Divertor structure vertical thickness [m] -divfix = 0.62 +dz_divertor = 0.62 * Coolant void fraction in shield vfshld = 0.60 diff --git a/tests/integration/data/large_tokamak_once_through.IN.DAT b/tests/integration/data/large_tokamak_once_through.IN.DAT index 540d2aa62a..288e9ca5f1 100644 --- a/tests/integration/data/large_tokamak_once_through.IN.DAT +++ b/tests/integration/data/large_tokamak_once_through.IN.DAT @@ -99,8 +99,8 @@ dr_bore = 2.003843190236783 * central solenoid inboard radius (m) (`iteratio dr_cryostat = 0.15 * cryostat thickness (m) dr_vv_inboard = 0.3 * vacuum vessel inboard thickness (TF coil / shield) (m) dr_vv_outboard = 0.3 * vacuum vessel outboard thickness (TF coil / shield) (m) -d_vv_top = 0.3 * vacuum vessel topside thickness (TF coil / shield) (m) (= d_vv_bot if double-null) -d_vv_bot = 0.3 * vacuum vessel underside thickness (TF coil / shield) (m) +dz_vv_upper = 0.3 * vacuum vessel topside thickness (TF coil / shield) (m) (= dz_vv_lower if double-null) +dz_vv_lower = 0.3 * vacuum vessel underside thickness (TF coil / shield) (m) dr_shld_vv_gap_inboard = 0.02 * gap between inboard vacuum vessel and thermal shield (m) (`iteration variable 61`) dr_cs = 0.546816593988753 * Central solenoid thickness (m) (`iteration variable 16`) dr_fw_plasma_gap_inboard = 0.25 * Gap between plasma and first wall; inboard side (m) (if `iscrp=1`) @@ -110,7 +110,7 @@ dr_shld_outboard = 0.800 * outboard shield thickness (m) (`iteration variable 9 dr_tf_inboard = 1.2 * inboard TF coil thickness; (centrepost for ST) (m) dr_shld_thermal_inboard = 0.050 * TF-VV thermal shield thickness; inboard (m) dr_shld_thermal_outboard = 0.050 * TF-VV thermal shield thickness; outboard (m) -thshield_vb = 0.050 * TF-VV thermal shield thickness; vertical build (m) +dz_shld_thermal = 0.050 * TF-VV thermal shield thickness; vertical build (m) dr_shld_blkt_gap = 0.02 * gap between vacuum vessel and blanket (m) *---------------Buildings Variables----------------* @@ -175,7 +175,7 @@ pinjalw = 200.0 * maximum allowable value for injected power (MW) (`constraint *----------------Divertor Variables----------------* -divfix = 0.62 * divertor structure vertical thickness (m) +dz_divertor = 0.62 * divertor structure vertical thickness (m) *------------------Error Handling------------------* diff --git a/tests/integration/data/ref_IN.DAT b/tests/integration/data/ref_IN.DAT index a89c66b28f..b50005cec9 100644 --- a/tests/integration/data/ref_IN.DAT +++ b/tests/integration/data/ref_IN.DAT @@ -105,8 +105,8 @@ dr_bore = 2.483 * Central solenoid inboard radius (m) dr_cryostat = 0.15 * Cryostat thickness (m) dr_vv_inboard = 0.30 * Inboard vacuum vessel thickness (tf coil / shield) (m) dr_vv_outboard = 0.30 * Outboard vacuum vessel thickness (tf coil / shield) (m) -d_vv_top = 0.30 * Topside vacuum vessel thickness (tf coil / shield) (m) -d_vv_bot = 0.30 * Underside vacuum vessel thickness (tf coil / shield) (m) +dz_vv_upper = 0.30 * Topside vacuum vessel thickness (tf coil / shield) (m) +dz_vv_lower = 0.30 * Underside vacuum vessel thickness (tf coil / shield) (m) dr_shld_vv_gap_inboard = 0.12 * Gap between inboard vacuum vessel and tf coil (m) dr_cs_tf_gap = 0.05 * Gap between central solenoid and tf coil (m) gapomin = 0.20 * Minimum gap between outboard vacuum vessel and tf coil (m) @@ -116,7 +116,7 @@ dr_fw_plasma_gap_inboard = 0.225 * Gap between plasma and first wall; inboard s dr_fw_plasma_gap_outboard = 0.225 * Gap between plasma and first wall; outboard side (m) dr_shld_inboard = 0.30 * Inboard shield thickness (m) dr_shld_outboard = 0.80 * Outboard shield thickness (m) -shldtth = 0.30 * Upper/lower shield thickness (m); +dz_shld_upper = 0.30 * Upper/lower shield thickness (m); dr_tf_inboard = 1.05 * Inboard tf coil thickness; (centrepost for st) (m) dr_tf_shld_gap = 0.05 * manufacturing/thermal expansion gap between TF and thermal shield (m) vgap2 = 0.05 * Vertical gap between vacuum vessel and tf coil (m) @@ -175,7 +175,7 @@ pheat = 50.0 *----------------Divertor Variables----------------* divdum = 1 * Switch for divertor zeff model; 0=calc; 1=input -divfix = 0.621 * Divertor structure vertical thickness (m) +dz_divertor = 0.621 * Divertor structure vertical thickness (m) hldivlim = 10 * Heat load limit (mw/m2) ksic = 1.4 * Power fraction for outboard double-null scrape-off plasma prn1 = 0.4 * N-scrape-off / n-average plasma; diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 74c4f99f64..e3015461d4 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -564,8 +564,8 @@ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8415E+03 OP # Radial Build # - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 2.0486E+00 ITV CS_radial_thickness_(m)_________________________________________________ (dr_cs)_______________________ 5.5540E-01 ITV CS_precompression_(m)___________________________________________________ (dr_cs_precomp)_____________________ 6.6514E-02 @@ -592,16 +592,16 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 - Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 + Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -1727,8 +1727,8 @@ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0137E+04 OP # Radial Build # - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 2.0684E+00 ITV CS_radial_thickness_(m)_________________________________________________ (dr_cs)_______________________ 5.5277E-01 ITV CS_precompression_(m)___________________________________________________ (dr_cs_precomp)_____________________ 6.5991E-02 @@ -1755,16 +1755,16 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 - Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 + Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -2890,8 +2890,8 @@ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0323E+04 OP # Radial Build # - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 2.0815E+00 ITV CS_radial_thickness_(m)_________________________________________________ (dr_cs)_______________________ 5.5352E-01 ITV CS_precompression_(m)___________________________________________________ (dr_cs_precomp)_____________________ 6.5613E-02 @@ -2918,16 +2918,16 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 - Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 + Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -4053,8 +4053,8 @@ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0386E+04 OP # Radial Build # - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 2.0802E+00 ITV CS_radial_thickness_(m)_________________________________________________ (dr_cs)_______________________ 5.5349E-01 ITV CS_precompression_(m)___________________________________________________ (dr_cs_precomp)_____________________ 6.5651E-02 @@ -4081,16 +4081,16 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 - Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 + Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -5216,8 +5216,8 @@ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0240E+04 OP # Radial Build # - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 2.0685E+00 ITV CS_radial_thickness_(m)_________________________________________________ (dr_cs)_______________________ 5.5266E-01 ITV CS_precompression_(m)___________________________________________________ (dr_cs_precomp)_____________________ 6.5989E-02 @@ -5244,16 +5244,16 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 - Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 + Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -6379,8 +6379,8 @@ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0122E+04 OP # Radial Build # - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 2.0572E+00 ITV CS_radial_thickness_(m)_________________________________________________ (dr_cs)_______________________ 5.4639E-01 ITV CS_precompression_(m)___________________________________________________ (dr_cs_precomp)_____________________ 6.6399E-02 @@ -6407,16 +6407,16 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 - Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 + Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -7542,8 +7542,8 @@ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0178E+04 OP # Radial Build # - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 2.0569E+00 ITV CS_radial_thickness_(m)_________________________________________________ (dr_cs)_______________________ 5.4494E-01 ITV CS_precompression_(m)___________________________________________________ (dr_cs_precomp)_____________________ 6.6427E-02 @@ -7570,16 +7570,16 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 - Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 + Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -8705,8 +8705,8 @@ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0292E+04 OP # Radial Build # - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 2.0708E+00 ITV CS_radial_thickness_(m)_________________________________________________ (dr_cs)_______________________ 5.4622E-01 ITV CS_precompression_(m)___________________________________________________ (dr_cs_precomp)_____________________ 6.6015E-02 @@ -8733,16 +8733,16 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 - Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 + Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -9868,8 +9868,8 @@ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0398E+04 OP # Radial Build # - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 2.0841E+00 ITV CS_radial_thickness_(m)_________________________________________________ (dr_cs)_______________________ 5.4724E-01 ITV CS_precompression_(m)___________________________________________________ (dr_cs_precomp)_____________________ 6.5627E-02 @@ -9896,16 +9896,16 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 - Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 + Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -11031,8 +11031,8 @@ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0437E+04 OP # Radial Build # - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 2.0834E+00 ITV CS_radial_thickness_(m)_________________________________________________ (dr_cs)_______________________ 5.4720E-01 ITV CS_precompression_(m)___________________________________________________ (dr_cs_precomp)_____________________ 6.5650E-02 @@ -11059,16 +11059,16 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 - Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 + Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -12194,8 +12194,8 @@ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0315E+04 OP # Radial Build # - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 2.0691E+00 ITV CS_radial_thickness_(m)_________________________________________________ (dr_cs)_______________________ 5.4697E-01 ITV CS_precompression_(m)___________________________________________________ (dr_cs_precomp)_____________________ 6.6052E-02 @@ -12222,16 +12222,16 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 - Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 + Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -13357,8 +13357,8 @@ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0190E+04 OP # Radial Build # - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 2.0559E+00 ITV CS_radial_thickness_(m)_________________________________________________ (dr_cs)_______________________ 5.4537E-01 ITV CS_precompression_(m)___________________________________________________ (dr_cs_precomp)_____________________ 6.6450E-02 @@ -13385,16 +13385,16 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 - Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 + Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -14520,8 +14520,8 @@ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0232E+04 OP # Radial Build # - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 2.0549E+00 ITV CS_radial_thickness_(m)_________________________________________________ (dr_cs)_______________________ 5.4535E-01 ITV CS_precompression_(m)___________________________________________________ (dr_cs_precomp)_____________________ 6.6479E-02 @@ -14548,16 +14548,16 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 - Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 + Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -15683,8 +15683,8 @@ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0304E+04 OP # Radial Build # - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 2.0688E+00 ITV CS_radial_thickness_(m)_________________________________________________ (dr_cs)_______________________ 5.4673E-01 ITV CS_precompression_(m)___________________________________________________ (dr_cs_precomp)_____________________ 6.6065E-02 @@ -15711,16 +15711,16 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 - Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 + Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -16846,8 +16846,8 @@ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 1.0374E+04 OP # Radial Build # - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 2.0828E+00 ITV CS_radial_thickness_(m)_________________________________________________ (dr_cs)_______________________ 5.4798E-01 ITV CS_precompression_(m)___________________________________________________ (dr_cs_precomp)_____________________ 6.5654E-02 @@ -16874,16 +16874,16 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 - Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 + Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -17767,7 +17767,7 @@ dr_tf_wp = 0.5 * Thermal shield radial thickness [m] dr_shld_thermal_inboard = 0.050 dr_shld_thermal_outboard = 0.050 -thshield_vb = 0.050 +dz_shld_thermal = 0.050 * Gap between thermal shield and vacuum vessel [m] dr_shld_vv_gap_inboard = 0.02 @@ -17779,10 +17779,10 @@ dr_vv_inboard = 0.3 dr_vv_outboard = 0.3 * Topside vacuum vessel radial thickness [m] -d_vv_top = 0.3 +dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] -d_vv_bot = 0.3 +dz_vv_lower = 0.3 * Inboard vacuum vessel thickness [m] dr_shld_inboard = 0.3 @@ -17809,7 +17809,7 @@ dr_cryostat = 0.15 dr_shld_outboard = 0.800 * Divertor structure vertical thickness [m] -divfix = 0.62 +dz_divertor = 0.62 * Coolant void fraction in shield vfshld = 0.60 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index ebd14858dc..9596ae4c34 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -444,16 +444,16 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.6850E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -1439,16 +1439,16 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.6850E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -2434,16 +2434,16 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.6850E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -3429,16 +3429,16 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.6850E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -4424,16 +4424,16 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.6850E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -5419,16 +5419,16 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.6850E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -6414,16 +6414,16 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.6850E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -7409,16 +7409,16 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.6850E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -8404,16 +8404,16 @@ # Vertical Build # Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 5.0000E-02 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 3.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.6850E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 3.0000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.6850E-01 Top_first_wall_vertical_thickness_(m)___________________________________ fwtth_________________________ 1.8000E-02 Top_scrape-off_vertical_thickness_(m)___________________________________ vgaptop_______________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 5.4712E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0024E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2100E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2100E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(m)_________________________________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -9084,8 +9084,8 @@ dr_bore = 2.483 * Central solenoid inboard radius (m) dr_cryostat = 0.15 * Cryostat thickness (m) dr_vv_inboard = 0.30 * Inboard vacuum vessel thickness (tf coil / shield) (m) dr_vv_outboard = 0.30 * Outboard vacuum vessel thickness (tf coil / shield) (m) -d_vv_top = 0.30 * Topside vacuum vessel thickness (tf coil / shield) (m) -d_vv_bot = 0.30 * Underside vacuum vessel thickness (tf coil / shield) (m) +dz_vv_upper = 0.30 * Topside vacuum vessel thickness (tf coil / shield) (m) +dz_vv_lower = 0.30 * Underside vacuum vessel thickness (tf coil / shield) (m) dr_shld_vv_gap_inboard = 0.12 * Gap between inboard vacuum vessel and tf coil (m) dr_cs_tf_gap = 0.05 * Gap between central solenoid and tf coil (m) gapomin = 0.20 * Minimum gap between outboard vacuum vessel and tf coil (m) @@ -9095,7 +9095,7 @@ dr_fw_plasma_gap_inboard = 0.225 * Gap between plasma and first wall; inboard s dr_fw_plasma_gap_outboard = 0.225 * Gap between plasma and first wall; outboard side (m) dr_shld_inboard = 0.30 * Inboard shield thickness (m) dr_shld_outboard = 0.80 * Outboard shield thickness (m) -shldtth = 0.30 * Upper/lower shield thickness (m); +dz_shld_upper = 0.30 * Upper/lower shield thickness (m); dr_tf_inboard = 1.05 * Inboard tf coil thickness; (centrepost for st) (m) dr_tf_shld_gap = 0.05 * manufacturing/thermal expansion gap between TF and thermal shield (m) vgap2 = 0.05 * Vertical gap between vacuum vessel and tf coil (m) @@ -9154,7 +9154,7 @@ pheat = 50.0 *----------------Divertor Variables----------------* divdum = 1 * Switch for divertor zeff model; 0=calc; 1=input -divfix = 0.621 * Divertor structure vertical thickness (m) +dz_divertor = 0.621 * Divertor structure vertical thickness (m) hldivlim = 10 * Heat load limit (mw/m2) ksic = 1.4 * Power fraction for outboard double-null scrape-off plasma prn1 = 0.4 * N-scrape-off / n-average plasma; diff --git a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT index b5b3cf78d5..6722279d0a 100644 --- a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT +++ b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT @@ -105,8 +105,8 @@ dr_bore = 2.483 * Central solenoid inboard radius (m) dr_cryostat = 0.15 * Cryostat thickness (m) dr_vv_inboard = 0.30 * Inboard vacuum vessel thickness (tf coil / shield) (m) dr_vv_outboard = 0.30 * Outboard vacuum vessel thickness (tf coil / shield) (m) -d_vv_top = 0.30 * Topside vacuum vessel thickness (tf coil / shield) (m) -d_vv_bot = 0.30 * Underside vacuum vessel thickness (tf coil / shield) (m) +dz_vv_upper = 0.30 * Topside vacuum vessel thickness (tf coil / shield) (m) +dz_vv_lower = 0.30 * Underside vacuum vessel thickness (tf coil / shield) (m) dr_shld_vv_gap_inboard = 0.12 * Gap between inboard vacuum vessel and tf coil (m) dr_cs_tf_gap = 0.05 * Gap between central solenoid and tf coil (m) gapomin = 0.20 * Minimum gap between outboard vacuum vessel and tf coil (m) @@ -175,7 +175,7 @@ pheat = 50.0 *----------------Divertor Variables----------------* divdum = 1 * Switch for divertor zeff model; 0=calc; 1=input -divfix = 0.621 * Divertor structure vertical thickness (m) +dz_divertor = 0.621 * Divertor structure vertical thickness (m) hldivlim = 10 * Heat load limit (mw/m2) ksic = 1.4 * Power fraction for outboard double-null scrape-off plasma prn1 = 0.4 * N-scrape-off / n-average plasma; diff --git a/tests/integration/data/uncertainties_ref_IN.DAT b/tests/integration/data/uncertainties_ref_IN.DAT index 59dd7fff86..3a3826cb92 100644 --- a/tests/integration/data/uncertainties_ref_IN.DAT +++ b/tests/integration/data/uncertainties_ref_IN.DAT @@ -105,8 +105,8 @@ dr_bore = 2.483 * Central solenoid inboard radius (m) dr_cryostat = 0.15 * Cryostat thickness (m) dr_vv_inboard = 0.30 * Inboard vacuum vessel thickness (tf coil / shield) (m) dr_vv_outboard = 0.30 * Outboard vacuum vessel thickness (tf coil / shield) (m) -d_vv_top = 0.30 * Topside vacuum vessel thickness (tf coil / shield) (m) -d_vv_bot = 0.30 * Underside vacuum vessel thickness (tf coil / shield) (m) +dz_vv_upper = 0.30 * Topside vacuum vessel thickness (tf coil / shield) (m) +dz_vv_lower = 0.30 * Underside vacuum vessel thickness (tf coil / shield) (m) dr_shld_vv_gap_inboard = 0.12 * Gap between inboard vacuum vessel and tf coil (m) dr_cs_tf_gap = 0.05 * Gap between central solenoid and tf coil (m) gapomin = 0.20 * Minimum gap between outboard vacuum vessel and tf coil (m) @@ -175,7 +175,7 @@ pheat = 50.0 *----------------Divertor Variables----------------* divdum = 1 * Switch for divertor zeff model; 0=calc; 1=input -divfix = 0.621 * Divertor structure vertical thickness (m) +dz_divertor = 0.621 * Divertor structure vertical thickness (m) hldivlim = 10 * Heat load limit (mw/m2) ksic = 1.4 * Power fraction for outboard double-null scrape-off plasma prn1 = 0.4 * N-scrape-off / n-average plasma; diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index e8d1fb3b72..219ded77e0 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -381,7 +381,7 @@ "blmatv": 0.0, "dr_blkt_inboard": 0.115, "dr_blkt_outboard": 0.235, - "blnktth": 0.0, + "dz_blkt_upper": 0.0, "bloact": [ 0.0, 0.0, @@ -1583,10 +1583,10 @@ "f_vol_plasma": 1.0, "f_r_conducting_wall": 1.35, "czero": "(0.0_wp_, 0.0_wp_)", - "d_vv_bot": 0.07, + "dz_vv_lower": 0.07, "dr_vv_inboard": 0.07, "dr_vv_outboard": 0.07, - "d_vv_top": 0.07, + "dz_vv_upper": 0.07, "dalu": 2700.0, "data_lz": 0.0, "data_qz": 0.0, @@ -1649,7 +1649,7 @@ "divcst": 0.0, "divdens": 10000.0, "divdum": 0.0, - "divfix": 0.2, + "dz_divertor": 0.2, "divlife": 0.0, "divmas": 0.0, "divplt": 0.035, @@ -5276,9 +5276,9 @@ "shield_density": 0.0, "shld_u_nuc_heating": 0.0, "dr_shld_inboard": 0.69, - "shldlth": 0.7, + "dz_shld_lower": 0.7, "dr_shld_outboard": 1.05, - "shldtth": 0.6, + "dz_shld_upper": 0.6, "shmatf": [ 0.05, 0.05, @@ -7924,9 +7924,9 @@ "vfpblkt": 0.1, "vfshld": 0.25, "vftf": 0.4, - "vgap_xpoint_divertor": 0.0, - "vgap_vv_thermalshield": 0.163, - "vgaptop": 0.6, + "dz_xpoint_divertor": 0.0, + "dz_shld_vv_gap": 0.163, + "dz_fw_plasma_gap": 0.6, "vlabel": "", "vlabel_2": "", "vlam": 0.0, @@ -8911,7 +8911,7 @@ "blmatv": "IFE blanket material volumes (m3)", "dr_blkt_inboard": "inboard blanket thickness (m); (calculated if `blktmodel>0`) (=0.0 if `i_blkt_inboard=0`)", "dr_blkt_outboard": "outboard blanket thickness (m); calculated if `blktmodel>0`", - "blnktth": "top blanket thickness (m), = mean of inboard and outboard blanket thicknesses", + "dz_blkt_upper": "top blanket thickness (m), = mean of inboard and outboard blanket thicknesses", "bloact": "outboard blanket total activity (Bq)", "blogdr": "outboard blanket total gamma dose rate (Sv/hr)", "blohkw": "outboard blanket total heat output (kW)", @@ -9245,10 +9245,10 @@ "f_vol_plasma": "multiplying factor times plasma volume (normally=1)", "f_r_conducting_wall": "maximum ratio of conducting wall distance to plasma minor radius for\n vertical stability (`constraint equation 23`)", "czero": "", - "d_vv_bot": "vacuum vessel underside thickness (TF coil / shield) (m)", + "dz_vv_lower": "vacuum vessel underside thickness (TF coil / shield) (m)", "dr_vv_inboard": "vacuum vessel inboard thickness (TF coil / shield) (m)", "dr_vv_outboard": "vacuum vessel outboard thickness (TF coil / shield) (m)", - "d_vv_top": "vacuum vessel topside thickness (TF coil / shield) (m) (= d_vv_bot if double-null)", + "dz_vv_upper": "vacuum vessel topside thickness (TF coil / shield) (m) (= dz_vv_lower if double-null)", "dalu": "density of aluminium (kg/m3)", "data_lz": "", "data_qz": "", @@ -9301,7 +9301,7 @@ "divcst": "divertor direct cost (M$)", "divdens": "divertor structure density (kg/m3)", "divdum": "switch for divertor Zeff model:\n", - "divfix": "divertor structure vertical thickness (m)", + "dz_divertor": "divertor structure vertical thickness (m)", "divlife": "Full power lifetime of divertor (y)", "divmas": "divertor plate mass (kg)", "divplt": "divertor plate thickness (m) (from Spears, Sept 1990)", @@ -10614,9 +10614,9 @@ "shield_density": "Shield density [kg/m3]", "shld_u_nuc_heating": "Unit nuclear heating in shield (W per W of fusion power)", "dr_shld_inboard": "inboard shield thickness (m) (`iteration variable 93`)", - "shldlth": "lower (under divertor) shield thickness (m)", + "dz_shld_lower": "lower (under divertor) shield thickness (m)", "dr_shld_outboard": "outboard shield thickness (m) (`iteration variable 94`)", - "shldtth": "upper/lower shield thickness (m); calculated if `blktmodel > 0` (= shldlth if double-null)", + "dz_shld_upper": "upper/lower shield thickness (m); calculated if `blktmodel > 0` (= dz_shld_lower if double-null)", "shmatf": "IFE shield material fractions", "shmatm": "IFE shield material masses (kg)", "shmatv": "IFE shield material volumes (kg)", @@ -11033,9 +11033,9 @@ "vfpblkt": "He purge gas fraction of blanket by volume (`i_blanket_type= 1,3` (CCFE HCPB))", "vfshld": "coolant void fraction in shield", "vftf": "coolant fraction of TFC 'cable' (`i_tf_sup=1`), or of TFC leg (`i_tf_ssup=0`)", - "vgap_xpoint_divertor": "vertical gap between x-point and divertor (m) (if = 0, it is calculated)", - "vgap_vv_thermalshield": "vertical gap between vacuum vessel and thermal shields (m)", - "vgaptop": "vertical gap between top of plasma and first wall (m) (= vgap_xpoint_divertor if double-null)", + "dz_xpoint_divertor": "vertical gap between x-point and divertor (m) (if = 0, it is calculated)", + "dz_shld_vv_gap": "vertical gap between vacuum vessel and thermal shields (m)", + "dz_fw_plasma_gap": "vertical gap between top of plasma and first wall (m) (= dz_xpoint_divertor if double-null)", "vlabel": "scan value name label", "vlabel_2": "scan value name label (2nd dimension)", "vlam": "", @@ -12117,7 +12117,7 @@ "lb": 1.0, "ub": 3.0 }, - "d_vv_bot": { + "dz_vv_lower": { "lb": 0.0, "ub": 10.0 }, @@ -12129,7 +12129,7 @@ "lb": 0.0, "ub": 10.0 }, - "d_vv_top": { + "dz_vv_upper": { "lb": 0.0, "ub": 10.0 }, @@ -12233,7 +12233,7 @@ "lb": 0, "ub": 1 }, - "divfix": { + "dz_divertor": { "lb": 0.1, "ub": 5.0 }, @@ -14257,7 +14257,7 @@ "lb": 0.0, "ub": 10.0 }, - "shldlth": { + "dz_shld_lower": { "lb": 0.0, "ub": 10.0 }, @@ -14265,7 +14265,7 @@ "lb": 0.0, "ub": 10.0 }, - "shldtth": { + "dz_shld_upper": { "lb": 0.0, "ub": 10.0 }, @@ -14965,15 +14965,15 @@ "lb": 0.0, "ub": 1.0 }, - "vgap_xpoint_divertor": { + "dz_xpoint_divertor": { "lb": 0.0, "ub": 10.0 }, - "vgap_vv_thermalshield": { + "dz_shld_vv_gap": { "lb": 0.0, "ub": 10.0 }, - "vgaptop": { + "dz_fw_plasma_gap": { "lb": 0.0, "ub": 10.0 }, @@ -17005,14 +17005,14 @@ "blbuoth", "dr_blkt_inboard", "dr_blkt_outboard", - "blnktth", + "dz_blkt_upper", "dr_bore", "f_z_cryostat", "dr_cryostat", "dr_vv_inboard", "dr_vv_outboard", - "d_vv_top", - "d_vv_bot", + "dz_vv_upper", + "dz_vv_lower", "f_avspace", "fcspc", "fseppc", @@ -17056,9 +17056,9 @@ "shareaib", "shareaob", "dr_shld_inboard", - "shldlth", + "dz_shld_lower", "dr_shld_outboard", - "shldtth", + "dz_shld_upper", "sigallpc", "dr_tf_inboard", "tfoffset", @@ -17066,9 +17066,9 @@ "dr_tf_outboard", "dr_tf_shld_gap", "thshield", - "vgap_vv_thermalshield", - "vgap_xpoint_divertor", - "vgaptop", + "dz_shld_vv_gap", + "dz_xpoint_divertor", + "dz_fw_plasma_gap", "dr_shld_blkt_gap", "plleni", "plleno", @@ -17908,7 +17908,7 @@ "divclfr", "divdens", "divdum", - "divfix", + "dz_divertor", "divmas", "divplt", "divsur", @@ -20135,10 +20135,10 @@ "cturbb": "real_variable", "f_vol_plasma": "real_variable", "f_r_conducting_wall": "real_variable", - "d_vv_bot": "real_variable", + "dz_vv_lower": "real_variable", "dr_vv_inboard": "real_variable", "dr_vv_outboard": "real_variable", - "d_vv_top": "real_variable", + "dz_vv_upper": "real_variable", "dalu": "real_variable", "dcase": "real_variable", "dcdrv0": "real_variable", @@ -20165,7 +20165,7 @@ "divclfr": "real_variable", "divdens": "real_variable", "divdum": "int_variable", - "divfix": "real_variable", + "dz_divertor": "real_variable", "divplt": "real_variable", "beta_norm_max": "real_variable", "dp_he": "real_variable", @@ -20692,9 +20692,9 @@ "shdzu": "real_variable", "shear": "real_variable", "dr_shld_inboard": "real_variable", - "shldlth": "real_variable", + "dz_shld_lower": "real_variable", "dr_shld_outboard": "real_variable", - "shldtth": "real_variable", + "dz_shld_upper": "real_variable", "shmatf": "real_array", "shmf": "real_variable", "shov": "real_variable", @@ -20880,9 +20880,9 @@ "vfpblkt": "real_variable", "vfshld": "real_variable", "vftf": "real_variable", - "vgap_xpoint_divertor": "real_variable", - "vgap_vv_thermalshield": "real_variable", - "vgaptop": "real_variable", + "dz_xpoint_divertor": "real_variable", + "dz_shld_vv_gap": "real_variable", + "dz_fw_plasma_gap": "real_variable", "dr_shld_blkt_gap": "real_variable", "vvhealw": "real_variable", "walalw": "real_variable", diff --git a/tests/regression/input_files/helias_5b.IN.DAT b/tests/regression/input_files/helias_5b.IN.DAT index f5c2cc828d..7612f6c197 100644 --- a/tests/regression/input_files/helias_5b.IN.DAT +++ b/tests/regression/input_files/helias_5b.IN.DAT @@ -85,16 +85,16 @@ dr_blkt_outboard = 0.8 *Outboard blanket thickness (m) dr_cryostat = 0.15 *Cryostat thickness (m) dr_vv_inboard = 0.35 *Inboard vacuum vessel thickness (tf coil / shield) (m) dr_vv_outboard = 0.35 *Outboard vacuum vessel thickness (tf coil / shield) (m) -d_vv_top = 0.35 *Topside vacuum vessel thickness (tf coil / shield) (m) -d_vv_bot = 0.35 *Underside vacuum vessel thickness (tf coil / shield) (m) +dz_vv_upper = 0.35 *Topside vacuum vessel thickness (tf coil / shield) (m) +dz_vv_lower = 0.35 *Underside vacuum vessel thickness (tf coil / shield) (m) dr_shld_vv_gap_inboard = 0.025 *Gap between inboard vacuum vessel and tf coil (m) gapomin = 0.025 *Minimum gap between outboard vacuum vessel and TF coil (m) dr_fw_plasma_gap_inboard = 0.15 *Gap between plasma and first wall; inboard side (m) dr_fw_plasma_gap_outboard = 0.3 *Gap between plasma and first wall; outboard side (m) dr_shld_inboard = 0.4 *Inboard shield thickness (m) dr_shld_outboard = 0.7 *Outboard shield thickness (m) -shldtth = 0.7 *Upper/lower shield thickness (m) -vgap_xpoint_divertor = 0.0 *Vertical gap between x-point and divertor (m) +dz_shld_upper = 0.7 *Upper/lower shield thickness (m) +dz_xpoint_divertor = 0.0 *Vertical gap between x-point and divertor (m) *---------------Constraint Variables---------------* diff --git a/tests/regression/input_files/large_tokamak.IN.DAT b/tests/regression/input_files/large_tokamak.IN.DAT index 0b28522c22..f8dbe7054d 100644 --- a/tests/regression/input_files/large_tokamak.IN.DAT +++ b/tests/regression/input_files/large_tokamak.IN.DAT @@ -291,7 +291,7 @@ dr_tf_wp = 0.5 * Thermal shield radial thickness [m] dr_shld_thermal_inboard = 0.050 dr_shld_thermal_outboard = 0.050 -thshield_vb = 0.050 +dz_shld_thermal = 0.050 * Gap between thermal shield and vacuum vessel [m] dr_shld_vv_gap_inboard = 0.02 @@ -303,10 +303,10 @@ dr_vv_inboard = 0.3 dr_vv_outboard = 0.3 * Topside vacuum vessel radial thickness [m] -d_vv_top = 0.3 +dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] -d_vv_bot = 0.3 +dz_vv_lower = 0.3 * Inboard vacuum vessel thickness [m] dr_shld_inboard = 0.3 @@ -333,7 +333,7 @@ dr_cryostat = 0.15 dr_shld_outboard = 0.800 * Divertor structure vertical thickness [m] -divfix = 0.62 +dz_divertor = 0.62 * Coolant void fraction in shield vfshld = 0.60 diff --git a/tests/regression/input_files/large_tokamak_nof.IN.DAT b/tests/regression/input_files/large_tokamak_nof.IN.DAT index 26cdd3cb63..287c6b6603 100644 --- a/tests/regression/input_files/large_tokamak_nof.IN.DAT +++ b/tests/regression/input_files/large_tokamak_nof.IN.DAT @@ -273,7 +273,7 @@ dr_tf_wp = 0.5 * Thermal shield radial thickness [m] dr_shld_thermal_inboard = 0.050 dr_shld_thermal_outboard = 0.050 -thshield_vb = 0.050 +dz_shld_thermal = 0.050 * Gap between thermal shield and vacuum vessel [m] dr_shld_vv_gap_inboard = 0.02 @@ -285,10 +285,10 @@ dr_vv_inboard = 0.3 dr_vv_outboard = 0.3 * Topside vacuum vessel radial thickness [m] -d_vv_top = 0.3 +dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] -d_vv_bot = 0.3 +dz_vv_lower = 0.3 * Inboard vacuum vessel thickness [m] dr_shld_inboard = 0.3 @@ -315,7 +315,7 @@ dr_cryostat = 0.15 dr_shld_outboard = 0.800 * Divertor structure vertical thickness [m] -divfix = 0.62 +dz_divertor = 0.62 * Coolant void fraction in shield vfshld = 0.60 diff --git a/tests/regression/input_files/large_tokamak_once_through.IN.DAT b/tests/regression/input_files/large_tokamak_once_through.IN.DAT index 893eebffac..35087e33fb 100644 --- a/tests/regression/input_files/large_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/large_tokamak_once_through.IN.DAT @@ -99,8 +99,8 @@ dr_bore = 2.003843190236783 * central solenoid inboard radius (m) (`iteratio dr_cryostat = 0.15 * cryostat thickness (m) dr_vv_inboard = 0.3 * vacuum vessel inboard thickness (TF coil / shield) (m) dr_vv_outboard = 0.3 * vacuum vessel outboard thickness (TF coil / shield) (m) -d_vv_top = 0.3 * vacuum vessel topside thickness (TF coil / shield) (m) (= d_vv_bot if double-null) -d_vv_bot = 0.3 * vacuum vessel underside thickness (TF coil / shield) (m) +dz_vv_upper = 0.3 * vacuum vessel topside thickness (TF coil / shield) (m) (= dz_vv_lower if double-null) +dz_vv_lower = 0.3 * vacuum vessel underside thickness (TF coil / shield) (m) dr_shld_vv_gap_inboard = 0.02 * gap between inboard vacuum vessel and thermal shield (m) (`iteration variable 61`) dr_cs = 0.546816593988753 * Central solenoid thickness (m) (`iteration variable 16`) dr_fw_plasma_gap_inboard = 0.25 * Gap between plasma and first wall; inboard side (m) (if `i_plasma_wall_gap=1`) @@ -110,7 +110,7 @@ dr_shld_outboard = 0.800 * outboard shield thickness (m) (`iteration variable 9 dr_tf_inboard = 1.2 * inboard TF coil thickness; (centrepost for ST) (m) dr_shld_thermal_inboard = 0.050 * TF-VV thermal shield thickness; inboard (m) dr_shld_thermal_outboard = 0.050 * TF-VV thermal shield thickness; outboard (m) -thshield_vb = 0.050 * TF-VV thermal shield thickness; vertical build (m) +dz_shld_thermal = 0.050 * TF-VV thermal shield thickness; vertical build (m) dr_shld_blkt_gap = 0.02 * gap between vacuum vessel and blanket (m) *---------------Buildings Variables----------------* @@ -175,7 +175,7 @@ pinjalw = 200.0 * maximum allowable value for injected power (MW) (`constraint *----------------Divertor Variables----------------* -divfix = 0.62 * divertor structure vertical thickness (m) +dz_divertor = 0.62 * divertor structure vertical thickness (m) *------------------Error Handling------------------* diff --git a/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT b/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT index ac1aa36bb7..66e61a384f 100644 --- a/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT @@ -119,29 +119,29 @@ dr_blkt_outboard = 1.0 * outboard blanket thickness (m); calculated if `blktmod dr_bore = 0.23375250334739459 * central solenoid inboard radius (m) (`iteration variable 29`) dr_vv_inboard = 0.2 * vacuum vessel inboard thickness (TF coil / shield) (m) dr_vv_outboard = 0.3 * vacuum vessel outboard thickness (TF coil / shield) (m) -d_vv_top = 0.3 * vacuum vessel topside thickness (TF coil / shield) (m) (= d_vv_bot if double-null) -d_vv_bot = 0.3 * vacuum vessel underside thickness (TF coil / shield) (m) +dz_vv_upper = 0.3 * vacuum vessel topside thickness (TF coil / shield) (m) (= dz_vv_lower if double-null) +dz_vv_lower = 0.3 * vacuum vessel underside thickness (TF coil / shield) (m) dr_shld_vv_gap_inboard = 0.01 * gap between inboard vacuum vessel and thermal shield (m) (`iteration variable 61`) dr_cs_tf_gap = 0.0 * gap between central solenoid and TF coil (m) (`iteration variable 42`) gapomin = 0.0 * minimum gap between outboard vacuum vessel and TF coil (m) (`iteration variable 31`) iohcl = 0 * Switch for existence of central solenoid; i_cs_precomp = 0 * Switch for existence of central solenoid pre-compression structure; -tf_in_cs = 0 * Switch for placing the TF coil inside the CS +i_tf_inside_cs = 0 * Switch for placing the TF coil inside the CS dr_cs = 0.20016400484967947 * Central solenoid thickness (m) (`iteration variable 16`) i_r_cp_top = 2 * Switch selecting the he parametrization of the outer radius of the top of the CP part of the TF coil dr_fw_plasma_gap_inboard = 0.1 * Gap between plasma and first wall; inboard side (m) (if `i_plasma_wall_gap=1`) dr_fw_plasma_gap_outboard = 0.1 * Gap between plasma and first wall; outboard side (m) (if `i_plasma_wall_gap=1`) dr_shld_inboard = 0.39314459807893426 * inboard shield thickness (m) (`iteration variable 93`) -shldlth = 0.6 * lower (under divertor) shield thickness (m) +dz_shld_lower = 0.6 * lower (under divertor) shield thickness (m) dr_shld_outboard = 0.3 * outboard shield thickness (m) (`iteration variable 94`) -shldtth = 0.3 * upper/lower shield thickness (m); calculated if `blktmodel > 0` (= shldlth if double-null) +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 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) -thshield_vb = 0.075 * TF-VV thermal shield thickness; vertical build (m) -vgap_vv_thermalshield = 2.0 * vertical gap between vacuum vessel and thermal shields (m) -vgap_xpoint_divertor = 0.75 * vertical gap between x-point and divertor (m) (if = 0; it is calculated) +dz_shld_thermal = 0.075 * TF-VV thermal shield thickness; vertical build (m) +dz_shld_vv_gap = 2.0 * vertical gap between vacuum vessel and thermal shields (m) +dz_xpoint_divertor = 0.75 * vertical gap between x-point and divertor (m) (if = 0; it is calculated) dr_shld_blkt_gap = 0.01 * gap between vacuum vessel and blanket (m) *---------------Buildings Variables----------------* @@ -208,7 +208,7 @@ pinjalw = 150.0 * maximum allowable value for injected power (MW) (`constraint *----------------Divertor Variables----------------* -divfix = 1.0 * divertor structure vertical thickness (m) +dz_divertor = 1.0 * divertor structure vertical thickness (m) *------------------Error Handling------------------* diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index c693737da0..6b7aab7876 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -918,7 +918,7 @@ ripmax = 1.0 * DESCRIPTION: Maximum Allowable Toroidal Field Ripple Amplitude at Plasma Edge (%) * JUSTIFICATION: Default -*tf_in_cs switch is found in the radial build section* +*i_tf_inside_cs switch is found in the radial build section* *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Conductor Type ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ @@ -1970,7 +1970,7 @@ icc = 11 * JUSTIFICATION: Consistency equations should always be on * VARIABLES: rmajor, Rest calculated in-situ -tf_in_cs = 0 +i_tf_inside_cs = 0 * DESCRIPTION: Switch for placing TF coils inside of the CS * JUSTIFICATION: TF placed in CS as design choice @@ -2148,43 +2148,43 @@ tfootfi = 1.0 *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~Vertical Build~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~* *‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ -vgap_xpoint_divertor = 0.75 +dz_xpoint_divertor = 0.75 * DESCRIPTION: Vertical Gap Between x-point and Divertor (m) * JUSTIFICATION: -*vgaptop = +*dz_fw_plasma_gap = * DESCRIPTION: Top vert gap between plasma and first wall (m) * JUSTIFICATION: Not yet set -divfix = 1.0 +dz_divertor = 1.0 * DESCRIPTION: Divertor Structure Vertical Thickness (m) * JUSTIFICATION: -shldtth = 0.3 +dz_shld_upper = 0.3 * DESCRIPTION: Top shield thickness (m) * JUSTIFICATION: Set to match outboard build -shldlth = 0.6 +dz_shld_lower = 0.6 * DESCRIPTION: Lower (under divertor) Shield Thickness (m) * JUSTIFICATION: -*blnktth = +*dz_blkt_upper = * DESCRIPTION: top blanket thickness (m) * JUSTIFICATION: No longer an input variable -thshield_vb = 0.075 +dz_shld_thermal = 0.075 * DESCRIPTION: TF-VV Thermal Shield Thickness (m) * JUSTIFICATION: -vgap_vv_thermalshield = 2.0 +dz_shld_vv_gap = 2.0 * DESCRIPTION: Vertical Gap Between Vacuum Vessel and TF coil (m) * JUSTIFICATION: -d_vv_top = 0.3 +dz_vv_upper = 0.3 * DESCRIPTION: top vaccum vessel thickness(m) * JUSTIFICATION: Set to match outboard build -d_vv_bot = 0.3 +dz_vv_lower = 0.3 * DESCRIPTION: Bottom (and top for double null) vaccum vessel thickness * JUSTIFICATION: diff --git a/tests/regression/input_files/stellarator_helias_once_through.IN.DAT b/tests/regression/input_files/stellarator_helias_once_through.IN.DAT index 38f00ae875..4717eb05d2 100644 --- a/tests/regression/input_files/stellarator_helias_once_through.IN.DAT +++ b/tests/regression/input_files/stellarator_helias_once_through.IN.DAT @@ -90,8 +90,8 @@ dr_fw_plasma_gap_inboard = 0.15 * Gap between plasma and first wall; inboard si dr_fw_plasma_gap_outboard = 0.2 * Gap between plasma and first wall; outboard side (m) (if `i_plasma_wall_gap=1`) dr_shld_inboard = 0.2 * inboard shield thickness (m) (`iteration variable 93`) dr_shld_outboard = 0.2 * outboard shield thickness (m) (`iteration variable 94`) -shldtth = 0.2 * upper/lower shield thickness (m); calculated if `blktmodel > 0` (= shldlth if double-null) -vgap_xpoint_divertor = 0. * vertical gap between x-point and divertor (m) (if = 0; it is calculated) +dz_shld_upper = 0.2 * upper/lower shield thickness (m); calculated if `blktmodel > 0` (= dz_shld_lower if double-null) +dz_xpoint_divertor = 0. * vertical gap between x-point and divertor (m) (if = 0; it is calculated) *---------------Buildings Variables----------------* diff --git a/tests/unit/data/large_tokamak_IN.DAT b/tests/unit/data/large_tokamak_IN.DAT index bec25666fc..4fcbf3aaa6 100644 --- a/tests/unit/data/large_tokamak_IN.DAT +++ b/tests/unit/data/large_tokamak_IN.DAT @@ -291,7 +291,7 @@ dr_tf_wp = 0.5 * Thermal shield radial thickness [m] dr_shld_thermal_inboard = 0.050 dr_shld_thermal_outboard = 0.050 -thshield_vb = 0.050 +dz_shld_thermal = 0.050 * Gap between thermal shield and vacuum vessel [m] dr_shld_vv_gap_inboard = 0.02 @@ -303,10 +303,10 @@ dr_vv_inboard = 0.3 dr_vv_outboard = 0.3 * Topside vacuum vessel radial thickness [m] -d_vv_top = 0.3 +dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] -d_vv_bot = 0.3 +dz_vv_lower = 0.3 * Inboard vacuum vessel thickness [m] dr_shld_inboard = 0.3 @@ -333,7 +333,7 @@ dr_cryostat = 0.15 dr_shld_outboard = 0.800 * Divertor structure vertical thickness [m] -divfix = 0.62 +dz_divertor = 0.62 * Coolant void fraction in shield vfshld = 0.60 diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index bfd59fffbc..a7fb917cd1 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -560,8 +560,8 @@ Time_between_pulses_(s)_________________________________________________ (t_between_pulse)______________________ 1.8000E+03 Total_plant_cycle_time_(s)______________________________________________ (t_cycle)______________________ 9.8377E+03 OP # Radial Build # - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 - TF_coil_radial_placement_switch_________________________________________ (tf_in_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 + TF_coil_radial_placement_switch_________________________________________ (i_tf_inside_cs)____________________ 0 Machine_bore_(m)________________________________________________________ (dr_bore)________________________ 1.9704E+00 ITV CS_radial_thickness_(m)_________________________________________________ (dr_cs)_______________________ 5.7696E-01 ITV CS_precompression_(m)___________________________________________________ (dr_cs_precomp)_____________________ 6.8501E-02 @@ -589,16 +589,16 @@ Divertor_null_switch____________________________________________________ (i_single_null)_______________ 1 Cryostat_roof_structure*________________________________________________ (dz_tf_cryostat)________________________ 5.6032E+00 Vessel_-_TF_coil_vertical_gap_(m)_______________________________________ (vgap2)_______________________ 1.6300E-01 - Topside_vacuum_vessel_radial_thickness_(m)______________________________ (d_vv_top)____________________ 3.0000E-01 - Top_radiation_shield_thickness_(m)______________________________________ (shldtth)_____________________ 6.0000E-01 - Top_blanket_vertical_thickness_(m)______________________________________ (blnktth)_____________________ 8.5000E-01 + Topside_vacuum_vessel_radial_thickness_(m)______________________________ (dz_vv_upper)____________________ 3.0000E-01 + Top_radiation_shield_thickness_(m)______________________________________ (dz_shld_upper)_____________________ 6.0000E-01 + Top_blanket_vertical_thickness_(m)______________________________________ (dz_blkt_upper)_____________________ 8.5000E-01 Top_first_wall_vertical_thickness_(m)___________________________________ (fwtth)_______________________ 1.8000E-02 - Top_scrape-off_vertical_thickness_(m)___________________________________ (vgaptop)_____________________ 6.0000E-01 + Top_scrape-off_vertical_thickness_(m)___________________________________ (dz_fw_plasma_gap)_____________________ 6.0000E-01 Plasma_half-height_(m)__________________________________________________ (rminor*kappa)________________ 4.9333E+00 Bottom_scrape-off_vertical_thickness_(m)________________________________ (vgap)________________________ 2.0019E+00 - Divertor_structure_vertical_thickness_(m)_______________________________ (divfix)______________________ 6.2000E-01 - Bottom_radiation_shield_thickness_(m)___________________________________ (shldlth)_____________________ 7.0000E-01 - Underside_vacuum_vessel_radial_thickness_(m)____________________________ (d_vv_bot)____________________ 3.0000E-01 + Divertor_structure_vertical_thickness_(m)_______________________________ (dz_divertor)______________________ 6.2000E-01 + Bottom_radiation_shield_thickness_(m)___________________________________ (dz_shld_lower)_____________________ 7.0000E-01 + Underside_vacuum_vessel_radial_thickness_(m)____________________________ (dz_vv_lower)____________________ 3.0000E-01 External_cryostat_thickness_(excludes_structure)_(m)____________________ (dr_cryostat)_______________________ 1.5000E-01 Ratio_of_Central_Solenoid_height_to_TF_coil_internal_height_____________ (f_z_cs_tf_internal)______________________ 9.0000E-01 Width_of_neutral_beam_duct_where_it_passes_between_the_TF_coils_(m)_____ (beamwd)______________________ 5.8000E-01 @@ -1482,7 +1482,7 @@ dr_tf_wp = 0.5 * Thermal shield radial thickness [m] dr_shld_thermal_inboard = 0.050 dr_shld_thermal_outboard = 0.050 -thshield_vb = 0.050 +dz_shld_thermal = 0.050 * Gap between thermal shield and vacuum vessel [m] dr_shld_vv_gap_inboard = 0.02 @@ -1494,10 +1494,10 @@ dr_vv_inboard = 0.3 dr_vv_outboard = 0.3 * Topside vacuum vessel radial thickness [m] -d_vv_top = 0.3 +dz_vv_upper = 0.3 * Underside vacuum vessel radial thickness [m] -d_vv_bot = 0.3 +dz_vv_lower = 0.3 * Inboard vacuum vessel thickness [m] dr_shld_inboard = 0.3 @@ -1524,7 +1524,7 @@ dr_cryostat = 0.15 dr_shld_outboard = 0.800 * Divertor structure vertical thickness [m] -divfix = 0.62 +dz_divertor = 0.62 * Coolant void fraction in shield vfshld = 0.60 diff --git a/tests/unit/test_blanket_library.py b/tests/unit/test_blanket_library.py index e2d5afa66e..cf9a307abf 100644 --- a/tests/unit/test_blanket_library.py +++ b/tests/unit/test_blanket_library.py @@ -358,20 +358,20 @@ def test_pumppower_secondary_pb_li(monkeypatch, blanket_library_fixture): class ComponentHalfHeightParam(NamedTuple): hmax: Any = None - vgap_xpoint_divertor: Any = None - vgap_vv_thermalshield: Any = None - blnktth: Any = None - shldtth: Any = None + dz_xpoint_divertor: Any = None + dz_shld_vv_gap: Any = None + dz_blkt_upper: Any = None + dz_shld_upper: Any = None dr_fw_plasma_gap_inboard: Any = None dr_fw_plasma_gap_outboard: Any = None dr_fw_inboard: Any = None dr_fw_outboard: Any = None - d_vv_bot: Any = None - d_vv_top: Any = None - rminor: Any = None - kappa: Any = None + dz_vv_lower: Any = None + dz_vv_upper: Any = None + z_plasma_xpoint_lower: Any = None + z_plasma_xpoint_upper: Any = None idivrt: Any = None - divfix: Any = None + dz_divertor: Any = None icomponent: Any = None expected_icomponent: Any = None expected_half_height: Any = None @@ -382,20 +382,20 @@ class ComponentHalfHeightParam(NamedTuple): ( ComponentHalfHeightParam( hmax=8.8182171641274945, - vgap_xpoint_divertor=2.0018838307941582, - vgap_vv_thermalshield=0.16300000000000001, - blnktth=0.85000000000000009, - shldtth=0.59999999999999998, + dz_xpoint_divertor=2.0018838307941582, + dz_shld_vv_gap=0.16300000000000001, + dz_blkt_upper=0.85000000000000009, + dz_shld_upper=0.59999999999999998, dr_fw_plasma_gap_inboard=0.25, dr_fw_plasma_gap_outboard=0.25, dr_fw_inboard=0.018000000000000002, dr_fw_outboard=0.018000000000000002, - d_vv_bot=0.30000000000000004, - d_vv_top=0.30000000000000004, - rminor=2.6666666666666665, - kappa=1.8500000000000001, + dz_vv_lower=0.30000000000000004, + dz_vv_upper=0.30000000000000004, + z_plasma_xpoint_lower=4.93333333333333333, + z_plasma_xpoint_upper=4.93333333333333333, idivrt=1, - divfix=0.62000000000000011, + dz_divertor=0.62000000000000011, icomponent=0, expected_icomponent=0, expected_half_height=5.9532752487304119, @@ -419,16 +419,20 @@ def test_component_half_height( monkeypatch.setattr(build_variables, "hmax", componenthalfheightparam.hmax) monkeypatch.setattr( build_variables, - "vgap_xpoint_divertor", - componenthalfheightparam.vgap_xpoint_divertor, + "dz_xpoint_divertor", + componenthalfheightparam.dz_xpoint_divertor, ) monkeypatch.setattr( build_variables, - "vgap_vv_thermalshield", - componenthalfheightparam.vgap_vv_thermalshield, + "dz_shld_vv_gap", + componenthalfheightparam.dz_shld_vv_gap, + ) + monkeypatch.setattr( + build_variables, "dz_blkt_upper", componenthalfheightparam.dz_blkt_upper + ) + monkeypatch.setattr( + build_variables, "dz_shld_upper", componenthalfheightparam.dz_shld_upper ) - monkeypatch.setattr(build_variables, "blnktth", componenthalfheightparam.blnktth) - monkeypatch.setattr(build_variables, "shldtth", componenthalfheightparam.shldtth) monkeypatch.setattr( build_variables, "dr_fw_plasma_gap_inboard", @@ -445,12 +449,26 @@ def test_component_half_height( monkeypatch.setattr( build_variables, "dr_fw_outboard", componenthalfheightparam.dr_fw_outboard ) - monkeypatch.setattr(build_variables, "d_vv_bot", componenthalfheightparam.d_vv_bot) - monkeypatch.setattr(build_variables, "d_vv_top", componenthalfheightparam.d_vv_top) - monkeypatch.setattr(physics_variables, "rminor", componenthalfheightparam.rminor) - monkeypatch.setattr(physics_variables, "kappa", componenthalfheightparam.kappa) + monkeypatch.setattr( + build_variables, "dz_vv_lower", componenthalfheightparam.dz_vv_lower + ) + monkeypatch.setattr( + build_variables, "dz_vv_upper", componenthalfheightparam.dz_vv_upper + ) + monkeypatch.setattr( + build_variables, + "z_plasma_xpoint_lower", + componenthalfheightparam.z_plasma_xpoint_lower, + ) + monkeypatch.setattr( + build_variables, + "z_plasma_xpoint_upper", + componenthalfheightparam.z_plasma_xpoint_upper, + ) monkeypatch.setattr(physics_variables, "idivrt", componenthalfheightparam.idivrt) - monkeypatch.setattr(divertor_variables, "divfix", componenthalfheightparam.divfix) + monkeypatch.setattr( + divertor_variables, "dz_divertor", componenthalfheightparam.dz_divertor + ) half_height = blanket_library_fixture.component_half_height( componenthalfheightparam.icomponent @@ -471,17 +489,17 @@ class DshapedComponentParam(NamedTuple): blareaob: Any = None blarea: Any = None dr_blkt_outboard: Any = None - blnktth: Any = None + dz_blkt_upper: Any = None shareaib: Any = None shareaob: Any = None sharea: Any = None dr_shld_outboard: Any = None - shldtth: Any = None + dz_shld_upper: Any = None rsldo: Any = None dr_vv_inboard: Any = None dr_vv_outboard: Any = None - d_vv_top: Any = None - d_vv_bot: Any = None + dz_vv_upper: Any = None + dz_vv_lower: Any = None volblkti: Any = None volblkto: Any = None volblkt: Any = None @@ -528,17 +546,17 @@ class DshapedComponentParam(NamedTuple): blareaob=0, blarea=0, dr_blkt_outboard=1, - blnktth=0.5, + dz_blkt_upper=0.5, shareaib=0, shareaob=0, sharea=0, dr_shld_outboard=0.30000000000000004, - shldtth=0.60000000000000009, + dz_shld_upper=0.60000000000000009, rsldo=8.4000000000000004, dr_vv_inboard=0.20000000000000001, dr_vv_outboard=0.30000000000000004, - d_vv_top=0.30000000000000004, - d_vv_bot=0.30000000000000004, + dz_vv_upper=0.30000000000000004, + dz_vv_lower=0.30000000000000004, volblkti=0, volblkto=0, volblkt=0, @@ -581,17 +599,17 @@ class DshapedComponentParam(NamedTuple): blareaob=852.24160940262459, blarea=1049.2194687827046, dr_blkt_outboard=1, - blnktth=0.5, + dz_blkt_upper=0.5, shareaib=0, shareaob=0, sharea=0, dr_shld_outboard=0.30000000000000004, - shldtth=0.60000000000000009, + dz_shld_upper=0.60000000000000009, rsldo=8.4000000000000004, dr_vv_inboard=0.20000000000000001, dr_vv_outboard=0.30000000000000004, - d_vv_top=0.30000000000000004, - d_vv_bot=0.30000000000000004, + dz_vv_upper=0.30000000000000004, + dz_vv_lower=0.30000000000000004, volblkti=0, volblkto=691.06561956756764, volblkt=691.06561956756764, @@ -634,17 +652,17 @@ class DshapedComponentParam(NamedTuple): blareaob=852.24160940262459, blarea=1049.2194687827046, dr_blkt_outboard=1, - blnktth=0.5, + dz_blkt_upper=0.5, shareaib=208.91591146372122, shareaob=1013.8483589087293, sharea=1222.7642703724505, dr_shld_outboard=0.30000000000000004, - shldtth=0.60000000000000009, + dz_shld_upper=0.60000000000000009, rsldo=8.4000000000000004, dr_vv_inboard=0.20000000000000001, dr_vv_outboard=0.30000000000000004, - d_vv_top=0.30000000000000004, - d_vv_bot=0.30000000000000004, + dz_vv_upper=0.30000000000000004, + dz_vv_lower=0.30000000000000004, volblkti=0, volblkto=691.06561956756764, volblkt=691.06561956756764, @@ -718,14 +736,18 @@ def test_dshaped_component(dshapedcomponentparam, monkeypatch, blanket_library_f monkeypatch.setattr( build_variables, "dr_blkt_outboard", dshapedcomponentparam.dr_blkt_outboard ) - monkeypatch.setattr(build_variables, "blnktth", dshapedcomponentparam.blnktth) + monkeypatch.setattr( + build_variables, "dz_blkt_upper", dshapedcomponentparam.dz_blkt_upper + ) monkeypatch.setattr(build_variables, "shareaib", dshapedcomponentparam.shareaib) monkeypatch.setattr(build_variables, "shareaob", dshapedcomponentparam.shareaob) monkeypatch.setattr(build_variables, "sharea", dshapedcomponentparam.sharea) monkeypatch.setattr( build_variables, "dr_shld_outboard", dshapedcomponentparam.dr_shld_outboard ) - monkeypatch.setattr(build_variables, "shldtth", dshapedcomponentparam.shldtth) + monkeypatch.setattr( + build_variables, "dz_shld_upper", dshapedcomponentparam.dz_shld_upper + ) monkeypatch.setattr(build_variables, "rsldo", dshapedcomponentparam.rsldo) monkeypatch.setattr( build_variables, "dr_vv_inboard", dshapedcomponentparam.dr_vv_inboard @@ -733,8 +755,12 @@ def test_dshaped_component(dshapedcomponentparam, monkeypatch, blanket_library_f monkeypatch.setattr( build_variables, "dr_vv_outboard", dshapedcomponentparam.dr_vv_outboard ) - monkeypatch.setattr(build_variables, "d_vv_top", dshapedcomponentparam.d_vv_top) - monkeypatch.setattr(build_variables, "d_vv_bot", dshapedcomponentparam.d_vv_bot) + monkeypatch.setattr( + build_variables, "dz_vv_upper", dshapedcomponentparam.dz_vv_upper + ) + monkeypatch.setattr( + build_variables, "dz_vv_lower", dshapedcomponentparam.dz_vv_lower + ) monkeypatch.setattr(fwbs_variables, "volblkti", dshapedcomponentparam.volblkti) monkeypatch.setattr(fwbs_variables, "volblkto", dshapedcomponentparam.volblkto) monkeypatch.setattr(fwbs_variables, "volblkt", dshapedcomponentparam.volblkt) @@ -778,15 +804,15 @@ class EllipticalComponentParam(NamedTuple): blareaib: Any = None blareaob: Any = None blarea: Any = None - blnktth: Any = None + dz_blkt_upper: Any = None shareaib: Any = None shareaob: Any = None sharea: Any = None - shldtth: Any = None + dz_shld_upper: Any = None dr_vv_inboard: Any = None dr_vv_outboard: Any = None - d_vv_top: Any = None - d_vv_bot: Any = None + dz_vv_upper: Any = None + dz_vv_lower: Any = None volblkti: Any = None volblkto: Any = None volblkt: Any = None @@ -834,15 +860,15 @@ class EllipticalComponentParam(NamedTuple): blareaib=0, blareaob=0, blarea=0, - blnktth=0.85000000000000009, + dz_blkt_upper=0.85000000000000009, shareaib=0, shareaob=0, sharea=0, - shldtth=0.59999999999999998, + dz_shld_upper=0.59999999999999998, dr_vv_inboard=0.30000000000000004, dr_vv_outboard=0.30000000000000004, - d_vv_top=0.30000000000000004, - d_vv_bot=0.30000000000000004, + dz_vv_upper=0.30000000000000004, + dz_vv_lower=0.30000000000000004, volblkti=0, volblkto=0, volblkt=0, @@ -886,15 +912,15 @@ class EllipticalComponentParam(NamedTuple): blareaib=664.9687712975541, blareaob=1101.3666396424403, blarea=1766.3354109399943, - blnktth=0.85000000000000009, + dz_blkt_upper=0.85000000000000009, shareaib=0, shareaob=0, sharea=0, - shldtth=0.59999999999999998, + dz_shld_upper=0.59999999999999998, dr_vv_inboard=0.30000000000000004, dr_vv_outboard=0.30000000000000004, - d_vv_top=0.30000000000000004, - d_vv_bot=0.30000000000000004, + dz_vv_upper=0.30000000000000004, + dz_vv_lower=0.30000000000000004, volblkti=315.83946385183026, volblkto=1020.3677420460117, volblkt=1336.207205897842, @@ -938,15 +964,15 @@ class EllipticalComponentParam(NamedTuple): blareaib=664.9687712975541, blareaob=1101.3666396424403, blarea=1766.3354109399943, - blnktth=0.85000000000000009, + dz_blkt_upper=0.85000000000000009, shareaib=700.06731267447844, shareaob=1344.1106481995357, sharea=2044.1779608740142, - shldtth=0.59999999999999998, + dz_shld_upper=0.59999999999999998, dr_vv_inboard=0.30000000000000004, dr_vv_outboard=0.30000000000000004, - d_vv_top=0.30000000000000004, - d_vv_bot=0.30000000000000004, + dz_vv_upper=0.30000000000000004, + dz_vv_lower=0.30000000000000004, volblkti=315.83946385183026, volblkto=1020.3677420460117, volblkt=1336.207205897842, @@ -1013,19 +1039,27 @@ def test_elliptical_component( monkeypatch.setattr(build_variables, "blareaib", ellipticalcomponentparam.blareaib) monkeypatch.setattr(build_variables, "blareaob", ellipticalcomponentparam.blareaob) monkeypatch.setattr(build_variables, "blarea", ellipticalcomponentparam.blarea) - monkeypatch.setattr(build_variables, "blnktth", ellipticalcomponentparam.blnktth) + monkeypatch.setattr( + build_variables, "dz_blkt_upper", ellipticalcomponentparam.dz_blkt_upper + ) monkeypatch.setattr(build_variables, "shareaib", ellipticalcomponentparam.shareaib) monkeypatch.setattr(build_variables, "shareaob", ellipticalcomponentparam.shareaob) monkeypatch.setattr(build_variables, "sharea", ellipticalcomponentparam.sharea) - monkeypatch.setattr(build_variables, "shldtth", ellipticalcomponentparam.shldtth) + monkeypatch.setattr( + build_variables, "dz_shld_upper", ellipticalcomponentparam.dz_shld_upper + ) monkeypatch.setattr( build_variables, "dr_vv_inboard", ellipticalcomponentparam.dr_vv_inboard ) monkeypatch.setattr( build_variables, "dr_vv_outboard", ellipticalcomponentparam.dr_vv_outboard ) - monkeypatch.setattr(build_variables, "d_vv_top", ellipticalcomponentparam.d_vv_top) - monkeypatch.setattr(build_variables, "d_vv_bot", ellipticalcomponentparam.d_vv_bot) + monkeypatch.setattr( + build_variables, "dz_vv_upper", ellipticalcomponentparam.dz_vv_upper + ) + monkeypatch.setattr( + build_variables, "dz_vv_lower", ellipticalcomponentparam.dz_vv_lower + ) monkeypatch.setattr(fwbs_variables, "volblkti", ellipticalcomponentparam.volblkti) monkeypatch.setattr(fwbs_variables, "volblkto", ellipticalcomponentparam.volblkto) monkeypatch.setattr(fwbs_variables, "volblkt", ellipticalcomponentparam.volblkt) diff --git a/tests/unit/test_buildings.py b/tests/unit/test_buildings.py index 7e2c4170e0..48ba9a7a2f 100644 --- a/tests/unit/test_buildings.py +++ b/tests/unit/test_buildings.py @@ -144,7 +144,7 @@ class BldgsSizesParam(NamedTuple): dr_tf_shld_gap: Any dr_shld_thermal_inboard: Any dr_shld_thermal_outboard: Any - thshield_vb: Any + dz_shld_thermal: Any dr_shld_inboard: Any dr_shld_outboard: Any dr_fw_plasma_gap_inboard: Any @@ -154,7 +154,7 @@ class BldgsSizesParam(NamedTuple): dr_blkt_inboard: Any dr_blkt_outboard: Any r_cp_top: Any - divfix: Any + dz_divertor: Any rmajor: Any rminor: Any tf_radial_dim: Any @@ -287,7 +287,7 @@ class BldgsSizesParam(NamedTuple): dr_tf_shld_gap=0.05000000000000001, dr_shld_thermal_inboard=0.050000000000000003, dr_shld_thermal_outboard=0.050000000000000003, - thshield_vb=0.050000000000000003, + dz_shld_thermal=0.050000000000000003, dr_shld_inboard=0.30000000000000004, dr_shld_outboard=0.80000000000000004, dr_fw_plasma_gap_inboard=0.22500000000000003, @@ -297,7 +297,7 @@ class BldgsSizesParam(NamedTuple): dr_blkt_inboard=0.75500000000000012, dr_blkt_outboard=0.98199999999999998, r_cp_top=4.20194118510911, - divfix=0.62100000000000011, + dz_divertor=0.62100000000000011, rmajor=8.8901000000000003, rminor=2.8677741935483869, tf_radial_dim=14.129464674334221, @@ -426,7 +426,7 @@ class BldgsSizesParam(NamedTuple): dr_tf_shld_gap=0.05000000000000001, dr_shld_thermal_inboard=0.050000000000000003, dr_shld_thermal_outboard=0.050000000000000003, - thshield_vb=0.050000000000000003, + dz_shld_thermal=0.050000000000000003, dr_shld_inboard=0.30000000000000004, dr_shld_outboard=0.80000000000000004, dr_fw_plasma_gap_inboard=0.22500000000000003, @@ -436,7 +436,7 @@ class BldgsSizesParam(NamedTuple): dr_blkt_inboard=0.75500000000000012, dr_blkt_outboard=0.98199999999999998, r_cp_top=4.20194118510911, - divfix=0.62100000000000011, + dz_divertor=0.62100000000000011, rmajor=8.8901000000000003, rminor=2.8677741935483869, tf_radial_dim=14.129464674334221, @@ -699,7 +699,9 @@ def test_bldgs_sizes(buildings, bldgssizesparam, monkeypatch): "dr_shld_thermal_outboard", bldgssizesparam.dr_shld_thermal_outboard, ) - monkeypatch.setattr(build_variables, "thshield_vb", bldgssizesparam.thshield_vb) + monkeypatch.setattr( + build_variables, "dz_shld_thermal", bldgssizesparam.dz_shld_thermal + ) monkeypatch.setattr( build_variables, "dr_shld_inboard", bldgssizesparam.dr_shld_inboard ) @@ -727,7 +729,7 @@ def test_bldgs_sizes(buildings, bldgssizesparam, monkeypatch): build_variables, "dr_blkt_outboard", bldgssizesparam.dr_blkt_outboard ) monkeypatch.setattr(build_variables, "r_cp_top", bldgssizesparam.r_cp_top) - monkeypatch.setattr(divertor_variables, "divfix", bldgssizesparam.divfix) + monkeypatch.setattr(divertor_variables, "dz_divertor", bldgssizesparam.dz_divertor) monkeypatch.setattr(physics_variables, "rmajor", bldgssizesparam.rmajor) monkeypatch.setattr(physics_variables, "rminor", bldgssizesparam.rminor) diff --git a/tests/unit/test_divertor.py b/tests/unit/test_divertor.py index 2f5ae25579..76a3e4558b 100644 --- a/tests/unit/test_divertor.py +++ b/tests/unit/test_divertor.py @@ -137,7 +137,7 @@ def test_divtart(self, monkeypatch, divertor): rminor = 0.97142857142857153 triang = 0.5 dr_fw_plasma_gap_inboard = 0.09595 - vgap_xpoint_divertor = 0.5 + dz_xpoint_divertor = 0.5 pdivt = 7.7197999809272062 monkeypatch.setattr(dv, "i_hldiv", 1) @@ -148,7 +148,7 @@ def test_divtart(self, monkeypatch, divertor): rminor, triang, dr_fw_plasma_gap_inboard, - vgap_xpoint_divertor, + dz_xpoint_divertor, pdivt, False, ) diff --git a/tests/unit/test_sctfcoil.py b/tests/unit/test_sctfcoil.py index 230c627657..a92d0476da 100644 --- a/tests/unit/test_sctfcoil.py +++ b/tests/unit/test_sctfcoil.py @@ -3461,7 +3461,7 @@ class StressclParam(NamedTuple): dr_cs: Any = None - tf_in_cs: Any = None + i_tf_inside_cs: Any = None dr_cs_tf_gap: Any = None @@ -3639,7 +3639,7 @@ class StressclParam(NamedTuple): ( StressclParam( dr_tf_inboard=1.208, - tf_in_cs=0, + i_tf_inside_cs=0, dr_cs_tf_gap=0.01, r_tf_inboard_mid=3.5979411851091103, dr_bore=2.3322000000000003, @@ -3762,7 +3762,7 @@ class StressclParam(NamedTuple): ), StressclParam( dr_tf_inboard=1.208, - tf_in_cs=0, + i_tf_inside_cs=0, dr_cs_tf_gap=0.01, r_tf_inboard_mid=3.5979411851091103, dr_bore=2.3322000000000003, @@ -3943,7 +3943,7 @@ def test_stresscl(stressclparam, monkeypatch, sctfcoil): stressclparam.hmax, stressclparam.f_z_cs_tf_internal, stressclparam.dr_cs, - stressclparam.tf_in_cs, + stressclparam.i_tf_inside_cs, stressclparam.dr_tf_inboard, stressclparam.dr_cs_tf_gap, stressclparam.i_pf_conductor, @@ -14098,8 +14098,9 @@ def test_vv_stress_on_quench_integration(sctfcoil, monkeypatch): ) monkeypatch.setattr(build_variables, "dr_tf_outboard", 0) # simplifies - monkeypatch.setattr(physics_variables, "rminor", 2.96) # Baseline 2018 - monkeypatch.setattr(physics_variables, "kappa", 1.848) # Baseline 2018 + monkeypatch.setattr( + build_variables, "z_plasma_xpoint_upper", 5.47008 + ) # Baseline 2018 monkeypatch.setattr(sctfcoil_module, "a_tf_steel", 0.55) # Section 3 @@ -14107,10 +14108,10 @@ def test_vv_stress_on_quench_integration(sctfcoil, monkeypatch): monkeypatch.setattr(sctfcoil_module, "a_case_front", 0.47) monkeypatch.setattr(sctfcoil_module, "a_case_nose", 0.47) - monkeypatch.setattr(build_variables, "vgap_xpoint_divertor", 0.05) # Baseline 2018 - monkeypatch.setattr(build_variables, "shldtth", 0.3) # Baseline 2018 + monkeypatch.setattr(build_variables, "dz_xpoint_divertor", 0.05) # Baseline 2018 + monkeypatch.setattr(build_variables, "dz_shld_upper", 0.3) # Baseline 2018 monkeypatch.setattr( - divertor_variables, "divfix", 2.05 + divertor_variables, "dz_divertor", 2.05 ) # chosen to achieve H_vv in Table 2 monkeypatch.setattr(build_variables, "dr_tf_shld_gap", 0.05) # Baseline 2018 @@ -14124,7 +14125,7 @@ def test_vv_stress_on_quench_integration(sctfcoil, monkeypatch): monkeypatch.setattr(build_variables, "dr_vv_outboard", 0.06) # Section 3 monkeypatch.setattr(build_variables, "dr_vv_inboard", 0.06) # Section 3 - monkeypatch.setattr(build_variables, "d_vv_top", 0.06) # Section 3 + monkeypatch.setattr(build_variables, "dz_vv_upper", 0.06) # Section 3 monkeypatch.setattr(tfcoil_variables, "len_tf_coil", 51.1) # Table 2 monkeypatch.setattr( diff --git a/tests/unit/test_stellarator.py b/tests/unit/test_stellarator.py index 5d8db37fee..e7909469d7 100644 --- a/tests/unit/test_stellarator.py +++ b/tests/unit/test_stellarator.py @@ -212,7 +212,7 @@ class StbildParam(NamedTuple): dr_blkt_outboard: Any = None - blnktth: Any = None + dz_blkt_upper: Any = None dr_bore: Any = None @@ -256,7 +256,7 @@ class StbildParam(NamedTuple): dr_shld_outboard: Any = None - shldtth: Any = None + dz_shld_upper: Any = None dr_tf_inboard: Any = None @@ -304,7 +304,7 @@ class StbildParam(NamedTuple): outfile: Any = None - expected_blnktth: Any = None + expected_dz_blkt_upper: Any = None expected_bore: Any = None @@ -345,7 +345,7 @@ class StbildParam(NamedTuple): blbuoth=0.46500000000000002, dr_blkt_inboard=0.70000000000000007, dr_blkt_outboard=0.80000000000000004, - blnktth=0, + dz_blkt_upper=0, dr_bore=1.4199999999999999, dr_vv_inboard=0.35000000000000003, dr_vv_outboard=0.35000000000000003, @@ -367,7 +367,7 @@ class StbildParam(NamedTuple): dr_fw_plasma_gap_outboard=0.30000000000000004, dr_shld_inboard=0.40000000000000002, dr_shld_outboard=0.70000000000000007, - shldtth=0.70000000000000007, + dz_shld_upper=0.70000000000000007, dr_tf_inboard=0.78058448071757114, dr_tf_outboard=0.78058448071757114, available_radial_space=0, @@ -391,7 +391,7 @@ class StbildParam(NamedTuple): f_a=0.99125889880147788, iprint=0, outfile=11, - expected_blnktth=0.75, + expected_dz_blkt_upper=0.75, expected_bore=17.79214950143977, expected_a_fw_total=1918.8188778803135, expected_dr_fw_inboard=0.018000000000000002, @@ -415,7 +415,7 @@ class StbildParam(NamedTuple): blbuoth=0.46500000000000002, dr_blkt_inboard=0.70000000000000007, dr_blkt_outboard=0.80000000000000004, - blnktth=0.75, + dz_blkt_upper=0.75, dr_bore=17.79214950143977, dr_vv_inboard=0.35000000000000003, dr_vv_outboard=0.35000000000000003, @@ -437,7 +437,7 @@ class StbildParam(NamedTuple): dr_fw_plasma_gap_outboard=0.30000000000000004, dr_shld_inboard=0.40000000000000002, dr_shld_outboard=0.70000000000000007, - shldtth=0.70000000000000007, + dz_shld_upper=0.70000000000000007, dr_tf_inboard=0.78058448071757114, dr_tf_outboard=0.78058448071757114, available_radial_space=1.8828828828828827, @@ -461,7 +461,7 @@ class StbildParam(NamedTuple): f_a=0.99125889880147788, iprint=0, outfile=11, - expected_blnktth=0.75, + expected_dz_blkt_upper=0.75, expected_bore=17.79214950143977, expected_a_fw_total=2120.6210472630282, expected_dr_fw_inboard=0.018000000000000002, @@ -509,7 +509,7 @@ def test_stbild(stbildparam, monkeypatch, stellarator): build_variables, "dr_blkt_outboard", stbildparam.dr_blkt_outboard ) - monkeypatch.setattr(build_variables, "blnktth", stbildparam.blnktth) + monkeypatch.setattr(build_variables, "dz_blkt_upper", stbildparam.dz_blkt_upper) monkeypatch.setattr(build_variables, "dr_bore", stbildparam.dr_bore) @@ -569,7 +569,7 @@ def test_stbild(stbildparam, monkeypatch, stellarator): build_variables, "dr_shld_outboard", stbildparam.dr_shld_outboard ) - monkeypatch.setattr(build_variables, "shldtth", stbildparam.shldtth) + monkeypatch.setattr(build_variables, "dz_shld_upper", stbildparam.dz_shld_upper) monkeypatch.setattr(build_variables, "dr_tf_inboard", stbildparam.dr_tf_inboard) @@ -634,7 +634,9 @@ def test_stbild(stbildparam, monkeypatch, stellarator): monkeypatch.setattr(stellarator_module, "f_a", stbildparam.f_a) stellarator.stbild(False) - assert build_variables.blnktth == pytest.approx(stbildparam.expected_blnktth) + assert build_variables.dz_blkt_upper == pytest.approx( + stbildparam.expected_dz_blkt_upper + ) assert build_variables.dr_bore == pytest.approx(stbildparam.expected_bore)