Skip to content

Commit 346ce6c

Browse files
chris-ashechris-ashe
committed
🔄 Replaced all instances of fpinj with fp_hcd_injected_max across multiple data files and scripts to standardize the naming convention for injected power.
1 parent 29f7a9a commit 346ce6c

27 files changed

Lines changed: 77 additions & 73 deletions

‎examples/data/csv_output_large_tokamak_MFILE.DAT‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@
4040
flhthresh_______________________________________________________________ (itvar006)____________________ 1.6436E+00
4141
flhthresh_(final_value/initial_value)___________________________________ (xcm006)______________________ 1.6436E+00
4242
flhthresh_(range_normalised)____________________________________________ (nitvar006)___________________ 7.1515E-02
43-
fpinj___________________________________________________________________ (itvar007)____________________ 3.7606E-01
44-
fpinj_(final_value/initial_value)_______________________________________ (xcm007)______________________ 3.7606E-01
45-
fpinj_(range_normalised)________________________________________________ (nitvar007)___________________ 3.7544E-01
43+
fp_hcd_injected_max___________________________________________________________________ (itvar007)____________________ 3.7606E-01
44+
fp_hcd_injected_max_(final_value/initial_value)_______________________________________ (xcm007)______________________ 3.7606E-01
45+
fp_hcd_injected_max_(range_normalised)________________________________________________ (nitvar007)___________________ 3.7544E-01
4646
fp_plant_electric_net_required_mw_________________________________________________________________ (itvar008)____________________ 1.0000E+00
4747
fp_plant_electric_net_required_mw_(final_value/initial_value)_____________________________________ (xcm008)______________________ 1.0000E+00
4848
fp_plant_electric_net_required_mw_(range_normalised)______________________________________________ (nitvar008)___________________ 1.0000E+00
@@ -1269,7 +1269,7 @@ boundu(103) = 10.0
12691269
* Injection power upper limit *
12701270
*-----------------------------*
12711271
icc = 30
1272-
ixc = 46 * fpinj
1272+
ixc = 46 * fp_hcd_injected_max
12731273
* Maximum allowable value for injected power [MW]
12741274
p_hcd_injected_max = 200.0
12751275

‎examples/data/large_tokamak_1_MFILE.DAT‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@
4141
flhthresh_______________________________________________________________ (itvar006)____________________ 1.6735E+00
4242
flhthresh_(final_value/initial_value)___________________________________ (xcm006)______________________ 1.6735E+00
4343
flhthresh_(range_normalised)____________________________________________ (nitvar006)___________________ 7.4836E-02
44-
fpinj___________________________________________________________________ (itvar007)____________________ 4.0071E-01
45-
fpinj_(final_value/initial_value)_______________________________________ (xcm007)______________________ 4.0071E-01
46-
fpinj_(range_normalised)________________________________________________ (nitvar007)___________________ 4.0011E-01
44+
fp_hcd_injected_max___________________________________________________________________ (itvar007)____________________ 4.0071E-01
45+
fp_hcd_injected_max_(final_value/initial_value)_______________________________________ (xcm007)______________________ 4.0071E-01
46+
fp_hcd_injected_max_(range_normalised)________________________________________________ (nitvar007)___________________ 4.0011E-01
4747
fp_plant_electric_net_required_mw_________________________________________________________________ (itvar008)____________________ 1.0000E+00
4848
fp_plant_electric_net_required_mw_(final_value/initial_value)_____________________________________ (xcm008)______________________ 1.0000E+00
4949
fp_plant_electric_net_required_mw_(range_normalised)______________________________________________ (nitvar008)___________________ 1.0000E+00
@@ -1264,7 +1264,7 @@ boundu(103) = 10.0
12641264
* Injection power upper limit *
12651265
*-----------------------------*
12661266
icc = 30
1267-
ixc = 46 * fpinj
1267+
ixc = 46 * fp_hcd_injected_max
12681268
* Maximum allowable value for injected power [MW]
12691269
p_hcd_injected_max = 200.0
12701270

