Skip to content

🎨 Update the vertical build variables to new style #3523

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
timothy-nunn merged 17 commits into from
Mar 11, 2025
Merged

🎨 Update the vertical build variables to new style #3523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
be463ec
:sparkle: Add new z_plasma_xpoint_upper and z_plasma_xpoint_lower var…
chris-ashe Feb 3, 2025
3205cce
🔄 Rename thshield_vb to dz_shld_thermal for consistency across multip…
chris-ashe Feb 11, 2025
146c8c4
🔄 Rename vgap_xpoint_divertor to dz_xpoint_divertor for consistency a…
chris-ashe Feb 11, 2025
e601ab1
🔄 Rename divfix to dz_divertor for consistency across multiple files
chris-ashe Feb 11, 2025
63991e3
🔄 Rename vgap_vv_thermalshield to dz_shld_vv_gap for consistency acro…
chris-ashe Feb 11, 2025
371b7f0
🔄 Rename vgaptop to dz_fw_plasma_gap for consistency across multiple …
chris-ashe Feb 11, 2025
e8dfc29
🔄 Rename blnktth to dz_blkt_top for consistency across multiple files
chris-ashe Feb 11, 2025
5bdb4b6
🔄 Rename fwtth to dz_fw_upper for consistency across multiple files
chris-ashe Feb 20, 2025
3f26ab1
🔄 Rename shldlth to dz_shld_lower for consistency across multiple files
chris-ashe Feb 20, 2025
a5af817
🔄 Rename shldtth to dz_shld_upper for consistency across multiple files
chris-ashe Feb 20, 2025
3d6a6c5
🔄 Rename d_vv_top to dz_vv_upper for consistency across multiple files
chris-ashe Feb 20, 2025
fa69f27
🔄 Rename d_vv_bot to dz_vv_lower for consistency across multiple files
chris-ashe Feb 20, 2025
4dcffab
🔄 Rename dz_blkt_top to dz_blkt_upper for consistency across multiple…
chris-ashe Feb 20, 2025
877266f
🔄 Rename tf_in_cs to i_tf_inside_cs for consistency across multiple f…
chris-ashe Feb 20, 2025
8e9ac8b
🔄 Update obsolete_vars.py to rename variables for consistency across …
chris-ashe Feb 20, 2025
a3a6134
Update process/io/obsolete_vars.py
chris-ashe Mar 6, 2025
3c3ee34
🔄 Rename variables for consistency in input files
chris-ashe Mar 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions documentation/proc-pages/eng-models/machine-build.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)**
6 changes: 3 additions & 3 deletions documentation/proc-pages/eng-models/tf-coil.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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. <br> - 0 : Outside of central solenoid <br> - 1 : Inside of central solenoid | - | 0 | - |
| `i_tf_inside_cs` | TF coil inboard leg radial placement switch. <br> - 0 : Outside of central solenoid <br> - 1 : Inside of central solenoid | - | 0 | - |
| `dr_tf_inboard` | TF coil maximum radial size <br> 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 <br> calculated if `dr_tf_inboard` is used as iteration variable. Include the ground insulation and the insertion gap. | ixc = 140 | No default | m |
Expand Down
2 changes: 1 addition & 1 deletion documentation/proc-pages/fusion-devices/stellarator.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
```

Expand Down
26 changes: 13 additions & 13 deletions examples/data/csv_output_large_tokamak_MFILE.DAT
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
26 changes: 13 additions & 13 deletions examples/data/large_tokamak_1_MFILE.DAT
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
26 changes: 13 additions & 13 deletions examples/data/large_tokamak_2_MFILE.DAT
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
Loading