Skip to content

Commit

Permalink
🔄 Rename maxradwallload to pflux_fw_rad_max for clarity and consistency
Browse files Browse the repository at this point in the history
  • Loading branch information
chris-ashe committed Feb 12, 2025
1 parent e6c61c4 commit 8e9a0a3
Show file tree
Hide file tree
Showing 23 changed files with 66 additions and 66 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ The scaling value `fradpwr` can be varied also.

This constraint can be activated by stating `icc = 67` in the input file.

The limiting value of $q_{\text{fw,rad}}$ in $\mathrm {MWm^{-2}}$ is be set using input parameter `maxradwallload`.
The limiting value of $q_{\text{fw,rad}}$ in $\mathrm {MWm^{-2}}$ is be set using input parameter `pflux_fw_rad_max`.

The scaling value `fradwall` can be varied also.

Expand Down
2 changes: 1 addition & 1 deletion examples/data/csv_output_large_tokamak_MFILE.DAT
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@
LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.9094E-01 OP
Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.7570E-01 OP
Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP
Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP
Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP
Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.8507E-01 OP
Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.5907E+01 OP
Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.9792E-01 OP
Expand Down
2 changes: 1 addition & 1 deletion examples/data/large_tokamak_1_MFILE.DAT
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@
LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8144E-01 OP
Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.7749E-01 OP
Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP
Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP
Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP
Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.9106E-01 OP
Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6182E+01 OP
Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0152E+00 OP
Expand Down
2 changes: 1 addition & 1 deletion examples/data/large_tokamak_2_MFILE.DAT
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@
LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8144E-01 OP
Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.7749E-01 OP
Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP
Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP
Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP
Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.9106E-01 OP
Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6182E+01 OP
Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0152E+00 OP
Expand Down
2 changes: 1 addition & 1 deletion examples/data/large_tokamak_3_MFILE.DAT
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@
LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8144E-01 OP
Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.7749E-01 OP
Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP
Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP
Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP
Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.9106E-01 OP
Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6182E+01 OP
Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0152E+00 OP
Expand Down
2 changes: 1 addition & 1 deletion examples/data/large_tokamak_4_MFILE.DAT
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@
LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8144E-01 OP
Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.7749E-01 OP
Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP
Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP
Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP
Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.9106E-01 OP
Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6182E+01 OP
Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0152E+00 OP
Expand Down
18 changes: 9 additions & 9 deletions examples/data/scan_MFILE.DAT
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@
Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP
Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.6053E-01 OP
Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP
Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP
Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP
Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.3457E-01 OP
Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP
Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.4795E+01 OP
Expand Down Expand Up @@ -1289,7 +1289,7 @@
Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP
Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.6053E-01 OP
Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP
Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP
Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP
Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.3457E-01 OP
Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP
Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.4795E+01 OP
Expand Down Expand Up @@ -2284,7 +2284,7 @@
Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP
Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.6053E-01 OP
Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP
Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP
Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP
Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.3457E-01 OP
Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP
Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.4795E+01 OP
Expand Down Expand Up @@ -3279,7 +3279,7 @@
Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP
Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.6053E-01 OP
Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP
Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP
Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP
Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.3457E-01 OP
Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP
Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.4795E+01 OP
Expand Down Expand Up @@ -4274,7 +4274,7 @@
Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP
Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.6053E-01 OP
Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP
Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP
Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP
Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.3457E-01 OP
Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP
Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.4795E+01 OP
Expand Down Expand Up @@ -5269,7 +5269,7 @@
Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP
Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.6053E-01 OP
Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP
Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP
Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP
Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.3457E-01 OP
Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP
Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.4795E+01 OP
Expand Down Expand Up @@ -6264,7 +6264,7 @@
Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP
Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.6053E-01 OP
Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP
Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP
Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP
Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.3457E-01 OP
Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP
Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.4795E+01 OP
Expand Down Expand Up @@ -7259,7 +7259,7 @@
Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP
Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.6053E-01 OP
Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP
Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP
Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP
Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.3457E-01 OP
Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP
Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.4795E+01 OP
Expand Down Expand Up @@ -8254,7 +8254,7 @@
Radiation_fraction_=_total_radiation_/_total_power_deposited_in_plasma__ (rad_fraction)________________ 9.2000E-01 OP
Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.6053E-01 OP
Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP
Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP
Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP
Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.3457E-01 OP
Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 9.8928E-01 OP
Power_incident_on_the_divertor_targets_(MW)_____________________________ (ptarmw)______________________ 3.4795E+01 OP
Expand Down
4 changes: 2 additions & 2 deletions process/physics.py
Original file line number Diff line number Diff line change
Expand Up @@ -4671,8 +4671,8 @@ def outplas(self):
po.ovarre(
self.outfile,
"Maximum permitted radiation wall load (MW/m^2)",
"(maxradwallload)",
constraint_variables.maxradwallload,
"(pflux_fw_rad_max)",
constraint_variables.pflux_fw_rad_max,
"IP ",
)
po.ovarre(
Expand Down
12 changes: 6 additions & 6 deletions source/fortran/constraint_equations.f90
Original file line number Diff line number Diff line change
Expand Up @@ -2601,23 +2601,23 @@ subroutine constraint_eqn_067(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units)
!! residual error in physical units; output string; units string
!! Simple upper limit on radiation wall load
!! #=# physics
!! #=#=# fradwall, maxradwallload
!! #=#=# fradwall, pflux_fw_rad_max
!! and hence also optional here.
!! Logic change during pre-factoring: err, symbol, units will be assigned only if present.
!! fradwall : input real : f-value for upper limit on radiation wall load
!! maxradwallload : input real : Maximum permitted radiation wall load (MW/m^2)
!! pflux_fw_rad_max : input real : Maximum permitted radiation wall load (MW/m^2)
!! pflux_fw_rad_max_mw : input real : Peak radiation wall load (MW/m^2)
use constraint_variables, only: fradwall, maxradwallload, pflux_fw_rad_max_mw
use constraint_variables, only: fradwall, pflux_fw_rad_max, pflux_fw_rad_max_mw
implicit none
real(dp), intent(out) :: tmp_cc
real(dp), intent(out) :: tmp_con
real(dp), intent(out) :: tmp_err
character(len=1), intent(out) :: tmp_symbol
character(len=10), intent(out) :: tmp_units

tmp_cc = 1.0d0 - fradwall * maxradwallload / pflux_fw_rad_max_mw
tmp_con = maxradwallload
tmp_err = maxradwallload * tmp_cc
tmp_cc = 1.0d0 - fradwall * pflux_fw_rad_max / pflux_fw_rad_max_mw
tmp_con = pflux_fw_rad_max
tmp_err = pflux_fw_rad_max * tmp_cc
tmp_symbol = '<'
tmp_units = 'MW/m^2'

Expand Down
4 changes: 2 additions & 2 deletions source/fortran/constraint_variables.f90
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ module constraint_variables
real(dp) :: gammax
!! maximum current drive gamma (`constraint equation 37`)

real(dp) :: maxradwallload
real(dp) :: pflux_fw_rad_max
!! Maximum permitted radiation wall load (MW/m^2) (`constraint equation 67`)

real(dp) :: mvalim
Expand Down Expand Up @@ -372,7 +372,7 @@ subroutine init_constraint_variables
fwalld = 1.0D0
fzeffmax = 1.0D0
gammax = 2.0D0
maxradwallload = 1.0D0
pflux_fw_rad_max = 1.0D0
mvalim = 40.0D0
nbshinefmax = 1.0D-3
nflutfmax = 1.0D23
Expand Down
6 changes: 3 additions & 3 deletions source/fortran/input.f90
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ subroutine parse_input_file(in_file,out_file,show_changes)
workshop_l, workshop_w, workshop_h
use constraint_variables, only: flhthresh, fpeakb, fpsep, fdivcol, ftcycl, &
beta_poloidal_max, fpsepbqar, ftmargtf, fradwall, fptfnuc, fnesep, fportsz, tbrmin, &
maxradwallload, pseprmax, fdene, fniterpump, fpinj, pnetelin, powfmax, &
pflux_fw_rad_max, pseprmax, fdene, fniterpump, fpinj, pnetelin, powfmax, &
fgamcd, ftbr, mvalim, f_alpha_energy_confinement_min, walalw, fmva, fradpwr, nflutfmax, fipir, &
fauxmn, fiooic,fr_conducting_wall, fjohc0, frminor, psepbqarmax, ftpeak, bigqmin, &
fstrcond, fptemp, ftmargoh, fvs, fbeta_max, vvhealw, fpnetel, ft_burn, &
Expand Down Expand Up @@ -985,8 +985,8 @@ subroutine parse_input_file(in_file,out_file,show_changes)
case ('gammax')
call parse_real_variable('gammax', gammax, 0.01D0, 10.0D0, &
'Maximum current drive gamma (A/W-m2)')
case ('maxradwallload')
call parse_real_variable('maxradwallload', maxradwallload, 0.1D0, 10.0D0, &
case ('pflux_fw_rad_max')
call parse_real_variable('pflux_fw_rad_max', pflux_fw_rad_max, 0.1D0, 10.0D0, &
'Maximum permitted radiation wall load (MW/m^2)')
case ('mvalim')
call parse_real_variable('mvalim', mvalim, 0.0D0, 1000.0D0, &
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/data/large_tokamak_1_MFILE.DAT
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@
LCFS_radiation_fraction_=_total_radiation_in_LCFS_/_total_power_deposite (rad_fraction_LCFS)___________ 5.8144E-01 OP
Nominal_mean_radiation_load_on_inside_surface_of_reactor_(MW/m2)________ (pflux_fw_rad_mw)_________________ 1.7749E-01 OP
Peaking_factor_for_radiation_wall_load__________________________________ (f_fw_rad_max)_________________ 3.3300E+00 IP
Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (maxradwallload)______________ 1.0000E+00 IP
Maximum_permitted_radiation_wall_load_(MW/m^2)__________________________ (pflux_fw_rad_max)______________ 1.0000E+00 IP
Peak_radiation_wall_load_(MW/m^2)_______________________________________ (pflux_fw_rad_max_mw)_____________ 5.9106E-01 OP
Fast_alpha_particle_power_incident_on_the_first_wall_(MW)_______________ (palpfwmw)____________________ 1.6182E+01 OP
Nominal_mean_neutron_load_on_inside_surface_of_reactor_(MW/m2)__________ (wallmw)______________________ 1.0152E+00 OP
Expand Down
Loading

0 comments on commit 8e9a0a3

Please sign in to comment.