‎examples/data/large_tokamak_2_MFILE.DAT‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@
4141
flhthresh_______________________________________________________________ (itvar006)____________________ 1.7735E+00
4242
flhthresh_(final_value/initial_value)___________________________________ (xcm006)______________________ 1.6735E+00
4343
flhthresh_(range_normalised)____________________________________________ (nitvar006)___________________ 7.4836E-02
44-
fpinj___________________________________________________________________ (itvar007)____________________ 3.0071E-01
45-
fpinj_(final_value/initial_value)_______________________________________ (xcm007)______________________ 4.0071E-01
46-
fpinj_(range_normalised)________________________________________________ (nitvar007)___________________ 4.0011E-01
44+
fp_hcd_injected_max___________________________________________________________________ (itvar007)____________________ 3.0071E-01
45+
fp_hcd_injected_max_(final_value/initial_value)_______________________________________ (xcm007)______________________ 4.0071E-01
46+
fp_hcd_injected_max_(range_normalised)________________________________________________ (nitvar007)___________________ 4.0011E-01
4747
fp_plant_electric_net_required_mw_________________________________________________________________ (itvar008)____________________ 1.0000E+00
4848
fp_plant_electric_net_required_mw_(final_value/initial_value)_____________________________________ (xcm008)______________________ 1.0000E+00
4949
fp_plant_electric_net_required_mw_(range_normalised)______________________________________________ (nitvar008)___________________ 1.0000E+00
@@ -1264,7 +1264,7 @@ boundu(103) = 10.0
12641264
* Injection power upper limit *
12651265
*-----------------------------*
12661266
icc = 30
1267-
ixc = 46 * fpinj
1267+
ixc = 46 * fp_hcd_injected_max
12681268
* Maximum allowable value for injected power [MW]
12691269
p_hcd_injected_max = 200.0
12701270

‎examples/data/large_tokamak_3_MFILE.DAT‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@
4141
flhthresh_______________________________________________________________ (itvar006)____________________ 1.6735E+00
4242
flhthresh_(final_value/initial_value)___________________________________ (xcm006)______________________ 1.6735E+00
4343
flhthresh_(range_normalised)____________________________________________ (nitvar006)___________________ 7.4836E-02
44-
fpinj___________________________________________________________________ (itvar007)____________________ 4.0071E-01
45-
fpinj_(final_value/initial_value)_______________________________________ (xcm007)______________________ 3.8071E-01
46-
fpinj_(range_normalised)________________________________________________ (nitvar007)___________________ 4.0011E-01
44+
fp_hcd_injected_max___________________________________________________________________ (itvar007)____________________ 4.0071E-01
45+
fp_hcd_injected_max_(final_value/initial_value)_______________________________________ (xcm007)______________________ 3.8071E-01
46+
fp_hcd_injected_max_(range_normalised)________________________________________________ (nitvar007)___________________ 4.0011E-01
4747
fp_plant_electric_net_required_mw_________________________________________________________________ (itvar008)____________________ 1.0000E+00
4848
fp_plant_electric_net_required_mw_(final_value/initial_value)_____________________________________ (xcm008)______________________ 1.0000E+00
4949
fp_plant_electric_net_required_mw_(range_normalised)______________________________________________ (nitvar008)___________________ 1.0000E+00
@@ -1264,7 +1264,7 @@ boundu(103) = 10.0
12641264
* Injection power upper limit *
12651265
*-----------------------------*
12661266
icc = 30
1267-
ixc = 46 * fpinj
1267+
ixc = 46 * fp_hcd_injected_max
12681268
* Maximum allowable value for injected power [MW]
12691269
p_hcd_injected_max = 200.0
12701270

‎examples/data/large_tokamak_4_MFILE.DAT‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@
4141
flhthresh_______________________________________________________________ (itvar006)____________________ 1.9735E+00
4242
flhthresh_(final_value/initial_value)___________________________________ (xcm006)______________________ 1.5735E+00
4343
flhthresh_(range_normalised)____________________________________________ (nitvar006)___________________ 7.4836E-02
44-
fpinj___________________________________________________________________ (itvar007)____________________ 4.3071E-01
45-
fpinj_(final_value/initial_value)_______________________________________ (xcm007)______________________ 3.8071E-01
46-
fpinj_(range_normalised)________________________________________________ (nitvar007)___________________ 4.0011E-01
44+
fp_hcd_injected_max___________________________________________________________________ (itvar007)____________________ 4.3071E-01
45+
fp_hcd_injected_max_(final_value/initial_value)_______________________________________ (xcm007)______________________ 3.8071E-01
46+
fp_hcd_injected_max_(range_normalised)________________________________________________ (nitvar007)___________________ 4.0011E-01
4747
fp_plant_electric_net_required_mw_________________________________________________________________ (itvar008)____________________ 1.7000E+00
4848
fp_plant_electric_net_required_mw_(final_value/initial_value)_____________________________________ (xcm008)______________________ 1.0000E+00
4949
fp_plant_electric_net_required_mw_(range_normalised)______________________________________________ (nitvar008)___________________ 1.0000E+00
@@ -1264,7 +1264,7 @@ boundu(103) = 10.0
12641264
* Injection power upper limit *
12651265
*-----------------------------*
12661266
icc = 30
1267-
ixc = 46 * fpinj
1267+
ixc = 46 * fp_hcd_injected_max
12681268
* Maximum allowable value for injected power [MW]
12691269
p_hcd_injected_max = 200.0
12701270

