ukaea · kj5248 · Jan 26, 2025 · Jan 26, 2025 · Jan 26, 2025 · Jan 26, 2025
@@ -37,7 +37,7 @@ The models used for the thermoydraulics of the first wall, the profile of
 deposition of the neutron energy, tritium breeding, and conversion of heat to 
 electricity have been revised extensively.
 
-`iblanket` -- This switch selects between different types of blanket.
+`i_blanket_type` -- This switch selects between different types of blanket.
 
 - `== 1` -- CCFE HCPB (helium-cooled pebble bed) model. The energy 
     deposition in the armour and first wall, blanket and shield are calculated 
@@ -76,19 +76,19 @@ Summary of key variables and switches:
 | :----------------------: | :---------------------: | ------------------------ | ------------------------------------ |
 |     Coolant Channels     |      :-----------:      | ------------------------ | --------------------------           |
 |        length (m)        |   `fw_channel_length`   | ---                      | ---                                  |
-|        width (m)         | `afw` (radius, cicular) | `afw`                    | `a_bz_liq`, `b_bz_liq` (rectangular) |
-|    wall thickness (m)    |        `fw_wall`        | fw_wall                  | `th_wall_secondary`                  |
-|        pitch (m)         |         `pitch`         | ---                      | ---                                  |
+|        width (m)         | `radius_fw_channel` (radius, cicular) | `radius_fw_channel`                    | `a_bz_liq`, `b_bz_liq` (rectangular) |
+|    wall thickness (m)    |        `dr_fw_wall`        | dr_fw_wall                  | `th_wall_secondary`                  |
+|        dx_fw_module (m)         |         `dx_fw_module`         | ---                      | ---                                  |
 |    roughness epsilon     |       `roughness`       | ---                      | ---                                  |
 |     peak FW temp (K)     |         `tpeak`         | ---                      | ---                                  |
 |     maximum temp (K)     |       `tfwmatmax`       | ---                      | ---                                  |
 |        FCI switch        |           ---           | ---                      | `ifci`                               |
 |         Coolant          |      :-----------:      | ------------------------ | --------------------------           |
-|  primary coolant switch  |       `fwcoolant`       | `coolwh`                 | ---                                  |
+|  primary coolant switch  |       `i_fw_coolant_type`       | `coolwh`                 | ---                                  |
 | secondary coolant switch |           ---           | ---                      | `i_bb_liq`                           |
-|      inlet temp (K)      |        `fwinlet`        | `inlet_temp`             | `inlet_temp_liq`                     |
-|     outlet temp (K)      |       `fwoutlet`        | `outlet_temp`            | `outlet_temp_liq`                    |
-|      pressure (Pa)       |      `fwpressure`       | `blpressure`             | `blpressure_liq`                     |
+|      inlet temp (K)      |        `temp_fw_coolant_in`        | `inlet_temp`             | `inlet_temp_liq`                     |
+|     outlet temp (K)      |       `temp_fw_coolant_out`        | `outlet_temp`            | `outlet_temp_liq`                    |
+|      pressure (Pa)       |      `pres_fw_coolant`       | `blpressure`             | `blpressure_liq`                     |
 
 The default thermo-hydraulic model assumes that a solid breeder is in use, with both the first wall and the breeding blanket using helium as a coolant.
 This can be changed using the switches detailed in the following subsection. 
@@ -110,7 +110,7 @@ Minimum distance travelled by surface heat load = $\texttt{fw} \_ \texttt{wall}$
 Maximum distance travelled by surface heat load = $\texttt{diagonal}$
 
 $$
-\texttt{diagonal}=\sqrt{(\texttt{afw}+\texttt{fw} \_ \texttt{wall})^2 + \left(\frac{\texttt{pitch}}{2}-\texttt{afw}\right)^2 }
+\texttt{diagonal}=\sqrt{(\texttt{radius_fw_channel}+\texttt{fw} \_ \texttt{wall})^2 + \left(\frac{\texttt{dx_fw_module}}{2}-\texttt{radius_fw_channel}\right)^2 }
 $$
 
 Typical distance travelled by surface heat load:
@@ -121,15 +121,15 @@ $$
 
 
 $$
-\texttt{diagonal}=\sqrt{(\texttt{afw}+\texttt{fw} \_ \texttt{wall})^2 + \left(\frac{\texttt{pitch}}{2}-\texttt{afw}\right)^2 }
+\texttt{diagonal}=\sqrt{(\texttt{radius_fw_channel}+\texttt{fw} \_ \texttt{wall})^2 + \left(\frac{\texttt{dx_fw_module}}{2}-\texttt{radius_fw_channel}\right)^2 }
 $$
 
