Skip to content

Commit

Permalink
🔄 Rename 'ptfnuc' to 'p_tf_nuclear_heat' for consistency across modul…
Browse files Browse the repository at this point in the history 
…es and update references
  • Loading branch information
@chris-ashe
chris-ashe committed Dec 9, 2024
1 parent 1964911 commit c9ef50a
Show file tree
Hide file tree
Showing 31 changed files with 341 additions and 225 deletions.
6 changes: 3 additions & 3 deletions examples/data/csv_output_large_tokamak_MFILE.DAT
View file
Original file line number Diff line number Diff line change
Expand Up @@ -940,7 +940,7 @@
Shield_line_density_(tonne/m2)__________________________________________ (x_shield)____________________ 4.0560E+00
Blanket_line_density_(tonne/m2)_________________________________________ (x_blanket)___________________ 2.2911E+00
Unit_nuclear_heating_in_TF_coil_(W/GW)__________________________________ (tfc_nuc_heating)_____________ 1.3678E+04
Total_nuclear_heating_in_TF_coil_(MW)___________________________________ (ptfnuc.)_____________________ 2.1784E-02
Total_nuclear_heating_in_TF_coil_(MW)___________________________________ (p_tf_nuclear_heat_mw.)_____________________ 2.1784E-02
powfmw__________________________________________________________________ (powfmw.)_____________________ 1.5926E+03
total_mass_of_the_TF_coils_(kg)_________________________________________ (whttf)_______________________ 1.0511E+07
# Pumping for primary coolant (helium) #
Expand Down Expand Up @@ -973,7 +973,7 @@
Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 3.2350E+06 OP
Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4498E+06 OP
Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 7.9388E+06 OP
Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 2.2718E-02 OP
Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (p_tf_nuclear_heat_mw)______________________ 2.2718E-02 OP
Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_mw)______________________ 1.6038E+02 OP
Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blanket_nuclear_heat_mw)____________________ 1.2682E+03 OP
Total_nuclear_heating_in_the_shield_(MW)________________________________ (p_shield_nuclear_heat_mw)____________________ 1.3897E+00 OP
Expand Down Expand Up @@ -1154,7 +1154,7 @@
Heat_extracted_from_shield__(MW)________________________________________ (p_shield_coolant_thermal_mw)__________________ 1.3967E+00
Heat_extracted_from_divertor_(MW)_______________________________________ (p_div_coolant_thermal_mw)___________________ 3.2912E+02
Nuclear_and_photon_power_lost_to_H/CD_system_(MW)_______________________ (p_hcd_thermal_secondary_mw)_____________________ 0.0000E+00
Nuclear_power_lost_to_TF_(MW)___________________________________________ (ptfnuc)______________________ 2.2718E-02
Nuclear_power_lost_to_TF_(MW)___________________________________________ (p_tf_nuclear_heat_mw)______________________ 2.2718E-02
Total_(MW)______________________________________________________________ ______________________________ 2.1348E+03
Net_electric_power_output(MW)___________________________________________ (p_net_electrical_mw.)___________________ 4.0000E+02
Required_Net_electric_power_output(MW)__________________________________ (pnetelin)____________________ 4.0000E+02
Expand Down
6 changes: 3 additions & 3 deletions examples/data/large_tokamak_1_MFILE.DAT
View file
Original file line number Diff line number Diff line change
Expand Up @@ -935,7 +935,7 @@
Shield_line_density_(tonne/m2)__________________________________________ (x_shield)____________________ 4.0560E+00
Blanket_line_density_(tonne/m2)_________________________________________ (x_blanket)___________________ 2.2911E+00
Unit_nuclear_heating_in_TF_coil_(W/GW)__________________________________ (tfc_nuc_heating)_____________ 1.4866E+04
Total_nuclear_heating_in_TF_coil_(MW)___________________________________ (ptfnuc.)_____________________ 2.4085E-02
Total_nuclear_heating_in_TF_coil_(MW)___________________________________ (p_tf_nuclear_heat_mw.)_____________________ 2.4085E-02
powfmw__________________________________________________________________ (powfmw.)_____________________ 1.6202E+03
total_mass_of_the_TF_coils_(kg)_________________________________________ (whttf)_______________________ 1.1424E+07
# Pumping for primary coolant (helium) #
Expand Down Expand Up @@ -968,7 +968,7 @@
Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 3.2350E+06 OP
Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4498E+06 OP
Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 7.9388E+06 OP
Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 2.5118E-02 OP
Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (p_tf_nuclear_heat_mw)______________________ 2.5118E-02 OP
Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_mw)______________________ 1.6315E+02 OP
Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blanket_nuclear_heat_mw)____________________ 1.2901E+03 OP
Total_nuclear_heating_in_the_shield_(MW)________________________________ (p_shield_nuclear_heat_mw)____________________ 1.4138E+00 OP
Expand Down Expand Up @@ -1149,7 +1149,7 @@
Heat_extracted_from_shield__(MW)________________________________________ (p_shield_coolant_thermal_mw)__________________ 1.4208E+00
Heat_extracted_from_divertor_(MW)_______________________________________ (p_div_coolant_thermal_mw)___________________ 3.3982E+02
Nuclear_and_photon_power_lost_to_H/CD_system_(MW)_______________________ (p_hcd_thermal_secondary_mw)_____________________ 0.0000E+00
Nuclear_power_lost_to_TF_(MW)___________________________________________ (ptfnuc)______________________ 2.5118E-02
Nuclear_power_lost_to_TF_(MW)___________________________________________ (p_tf_nuclear_heat_mw)______________________ 2.5118E-02
Total_(MW)______________________________________________________________ ______________________________ 2.1752E+03
Net_electric_power_output(MW)___________________________________________ (p_net_electrical_mw.)___________________ 4.0001E+02
Required_Net_electric_power_output(MW)__________________________________ (pnetelin)____________________ 4.0000E+02
Expand Down
6 changes: 3 additions & 3 deletions examples/data/large_tokamak_2_MFILE.DAT
View file
Original file line number Diff line number Diff line change
Expand Up @@ -935,7 +935,7 @@
Shield_line_density_(tonne/m2)__________________________________________ (x_shield)____________________ 4.0560E+00
Blanket_line_density_(tonne/m2)_________________________________________ (x_blanket)___________________ 2.2911E+00
Unit_nuclear_heating_in_TF_coil_(W/GW)__________________________________ (tfc_nuc_heating)_____________ 1.4866E+04
Total_nuclear_heating_in_TF_coil_(MW)___________________________________ (ptfnuc.)_____________________ 2.4085E-02
Total_nuclear_heating_in_TF_coil_(MW)___________________________________ (p_tf_nuclear_heat_mw.)_____________________ 2.4085E-02
powfmw__________________________________________________________________ (powfmw.)_____________________ 1.6202E+03
total_mass_of_the_TF_coils_(kg)_________________________________________ (whttf)_______________________ 1.1424E+07
# Pumping for primary coolant (helium) #
Expand Down Expand Up @@ -968,7 +968,7 @@
Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 3.2350E+06 OP
Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4498E+06 OP
Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 7.9388E+06 OP
Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 2.5118E-02 OP
Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (p_tf_nuclear_heat_mw)______________________ 2.5118E-02 OP
Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_mw)______________________ 1.6315E+02 OP
Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blanket_nuclear_heat_mw)____________________ 1.2901E+03 OP
Total_nuclear_heating_in_the_shield_(MW)________________________________ (p_shield_nuclear_heat_mw)____________________ 1.4138E+00 OP
Expand Down Expand Up @@ -1149,7 +1149,7 @@
Heat_extracted_from_shield__(MW)________________________________________ (p_shield_coolant_thermal_mw)__________________ 1.4208E+00
Heat_extracted_from_divertor_(MW)_______________________________________ (p_div_coolant_thermal_mw)___________________ 3.3982E+02
Nuclear_and_photon_power_lost_to_H/CD_system_(MW)_______________________ (p_hcd_thermal_secondary_mw)_____________________ 0.0000E+00
Nuclear_power_lost_to_TF_(MW)___________________________________________ (ptfnuc)______________________ 2.5118E-02
Nuclear_power_lost_to_TF_(MW)___________________________________________ (p_tf_nuclear_heat_mw)______________________ 2.5118E-02
Total_(MW)______________________________________________________________ ______________________________ 2.1752E+03
Net_electric_power_output(MW)___________________________________________ (p_net_electrical_mw.)___________________ 4.0001E+02
Required_Net_electric_power_output(MW)__________________________________ (pnetelin)____________________ 4.0000E+02
Expand Down
6 changes: 3 additions & 3 deletions examples/data/large_tokamak_3_MFILE.DAT
View file
Original file line number Diff line number Diff line change
Expand Up @@ -935,7 +935,7 @@
Shield_line_density_(tonne/m2)__________________________________________ (x_shield)____________________ 4.0560E+00
Blanket_line_density_(tonne/m2)_________________________________________ (x_blanket)___________________ 2.2911E+00
Unit_nuclear_heating_in_TF_coil_(W/GW)__________________________________ (tfc_nuc_heating)_____________ 1.4866E+04
Total_nuclear_heating_in_TF_coil_(MW)___________________________________ (ptfnuc.)_____________________ 2.4085E-02
Total_nuclear_heating_in_TF_coil_(MW)___________________________________ (p_tf_nuclear_heat_mw.)_____________________ 2.4085E-02
powfmw__________________________________________________________________ (powfmw.)_____________________ 1.6202E+03
total_mass_of_the_TF_coils_(kg)_________________________________________ (whttf)_______________________ 1.1424E+07
# Pumping for primary coolant (helium) #
Expand Down Expand Up @@ -968,7 +968,7 @@
Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 3.2350E+06 OP
Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4498E+06 OP
Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 7.9388E+06 OP
Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 2.5118E-02 OP
Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (p_tf_nuclear_heat_mw)______________________ 2.5118E-02 OP
Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_mw)______________________ 1.6315E+02 OP
Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blanket_nuclear_heat_mw)____________________ 1.2901E+03 OP
Total_nuclear_heating_in_the_shield_(MW)________________________________ (p_shield_nuclear_heat_mw)____________________ 1.4138E+00 OP
Expand Down Expand Up @@ -1149,7 +1149,7 @@
Heat_extracted_from_shield__(MW)________________________________________ (p_shield_coolant_thermal_mw)__________________ 1.4208E+00
Heat_extracted_from_divertor_(MW)_______________________________________ (p_div_coolant_thermal_mw)___________________ 3.3982E+02
Nuclear_and_photon_power_lost_to_H/CD_system_(MW)_______________________ (p_hcd_thermal_secondary_mw)_____________________ 0.0000E+00
Nuclear_power_lost_to_TF_(MW)___________________________________________ (ptfnuc)______________________ 2.5118E-02
Nuclear_power_lost_to_TF_(MW)___________________________________________ (p_tf_nuclear_heat_mw)______________________ 2.5118E-02
Total_(MW)______________________________________________________________ ______________________________ 2.1752E+03
Net_electric_power_output(MW)___________________________________________ (p_net_electrical_mw.)___________________ 4.0001E+02
Required_Net_electric_power_output(MW)__________________________________ (pnetelin)____________________ 4.0000E+02
Expand Down
6 changes: 3 additions & 3 deletions examples/data/large_tokamak_4_MFILE.DAT
View file
Original file line number Diff line number Diff line change
Expand Up @@ -935,7 +935,7 @@
Shield_line_density_(tonne/m2)__________________________________________ (x_shield)____________________ 4.0560E+00
Blanket_line_density_(tonne/m2)_________________________________________ (x_blanket)___________________ 2.2911E+00
Unit_nuclear_heating_in_TF_coil_(W/GW)__________________________________ (tfc_nuc_heating)_____________ 1.4866E+04
Total_nuclear_heating_in_TF_coil_(MW)___________________________________ (ptfnuc.)_____________________ 2.4085E-02
Total_nuclear_heating_in_TF_coil_(MW)___________________________________ (p_tf_nuclear_heat_mw.)_____________________ 2.4085E-02
powfmw__________________________________________________________________ (powfmw.)_____________________ 1.6202E+03
total_mass_of_the_TF_coils_(kg)_________________________________________ (whttf)_______________________ 1.1424E+07
# Pumping for primary coolant (helium) #
Expand Down Expand Up @@ -968,7 +968,7 @@
Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 3.2350E+06 OP
Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4498E+06 OP
Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 7.9388E+06 OP
Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 2.5118E-02 OP
Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (p_tf_nuclear_heat_mw)______________________ 2.5118E-02 OP
Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_mw)______________________ 1.6315E+02 OP
Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blanket_nuclear_heat_mw)____________________ 1.2901E+03 OP
Total_nuclear_heating_in_the_shield_(MW)________________________________ (p_shield_nuclear_heat_mw)____________________ 1.4138E+00 OP
Expand Down Expand Up @@ -1149,7 +1149,7 @@
Heat_extracted_from_shield__(MW)________________________________________ (p_shield_coolant_thermal_mw)__________________ 1.4208E+00
Heat_extracted_from_divertor_(MW)_______________________________________ (p_div_coolant_thermal_mw)___________________ 3.3982E+02
Nuclear_and_photon_power_lost_to_H/CD_system_(MW)_______________________ (p_hcd_thermal_secondary_mw)_____________________ 0.0000E+00
Nuclear_power_lost_to_TF_(MW)___________________________________________ (ptfnuc)______________________ 2.5118E-02
Nuclear_power_lost_to_TF_(MW)___________________________________________ (p_tf_nuclear_heat_mw)______________________ 2.5118E-02
Total_(MW)______________________________________________________________ ______________________________ 2.1752E+03
Net_electric_power_output(MW)___________________________________________ (p_net_electrical_mw.)___________________ 4.0001E+02
Required_Net_electric_power_output(MW)__________________________________ (pnetelin)____________________ 4.0000E+02
Expand Down
Loading

0 comments on commit c9ef50a

Please sign in to comment.