‎examples/data/scan_MFILE.DAT‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9110,7 +9110,7 @@ fjohc = 0.25 * F-value for central solenoid current at end-of-flattop
91109110
fjohc0 = 0.25 * F-value for central solenoid current at beginning of pulse
91119111
fjprot = 1.0 * F-value for tf coil winding pack current density
91129112
fl_h_threshold = 1.271 * F-value for l-h power threshold
9113-
fpinj = 1.0 * F-value for injection power
9113+
fp_hcd_injected_max = 1.0 * F-value for injection power
91149114
fp_plant_electric_net_required_mw = 1.0 * F-value for net electric power
91159115
ft_burn = 1.00e+00 * F-value for minimum burn time
91169116
fvdump = 0.6116 * F-value for dump voltage

‎examples/data/scan_example_file_IN.DAT‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ boundu(103) = 10.0
7676
* Injection power upper limit *
7777
*-----------------------------*
7878
icc = 30
79-
ixc = 46 * fpinj
79+
ixc = 46 * fp_hcd_injected_max
8080
* Maximum allowable value for injected power [MW]
8181
p_hcd_injected_max = 200.0
8282

‎examples/plot_solutions.ipynb‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,7 @@
552552
"0.9994",
553553
"flhthresh",
554554
"1.6735",
555-
"fpinj",
555+
"fp_hcd_injected_max",
556556
"0.40071",
557557
"fp_plant_electric_net_required_mw",
558558
"1.0",
@@ -1270,7 +1270,7 @@
12701270
"0.9994",
12711271
"flhthresh",
12721272
"1.6735",
1273-
"fpinj",
1273+
"fp_hcd_injected_max",
12741274
"0.40071",
12751275
"fp_plant_electric_net_required_mw",
12761276
"1.0",
@@ -1367,7 +1367,7 @@
13671367
"0.9994",
13681368
"flhthresh",
13691369
"1.6735",
1370-
"fpinj",
1370+
"fp_hcd_injected_max",
13711371
"0.40071",
13721372
"fp_plant_electric_net_required_mw",
13731373
"1.0",
@@ -2120,7 +2120,7 @@
21202120
"0.9994",
21212121
"flhthresh",
21222122
"1.6735",
2123-
"fpinj",
2123+
"fp_hcd_injected_max",
21242124
"0.40071",
21252125
"fp_plant_electric_net_required_mw",
21262126
"1.0",
@@ -2217,7 +2217,7 @@
22172217
"0.9994",
22182218
"flhthresh",
22192219
"1.6735",
2220-
"fpinj",
2220+
"fp_hcd_injected_max",
22212221
"0.40071",
22222222
"fp_plant_electric_net_required_mw",
22232223
"1.0",
@@ -2966,7 +2966,7 @@
29662966
"0.9994",
29672967
"flhthresh",
29682968
"1.6735",
2969-
"fpinj",
2969+
"fp_hcd_injected_max",
29702970
"0.40071",
29712971
"fp_plant_electric_net_required_mw",
29722972
"1.0",
@@ -3063,7 +3063,7 @@
30633063
"0.9994",
30643064
"flhthresh",
30653065
"1.6735",
3066-
"fpinj",
3066+
"fp_hcd_injected_max",
30673067
"0.40071",
30683068
"fp_plant_electric_net_required_mw",
30693069
"1.0",
@@ -3160,7 +3160,7 @@
31603160
"0.9794",
31613161
"flhthresh",
31623162
"1.6735",
3163-
"fpinj",
3163+
"fp_hcd_injected_max",
31643164
"0.38071",
31653165
"fp_plant_electric_net_required_mw",
31663166
"1.0",
@@ -3942,7 +3942,7 @@
39423942
"0.9994",
39433943
"flhthresh",
39443944
"1.6735",
3945-
"fpinj",
3945+
"fp_hcd_injected_max",
39463946
"0.40071",
39473947
"fp_plant_electric_net_required_mw",
39483948
"1.0",
@@ -4039,7 +4039,7 @@
40394039
"0.9994",
40404040
"flhthresh",
40414041
"1.6735",
4042-
"fpinj",
4042+
"fp_hcd_injected_max",
40434043
"0.40071",
40444044
"fp_plant_electric_net_required_mw",
40454045
"1.0",
@@ -4136,7 +4136,7 @@
41364136
"0.9794",
41374137
"flhthresh",
41384138
"1.6735",
4139-
"fpinj",
4139+
"fp_hcd_injected_max",
41404140
"0.38071",
41414141
"fp_plant_electric_net_required_mw",
41424142
"1.0",
@@ -4233,7 +4233,7 @@
42334233
"0.9794",
42344234
"flhthresh",
42354235
"1.5735",
4236-
"fpinj",
4236+
"fp_hcd_injected_max",
42374237
"0.38071",
42384238
"fp_plant_electric_net_required_mw",
42394239
"1.0",
@@ -5037,7 +5037,7 @@
50375037
"0.9994",
50385038
"flhthresh",
50395039
"0.074836",
5040-
"fpinj",
5040+
"fp_hcd_injected_max",
50415041
"0.40011",
50425042
"fp_plant_electric_net_required_mw",
50435043
"1.0",
@@ -5134,7 +5134,7 @@
51345134
"0.7994",
51355135
"flhthresh",
51365136
"0.074836",
5137-
"fpinj",
5137+
"fp_hcd_injected_max",
51385138
"0.40011",
51395139
"fp_plant_electric_net_required_mw",
51405140
"1.0",
@@ -5231,7 +5231,7 @@
52315231
"0.5994",
52325232
"flhthresh",
52335233
"0.074836",
5234-
"fpinj",
5234+
"fp_hcd_injected_max",
52355235
"0.40011",
52365236
"fp_plant_electric_net_required_mw",
52375237
"1.0",
@@ -5328,7 +5328,7 @@
53285328
"0.9994",
53295329
"flhthresh",
53305330
"0.074836",
5331-
"fpinj",
5331+
"fp_hcd_injected_max",
53325332
"0.40011",
53335333
"fp_plant_electric_net_required_mw",
53345334
"1.0",
@@ -6129,7 +6129,7 @@
61296129
"0.9994",
61306130
"flhthresh",
61316131
"1.6735",
6132-
"fpinj",
6132+
"fp_hcd_injected_max",
61336133
"0.40071",
61346134
"fp_plant_electric_net_required_mw",
61356135
"1.0",
@@ -6226,7 +6226,7 @@
62266226
"0.9894",
62276227
"flhthresh",
62286228
"1.7735",
6229-
"fpinj",
6229+
"fp_hcd_injected_max",
62306230
"0.30071",
62316231
"fp_plant_electric_net_required_mw",
62326232
"1.0",
@@ -6323,7 +6323,7 @@
63236323
"0.9994",
63246324
"flhthresh",
63256325
"1.6735",
6326-
"fpinj",
6326+
"fp_hcd_injected_max",
63276327
"0.40071",
63286328
"fp_plant_electric_net_required_mw",
63296329
"1.0",
@@ -6420,7 +6420,7 @@
64206420
"0.9294",
64216421
"flhthresh",
64226422
"1.9735",
6423-
"fpinj",
6423+
"fp_hcd_injected_max",
64246424
"0.43071",
64256425
"fp_plant_electric_net_required_mw",
64266426
"1.7",