-The energy travels over a cross-section which is initially $= \texttt{pitch}$
+The energy travels over a cross-section which is initially $= \texttt{dx_fw_module}$
 It spreads out, arriving at the coolant pipe over an area of half the circumference.
 We use the mean of these values:
 
 $$ 
-\texttt{mean} \_ \texttt{width} = \frac{\texttt{pitch} + \pi \times \texttt{afw}}{2}
+\texttt{mean} \_ \texttt{width} = \frac{\texttt{dx_fw_module} + \pi \times \texttt{radius_fw_channel}}{2}
 $$
 
 The temperature difference between the plasma-facing surface and the coolant is then:
@@ -159,8 +159,8 @@ There are three blanket model options, chosen by the user to match their selecte
 The default assuption for all blanket models is that the first wall and breeding blanket have the same coolant (flow = FW inlet -> FW outlet -> BB inlet-> BB outlet). 
 It is possible to choose a different coolant for the FW and breeding blanket, in which case the mechanical pumping powers for the FW and BB are calculated seperately. 
 The model has three mechanical pumping power options, chosen by the user to match their selected blanket design using the switch 'ipump' (default=0): 
-    0.   Same coolant for FW and BB ('fwcoolant`=`coolwh`)
-    1.   Different coolant for FW and BB ('fwcoolant`/=`coolwh`) 
+    0.   Same coolant for FW and BB ('i_fw_coolant_type`=`coolwh`)
+    1.   Different coolant for FW and BB ('i_fw_coolant_type`/=`coolwh`) 
 
 !!! Note "Note" 
     For the dual-coolant blanket the 'ipump' switch is relavent for the blanket structure coolant and not the liquid metal breeder/coolant choice.  
@@ -190,8 +190,8 @@ The Hartmann number is also calculated (using the magnetic feild strength in the
 |   `inlet_temp_liq`    |   K   | 68       | idualcool=1,2 | 570     | Inlet temperatute of liquid metal breeder/coolant     |
 |   `outlet_temp_liq`   |   K   | 69       | idualcool=1,2 | 720     | Outlet temperatute of liquid metal breeder/coolant    |
 |    `n_liq_recirc`     |  ---  | 71       | idualcool=1   | 10      | Number of liquid metal breeder recirculations per day |
-| `f_nuc_pow_bz_struct` |  ---  | 73       | iblanket=5    | 0.34    | FW nuclear power as fraction of total                 |
-|  `f_nuc_pow_bz_liq`   |  ---  | 74       | iblanket=5    | 0.66    | Fraction of BZ power cooled by primary coolant        |
+| `f_nuc_pow_bz_struct` |  ---  | 73       | i_blanket_type=5    | 0.34    | FW nuclear power as fraction of total                 |
+|  `f_nuc_pow_bz_liq`   |  ---  | 74       | i_blanket_type=5    | 0.66    | Fraction of BZ power cooled by primary coolant        |
 
 #### Flow Channel Inserts for Liquid Metal Breeder
 

@@ -960,12 +960,12 @@
  Coolant_fraction________________________________________________________ (vfcblkt)_____________________      5.2950E-02    
  Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________      1.0000E-01    
  First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________      5.8692E+00    
- First_Wall_Volume_(m3)__________________________________________________ (volfw)_______________________      1.9807E+01    
+ First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________      1.9807E+01    
  Blanket_Volume_(m3)_____________________________________________________ (volblkt)_____________________      1.1849E+03    
  Shield_Volume_(m3)______________________________________________________ (volshld)_____________________      7.8520E+02    
  Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________      1.0178E+03    
  First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________      1.1298E+05 OP 
- First_Wall_Mass,_excluding_armour_(kg)__________________________________ (fwmass)______________________      1.5449E+05 OP 
+ First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________      1.5449E+05 OP 
  Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________      2.9676E+06 OP 
  ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________      1.0042E+06 OP 
  ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________      1.0664E+06 OP 
@@ -983,15 +983,15 @@
  Shield:_second_exponential______________________________________________ (exp_shield2)_________________      2.5427E-01 OP 
  Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________      1.1500E-01    
  Switch_for_plant_secondary_cycle________________________________________ (secondary_cycle)_____________              2    
- First_wall_coolant_pressure_(Pa)________________________________________ (fwpressure)__________________      1.5500E+07    
+ First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________      1.5500E+07    
  Blanket_coolant_pressure_(Pa)___________________________________________ (blpressure)__________________      1.5500E+07    
  Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________      5.0000E+00    
  No_of_inboard_blanket_modules_poloidally________________________________ (nblktmodpi)__________________              7    
  No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________             32    
  No_of_outboard_blanket_modules_poloidally_______________________________ (nblktmodpo)__________________              8    
  No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________             48    
  Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________      9.0000E-01    
- First_wall_area_(m2)____________________________________________________ (fwarea)______________________      1.6044E+03 OP 
+ First_wall_area_(m2)____________________________________________________ (a_fw_total)______________________      1.6044E+03 OP 
  Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________      1.7769E+01 OP 
  Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________      1.5292E+01 OP 
  Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (dz_tf_cryostat)________________________      5.6091E+00 OP 

@@ -955,12 +955,12 @@
  Coolant_fraction________________________________________________________ (vfcblkt)_____________________      5.2950E-02    
  Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________      1.0000E-01    
  First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________      5.8692E+00    
- First_Wall_Volume_(m3)__________________________________________________ (volfw)_______________________      1.9807E+01    
+ First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________      1.9807E+01    
  Blanket_Volume_(m3)_____________________________________________________ (volblkt)_____________________      1.1849E+03    
  Shield_Volume_(m3)______________________________________________________ (volshld)_____________________      7.8520E+02    
  Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________      1.0178E+03    
  First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________      1.1298E+05 OP 
- First_Wall_Mass,_excluding_armour_(kg)__________________________________ (fwmass)______________________      1.5449E+05 OP 
+ First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________      1.5449E+05 OP 
  Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________      2.9676E+06 OP 
  ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________      1.0042E+06 OP 
  ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________      1.0664E+06 OP 
@@ -978,15 +978,15 @@
  Shield:_second_exponential______________________________________________ (exp_shield2)_________________      2.5427E-01 OP 
  Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________      1.1500E-01    
  Switch_for_plant_secondary_cycle________________________________________ (secondary_cycle)_____________              2    
- First_wall_coolant_pressure_(Pa)________________________________________ (fwpressure)__________________      1.5500E+07    
+ First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________      1.5500E+07    
  Blanket_coolant_pressure_(Pa)___________________________________________ (blpressure)__________________      1.5500E+07    
  Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________      5.0000E+00    
  No_of_inboard_blanket_modules_poloidally________________________________ (nblktmodpi)__________________              7    
  No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________             32    
  No_of_outboard_blanket_modules_poloidally_______________________________ (nblktmodpo)__________________              8    
  No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________             48    
  Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________      9.0000E-01    
- First_wall_area_(m2)____________________________________________________ (fwarea)______________________      1.6044E+03 OP 
+ First_wall_area_(m2)____________________________________________________ (a_fw_total)______________________      1.6044E+03 OP 
  Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________      1.7798E+01 OP 
  Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________      1.5339E+01 OP 
  Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (dz_tf_cryostat)________________________      5.6044E+00 OP 

@@ -955,12 +955,12 @@
  Coolant_fraction________________________________________________________ (vfcblkt)_____________________      5.2950E-02    
  Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________      1.0000E-01    
  First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________      5.8692E+00    
- First_Wall_Volume_(m3)__________________________________________________ (volfw)_______________________      1.9807E+01    
+ First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________      1.9807E+01    
  Blanket_Volume_(m3)_____________________________________________________ (volblkt)_____________________      1.1849E+03    
  Shield_Volume_(m3)______________________________________________________ (volshld)_____________________      7.8520E+02    
  Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________      1.0178E+03    
  First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________      1.1298E+05 OP 
- First_Wall_Mass,_excluding_armour_(kg)__________________________________ (fwmass)______________________      1.5449E+05 OP 
+ First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________      1.5449E+05 OP 
  Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________      2.9676E+06 OP 
  ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________      1.0042E+06 OP 
  ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________      1.0664E+06 OP 
@@ -978,15 +978,15 @@
  Shield:_second_exponential______________________________________________ (exp_shield2)_________________      2.5427E-01 OP 
  Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________      1.1500E-01    
  Switch_for_plant_secondary_cycle________________________________________ (secondary_cycle)_____________              2    
- First_wall_coolant_pressure_(Pa)________________________________________ (fwpressure)__________________      1.5500E+07    
+ First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________      1.5500E+07    
  Blanket_coolant_pressure_(Pa)___________________________________________ (blpressure)__________________      1.5500E+07    
  Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________      5.0000E+00    
  No_of_inboard_blanket_modules_poloidally________________________________ (nblktmodpi)__________________              7    
  No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________             32    
  No_of_outboard_blanket_modules_poloidally_______________________________ (nblktmodpo)__________________              8    
  No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________             48    
  Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________      9.0000E-01    
- First_wall_area_(m2)____________________________________________________ (fwarea)______________________      1.6044E+03 OP 
+ First_wall_area_(m2)____________________________________________________ (a_fw_total)______________________      1.6044E+03 OP 
  Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________      1.7798E+01 OP 
  Cryostat_internal_half-height_(m)_______________________________________ (z_cryostat_half_inside)______________________      1.5339E+01 OP 
  Vertical_clearance_from_TF_coil_to_cryostat_(m)_________________________ (dz_tf_cryostat)________________________      5.6044E+00 OP