‎process/constraints.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -972,17 +972,17 @@ def constraint_equation_30():
972972
author: P B Lloyd, CCFE, Culham Science Centre
973973
974974
p_hcd_injected_total_mw: total auxiliary injected power (MW)
975-
fpinj: f-value for injection power
975+
fp_hcd_injected_max: f-value for injection power
976976
p_hcd_injected_max: Maximum allowable value for injected power (MW)
977977
"""
978978
return ConstraintResult(
979979
fortran.current_drive_variables.p_hcd_injected_total_mw
980980
/ fortran.current_drive_variables.p_hcd_injected_max
981-
- 1.0 * fortran.constraint_variables.fpinj,
981+
- 1.0 * fortran.constraint_variables.fp_hcd_injected_max,
982982
fortran.current_drive_variables.p_hcd_injected_max,
983983
fortran.current_drive_variables.p_hcd_injected_max
984984
- fortran.current_drive_variables.p_hcd_injected_total_mw
985-
/ fortran.constraint_variables.fpinj,
985+
/ fortran.constraint_variables.fp_hcd_injected_max,
986986
)
987987

988988

@@ -2372,7 +2372,7 @@ def init_constraint_variables():
23722372
fortran.constraint_variables.fnesep = 1.0
23732373
fortran.constraint_variables.foh_stress = 1.0
23742374
fortran.constraint_variables.fb_tf_inboard_max = 1.0
2375-
fortran.constraint_variables.fpinj = 1.0
2375+
fortran.constraint_variables.fp_hcd_injected_max = 1.0
23762376
fortran.constraint_variables.fp_plant_electric_net_required_mw = 1.0
23772377
fortran.constraint_variables.fportsz = 1.0
23782378
fortran.constraint_variables.fpsepbqar = 1.0

‎process/input.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,9 @@ def __post_init__(self):
683683
"fb_tf_inboard_max": InputVariable(
684684
fortran.constraint_variables, float, range=(0.001, 10.0)
685685
),
686-
"fpinj": InputVariable(fortran.constraint_variables, float, range=(0.001, 10.0)),
686+
"fp_hcd_injected_max": InputVariable(
687+
fortran.constraint_variables, float, range=(0.001, 10.0)
688+
),
687689
"fp_plant_electric_net_required_mw": InputVariable(
688690
fortran.constraint_variables, float, range=(0.001, 10.0)
689691
),

0 commit comments

Comments
 (0)