From b2646a9fa81eca5eee11f39c0cf02291c40a15e7 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 17 Feb 2025 11:53:08 +0000 Subject: [PATCH 01/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20`bktlife`=20to=20?= =?UTF-8?q?`life=5Fblkt=5Ffpy`=20for=20clarity=20and=20consistency=20acros?= =?UTF-8?q?s=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 ++--- process/availability.py | 70 +++++++++---------- process/costs.py | 12 ++-- process/ife.py | 2 +- process/io/variable_metadata.py | 2 +- process/stellarator.py | 4 +- source/fortran/constraint_equations.f90 | 6 +- source/fortran/fwbs_variables.f90 | 4 +- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 ++++---- tests/integration/data/scan_MFILE.DAT | 18 ++--- tests/integration/ref_dicts.json | 6 +- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_availability.py | 22 +++--- tests/unit/test_buildings.py | 8 +-- tests/unit/test_costs_1990.py | 8 +-- tests/unit/test_ife.py | 14 ++-- 27 files changed, 129 insertions(+), 119 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 1d36f77853..22aaeec929 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -311,7 +311,7 @@ # Plant Availability # Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________ 5.0000E+00 Allowable_divertor_heat_fluence_(MW-yr/m2)______________________________ (adivflnc)____________________ 7.0000E+00 - First_wall_/_blanket_lifetime_(years)___________________________________ (bktlife)_____________________ 6.2630E+00 OP + First_wall_/_blanket_lifetime_(years)___________________________________ (life_blkt_fpy)_____________________ 6.2630E+00 OP Divertor_lifetime_(years)_______________________________________________ (divlife)_____________________ 4.7579E+00 OP Heating/CD_system_lifetime_(years)______________________________________ (cdrlife)_____________________ 6.2630E+00 OP Total_plant_lifetime_(years)____________________________________________ (tlife)_______________________ 3.0000E+01 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 646a3d0f6f..58d903fc47 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -312,7 +312,7 @@ # Plant Availability # Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________ 5.0000E+00 Allowable_divertor_heat_fluence_(MW-yr/m2)______________________________ (adivflnc)____________________ 7.0000E+00 - First_wall_/_blanket_lifetime_(years)___________________________________ (bktlife)_____________________ 6.1566E+00 OP + First_wall_/_blanket_lifetime_(years)___________________________________ (life_blkt_fpy)_____________________ 6.1566E+00 OP Divertor_lifetime_(years)_______________________________________________ (divlife)_____________________ 3.9769E+00 OP Heating/CD_system_lifetime_(years)______________________________________ (cdrlife)_____________________ 6.1566E+00 OP Total_plant_lifetime_(years)____________________________________________ (tlife)_______________________ 3.0000E+01 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 847e49b5f3..77812e5d89 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -312,7 +312,7 @@ # Plant Availability # Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________ 5.0000E+00 Allowable_divertor_heat_fluence_(MW-yr/m2)______________________________ (adivflnc)____________________ 7.0000E+00 - First_wall_/_blanket_lifetime_(years)___________________________________ (bktlife)_____________________ 6.1566E+00 OP + First_wall_/_blanket_lifetime_(years)___________________________________ (life_blkt_fpy)_____________________ 6.1566E+00 OP Divertor_lifetime_(years)_______________________________________________ (divlife)_____________________ 3.9769E+00 OP Heating/CD_system_lifetime_(years)______________________________________ (cdrlife)_____________________ 6.1566E+00 OP Total_plant_lifetime_(years)____________________________________________ (tlife)_______________________ 3.0000E+01 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index fba44acf5c..ec7f0b89a0 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -312,7 +312,7 @@ # Plant Availability # Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________ 5.0000E+00 Allowable_divertor_heat_fluence_(MW-yr/m2)______________________________ (adivflnc)____________________ 7.0000E+00 - First_wall_/_blanket_lifetime_(years)___________________________________ (bktlife)_____________________ 6.1566E+00 OP + First_wall_/_blanket_lifetime_(years)___________________________________ (life_blkt_fpy)_____________________ 6.1566E+00 OP Divertor_lifetime_(years)_______________________________________________ (divlife)_____________________ 3.9769E+00 OP Heating/CD_system_lifetime_(years)______________________________________ (cdrlife)_____________________ 6.1566E+00 OP Total_plant_lifetime_(years)____________________________________________ (tlife)_______________________ 3.0000E+01 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index f0f5966430..c2a0cf50c8 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -312,7 +312,7 @@ # Plant Availability # Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________ 5.0000E+00 Allowable_divertor_heat_fluence_(MW-yr/m2)______________________________ (adivflnc)____________________ 7.0000E+00 - First_wall_/_blanket_lifetime_(years)___________________________________ (bktlife)_____________________ 6.1566E+00 OP + First_wall_/_blanket_lifetime_(years)___________________________________ (life_blkt_fpy)_____________________ 6.1566E+00 OP Divertor_lifetime_(years)_______________________________________________ (divlife)_____________________ 3.9769E+00 OP Heating/CD_system_lifetime_(years)______________________________________ (cdrlife)_____________________ 6.1566E+00 OP Total_plant_lifetime_(years)____________________________________________ (tlife)_______________________ 3.0000E+01 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 9fa5055249..1508d062cd 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -168,7 +168,7 @@ # Plant Availability # Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________ 1.5000E+01 Allowable_divertor_heat_fluence_(MW-yr/m2)______________________________ (adivflnc)____________________ 2.0000E+01 - First_wall_/_blanket_lifetime_(years)___________________________________ (bktlife)_____________________ 2.0217E+01 OP + First_wall_/_blanket_lifetime_(years)___________________________________ (life_blkt_fpy)_____________________ 2.0217E+01 OP Divertor_lifetime_(years)_______________________________________________ (divlife)_____________________ 4.1594E+00 OP Heating/CD_system_lifetime_(years)______________________________________ (cdrlife)_____________________ 2.0217E+01 OP Total_plant_lifetime_(years)____________________________________________ (tlife)_______________________ 4.0000E+01 @@ -1163,7 +1163,7 @@ # Plant Availability # Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________ 1.5000E+01 Allowable_divertor_heat_fluence_(MW-yr/m2)______________________________ (adivflnc)____________________ 2.0000E+01 - First_wall_/_blanket_lifetime_(years)___________________________________ (bktlife)_____________________ 2.0217E+01 OP + First_wall_/_blanket_lifetime_(years)___________________________________ (life_blkt_fpy)_____________________ 2.0217E+01 OP Divertor_lifetime_(years)_______________________________________________ (divlife)_____________________ 4.1594E+00 OP Heating/CD_system_lifetime_(years)______________________________________ (cdrlife)_____________________ 2.0217E+01 OP Total_plant_lifetime_(years)____________________________________________ (tlife)_______________________ 4.0000E+01 @@ -2158,7 +2158,7 @@ # Plant Availability # Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________ 1.5000E+01 Allowable_divertor_heat_fluence_(MW-yr/m2)______________________________ (adivflnc)____________________ 2.0000E+01 - First_wall_/_blanket_lifetime_(years)___________________________________ (bktlife)_____________________ 2.0217E+01 OP + First_wall_/_blanket_lifetime_(years)___________________________________ (life_blkt_fpy)_____________________ 2.0217E+01 OP Divertor_lifetime_(years)_______________________________________________ (divlife)_____________________ 4.1594E+00 OP Heating/CD_system_lifetime_(years)______________________________________ (cdrlife)_____________________ 2.0217E+01 OP Total_plant_lifetime_(years)____________________________________________ (tlife)_______________________ 4.0000E+01 @@ -3153,7 +3153,7 @@ # Plant Availability # Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________ 1.5000E+01 Allowable_divertor_heat_fluence_(MW-yr/m2)______________________________ (adivflnc)____________________ 2.0000E+01 - First_wall_/_blanket_lifetime_(years)___________________________________ (bktlife)_____________________ 2.0217E+01 OP + First_wall_/_blanket_lifetime_(years)___________________________________ (life_blkt_fpy)_____________________ 2.0217E+01 OP Divertor_lifetime_(years)_______________________________________________ (divlife)_____________________ 4.1594E+00 OP Heating/CD_system_lifetime_(years)______________________________________ (cdrlife)_____________________ 2.0217E+01 OP Total_plant_lifetime_(years)____________________________________________ (tlife)_______________________ 4.0000E+01 @@ -4148,7 +4148,7 @@ # Plant Availability # Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________ 1.5000E+01 Allowable_divertor_heat_fluence_(MW-yr/m2)______________________________ (adivflnc)____________________ 2.0000E+01 - First_wall_/_blanket_lifetime_(years)___________________________________ (bktlife)_____________________ 2.0217E+01 OP + First_wall_/_blanket_lifetime_(years)___________________________________ (life_blkt_fpy)_____________________ 2.0217E+01 OP Divertor_lifetime_(years)_______________________________________________ (divlife)_____________________ 4.1594E+00 OP Heating/CD_system_lifetime_(years)______________________________________ (cdrlife)_____________________ 2.0217E+01 OP Total_plant_lifetime_(years)____________________________________________ (tlife)_______________________ 4.0000E+01 @@ -5143,7 +5143,7 @@ # Plant Availability # Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________ 1.5000E+01 Allowable_divertor_heat_fluence_(MW-yr/m2)______________________________ (adivflnc)____________________ 2.0000E+01 - First_wall_/_blanket_lifetime_(years)___________________________________ (bktlife)_____________________ 2.0217E+01 OP + First_wall_/_blanket_lifetime_(years)___________________________________ (life_blkt_fpy)_____________________ 2.0217E+01 OP Divertor_lifetime_(years)_______________________________________________ (divlife)_____________________ 4.1594E+00 OP Heating/CD_system_lifetime_(years)______________________________________ (cdrlife)_____________________ 2.0217E+01 OP Total_plant_lifetime_(years)____________________________________________ (tlife)_______________________ 4.0000E+01 @@ -6138,7 +6138,7 @@ # Plant Availability # Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________ 1.5000E+01 Allowable_divertor_heat_fluence_(MW-yr/m2)______________________________ (adivflnc)____________________ 2.0000E+01 - First_wall_/_blanket_lifetime_(years)___________________________________ (bktlife)_____________________ 2.0217E+01 OP + First_wall_/_blanket_lifetime_(years)___________________________________ (life_blkt_fpy)_____________________ 2.0217E+01 OP Divertor_lifetime_(years)_______________________________________________ (divlife)_____________________ 4.1594E+00 OP Heating/CD_system_lifetime_(years)______________________________________ (cdrlife)_____________________ 2.0217E+01 OP Total_plant_lifetime_(years)____________________________________________ (tlife)_______________________ 4.0000E+01 @@ -7133,7 +7133,7 @@ # Plant Availability # Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________ 1.5000E+01 Allowable_divertor_heat_fluence_(MW-yr/m2)______________________________ (adivflnc)____________________ 2.0000E+01 - First_wall_/_blanket_lifetime_(years)___________________________________ (bktlife)_____________________ 2.0217E+01 OP + First_wall_/_blanket_lifetime_(years)___________________________________ (life_blkt_fpy)_____________________ 2.0217E+01 OP Divertor_lifetime_(years)_______________________________________________ (divlife)_____________________ 4.1594E+00 OP Heating/CD_system_lifetime_(years)______________________________________ (cdrlife)_____________________ 2.0217E+01 OP Total_plant_lifetime_(years)____________________________________________ (tlife)_______________________ 4.0000E+01 @@ -8128,7 +8128,7 @@ # Plant Availability # Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________ 1.5000E+01 Allowable_divertor_heat_fluence_(MW-yr/m2)______________________________ (adivflnc)____________________ 2.0000E+01 - First_wall_/_blanket_lifetime_(years)___________________________________ (bktlife)_____________________ 2.0217E+01 OP + First_wall_/_blanket_lifetime_(years)___________________________________ (life_blkt_fpy)_____________________ 2.0217E+01 OP Divertor_lifetime_(years)_______________________________________________ (divlife)_____________________ 4.1594E+00 OP Heating/CD_system_lifetime_(years)______________________________________ (cdrlife)_____________________ 2.0217E+01 OP Total_plant_lifetime_(years)____________________________________________ (tlife)_______________________ 4.0000E+01 diff --git a/process/availability.py b/process/availability.py index ae5103731a..57e9a0332a 100644 --- a/process/availability.py +++ b/process/availability.py @@ -101,18 +101,18 @@ def avail(self, output: bool): # Calculate blanket lifetime using neutron fluence model (ibkt_life=0) # or DEMO fusion power model (ibkt_life=1) if cv.ibkt_life == 0: - fwbsv.bktlife = min(cv.abktflnc / pv.pflux_fw_neutron_mw, cv.tlife) + fwbsv.life_blkt_fpy = min(cv.abktflnc / pv.pflux_fw_neutron_mw, cv.tlife) else: - fwbsv.bktlife = min(cv.life_dpa / dpa_fpy, cv.tlife) # DEMO + fwbsv.life_blkt_fpy = min(cv.life_dpa / dpa_fpy, cv.tlife) # DEMO else: if cv.ibkt_life == 0: - fwbsv.bktlife = min( + fwbsv.life_blkt_fpy = min( fwbsv.life_fw_fpy, cv.abktflnc / pv.pflux_fw_neutron_mw, cv.tlife, ) else: - fwbsv.bktlife = min( + fwbsv.life_blkt_fpy = min( fwbsv.life_fw_fpy, cv.life_dpa / dpa_fpy, cv.tlife ) # DEMO @@ -132,19 +132,19 @@ def avail(self, output: bool): # Calculate the number of fusion cycles for a given blanket lifetime pulse_fpy = tv.t_cycle / YEAR_SECONDS - cv.bktcycles = (fwbsv.bktlife / pulse_fpy) + 1 + cv.bktcycles = (fwbsv.life_blkt_fpy / pulse_fpy) + 1 # if iavail = 0 use input value for cfactr # Taylor and Ward 1999 model (iavail=1) if cv.iavail == 1: # Which component has the shorter life? - if cv.divlife < fwbsv.bktlife: + if cv.divlife < fwbsv.life_blkt_fpy: ld = cv.divlife - lb = fwbsv.bktlife + lb = fwbsv.life_blkt_fpy td = cv.tdivrepl else: - ld = fwbsv.bktlife + ld = fwbsv.life_blkt_fpy lb = cv.divlife td = cv.tbktrepl @@ -176,8 +176,8 @@ def avail(self, output: bool): # Modify lifetimes to take account of the availability if ifev.ife != 1: # First wall / blanket - if fwbsv.bktlife < cv.tlife: - fwbsv.bktlife = min(fwbsv.bktlife / cv.cfactr, cv.tlife) + if fwbsv.life_blkt_fpy < cv.tlife: + fwbsv.life_blkt_fpy = min(fwbsv.life_blkt_fpy / cv.cfactr, cv.tlife) # Divertor if cv.divlife < cv.tlife: @@ -188,7 +188,7 @@ def avail(self, output: bool): cv.cplife = min(cv.cplife / cv.cfactr, cv.tlife) # Current drive system lifetime (assumed equal to first wall and blanket lifetime) - cv.cdrlife = fwbsv.bktlife + cv.cdrlife = fwbsv.life_blkt_fpy # Output section if output: @@ -210,8 +210,8 @@ def avail(self, output: bool): po.ovarre( self.outfile, "First wall / blanket lifetime (years)", - "(bktlife)", - fwbsv.bktlife, + "(life_blkt_fpy)", + fwbsv.life_blkt_fpy, "OP ", ) po.ovarre( @@ -241,7 +241,7 @@ def avail(self, output: bool): po.ovarre(self.outfile, "Total plant lifetime (years)", "(tlife)", cv.tlife) if cv.iavail == 1: - if cv.divlife < fwbsv.bktlife: + if cv.divlife < fwbsv.life_blkt_fpy: po.ovarre( self.outfile, "Time needed to replace divertor (years)", @@ -364,10 +364,10 @@ def avail_2(self, output: bool): # Modify lifetimes to take account of the availability if ifev.ife != 1: # First wall / blanket - if fwbsv.bktlife < cv.tlife: - fwbsv.bktlife = min(fwbsv.bktlife / cv.cfactr, cv.tlife) + if fwbsv.life_blkt_fpy < cv.tlife: + fwbsv.life_blkt_fpy = min(fwbsv.life_blkt_fpy / cv.cfactr, cv.tlife) # Current drive system lifetime (assumed equal to first wall and blanket lifetime) - cv.cdrlife = fwbsv.bktlife + cv.cdrlife = fwbsv.life_blkt_fpy # Divertor if cv.divlife < cv.tlife: @@ -385,8 +385,8 @@ def avail_2(self, output: bool): po.ovarre( self.outfile, "First wall / blanket lifetime (FPY)", - "(bktlife)", - fwbsv.bktlife, + "(life_blkt_fpy)", + fwbsv.life_blkt_fpy, "OP ", ) po.ovarre( @@ -477,9 +477,9 @@ def calc_u_planned(self, output: bool) -> float: # Calculate blanket lifetime using neutron fluence model (ibkt_life=0) # or DEMO fusion power model (ibkt_life=1) if cv.ibkt_life == 0: - fwbsv.bktlife = min(cv.abktflnc / pv.pflux_fw_neutron_mw, cv.tlife) + fwbsv.life_blkt_fpy = min(cv.abktflnc / pv.pflux_fw_neutron_mw, cv.tlife) else: - fwbsv.bktlife = min(cv.life_dpa / dpa_fpy, cv.tlife) # DEMO + fwbsv.life_blkt_fpy = min(cv.life_dpa / dpa_fpy, cv.tlife) # DEMO # Divertor lifetime (years) cv.divlife = self.divertor_lifetime() @@ -489,7 +489,7 @@ def calc_u_planned(self, output: bool) -> float: cv.cplife = self.cp_lifetime() # Current drive lifetime (assumed equal to first wall and blanket lifetime) - cv.cdrlife = fwbsv.bktlife + cv.cdrlife = fwbsv.life_blkt_fpy # Calculate the blanket and divertor replacement times ! @@ -506,12 +506,12 @@ def calc_u_planned(self, output: bool) -> float: mttr_divertor = 0.7e0 * mttr_blanket # Which component has the shorter life? - if cv.divlife < fwbsv.bktlife: + if cv.divlife < fwbsv.life_blkt_fpy: lifetime_shortest = cv.divlife - lifetime_longest = fwbsv.bktlife + lifetime_longest = fwbsv.life_blkt_fpy mttr_shortest = mttr_divertor else: - lifetime_shortest = fwbsv.bktlife + lifetime_shortest = fwbsv.life_blkt_fpy lifetime_longest = cv.divlife mttr_shortest = mttr_blanket @@ -762,7 +762,7 @@ def calc_u_unplanned_fwbs(self, output: bool) -> float: # Calculate cycle limit in terms of days # Number of cycles between planned blanket replacements, N - n = fwbsv.bktlife * YEAR_SECONDS / tv.t_cycle + n = fwbsv.life_blkt_fpy * YEAR_SECONDS / tv.t_cycle # The probability of failure in one pulse cycle # (before the reference cycle life) @@ -1047,9 +1047,9 @@ def avail_st(self, output: bool): dpa_fpy = f_scale * ref_dpa_fpy if cv.ibkt_life == 0: - fwbsv.bktlife = min(cv.abktflnc / pv.pflux_fw_neutron_mw, cv.tlife) + fwbsv.life_blkt_fpy = min(cv.abktflnc / pv.pflux_fw_neutron_mw, cv.tlife) else: - fwbsv.bktlife = min(cv.life_dpa / dpa_fpy, cv.tlife) # DEMO + fwbsv.life_blkt_fpy = min(cv.life_dpa / dpa_fpy, cv.tlife) # DEMO # Divertor lifetime (years) cv.divlife = self.divertor_lifetime() @@ -1058,12 +1058,12 @@ def avail_st(self, output: bool): cv.cplife = self.cp_lifetime() # Current drive lifetime (assumed equal to first wall and blanket lifetime) - cv.cdrlife = fwbsv.bktlife + cv.cdrlife = fwbsv.life_blkt_fpy # Time for a maintenance cycle (years) # Shortest component lifetime + time to replace shortest_lifetime = min( - fwbsv.bktlife, cv.divlife, cv.cplife, cv.cdrlife, cv.tlife + fwbsv.life_blkt_fpy, cv.divlife, cv.cplife, cv.cdrlife, cv.tlife ) maint_cycle = shortest_lifetime + cv.tmain @@ -1126,9 +1126,9 @@ def avail_st(self, output: bool): # Modify lifetimes to take account of the availability if ifev.ife != 1: # First wall / blanket - if fwbsv.bktlife < cv.tlife: - fwbsv.bktlife = min(fwbsv.bktlife / cv.cfactr, cv.tlife) - cv.cdrlife = fwbsv.bktlife + if fwbsv.life_blkt_fpy < cv.tlife: + fwbsv.life_blkt_fpy = min(fwbsv.life_blkt_fpy / cv.cfactr, cv.tlife) + cv.cdrlife = fwbsv.life_blkt_fpy # Divertor if cv.divlife < cv.tlife: @@ -1159,8 +1159,8 @@ def avail_st(self, output: bool): po.ovarre( self.outfile, "First wall / blanket lifetime (FPY)", - "(bktlife)", - fwbsv.bktlife, + "(life_blkt_fpy)", + fwbsv.life_blkt_fpy, "OP ", ) po.ovarre( diff --git a/process/costs.py b/process/costs.py index 3a37475d71..244fad8413 100644 --- a/process/costs.py +++ b/process/costs.py @@ -2678,7 +2678,9 @@ def coelc(self): ) if cost_variables.ifueltyp == 2: - annfwbl = annfwbl * (1.0e0 - fwbs_variables.bktlife / cost_variables.tlife) + annfwbl = annfwbl * ( + 1.0e0 - fwbs_variables.life_blkt_fpy / cost_variables.tlife + ) # Cost of electricity due to first wall/blanket replacements @@ -2917,12 +2919,14 @@ def convert_fpy_to_calendar() -> None: Author: J Foster, CCFE, Culham Campus """ # FW/Blanket and HCD - if fwbs_variables.bktlife < cost_variables.tlife: - fwbs_variables.bktlife_cal = fwbs_variables.bktlife * cost_variables.cfactr + if fwbs_variables.life_blkt_fpy < cost_variables.tlife: + fwbs_variables.bktlife_cal = ( + fwbs_variables.life_blkt_fpy * cost_variables.cfactr + ) # Current drive system lifetime (assumed equal to first wall and blanket lifetime) cost_variables.cdrlife_cal = fwbs_variables.bktlife_cal else: - fwbs_variables.bktlife_cal = fwbs_variables.bktlife + fwbs_variables.bktlife_cal = fwbs_variables.life_blkt_fpy # Divertor if cost_variables.divlife < cost_variables.tlife: diff --git a/process/ife.py b/process/ife.py index 43ef923093..23fa776771 100644 --- a/process/ife.py +++ b/process/ife.py @@ -1838,7 +1838,7 @@ def ifefbs(self, output: bool = False): / (physics_variables.pflux_fw_neutron_mw * cost_variables.cfactr), ) - fwbs_variables.bktlife = life + fwbs_variables.life_blkt_fpy = life fwbs_variables.life_fw_fpy = life if not output: diff --git a/process/io/variable_metadata.py b/process/io/variable_metadata.py index 6ee2871a9c..33015d752d 100644 --- a/process/io/variable_metadata.py +++ b/process/io/variable_metadata.py @@ -257,7 +257,7 @@ class VariableMetadata: description="Normalized TF current", units="", ), - "bktlife": VariableMetadata( + "life_blkt_fpy": VariableMetadata( latex=r"$T_{\mathrm{blk}}$", description="Blanket lifetime", units="" ), "bktcycles": VariableMetadata( diff --git a/process/stellarator.py b/process/stellarator.py index 4fb62a16bd..e31c8ac928 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -2173,8 +2173,8 @@ def stfwbs(self, output: bool): po.ovarre( self.outfile, "Blanket lifetime (full power years)", - "(bktlife)", - fwbs_variables.bktlife, + "(life_blkt_fpy)", + fwbs_variables.life_blkt_fpy, ) po.ovarre( self.outfile, diff --git a/source/fortran/constraint_equations.f90 b/source/fortran/constraint_equations.f90 index 9e61ee3dce..257128f845 100755 --- a/source/fortran/constraint_equations.f90 +++ b/source/fortran/constraint_equations.f90 @@ -3171,13 +3171,13 @@ subroutine constraint_eqn_085(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! Logic change during pre-factoring: err, symbol, units will be assigned !! only if present. !! cplife : input real : calculated CP full power year lifetime (years) - !! bktlife : input real : calculated first wall/blanket power year lifetime (years) + !! life_blkt_fpy : input real : calculated first wall/blanket power year lifetime (years) !! divlife : input real : calculated divertor power year lifetime (years) !! i_cp_lifetime : input integer : switch chosing which plant element the CP !! the CP lifetime must equate use cost_variables, only : cplife, divlife, cplife_input, & tlife, i_cp_lifetime - use fwbs_variables, only : bktlife + use fwbs_variables, only : life_blkt_fpy implicit none @@ -3198,7 +3198,7 @@ subroutine constraint_eqn_085(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) ! The CP lifetime is equal to the tritium breeding blankets / FW one else if ( i_cp_lifetime == 2 ) then - tmp_cc = 1.0D0 - cplife/bktlife + tmp_cc = 1.0D0 - cplife/life_blkt_fpy ! The CP lifetime is equal to the else if ( i_cp_lifetime == 3 ) then diff --git a/source/fortran/fwbs_variables.f90 b/source/fortran/fwbs_variables.f90 index 7914f0c3ca..542741fbcf 100644 --- a/source/fortran/fwbs_variables.f90 +++ b/source/fortran/fwbs_variables.f90 @@ -15,7 +15,7 @@ module fwbs_variables public - real(dp) :: bktlife + real(dp) :: life_blkt_fpy !! Full power blanket lifetime (years) real(dp) :: bktlife_cal @@ -664,7 +664,7 @@ subroutine init_fwbs_variables !! Initialise fwbs variables implicit none - bktlife = 0.0D0 + life_blkt_fpy = 0.0D0 bktlife_cal = 0.0D0 coolmass = 0.0D0 vvmass = 0.0D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 6661a79085..68639f3dae 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -311,7 +311,7 @@ # Plant Availability # Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________ 5.0000E+00 Allowable_divertor_heat_fluence_(MW-yr/m2)______________________________ (adivflnc)____________________ 7.0000E+00 - First_wall_/_blanket_lifetime_(years)___________________________________ (bktlife)_____________________ 6.1566E+00 OP + First_wall_/_blanket_lifetime_(years)___________________________________ (life_blkt_fpy)_____________________ 6.1566E+00 OP Divertor_lifetime_(years)_______________________________________________ (divlife)_____________________ 3.9769E+00 OP Heating/CD_system_lifetime_(years)______________________________________ (cdrlife)_____________________ 6.1566E+00 OP Total_plant_lifetime_(years)____________________________________________ (tlife)_______________________ 3.0000E+01 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index a441603cd1..76fae18cc6 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -312,7 +312,7 @@ # Plant Availability # Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________ 5.0000E+00 Allowable_divertor_heat_fluence_(MW-yr/m2)______________________________ (adivflnc)____________________ 7.0000E+00 - First_wall_/_blanket_lifetime_(years)___________________________________ (bktlife)_____________________ 6.1566E+00 OP + First_wall_/_blanket_lifetime_(years)___________________________________ (life_blkt_fpy)_____________________ 6.1566E+00 OP Divertor_lifetime_(years)_______________________________________________ (divlife)_____________________ 3.9769E+00 OP Heating/CD_system_lifetime_(years)______________________________________ (cdrlife)_____________________ 6.1566E+00 OP Total_plant_lifetime_(years)____________________________________________ (tlife)_______________________ 3.0000E+01 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index d17e1fc031..828dc75da1 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -312,7 +312,7 @@ # Plant Availability # Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________ 5.0000E+00 Allowable_divertor_heat_fluence_(MW-yr/m2)______________________________ (adivflnc)____________________ 7.0000E+00 - First_wall_/_blanket_lifetime_(years)___________________________________ (bktlife)_____________________ 6.1566E+00 OP + First_wall_/_blanket_lifetime_(years)___________________________________ (life_blkt_fpy)_____________________ 6.1566E+00 OP Divertor_lifetime_(years)_______________________________________________ (divlife)_____________________ 3.9769E+00 OP Heating/CD_system_lifetime_(years)______________________________________ (cdrlife)_____________________ 6.1566E+00 OP Total_plant_lifetime_(years)____________________________________________ (tlife)_______________________ 3.0000E+01 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index a387881c9f..35d8f2f214 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -312,7 +312,7 @@ # Plant Availability # Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________ 5.0000E+00 Allowable_divertor_heat_fluence_(MW-yr/m2)______________________________ (adivflnc)____________________ 7.0000E+00 - First_wall_/_blanket_lifetime_(years)___________________________________ (bktlife)_____________________ 6.1566E+00 OP + First_wall_/_blanket_lifetime_(years)___________________________________ (life_blkt_fpy)_____________________ 6.1566E+00 OP Divertor_lifetime_(years)_______________________________________________ (divlife)_____________________ 3.9769E+00 OP Heating/CD_system_lifetime_(years)______________________________________ (cdrlife)_____________________ 6.1566E+00 OP Total_plant_lifetime_(years)____________________________________________ (tlife)_______________________ 3.0000E+01 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 6e7fc08131..b3564527c0 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -308,7 +308,7 @@ # Plant Availability # Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________ 5.0000E+00 Allowable_divertor_heat_fluence_(MW-yr/m2)______________________________ (adivflnc)____________________ 7.0000E+00 - First_wall_/_blanket_lifetime_(years)___________________________________ (bktlife)_____________________ 6.1663E+00 OP + First_wall_/_blanket_lifetime_(years)___________________________________ (life_blkt_fpy)_____________________ 6.1663E+00 OP Divertor_lifetime_(years)_______________________________________________ (divlife)_____________________ 3.8258E+00 OP Heating/CD_system_lifetime_(years)______________________________________ (cdrlife)_____________________ 6.1663E+00 OP Total_plant_lifetime_(years)____________________________________________ (tlife)_______________________ 3.0000E+01 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index fca76e24ab..ee070c5f60 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -313,7 +313,7 @@ # Plant Availability # Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________ 5.0000E+00 Allowable_divertor_heat_fluence_(MW-yr/m2)______________________________ (adivflnc)____________________ 7.0000E+00 - First_wall_/_blanket_lifetime_(years)___________________________________ (bktlife)_____________________ 6.2378E+00 OP + First_wall_/_blanket_lifetime_(years)___________________________________ (life_blkt_fpy)_____________________ 6.2378E+00 OP Divertor_lifetime_(years)_______________________________________________ (divlife)_____________________ 3.9781E+00 OP Heating/CD_system_lifetime_(years)______________________________________ (cdrlife)_____________________ 6.2378E+00 OP Total_plant_lifetime_(years)____________________________________________ (tlife)_______________________ 3.0000E+01 @@ -1476,7 +1476,7 @@ # Plant Availability # Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________ 5.0000E+00 Allowable_divertor_heat_fluence_(MW-yr/m2)______________________________ (adivflnc)____________________ 7.0000E+00 - First_wall_/_blanket_lifetime_(years)___________________________________ (bktlife)_____________________ 6.1809E+00 OP + First_wall_/_blanket_lifetime_(years)___________________________________ (life_blkt_fpy)_____________________ 6.1809E+00 OP Divertor_lifetime_(years)_______________________________________________ (divlife)_____________________ 3.9607E+00 OP Heating/CD_system_lifetime_(years)______________________________________ (cdrlife)_____________________ 6.1809E+00 OP Total_plant_lifetime_(years)____________________________________________ (tlife)_______________________ 3.0000E+01 @@ -2639,7 +2639,7 @@ # Plant Availability # Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________ 5.0000E+00 Allowable_divertor_heat_fluence_(MW-yr/m2)______________________________ (adivflnc)____________________ 7.0000E+00 - First_wall_/_blanket_lifetime_(years)___________________________________ (bktlife)_____________________ 6.1514E+00 OP + First_wall_/_blanket_lifetime_(years)___________________________________ (life_blkt_fpy)_____________________ 6.1514E+00 OP Divertor_lifetime_(years)_______________________________________________ (divlife)_____________________ 4.1198E+00 OP Heating/CD_system_lifetime_(years)______________________________________ (cdrlife)_____________________ 6.1514E+00 OP Total_plant_lifetime_(years)____________________________________________ (tlife)_______________________ 3.0000E+01 @@ -3802,7 +3802,7 @@ # Plant Availability # Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________ 5.0000E+00 Allowable_divertor_heat_fluence_(MW-yr/m2)______________________________ (adivflnc)____________________ 7.0000E+00 - First_wall_/_blanket_lifetime_(years)___________________________________ (bktlife)_____________________ 6.1409E+00 OP + First_wall_/_blanket_lifetime_(years)___________________________________ (life_blkt_fpy)_____________________ 6.1409E+00 OP Divertor_lifetime_(years)_______________________________________________ (divlife)_____________________ 4.0530E+00 OP Heating/CD_system_lifetime_(years)______________________________________ (cdrlife)_____________________ 6.1409E+00 OP Total_plant_lifetime_(years)____________________________________________ (tlife)_______________________ 3.0000E+01 @@ -4965,7 +4965,7 @@ # Plant Availability # Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________ 5.0000E+00 Allowable_divertor_heat_fluence_(MW-yr/m2)______________________________ (adivflnc)____________________ 7.0000E+00 - First_wall_/_blanket_lifetime_(years)___________________________________ (bktlife)_____________________ 6.1311E+00 OP + First_wall_/_blanket_lifetime_(years)___________________________________ (life_blkt_fpy)_____________________ 6.1311E+00 OP Divertor_lifetime_(years)_______________________________________________ (divlife)_____________________ 3.9130E+00 OP Heating/CD_system_lifetime_(years)______________________________________ (cdrlife)_____________________ 6.1311E+00 OP Total_plant_lifetime_(years)____________________________________________ (tlife)_______________________ 3.0000E+01 @@ -6128,7 +6128,7 @@ # Plant Availability # Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________ 5.0000E+00 Allowable_divertor_heat_fluence_(MW-yr/m2)______________________________ (adivflnc)____________________ 7.0000E+00 - First_wall_/_blanket_lifetime_(years)___________________________________ (bktlife)_____________________ 6.1505E+00 OP + First_wall_/_blanket_lifetime_(years)___________________________________ (life_blkt_fpy)_____________________ 6.1505E+00 OP Divertor_lifetime_(years)_______________________________________________ (divlife)_____________________ 3.7932E+00 OP Heating/CD_system_lifetime_(years)______________________________________ (cdrlife)_____________________ 6.1505E+00 OP Total_plant_lifetime_(years)____________________________________________ (tlife)_______________________ 3.0000E+01 @@ -7291,7 +7291,7 @@ # Plant Availability # Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________ 5.0000E+00 Allowable_divertor_heat_fluence_(MW-yr/m2)______________________________ (adivflnc)____________________ 7.0000E+00 - First_wall_/_blanket_lifetime_(years)___________________________________ (bktlife)_____________________ 6.1381E+00 OP + First_wall_/_blanket_lifetime_(years)___________________________________ (life_blkt_fpy)_____________________ 6.1381E+00 OP Divertor_lifetime_(years)_______________________________________________ (divlife)_____________________ 3.7356E+00 OP Heating/CD_system_lifetime_(years)______________________________________ (cdrlife)_____________________ 6.1381E+00 OP Total_plant_lifetime_(years)____________________________________________ (tlife)_______________________ 3.0000E+01 @@ -8454,7 +8454,7 @@ # Plant Availability # Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________ 5.0000E+00 Allowable_divertor_heat_fluence_(MW-yr/m2)______________________________ (adivflnc)____________________ 7.0000E+00 - First_wall_/_blanket_lifetime_(years)___________________________________ (bktlife)_____________________ 6.1295E+00 OP + First_wall_/_blanket_lifetime_(years)___________________________________ (life_blkt_fpy)_____________________ 6.1295E+00 OP Divertor_lifetime_(years)_______________________________________________ (divlife)_____________________ 3.8406E+00 OP Heating/CD_system_lifetime_(years)______________________________________ (cdrlife)_____________________ 6.1295E+00 OP Total_plant_lifetime_(years)____________________________________________ (tlife)_______________________ 3.0000E+01 @@ -9617,7 +9617,7 @@ # Plant Availability # Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________ 5.0000E+00 Allowable_divertor_heat_fluence_(MW-yr/m2)______________________________ (adivflnc)____________________ 7.0000E+00 - First_wall_/_blanket_lifetime_(years)___________________________________ (bktlife)_____________________ 6.1526E+00 OP + First_wall_/_blanket_lifetime_(years)___________________________________ (life_blkt_fpy)_____________________ 6.1526E+00 OP Divertor_lifetime_(years)_______________________________________________ (divlife)_____________________ 3.9127E+00 OP Heating/CD_system_lifetime_(years)______________________________________ (cdrlife)_____________________ 6.1526E+00 OP Total_plant_lifetime_(years)____________________________________________ (tlife)_______________________ 3.0000E+01 @@ -10780,7 +10780,7 @@ # Plant Availability # Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________ 5.0000E+00 Allowable_divertor_heat_fluence_(MW-yr/m2)______________________________ (adivflnc)____________________ 7.0000E+00 - First_wall_/_blanket_lifetime_(years)___________________________________ (bktlife)_____________________ 6.1129E+00 OP + First_wall_/_blanket_lifetime_(years)___________________________________ (life_blkt_fpy)_____________________ 6.1129E+00 OP Divertor_lifetime_(years)_______________________________________________ (divlife)_____________________ 3.8644E+00 OP Heating/CD_system_lifetime_(years)______________________________________ (cdrlife)_____________________ 6.1129E+00 OP Total_plant_lifetime_(years)____________________________________________ (tlife)_______________________ 3.0000E+01 @@ -11943,7 +11943,7 @@ # Plant Availability # Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________ 5.0000E+00 Allowable_divertor_heat_fluence_(MW-yr/m2)______________________________ (adivflnc)____________________ 7.0000E+00 - First_wall_/_blanket_lifetime_(years)___________________________________ (bktlife)_____________________ 6.0770E+00 OP + First_wall_/_blanket_lifetime_(years)___________________________________ (life_blkt_fpy)_____________________ 6.0770E+00 OP Divertor_lifetime_(years)_______________________________________________ (divlife)_____________________ 3.8640E+00 OP Heating/CD_system_lifetime_(years)______________________________________ (cdrlife)_____________________ 6.0770E+00 OP Total_plant_lifetime_(years)____________________________________________ (tlife)_______________________ 3.0000E+01 @@ -13106,7 +13106,7 @@ # Plant Availability # Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________ 5.0000E+00 Allowable_divertor_heat_fluence_(MW-yr/m2)______________________________ (adivflnc)____________________ 7.0000E+00 - First_wall_/_blanket_lifetime_(years)___________________________________ (bktlife)_____________________ 6.0793E+00 OP + First_wall_/_blanket_lifetime_(years)___________________________________ (life_blkt_fpy)_____________________ 6.0793E+00 OP Divertor_lifetime_(years)_______________________________________________ (divlife)_____________________ 3.7702E+00 OP Heating/CD_system_lifetime_(years)______________________________________ (cdrlife)_____________________ 6.0793E+00 OP Total_plant_lifetime_(years)____________________________________________ (tlife)_______________________ 3.0000E+01 @@ -14269,7 +14269,7 @@ # Plant Availability # Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________ 5.0000E+00 Allowable_divertor_heat_fluence_(MW-yr/m2)______________________________ (adivflnc)____________________ 7.0000E+00 - First_wall_/_blanket_lifetime_(years)___________________________________ (bktlife)_____________________ 6.0468E+00 OP + First_wall_/_blanket_lifetime_(years)___________________________________ (life_blkt_fpy)_____________________ 6.0468E+00 OP Divertor_lifetime_(years)_______________________________________________ (divlife)_____________________ 3.7245E+00 OP Heating/CD_system_lifetime_(years)______________________________________ (cdrlife)_____________________ 6.0468E+00 OP Total_plant_lifetime_(years)____________________________________________ (tlife)_______________________ 3.0000E+01 @@ -15432,7 +15432,7 @@ # Plant Availability # Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________ 5.0000E+00 Allowable_divertor_heat_fluence_(MW-yr/m2)______________________________ (adivflnc)____________________ 7.0000E+00 - First_wall_/_blanket_lifetime_(years)___________________________________ (bktlife)_____________________ 6.0152E+00 OP + First_wall_/_blanket_lifetime_(years)___________________________________ (life_blkt_fpy)_____________________ 6.0152E+00 OP Divertor_lifetime_(years)_______________________________________________ (divlife)_____________________ 3.8183E+00 OP Heating/CD_system_lifetime_(years)______________________________________ (cdrlife)_____________________ 6.0152E+00 OP Total_plant_lifetime_(years)____________________________________________ (tlife)_______________________ 3.0000E+01 @@ -16595,7 +16595,7 @@ # Plant Availability # Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________ 5.0000E+00 Allowable_divertor_heat_fluence_(MW-yr/m2)______________________________ (adivflnc)____________________ 7.0000E+00 - First_wall_/_blanket_lifetime_(years)___________________________________ (bktlife)_____________________ 5.9822E+00 OP + First_wall_/_blanket_lifetime_(years)___________________________________ (life_blkt_fpy)_____________________ 5.9822E+00 OP Divertor_lifetime_(years)_______________________________________________ (divlife)_____________________ 3.9249E+00 OP Heating/CD_system_lifetime_(years)______________________________________ (cdrlife)_____________________ 5.9822E+00 OP Total_plant_lifetime_(years)____________________________________________ (tlife)_______________________ 3.0000E+01 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 34730883f9..b1cdd93d28 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -168,7 +168,7 @@ # Plant Availability # Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________ 1.5000E+01 Allowable_divertor_heat_fluence_(MW-yr/m2)______________________________ (adivflnc)____________________ 2.0000E+01 - First_wall_/_blanket_lifetime_(years)___________________________________ (bktlife)_____________________ 2.0217E+01 OP + First_wall_/_blanket_lifetime_(years)___________________________________ (life_blkt_fpy)_____________________ 2.0217E+01 OP Divertor_lifetime_(years)_______________________________________________ (divlife)_____________________ 4.1594E+00 OP Heating/CD_system_lifetime_(years)______________________________________ (cdrlife)_____________________ 2.0217E+01 OP Total_plant_lifetime_(years)____________________________________________ (tlife)_______________________ 4.0000E+01 @@ -1163,7 +1163,7 @@ # Plant Availability # Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________ 1.5000E+01 Allowable_divertor_heat_fluence_(MW-yr/m2)______________________________ (adivflnc)____________________ 2.0000E+01 - First_wall_/_blanket_lifetime_(years)___________________________________ (bktlife)_____________________ 2.0217E+01 OP + First_wall_/_blanket_lifetime_(years)___________________________________ (life_blkt_fpy)_____________________ 2.0217E+01 OP Divertor_lifetime_(years)_______________________________________________ (divlife)_____________________ 4.1594E+00 OP Heating/CD_system_lifetime_(years)______________________________________ (cdrlife)_____________________ 2.0217E+01 OP Total_plant_lifetime_(years)____________________________________________ (tlife)_______________________ 4.0000E+01 @@ -2158,7 +2158,7 @@ # Plant Availability # Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________ 1.5000E+01 Allowable_divertor_heat_fluence_(MW-yr/m2)______________________________ (adivflnc)____________________ 2.0000E+01 - First_wall_/_blanket_lifetime_(years)___________________________________ (bktlife)_____________________ 2.0217E+01 OP + First_wall_/_blanket_lifetime_(years)___________________________________ (life_blkt_fpy)_____________________ 2.0217E+01 OP Divertor_lifetime_(years)_______________________________________________ (divlife)_____________________ 4.1594E+00 OP Heating/CD_system_lifetime_(years)______________________________________ (cdrlife)_____________________ 2.0217E+01 OP Total_plant_lifetime_(years)____________________________________________ (tlife)_______________________ 4.0000E+01 @@ -3153,7 +3153,7 @@ # Plant Availability # Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________ 1.5000E+01 Allowable_divertor_heat_fluence_(MW-yr/m2)______________________________ (adivflnc)____________________ 2.0000E+01 - First_wall_/_blanket_lifetime_(years)___________________________________ (bktlife)_____________________ 2.0217E+01 OP + First_wall_/_blanket_lifetime_(years)___________________________________ (life_blkt_fpy)_____________________ 2.0217E+01 OP Divertor_lifetime_(years)_______________________________________________ (divlife)_____________________ 4.1594E+00 OP Heating/CD_system_lifetime_(years)______________________________________ (cdrlife)_____________________ 2.0217E+01 OP Total_plant_lifetime_(years)____________________________________________ (tlife)_______________________ 4.0000E+01 @@ -4148,7 +4148,7 @@ # Plant Availability # Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________ 1.5000E+01 Allowable_divertor_heat_fluence_(MW-yr/m2)______________________________ (adivflnc)____________________ 2.0000E+01 - First_wall_/_blanket_lifetime_(years)___________________________________ (bktlife)_____________________ 2.0217E+01 OP + First_wall_/_blanket_lifetime_(years)___________________________________ (life_blkt_fpy)_____________________ 2.0217E+01 OP Divertor_lifetime_(years)_______________________________________________ (divlife)_____________________ 4.1594E+00 OP Heating/CD_system_lifetime_(years)______________________________________ (cdrlife)_____________________ 2.0217E+01 OP Total_plant_lifetime_(years)____________________________________________ (tlife)_______________________ 4.0000E+01 @@ -5143,7 +5143,7 @@ # Plant Availability # Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________ 1.5000E+01 Allowable_divertor_heat_fluence_(MW-yr/m2)______________________________ (adivflnc)____________________ 2.0000E+01 - First_wall_/_blanket_lifetime_(years)___________________________________ (bktlife)_____________________ 2.0217E+01 OP + First_wall_/_blanket_lifetime_(years)___________________________________ (life_blkt_fpy)_____________________ 2.0217E+01 OP Divertor_lifetime_(years)_______________________________________________ (divlife)_____________________ 4.1594E+00 OP Heating/CD_system_lifetime_(years)______________________________________ (cdrlife)_____________________ 2.0217E+01 OP Total_plant_lifetime_(years)____________________________________________ (tlife)_______________________ 4.0000E+01 @@ -6138,7 +6138,7 @@ # Plant Availability # Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________ 1.5000E+01 Allowable_divertor_heat_fluence_(MW-yr/m2)______________________________ (adivflnc)____________________ 2.0000E+01 - First_wall_/_blanket_lifetime_(years)___________________________________ (bktlife)_____________________ 2.0217E+01 OP + First_wall_/_blanket_lifetime_(years)___________________________________ (life_blkt_fpy)_____________________ 2.0217E+01 OP Divertor_lifetime_(years)_______________________________________________ (divlife)_____________________ 4.1594E+00 OP Heating/CD_system_lifetime_(years)______________________________________ (cdrlife)_____________________ 2.0217E+01 OP Total_plant_lifetime_(years)____________________________________________ (tlife)_______________________ 4.0000E+01 @@ -7133,7 +7133,7 @@ # Plant Availability # Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________ 1.5000E+01 Allowable_divertor_heat_fluence_(MW-yr/m2)______________________________ (adivflnc)____________________ 2.0000E+01 - First_wall_/_blanket_lifetime_(years)___________________________________ (bktlife)_____________________ 2.0217E+01 OP + First_wall_/_blanket_lifetime_(years)___________________________________ (life_blkt_fpy)_____________________ 2.0217E+01 OP Divertor_lifetime_(years)_______________________________________________ (divlife)_____________________ 4.1594E+00 OP Heating/CD_system_lifetime_(years)______________________________________ (cdrlife)_____________________ 2.0217E+01 OP Total_plant_lifetime_(years)____________________________________________ (tlife)_______________________ 4.0000E+01 @@ -8128,7 +8128,7 @@ # Plant Availability # Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________ 1.5000E+01 Allowable_divertor_heat_fluence_(MW-yr/m2)______________________________ (adivflnc)____________________ 2.0000E+01 - First_wall_/_blanket_lifetime_(years)___________________________________ (bktlife)_____________________ 2.0217E+01 OP + First_wall_/_blanket_lifetime_(years)___________________________________ (life_blkt_fpy)_____________________ 2.0217E+01 OP Divertor_lifetime_(years)_______________________________________________ (divlife)_____________________ 4.1594E+00 OP Heating/CD_system_lifetime_(years)______________________________________ (cdrlife)_____________________ 2.0217E+01 OP Total_plant_lifetime_(years)____________________________________________ (tlife)_______________________ 4.0000E+01 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index d0b9abd945..81ce709b1a 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -309,7 +309,7 @@ "bigqmin": 10.0, "bioshld_thk": 2.5, "bktcycles": 1000.0, - "bktlife": 0.0, + "life_blkt_fpy": 0.0, "blanket_density": 0.0, "blarea": 0.0, "blareaib": 0.0, @@ -8879,7 +8879,7 @@ "bigqmin": "minimum fusion gain Q (`constraint equation 28`)", "bioshld_thk": "Radial thickness of bio-shield around reactor (m)", "bktcycles": "Number of fusion cycles to reach allowable DPA from DEMO fw/blanket lifetime calculation", - "bktlife": "Full power blanket lifetime (years)", + "life_blkt_fpy": "Full power blanket lifetime (years)", "blanket_density": "Blanket density [kg/m3]", "blarea": "blanket total surface area (m2)", "blareaib": "inboard blanket surface area (m2)", @@ -18012,7 +18012,7 @@ ], "fwbs_module": [], "fwbs_variables": [ - "bktlife", + "life_blkt_fpy", "coolmass", "vvmass", "denstl", diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index ad77f3148d..39b92b20fa 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -3097,7 +3097,7 @@ cost_model = 0 *abktflnc = * DESCRIPTION: Allowable FW/Blanket Neutron Fluence (MW-yr/m2) -* JUSTIFICATION: Set to enforce a blanket lifetime (`bktlife`) of 5 years +* JUSTIFICATION: Set to enforce a blanket lifetime (`life_blkt_fpy`) of 5 years *adivflnc = * DESCRIPTION: Allowable Divertor Heat Fluence (MW-yr/m2) diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index f206da043b..ef1aa4d773 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -308,7 +308,7 @@ # Plant Availability # Allowable_blanket_neutron_fluence_(MW-yr/m2)____________________________ (abktflnc)____________________ 5.0000E+00 Allowable_divertor_heat_fluence_(MW-yr/m2)______________________________ (adivflnc)____________________ 7.0000E+00 - First_wall_/_blanket_lifetime_(years)___________________________________ (bktlife)_____________________ 6.1663E+00 OP + First_wall_/_blanket_lifetime_(years)___________________________________ (life_blkt_fpy)_____________________ 6.1663E+00 OP Divertor_lifetime_(years)_______________________________________________ (divlife)_____________________ 3.8258E+00 OP Heating/CD_system_lifetime_(years)______________________________________ (cdrlife)_____________________ 6.1663E+00 OP Total_plant_lifetime_(years)____________________________________________ (tlife)_______________________ 3.0000E+01 diff --git a/tests/unit/test_availability.py b/tests/unit/test_availability.py index 46ff70f7d6..ba76a5e801 100644 --- a/tests/unit/test_availability.py +++ b/tests/unit/test_availability.py @@ -61,7 +61,7 @@ def test_avail_0(monkeypatch, availability, life_fw_fpy, ibkt_life, bktlife_exp_ cpfact_exp = 80.0 assert pytest.approx(cpfact_obs) == cpfact_exp - bktlife_obs = fwbsv.bktlife + bktlife_obs = fwbsv.life_blkt_fpy bktlife_exp = bktlife_exp_param assert pytest.approx(bktlife_obs) == bktlife_exp @@ -88,7 +88,7 @@ def test_avail_1(monkeypatch, availability): # Mock module vars monkeypatch.setattr(cv, "iavail", 1) monkeypatch.setattr(cv, "divlife", 1.0) - monkeypatch.setattr(fwbsv, "bktlife", 7.0) + monkeypatch.setattr(fwbsv, "life_blkt_fpy", 7.0) monkeypatch.setattr(cv, "tdivrepl", 0.1) monkeypatch.setattr(cv, "tbktrepl", 0.2) monkeypatch.setattr(cv, "tcomrepl", 0.3) @@ -206,7 +206,7 @@ def calc_u_planned_fix(request, monkeypatch): # Mock all module variables used by calc_u_planned() # Some are parameterised monkeypatch.setattr(fortran.divertor_variables, "hldiv", param["hldiv"]) - monkeypatch.setattr(fortran.fwbs_variables, "bktlife", 0.0) + monkeypatch.setattr(fortran.fwbs_variables, "life_blkt_fpy", 0.0) monkeypatch.setattr( fortran.physics_variables, "pflux_fw_neutron_mw", param["pflux_fw_neutron_mw"] ) @@ -406,7 +406,11 @@ def calc_u_unplanned_fwbs_param(**kwargs): :rtype: dict """ # Default parameters - defaults = {"bktlife": 5, "t_cycle": 9000, "expected": approx(0.02, abs=0.005)} + defaults = { + "life_blkt_fpy": 5, + "t_cycle": 9000, + "expected": approx(0.02, abs=0.005), + } # Merge default dict with any optional keyword arguments to override values return {**defaults, **kwargs} @@ -424,8 +428,8 @@ def calc_u_unplanned_fwbs_params(): """ return [ calc_u_unplanned_fwbs_param(), - calc_u_unplanned_fwbs_param(bktlife=15, expected=approx(1, abs=0)), - calc_u_unplanned_fwbs_param(bktlife=8.5, expected=approx(0.1, abs=0.005)), + calc_u_unplanned_fwbs_param(life_blkt_fpy=15, expected=approx(1, abs=0)), + calc_u_unplanned_fwbs_param(life_blkt_fpy=8.5, expected=approx(0.1, abs=0.005)), ] @@ -447,7 +451,7 @@ def calc_u_unplanned_fwbs_fix(request, monkeypatch): # Mock variables used by calc_u_unplanned_fwbs() # Some may be parameterised monkeypatch.setattr(fortran.times_variables, "t_cycle", param["t_cycle"]) - monkeypatch.setattr(fortran.fwbs_variables, "bktlife", param["bktlife"]) + monkeypatch.setattr(fortran.fwbs_variables, "life_blkt_fpy", param["life_blkt_fpy"]) # Return the expected result for the given parameter list return param["expected"] @@ -523,7 +527,7 @@ def mock_calc_u_unplanned_vacuum(*args, **kwargs): monkeypatch.setattr(tv, "t_cycle", 50.0) monkeypatch.setattr(ifev, "ife", 0) monkeypatch.setattr(pv, "itart", 1) - monkeypatch.setattr(fwbsv, "bktlife", 5.0) + monkeypatch.setattr(fwbsv, "life_blkt_fpy", 5.0) monkeypatch.setattr(cv, "divlife", 10.0) monkeypatch.setattr(cv, "cplife", 15.0) @@ -537,7 +541,7 @@ def mock_calc_u_unplanned_vacuum(*args, **kwargs): cpfact_exp = 0.07173 assert pytest.approx(cpfact_obs) == cpfact_exp - bktlife_obs = fwbsv.bktlife + bktlife_obs = fwbsv.life_blkt_fpy bktlife_exp = 6.97058413 assert pytest.approx(bktlife_obs) == bktlife_exp diff --git a/tests/unit/test_buildings.py b/tests/unit/test_buildings.py index 48ba9a7a2f..111a6e4b21 100644 --- a/tests/unit/test_buildings.py +++ b/tests/unit/test_buildings.py @@ -138,7 +138,7 @@ class BldgsSizesParam(NamedTuple): cplife: Any divlife: Any r_cryostat_inboard: Any - bktlife: Any + life_blkt_fpy: Any hmax: Any dr_tf_inboard: Any dr_tf_shld_gap: Any @@ -281,7 +281,7 @@ class BldgsSizesParam(NamedTuple): cplife=0, divlife=0, r_cryostat_inboard=19.48258241468535, - bktlife=0, + life_blkt_fpy=0, hmax=9.0730900215620327, dr_tf_inboard=1.208, dr_tf_shld_gap=0.05000000000000001, @@ -420,7 +420,7 @@ class BldgsSizesParam(NamedTuple): cplife=0, divlife=6.1337250397740126, r_cryostat_inboard=19.482980877139834, - bktlife=19.216116010620578, + life_blkt_fpy=19.216116010620578, hmax=9.0730900215620327, dr_tf_inboard=1.208, dr_tf_shld_gap=0.05000000000000001, @@ -683,7 +683,7 @@ def test_bldgs_sizes(buildings, bldgssizesparam, monkeypatch): monkeypatch.setattr( fwbs_variables, "r_cryostat_inboard", bldgssizesparam.r_cryostat_inboard ) - monkeypatch.setattr(fwbs_variables, "bktlife", bldgssizesparam.bktlife) + monkeypatch.setattr(fwbs_variables, "life_blkt_fpy", bldgssizesparam.life_blkt_fpy) monkeypatch.setattr(build_variables, "hmax", bldgssizesparam.hmax) monkeypatch.setattr(build_variables, "dr_tf_inboard", bldgssizesparam.dr_tf_inboard) monkeypatch.setattr( diff --git a/tests/unit/test_costs_1990.py b/tests/unit/test_costs_1990.py index c57e74c99e..8c179720cd 100644 --- a/tests/unit/test_costs_1990.py +++ b/tests/unit/test_costs_1990.py @@ -5473,7 +5473,7 @@ class CoelcParam(NamedTuple): cfind: Any = None - bktlife: Any = None + life_blkt_fpy: Any = None bktlife_cal: Any = None @@ -5578,7 +5578,7 @@ class CoelcParam(NamedTuple): ), order="F", ).transpose(), - bktlife=19.216116010620578, + life_blkt_fpy=19.216116010620578, bktlife_cal=19.216116010620578, uctarg=0.29999999999999999, ife=0, @@ -5662,7 +5662,7 @@ class CoelcParam(NamedTuple): ), order="F", ).transpose(), - bktlife=19.222115557991025, + life_blkt_fpy=19.222115557991025, bktlife_cal=19.222115557991025, uctarg=0.29999999999999999, ife=0, @@ -5768,7 +5768,7 @@ def test_coelc(coelcparam, monkeypatch, costs): monkeypatch.setattr(cost_variables, "cfind", coelcparam.cfind) - monkeypatch.setattr(fwbs_variables, "bktlife", coelcparam.bktlife) + monkeypatch.setattr(fwbs_variables, "life_blkt_fpy", coelcparam.life_blkt_fpy) monkeypatch.setattr(fwbs_variables, "bktlife_cal", coelcparam.bktlife_cal) diff --git a/tests/unit/test_ife.py b/tests/unit/test_ife.py index bb77da2967..35c297be56 100644 --- a/tests/unit/test_ife.py +++ b/tests/unit/test_ife.py @@ -1220,7 +1220,7 @@ class IfefbsParam(NamedTuple): whtblss: Any = None wtblli2o: Any = None whtblli: Any = None - bktlife: Any = None + life_blkt_fpy: Any = None life_fw_fpy: Any = None chmatm: Any = None chmatv: Any = None @@ -1243,7 +1243,7 @@ class IfefbsParam(NamedTuple): expected_m_fw_total: Any = None expected_whtblkt: Any = None expected_whtshld: Any = None - expected_bktlife: Any = None + expected_life_blkt_fpy: Any = None expected_life_fw_fpy: Any = None expected_fwmatm: Any = None expected_v1matm: Any = None @@ -1270,7 +1270,7 @@ class IfefbsParam(NamedTuple): whtblss=0, wtblli2o=0, whtblli=0, - bktlife=0, + life_blkt_fpy=0, life_fw_fpy=0, chmatm=np.array( np.array((0, 0, 0, 0, 0, 0, 0, 0, 0), order="F"), order="F" @@ -1454,7 +1454,7 @@ class IfefbsParam(NamedTuple): expected_m_fw_total=20574.366184891722, expected_whtblkt=347956.92928704334, expected_whtshld=1067310.9593707009, - expected_bktlife=3.000406304846492, + expected_life_blkt_fpy=3.000406304846492, expected_life_fw_fpy=3.000406304846492, expected_fwmatm=np.array( ( @@ -1555,7 +1555,7 @@ def test_ifefbs(ifefbsparam, monkeypatch, ife): monkeypatch.setattr(fwbs_variables, "whtblss", ifefbsparam.whtblss) monkeypatch.setattr(fwbs_variables, "wtblli2o", ifefbsparam.wtblli2o) monkeypatch.setattr(fwbs_variables, "whtblli", ifefbsparam.whtblli) - monkeypatch.setattr(fwbs_variables, "bktlife", ifefbsparam.bktlife) + monkeypatch.setattr(fwbs_variables, "life_blkt_fpy", ifefbsparam.life_blkt_fpy) monkeypatch.setattr(fwbs_variables, "life_fw_fpy", ifefbsparam.life_fw_fpy) monkeypatch.setattr(ife_variables, "chmatm", ifefbsparam.chmatm) monkeypatch.setattr(ife_variables, "chmatv", ifefbsparam.chmatv) @@ -1583,7 +1583,9 @@ def test_ifefbs(ifefbsparam, monkeypatch, ife): assert fwbs_variables.m_fw_total == pytest.approx(ifefbsparam.expected_m_fw_total) assert fwbs_variables.whtblkt == pytest.approx(ifefbsparam.expected_whtblkt) assert fwbs_variables.whtshld == pytest.approx(ifefbsparam.expected_whtshld) - assert fwbs_variables.bktlife == pytest.approx(ifefbsparam.expected_bktlife) + assert fwbs_variables.life_blkt_fpy == pytest.approx( + ifefbsparam.expected_life_blkt_fpy + ) assert fwbs_variables.life_fw_fpy == pytest.approx(ifefbsparam.expected_life_fw_fpy) assert ife_variables.fwmatm == pytest.approx(ifefbsparam.expected_fwmatm) assert ife_variables.v1matm == pytest.approx(ifefbsparam.expected_v1matm) From 4db0c7df611e4ad089062c68f9aac3aa2e5a8435 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 17 Feb 2025 11:54:06 +0000 Subject: [PATCH 02/74] :memo: Update standards documentation to correct spelling and clarify default units for lifetimes --- documentation/proc-pages/development/standards.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/documentation/proc-pages/development/standards.md b/documentation/proc-pages/development/standards.md index 6b07409ca6..fba170b8d0 100644 --- a/documentation/proc-pages/development/standards.md +++ b/documentation/proc-pages/development/standards.md @@ -339,7 +339,9 @@ This should be used for units of $\text{kg} \cdot \text{m}^{-2}\text{s}^{-1}$ ##### Lifetimes -- Lifetimes of componenets should start with the `life_` prefix. +- Lifetimes of components should start with the `life_` prefix. + +The default units for lifetimes is in years. The unit declaration `_fpy` can be used to specify that it is the full-power year lifetime. From 70471a8c8a26161c54f1026021749b1363d1bf20 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 17 Feb 2025 11:55:33 +0000 Subject: [PATCH 03/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20`bktlife=5Fcal`?= =?UTF-8?q?=20to=20`life=5Fblkt`=20for=20clarity=20and=20consistency=20acr?= =?UTF-8?q?oss=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/costs.py | 12 ++++++------ source/fortran/fwbs_variables.f90 | 4 ++-- tests/unit/test_costs_1990.py | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/process/costs.py b/process/costs.py index 244fad8413..541c6a95a0 100644 --- a/process/costs.py +++ b/process/costs.py @@ -134,8 +134,8 @@ def output(self): po.ovarrf( self.outfile, "First wall / blanket life (years)", - "(bktlife_cal)", - fwbs_variables.bktlife_cal, + "(life_blkt)", + fwbs_variables.life_blkt, ) if ife_variables.ife != 1: @@ -2662,7 +2662,7 @@ def coelc(self): # Compound interest factor - feffwbl = (1.0e0 + cost_variables.discount_rate) ** fwbs_variables.bktlife_cal + feffwbl = (1.0e0 + cost_variables.discount_rate) ** fwbs_variables.life_blkt # Capital recovery factor @@ -2920,13 +2920,13 @@ def convert_fpy_to_calendar() -> None: """ # FW/Blanket and HCD if fwbs_variables.life_blkt_fpy < cost_variables.tlife: - fwbs_variables.bktlife_cal = ( + fwbs_variables.life_blkt = ( fwbs_variables.life_blkt_fpy * cost_variables.cfactr ) # Current drive system lifetime (assumed equal to first wall and blanket lifetime) - cost_variables.cdrlife_cal = fwbs_variables.bktlife_cal + cost_variables.cdrlife_cal = fwbs_variables.life_blkt else: - fwbs_variables.bktlife_cal = fwbs_variables.life_blkt_fpy + fwbs_variables.life_blkt = fwbs_variables.life_blkt_fpy # Divertor if cost_variables.divlife < cost_variables.tlife: diff --git a/source/fortran/fwbs_variables.f90 b/source/fortran/fwbs_variables.f90 index 542741fbcf..74e092102e 100644 --- a/source/fortran/fwbs_variables.f90 +++ b/source/fortran/fwbs_variables.f90 @@ -18,7 +18,7 @@ module fwbs_variables real(dp) :: life_blkt_fpy !! Full power blanket lifetime (years) - real(dp) :: bktlife_cal + real(dp) :: life_blkt !! Calendar year blanket lifetime (years) real(dp) :: coolmass @@ -665,7 +665,7 @@ subroutine init_fwbs_variables implicit none life_blkt_fpy = 0.0D0 - bktlife_cal = 0.0D0 + life_blkt = 0.0D0 coolmass = 0.0D0 vvmass = 0.0D0 denstl = 7800.0D0 diff --git a/tests/unit/test_costs_1990.py b/tests/unit/test_costs_1990.py index 8c179720cd..7d2bbb3178 100644 --- a/tests/unit/test_costs_1990.py +++ b/tests/unit/test_costs_1990.py @@ -5475,7 +5475,7 @@ class CoelcParam(NamedTuple): life_blkt_fpy: Any = None - bktlife_cal: Any = None + life_blkt: Any = None uctarg: Any = None @@ -5579,7 +5579,7 @@ class CoelcParam(NamedTuple): order="F", ).transpose(), life_blkt_fpy=19.216116010620578, - bktlife_cal=19.216116010620578, + life_blkt=19.216116010620578, uctarg=0.29999999999999999, ife=0, reprat=0, @@ -5663,7 +5663,7 @@ class CoelcParam(NamedTuple): order="F", ).transpose(), life_blkt_fpy=19.222115557991025, - bktlife_cal=19.222115557991025, + life_blkt=19.222115557991025, uctarg=0.29999999999999999, ife=0, reprat=0, @@ -5770,7 +5770,7 @@ def test_coelc(coelcparam, monkeypatch, costs): monkeypatch.setattr(fwbs_variables, "life_blkt_fpy", coelcparam.life_blkt_fpy) - monkeypatch.setattr(fwbs_variables, "bktlife_cal", coelcparam.bktlife_cal) + monkeypatch.setattr(fwbs_variables, "life_blkt", coelcparam.life_blkt) monkeypatch.setattr(ife_variables, "uctarg", coelcparam.uctarg) From 784fe1d2977639ada562f6eb0947218bb88c5f64 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 17 Feb 2025 11:58:17 +0000 Subject: [PATCH 04/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20`coolmass`=20to?= =?UTF-8?q?=20`m=5Ffw=5Fblkt=5Fdiv=5Fcoolant=5Ftotal`=20for=20clarity=20an?= =?UTF-8?q?d=20consistency=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/hcpb.py | 2 +- process/stellarator.py | 6 +++--- process/structure.py | 10 +++++----- source/fortran/fwbs_variables.f90 | 4 ++-- tests/integration/ref_dicts.json | 6 +++--- tests/unit/test_ccfe_hcpb.py | 18 +++++++++++------- tests/unit/test_structure.py | 4 ++-- 7 files changed, 27 insertions(+), 23 deletions(-) diff --git a/process/hcpb.py b/process/hcpb.py index 300e6cc2ed..e788d157cc 100644 --- a/process/hcpb.py +++ b/process/hcpb.py @@ -244,7 +244,7 @@ def component_masses(self): ) # Mass of He coolant = volume * density at typical coolant temperatures and pressures (kg) - fwbs_variables.coolmass = coolvol * 1.517 + fwbs_variables.m_fw_blkt_div_coolant_total = coolvol * 1.517 # Average first wall coolant fraction, only used by old routines in fispact.f90, safety.f90 fwbs_variables.fwclfr = ( diff --git a/process/stellarator.py b/process/stellarator.py index e31c8ac928..3ddf9459a6 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -1728,7 +1728,7 @@ def stfwbs(self, output: bool): # When fwbs_variables.blktmodel > 0, although the blanket is by definition helium-cooled # in this case, the shield etc. are assumed to be water-cooled, and since - # water is heavier the calculation for fwbs_variables.coolmass is better done with + # water is heavier the calculation for fwbs_variables.m_fw_blkt_div_coolant_total is better done with # coolwh=2 if fwbs_variables.blktmodel > 0; thus we can ignore the helium coolant mass # in the blanket. @@ -1813,9 +1813,9 @@ def stfwbs(self, output: bool): if (fwbs_variables.blktmodel > 0) or ( fwbs_variables.coolwh == 2 ): # pressurised water coolant - fwbs_variables.coolmass = coolvol * 806.719e0 + fwbs_variables.m_fw_blkt_div_coolant_total = coolvol * 806.719e0 else: # gaseous helium coolant - fwbs_variables.coolmass = coolvol * 1.517e0 + fwbs_variables.m_fw_blkt_div_coolant_total = coolvol * 1.517e0 # Assume external cryostat is a torus with circular cross-section, # centred on plasma major radius. diff --git a/process/structure.py b/process/structure.py index 6b5b0cad0c..24255c767f 100644 --- a/process/structure.py +++ b/process/structure.py @@ -63,7 +63,7 @@ def run(self, output: bool = False) -> None: tfv.whttf, fwbsv.m_fw_total, fwbsv.whtblkt, - fwbsv.coolmass, + fwbsv.m_fw_blkt_div_coolant_total, fwbsv.dewmkg, output=output, ) @@ -85,7 +85,7 @@ def structure( tfmass, m_fw_total, blmass, - coolmass, + m_fw_blkt_div_coolant_total, dewmass, output, ): @@ -139,8 +139,8 @@ def structure( :param m_fw_total: first wall mass (kg) :type m_fw_total: float - :param coolmass: total water coolant mass (kg) - :type coolmass: float + :param m_fw_blkt_div_coolant_total: total water coolant mass (kg) + :type m_fw_blkt_div_coolant_total: float :param dewmass: vacuum vessel + cryostat mass (kg) :type dewmass: float @@ -189,7 +189,7 @@ def structure( # Torus leg support - ws1 = coolmass + m_fw_total + blmass + shldmass + dvrtmass + ws1 = m_fw_blkt_div_coolant_total + m_fw_total + blmass + shldmass + dvrtmass gsm1 = 5.0e0 * 9.807e0 * ws1 * dens / sigal # Ring beam diff --git a/source/fortran/fwbs_variables.f90 b/source/fortran/fwbs_variables.f90 index 74e092102e..00044d1516 100644 --- a/source/fortran/fwbs_variables.f90 +++ b/source/fortran/fwbs_variables.f90 @@ -21,7 +21,7 @@ module fwbs_variables real(dp) :: life_blkt !! Calendar year blanket lifetime (years) - real(dp) :: coolmass + real(dp) :: m_fw_blkt_div_coolant_total !! mass of water coolant (in shield, blanket, first wall, divertor) [kg] real(dp) :: vvmass @@ -666,7 +666,7 @@ subroutine init_fwbs_variables life_blkt_fpy = 0.0D0 life_blkt = 0.0D0 - coolmass = 0.0D0 + m_fw_blkt_div_coolant_total = 0.0D0 vvmass = 0.0D0 denstl = 7800.0D0 denwc = 15630.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 81ce709b1a..e20d14859a 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1506,7 +1506,7 @@ "conv": 60000.0, "convergence_parameter": 0.0, "convol": 0.0, - "coolmass": 0.0, + "m_fw_blkt_div_coolant_total": 0.0, "coolp": 15500000.0, "coolwh": 1.0, "copper": null, @@ -9168,7 +9168,7 @@ "conv": "control building volume (m3)", "convergence_parameter": "VMCON convergence parameter \"sum\"", "convol": "volume of control, protection and i&c building (m3)", - "coolmass": "mass of water coolant (in shield, blanket, first wall, divertor) (kg)", + "m_fw_blkt_div_coolant_total": "mass of water coolant (in shield, blanket, first wall, divertor) (kg)", "coolp": "blanket coolant pressure (Pa) (stellarator only)", "coolwh": "Switch for blanket coolant (set via blkttype):\n
    \n
  • =1 helium
    • \n
  • =2 pressurized water
    • \n
", "copper": "", @@ -18013,7 +18013,7 @@ "fwbs_module": [], "fwbs_variables": [ "life_blkt_fpy", - "coolmass", + "m_fw_blkt_div_coolant_total", "vvmass", "denstl", "denwc", diff --git a/tests/unit/test_ccfe_hcpb.py b/tests/unit/test_ccfe_hcpb.py index 47bcc5db8b..fa2d0b40f9 100644 --- a/tests/unit/test_ccfe_hcpb.py +++ b/tests/unit/test_ccfe_hcpb.py @@ -1437,7 +1437,7 @@ class ComponentMassesParam(NamedTuple): whtblkt: Any = None volshld: Any = None vfshld: Any = None - coolmass: Any = None + m_fw_blkt_div_coolant_total: Any = None fwclfr: Any = None breeder_f: Any = None breeder_multiplier: Any = None @@ -1477,7 +1477,7 @@ class ComponentMassesParam(NamedTuple): expected_whtblbe: Any = None expected_whtblss: Any = None expected_whtblkt: Any = None - expected_coolmass: Any = None + expected_m_fw_blkt_div_coolant_total: Any = None expected_fwclfr: Any = None expected_whtbltibe12: Any = None expected_whtblli4sio4: Any = None @@ -1528,7 +1528,7 @@ class ComponentMassesParam(NamedTuple): whtblkt=0, volshld=783.69914576548854, vfshld=0.60000000000000009, - coolmass=0, + m_fw_blkt_div_coolant_total=0, fwclfr=0.14999999999999999, breeder_f=0.5, breeder_multiplier=0.75, @@ -1568,7 +1568,7 @@ class ComponentMassesParam(NamedTuple): expected_whtblbe=1002205.5121936026, expected_whtblss=895173.51112145756, expected_whtblkt=2961668.0628126911, - expected_coolmass=1161.8025382862772, + expected_m_fw_blkt_div_coolant_total=1161.8025382862772, expected_fwclfr=0, expected_whtbltibe12=1002205.5121936026, expected_whtblli4sio4=1064289.0394976311, @@ -1642,7 +1642,11 @@ def test_component_masses(componentmassesparam, monkeypatch, ccfe_hcpb): monkeypatch.setattr(fwbs_variables, "whtblkt", componentmassesparam.whtblkt) monkeypatch.setattr(fwbs_variables, "volshld", componentmassesparam.volshld) monkeypatch.setattr(fwbs_variables, "vfshld", componentmassesparam.vfshld) - monkeypatch.setattr(fwbs_variables, "coolmass", componentmassesparam.coolmass) + monkeypatch.setattr( + fwbs_variables, + "m_fw_blkt_div_coolant_total", + componentmassesparam.m_fw_blkt_div_coolant_total, + ) monkeypatch.setattr(fwbs_variables, "fwclfr", componentmassesparam.fwclfr) monkeypatch.setattr(fwbs_variables, "breeder_f", componentmassesparam.breeder_f) monkeypatch.setattr( @@ -1721,8 +1725,8 @@ def test_component_masses(componentmassesparam, monkeypatch, ccfe_hcpb): assert fwbs_variables.whtblkt == pytest.approx( componentmassesparam.expected_whtblkt ) - assert fwbs_variables.coolmass == pytest.approx( - componentmassesparam.expected_coolmass + assert fwbs_variables.m_fw_blkt_div_coolant_total == pytest.approx( + componentmassesparam.expected_m_fw_blkt_div_coolant_total ) assert fwbs_variables.fwclfr == pytest.approx(componentmassesparam.expected_fwclfr) assert fwbs_variables.whtbltibe12 == pytest.approx( diff --git a/tests/unit/test_structure.py b/tests/unit/test_structure.py index 2c69e66097..17b224db20 100644 --- a/tests/unit/test_structure.py +++ b/tests/unit/test_structure.py @@ -31,7 +31,7 @@ def test_structure(self, structure): tfmass: float = 21234909.756419446 m_fw_total: float = 224802.80270851994 blmass: float = 3501027.3252278985 - coolmass: float = 1199.6389920083477 + m_fw_blkt_div_coolant_total: float = 1199.6389920083477 dewmass: float = 16426726.727684354 i_tf_sup: int = 1 i_pf_conductor: int = 0 @@ -58,7 +58,7 @@ def test_structure(self, structure): tfmass, m_fw_total, blmass, - coolmass, + m_fw_blkt_div_coolant_total, dewmass, output=False, ) From 1dede70e0652b15cfb4b5905ead45382122e16fd Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 17 Feb 2025 12:06:36 +0000 Subject: [PATCH 05/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20`fwbsshape`=20to?= =?UTF-8?q?=20`i=5Ffw=5Fblkt=5Fvv=5Fshape`=20for=20clarity=20and=20consist?= =?UTF-8?q?ency=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- documentation/proc-pages/eng-models/machine-build.md | 2 +- .../proc-pages/fusion-devices/spherical-tokamak.md | 4 ++-- process/blanket_library.py | 4 ++-- process/build.py | 2 +- source/fortran/fwbs_variables.f90 | 5 ++--- source/fortran/input.f90 | 6 +++--- tests/integration/ref_dicts.json | 10 +++++----- .../spherical_tokamak_once_through.IN.DAT | 2 +- tests/regression/input_files/st_regression.IN.DAT | 2 +- tests/unit/test_blanket_library.py | 12 ++++++++---- 10 files changed, 26 insertions(+), 23 deletions(-) diff --git a/documentation/proc-pages/eng-models/machine-build.md b/documentation/proc-pages/eng-models/machine-build.md index 0be1534cdc..b7c7304105 100644 --- a/documentation/proc-pages/eng-models/machine-build.md +++ b/documentation/proc-pages/eng-models/machine-build.md @@ -92,7 +92,7 @@ The vertical build is shown schematically below (click to zoom). Since PROCESS is essentially a 0-D code, the shape of each component is used to estimate its mass and cost, but is not used otherwise. The first wall, blanket, shield and vacuum vessel may be either D-shaped in cross-section, or each may be defined by two half-ellipses. The choice between -these two possibilities is set using input parameter `fwbsshape`, which should be +these two possibilities is set using input parameter `i_fw_blkt_vv_shape`, which should be - 1 for D-shaped, - 2 for ellipses. diff --git a/documentation/proc-pages/fusion-devices/spherical-tokamak.md b/documentation/proc-pages/fusion-devices/spherical-tokamak.md index 14a6dd0365..6f06045f8b 100644 --- a/documentation/proc-pages/fusion-devices/spherical-tokamak.md +++ b/documentation/proc-pages/fusion-devices/spherical-tokamak.md @@ -10,7 +10,7 @@ title="Schematic diagram of the Power Core radial build" width="650" height="100" />

-
Figure 1: Schematic diagram of the fusion power core of a typical tokamak power plant modelled by `PROCESS`, showing the relative positions of the components. A double null plasma is assumed (`i_single_null=0`) - compare Figure 2, and the first wall, blanket, shield and vacuum vessel are D-shaped in cross-section (chosen by setting switch `fwbsshape=1`) - compare Figure 3. Also shown are the code variables used to define the thicknesses of the components. The arrowed labels adjacent to the axes are the total 'builds' to that point. The precise locations and sizes of the PF coils are calculated within the code. +
Figure 1: Schematic diagram of the fusion power core of a typical tokamak power plant modelled by `PROCESS`, showing the relative positions of the components. A double null plasma is assumed (`i_single_null=0`) - compare Figure 2, and the first wall, blanket, shield and vacuum vessel are D-shaped in cross-section (chosen by setting switch `i_fw_blkt_vv_shape=1`) - compare Figure 3. Also shown are the code variables used to define the thicknesses of the components. The arrowed labels adjacent to the axes are the total 'builds' to that point. The precise locations and sizes of the PF coils are calculated within the code.

@@ -67,7 +67,7 @@ Switch `itart` provides overall control of the ST switches within the code, and title="Schematic diagram of the Power Core radial build" width="650" height="100" />

-
Figure 3: Schematic diagram of the fusion power core of a typical tokamak power plant modelled by `PROCESS`. The first wall, blanket, shield and vacuum vessel cross-sectional shapes are each assumed to be defined by two ellipses (chosen by setting switch `fwbsshape=2`) - compare Figure 2. +
Figure 3: Schematic diagram of the fusion power core of a typical tokamak power plant modelled by `PROCESS`. The first wall, blanket, shield and vacuum vessel cross-sectional shapes are each assumed to be defined by two ellipses (chosen by setting switch `i_fw_blkt_vv_shape=2`) - compare Figure 2.

diff --git a/process/blanket_library.py b/process/blanket_library.py index 68f7f1de3c..56d0ccfe5a 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -65,7 +65,7 @@ def component_volumes(self): blanket_library.hvv = self.component_half_height(icomponent=2) # D-shaped blanket and shield - if physics_variables.itart == 1 or fwbs_variables.fwbsshape == 1: + if physics_variables.itart == 1 or fwbs_variables.i_fw_blkt_vv_shape == 1: for icomponent in range(3): self.dshaped_component(icomponent) @@ -1114,7 +1114,7 @@ def blanket_mod_pol_height(self): Calculations for blanket module poloidal height for D shaped and elliptical machines """ if ( - physics_variables.itart == 1 or fwbs_variables.fwbsshape == 1 + physics_variables.itart == 1 or fwbs_variables.i_fw_blkt_vv_shape == 1 ): # D-shaped machine # Segment vertical inboard surface (m) blanket_library.bllengi = ( diff --git a/process/build.py b/process/build.py index a82e7e58ff..4168d4c401 100644 --- a/process/build.py +++ b/process/build.py @@ -1996,7 +1996,7 @@ def calculate_radial_build(self, output: bool) -> None: hfw = 0.5e0 * (htop + hbot) if (physics_variables.itart == 1) or ( - fwbs_variables.fwbsshape == 1 + fwbs_variables.i_fw_blkt_vv_shape == 1 ): # D-shaped # Major radius to outer edge of inboard section r1 = ( diff --git a/source/fortran/fwbs_variables.f90 b/source/fortran/fwbs_variables.f90 index 00044d1516..856f258bfd 100644 --- a/source/fortran/fwbs_variables.f90 +++ b/source/fortran/fwbs_variables.f90 @@ -56,12 +56,11 @@ module fwbs_variables real(dp) :: fhole !! area fraction taken up by other holes (IFE) - integer :: fwbsshape + integer :: i_fw_blkt_vv_shape !! switch for first wall, blanket, shield and vacuum vessel shape: !! !! - =1 D-shaped (cylinder inboard + ellipse outboard) !! - =2 defined by two ellipses - !#TODO: change to adopt switch naming convention real(dp) :: life_fw_fpy !! first wall full-power year lifetime (y) @@ -677,7 +676,7 @@ subroutine init_fwbs_variables fdiv = 0.115D0 fhcd = 0.0D0 fhole = 0.0D0 - fwbsshape = 2 + i_fw_blkt_vv_shape = 2 life_fw_fpy = 0.0D0 m_fw_total = 0.0D0 fw_armour_mass = 0.0D0 diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index e13b9df909..c5b538cc00 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -216,7 +216,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) declblkt, fblhebmo, blkttype, radius_fw_channel, inuclear, declshld, hcdportsize, & npdiv, f_fw_peak, primary_pumping, dr_pf_cryostat, secondary_cycle, secondary_cycle_liq, & denstl, declfw, nphcdout, i_blkt_inboard, vfpblkt, temp_fw_coolant_in, wallpf, fblbe, & - fhole, fwbsshape, coolp, temp_fw_max, irefprop, len_fw_channel, & + fhole, i_fw_blkt_vv_shape, coolp, temp_fw_max, irefprop, len_fw_channel, & li6enrich, etaiso, nblktmodto, fvoldw, i_shield_mat, i_bb_liq, & icooldual, ifci, inlet_temp_liq, outlet_temp_liq, bz_channel_conduct_liq, ipump, ims, & coolwh, emult @@ -2104,8 +2104,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('fwclfr') call parse_real_variable('fwclfr', fwclfr, 0.0D0, 1.0D0, & 'First wall coolant fraction') - case ('fwbsshape') - call parse_int_variable('fwbsshape', fwbsshape, 1, 2, & + case ('i_fw_blkt_vv_shape') + call parse_int_variable('i_fw_blkt_vv_shape', i_fw_blkt_vv_shape, 1, 2, & 'Switch for fw/blanket/shield/vv shape') case ('fw_armour_thickness') call parse_real_variable('fw_armour_thickness', fw_armour_thickness, 0.0D0, 1.0D0, & diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index e20d14859a..fab01e10b8 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -2079,7 +2079,7 @@ "fwbs_nu": 40000.0, "fwbs_prob_fail": 0.0002, "fwbs_umain_time": 0.25, - "fwbsshape": 2.0, + "i_fw_blkt_vv_shape": 2.0, "fwclfr": 0.15, "i_fw_coolant_type": "'helium'", "fwdr": 0.01, @@ -9671,7 +9671,7 @@ "fwbs_nu": "The cycle when the blanket fails with 100% probability", "fwbs_prob_fail": "Fwbs probability of failure (per op day)", "fwbs_umain_time": "Fwbs unplanned maintenance time (years)", - "fwbsshape": "switch for first wall, blanket, shield and vacuum vessel shape:\n
    \n
  • =1 D-shaped (cylinder inboard + ellipse outboard)
    • \n
  • =2 defined by two ellipses
    • \n
", + "i_fw_blkt_vv_shape": "switch for first wall, blanket, shield and vacuum vessel shape:\n
    \n
  • =1 D-shaped (cylinder inboard + ellipse outboard)
    • \n
  • =2 defined by two ellipses
    • \n
", "fwclfr": "first wall coolant fraction (calculated if `i_pulsed_plant=1` or `ipowerflow=1`)", "i_fw_coolant_type": "switch for first wall coolant (can be different from blanket coolant):\n
    \n
  • 'helium'
    • \n
  • 'water'
    • \n
", "fwdr": "radial thickness of IFE first wall (m)", @@ -13021,7 +13021,7 @@ "lb": 0.1, "ub": 2.0 }, - "fwbsshape": { + "i_fw_blkt_vv_shape": { "lb": 1, "ub": 2 }, @@ -18024,7 +18024,7 @@ "fdiv", "fhcd", "fhole", - "fwbsshape", + "i_fw_blkt_vv_shape", "life_fw_fpy", "m_fw_total", "fw_armour_mass", @@ -20363,7 +20363,7 @@ "fwbs_nu": "real_variable", "fwbs_prob_fail": "real_variable", "fwbs_umain_time": "real_variable", - "fwbsshape": "int_variable", + "i_fw_blkt_vv_shape": "int_variable", "fwclfr": "real_variable", "fwdr": "real_variable", "fwdzl": "real_variable", diff --git a/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT b/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT index b99c26a17d..acbf5bc072 100644 --- a/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT @@ -227,7 +227,7 @@ dz_divertor = 1.0 * divertor structure vertical thickness (m) *------------------Fwbs Variables------------------* -fwbsshape = 1 * switch for first wall; blanket; shield and vacuum vessel shape; +i_fw_blkt_vv_shape = 1 * switch for first wall; blanket; shield and vacuum vessel shape; fw_armour_thickness = 0.003 * first wall armour thickness [m] i_blanket_type = 1 * switch for blanket model; i_blkt_inboard = 0 * switch for inboard blanket; diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 39b92b20fa..345d106817 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2232,7 +2232,7 @@ i_r_cp_top = 2 *--------------------First wall, blanket, shield settings-------------------------------------------------------------------------------------------------------------------------------------------------------------------* *‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾* -fwbsshape = 1 +i_fw_blkt_vv_shape = 1 * DESCRIPTION: FW, Blanket, Shield & VV Shape (1: D-shaped (Cylinder Inboard & Ellipse Outboard)) * JUSTIFICATION: Unknown, tapered centrepost may justify ellises (option 2) diff --git a/tests/unit/test_blanket_library.py b/tests/unit/test_blanket_library.py index cf9a307abf..a9703e854d 100644 --- a/tests/unit/test_blanket_library.py +++ b/tests/unit/test_blanket_library.py @@ -1455,7 +1455,7 @@ def test_external_cryo_geometry( class BlanketModPolHeightParam(NamedTuple): dr_fw_plasma_gap_inboard: Any = None dr_fw_plasma_gap_outboard: Any = None - fwbsshape: Any = None + i_fw_blkt_vv_shape: Any = None nblktmodpi: Any = None fdiv: Any = None nblktmodpo: Any = None @@ -1477,7 +1477,7 @@ class BlanketModPolHeightParam(NamedTuple): BlanketModPolHeightParam( dr_fw_plasma_gap_inboard=0.25, dr_fw_plasma_gap_outboard=0.25, - fwbsshape=2, + i_fw_blkt_vv_shape=2, nblktmodpi=7, fdiv=0.115, nblktmodpo=8, @@ -1495,7 +1495,7 @@ class BlanketModPolHeightParam(NamedTuple): BlanketModPolHeightParam( dr_fw_plasma_gap_inboard=0.10000000000000001, dr_fw_plasma_gap_outboard=0.10000000000000001, - fwbsshape=1, + i_fw_blkt_vv_shape=1, nblktmodpi=7, fdiv=0.115, nblktmodpo=8, @@ -1538,7 +1538,11 @@ def test_blanket_mod_pol_height( "dr_fw_plasma_gap_outboard", blanketmodpolheightparam.dr_fw_plasma_gap_outboard, ) - monkeypatch.setattr(fwbs_variables, "fwbsshape", blanketmodpolheightparam.fwbsshape) + monkeypatch.setattr( + fwbs_variables, + "i_fw_blkt_vv_shape", + blanketmodpolheightparam.i_fw_blkt_vv_shape, + ) monkeypatch.setattr( fwbs_variables, "nblktmodpi", blanketmodpolheightparam.nblktmodpi ) From eaed38df5a7b6aaf42745d25187b78ac41cdfe8c Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 17 Feb 2025 13:16:14 +0000 Subject: [PATCH 06/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20`coolwh`=20to=20`?= =?UTF-8?q?i=5Fblkt=5Fcoolant=5Ftype`=20for=20clarity=20and=20consistency?= =?UTF-8?q?=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proc-pages/eng-models/fw-blanket.md | 6 ++-- process/blanket_library.py | 34 ++++++++++-------- process/costs.py | 6 ++-- process/hcpb.py | 4 +-- process/power.py | 2 +- process/stellarator.py | 6 ++-- source/fortran/cost_variables.f90 | 4 +-- source/fortran/fwbs_variables.f90 | 8 ++--- source/fortran/input.f90 | 6 ++-- tests/integration/ref_dicts.json | 12 +++---- .../input_files/st_regression.IN.DAT | 4 +-- tests/unit/test_blanket_library.py | 12 ++++--- tests/unit/test_ccfe_hcpb.py | 10 +++--- tests/unit/test_costs_1990.py | 35 +++++++++++-------- 14 files changed, 83 insertions(+), 66 deletions(-) diff --git a/documentation/proc-pages/eng-models/fw-blanket.md b/documentation/proc-pages/eng-models/fw-blanket.md index b676cee0a1..c97568f987 100644 --- a/documentation/proc-pages/eng-models/fw-blanket.md +++ b/documentation/proc-pages/eng-models/fw-blanket.md @@ -84,7 +84,7 @@ Summary of key variables and switches: | maximum temp (K) | `temp_fw_max` | --- | --- | | FCI switch | --- | --- | `ifci` | | Coolant | :-----------: | ------------------------ | -------------------------- | -| primary coolant switch | `i_fw_coolant_type` | `coolwh` | --- | +| primary coolant switch | `i_fw_coolant_type` | `i_blkt_coolant_type` | --- | | secondary coolant switch | --- | --- | `i_bb_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` | @@ -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 ('i_fw_coolant_type`=`coolwh`) - 1. Different coolant for FW and BB ('i_fw_coolant_type`/=`coolwh`) + 0. Same coolant for FW and BB ('i_fw_coolant_type`=`i_blkt_coolant_type`) + 1. Different coolant for FW and BB ('i_fw_coolant_type`/=`i_blkt_coolant_type`) !!! 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. diff --git a/process/blanket_library.py b/process/blanket_library.py index 56d0ccfe5a..804f5a4b92 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -444,13 +444,13 @@ def primary_coolant_properties(self, output: bool): if ( f2py_compatible_to_string(fwbs_variables.i_fw_coolant_type).title() == "Helium" - and fwbs_variables.coolwh == 2 + and fwbs_variables.i_blkt_coolant_type == 2 ): fwbs_variables.ipump = 1 if ( f2py_compatible_to_string(fwbs_variables.i_fw_coolant_type).title() == "Water" - and fwbs_variables.coolwh == 1 + and fwbs_variables.i_blkt_coolant_type == 1 ): fwbs_variables.ipump = 1 @@ -495,7 +495,7 @@ def primary_coolant_properties(self, output: bool): # BB mid_temp_bl = (fwbs_variables.inlet_temp + fwbs_variables.outlet_temp) * 0.5 bb_fluid_properties = FluidProperties.of( - "Helium" if fwbs_variables.coolwh == 1 else "Water", + "Helium" if fwbs_variables.i_blkt_coolant_type == 1 else "Water", temperature=mid_temp_bl, pressure=fwbs_variables.blpressure, ) @@ -584,10 +584,14 @@ def primary_coolant_properties(self, output: bool): if fwbs_variables.ipump == 1: po.osubhd(self.outfile, "Breeding Blanket :") - if fwbs_variables.coolwh == 1: - po.ocmmnt(self.outfile, "Coolant type (coolwh=1), Helium") - if fwbs_variables.coolwh == 2: - po.ocmmnt(self.outfile, "Coolant type (coolwh=2), Water") + if fwbs_variables.i_blkt_coolant_type == 1: + po.ocmmnt( + self.outfile, "Coolant type (i_blkt_coolant_type=1), Helium" + ) + if fwbs_variables.i_blkt_coolant_type == 2: + po.ocmmnt( + self.outfile, "Coolant type (i_blkt_coolant_type=2), Water" + ) po.ovarrf( self.outfile, "Density (kg m-3)", @@ -1534,7 +1538,7 @@ def thermo_hydraulic_model(self, output: bool): Coolant FW BB primary BB secondary - primary coolant switch i_fw_coolant_type coolwh --- + primary coolant switch i_fw_coolant_type i_blkt_coolant_type --- secondary coolant switch --- --- i_bb_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 @@ -1599,13 +1603,13 @@ def thermo_hydraulic_model(self, output: bool): if ( f2py_compatible_to_string(fwbs_variables.i_fw_coolant_type).title() == "Helium" - and fwbs_variables.coolwh == 2 + and fwbs_variables.i_blkt_coolant_type == 2 ): fwbs_variables.ipump = 1 if ( f2py_compatible_to_string(fwbs_variables.i_fw_coolant_type).title() == "Water" - and fwbs_variables.coolwh == 1 + and fwbs_variables.i_blkt_coolant_type == 1 ): fwbs_variables.ipump = 1 @@ -1909,7 +1913,7 @@ def thermo_hydraulic_model(self, output: bool): pdrop=deltap_blkt.item(), mf=blanket_library.mfblkt, primary_coolant_switch=( - "Helium" if fwbs_variables.coolwh == 1 else "Water" + "Helium" if fwbs_variables.i_blkt_coolant_type == 1 else "Water" ), coolant_density=blanket_library.rhof_bl, label="Blanket", @@ -1945,7 +1949,7 @@ def thermo_hydraulic_model(self, output: bool): pdrop=deltap_bl_liq, mf=fwbs_variables.mfblkt_liq, primary_coolant_switch=( - "Helium" if fwbs_variables.coolwh == 1 else "Water" + "Helium" if fwbs_variables.i_blkt_coolant_type == 1 else "Water" ), coolant_density=fwbs_variables.den_liq, label="Liquid Metal Breeder/Coolant", @@ -2034,8 +2038,8 @@ def thermo_hydraulic_model(self, output: bool): po.ovarin( self.outfile, "Blanket coolant type (1=He, 2=H20)", - "(coolwh)", - fwbs_variables.coolwh, + "(i_blkt_coolant_type)", + fwbs_variables.i_blkt_coolant_type, ) po.ovarrf( self.outfile, @@ -2641,7 +2645,7 @@ def pumppower( coolpin = pressure + pdrop # Adiabatic index for helium or water - gamma = (5 / 3) if fwbs_variables.coolwh == 1 else (4 / 3) + gamma = (5 / 3) if fwbs_variables.i_blkt_coolant_type == 1 else (4 / 3) # If caculating for primary coolant... if icoolpump == 1: diff --git a/process/costs.py b/process/costs.py index 541c6a95a0..482ebd86aa 100644 --- a/process/costs.py +++ b/process/costs.py @@ -2113,11 +2113,11 @@ def acc2261(self): # Pumps and piping system # N.B. with blktmodel > 0, the blanket is assumed to be helium-cooled, - # but the shield etc. is water-cooled (coolwh=2). Therefore, a slight + # but the shield etc. is water-cooled (i_blkt_coolant_type=2). Therefore, a slight # inconsistency exists here... self.cpp = ( 1.0e-6 - * cost_variables.uchts[fwbs_variables.coolwh - 1] + * cost_variables.uchts[fwbs_variables.i_blkt_coolant_type - 1] * ( (1.0e6 * heat_transport_variables.pfwdiv) ** exphts + (1.0e6 * fwbs_variables.pnucblkt) ** exphts @@ -2338,7 +2338,7 @@ def acc23(self): if cost_variables.ireactor == 1: self.c23 = ( 1.0e-6 - * cost_variables.ucturb[fwbs_variables.coolwh - 1] + * cost_variables.ucturb[fwbs_variables.i_blkt_coolant_type - 1] * (heat_transport_variables.pgrossmw / 1200.0e0) ** exptpe ) diff --git a/process/hcpb.py b/process/hcpb.py index e788d157cc..306ed596d2 100644 --- a/process/hcpb.py +++ b/process/hcpb.py @@ -50,7 +50,7 @@ def run(self, output: bool): build_variables.dr_fw_outboard = build_variables.dr_fw_inboard # Coolant type - fwbs_variables.coolwh = 1 + fwbs_variables.i_blkt_coolant_type = 1 # Note that the first wall coolant is now input separately. # Calculate blanket, shield, vacuum vessel and cryostat volumes @@ -674,7 +674,7 @@ def powerflow_calc(self, output: bool): # If we have chosen pressurised water as the blanket coolant, set the # coolant outlet temperature as 20 deg C below the boiling point - if fwbs_variables.coolwh == 2: + if fwbs_variables.i_blkt_coolant_type == 2: outlet_saturated_fluid_properties = FluidProperties.of( "Water", pressure=fwbs_variables.blpressure * 1.0e6, vapor_quality=0 ) diff --git a/process/power.py b/process/power.py index 30ac357f29..f13c5f26e8 100644 --- a/process/power.py +++ b/process/power.py @@ -502,7 +502,7 @@ def acpow(self, output: bool): ) # po.ovarre(self.outfile,'Heat removed from cryogenic coils (MWth)','(helpow/1.0e6)',helpow/1.0e6) # po.ovarre(self.outfile,'MGF (motor-generator flywheel) units (MW)', '(fmgdmw)',fmgdmw) - # po.ovarin(self.outfile,'Primary coolant pumps (MW)', '(coolwh)',coolwh) + # po.ovarin(self.outfile,'Primary coolant pumps (MW)', '(i_blkt_coolant_type)',i_blkt_coolant_type) po.ovarre( self.outfile, "Primary coolant pumps (MW)", diff --git a/process/stellarator.py b/process/stellarator.py index 3ddf9459a6..d2c66be3ab 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -1368,7 +1368,7 @@ def stfwbs(self, output: bool): # If we have chosen pressurised water as the coolant, set the # coolant outlet temperature as 20 deg C below the boiling point - if fwbs_variables.coolwh == 2: + if fwbs_variables.i_blkt_coolant_type == 2: if fwbs_variables.irefprop: fwbs_variables.outlet_temp = ( FluidProperties.of( @@ -1729,7 +1729,7 @@ def stfwbs(self, output: bool): # When fwbs_variables.blktmodel > 0, although the blanket is by definition helium-cooled # in this case, the shield etc. are assumed to be water-cooled, and since # water is heavier the calculation for fwbs_variables.m_fw_blkt_div_coolant_total is better done with - # coolwh=2 if fwbs_variables.blktmodel > 0; thus we can ignore the helium coolant mass + # i_blkt_coolant_type=2 if fwbs_variables.blktmodel > 0; thus we can ignore the helium coolant mass # in the blanket. if fwbs_variables.blktmodel == 0: @@ -1811,7 +1811,7 @@ def stfwbs(self, output: bool): # structures is used (see comment above) if (fwbs_variables.blktmodel > 0) or ( - fwbs_variables.coolwh == 2 + fwbs_variables.i_blkt_coolant_type == 2 ): # pressurised water coolant fwbs_variables.m_fw_blkt_div_coolant_total = coolvol * 806.719e0 else: # gaseous helium coolant diff --git a/source/fortran/cost_variables.f90 b/source/fortran/cost_variables.f90 index a33579b9ae..653991eaee 100644 --- a/source/fortran/cost_variables.f90 +++ b/source/fortran/cost_variables.f90 @@ -484,7 +484,7 @@ module cost_variables !! cost of heat rejection system ($) real(dp), dimension(2) :: uchts - !! cost of heat transport system equipment per loop ($/W); dependent on coolant type (coolwh) + !! cost of heat transport system equipment per loop ($/W); dependent on coolant type (i_blkt_coolant_type) real(dp) :: uciac !! cost of instrumentation, control & diagnostics ($) @@ -595,7 +595,7 @@ module cost_variables !! cost of tritium building ($/m3) real(dp), dimension(2) :: ucturb - !! cost of turbine plant equipment ($) (dependent on coolant type coolwh) + !! cost of turbine plant equipment ($) (dependent on coolant type i_blkt_coolant_type) real(dp), parameter :: ucvalv = 3.9D5 !! vacuum system valve cost ($) diff --git a/source/fortran/fwbs_variables.f90 b/source/fortran/fwbs_variables.f90 index 856f258bfd..55b3081104 100644 --- a/source/fortran/fwbs_variables.f90 +++ b/source/fortran/fwbs_variables.f90 @@ -293,7 +293,7 @@ module fwbs_variables !! - =2 user input thermal-electric efficiency (etath) !! - =4 supercritical CO2 cycle - integer :: coolwh + integer :: i_blkt_coolant_type !! Switch for blanket coolant (set via blkttype): !! !! - =1 helium @@ -356,8 +356,8 @@ module fwbs_variables real(dp) :: outlet_temp !! Outlet temperature of blanket coolant [K] (`secondary_cycle>1`) !! - !! - input if `coolwh=1` (helium) - !! - calculated if `coolwh=2` (water) + !! - input if `i_blkt_coolant_type=1` (helium) + !! - calculated if `i_blkt_coolant_type=2` (water) real(dp) :: coolp !! blanket coolant pressure [Pa] (stellarator only) @@ -735,7 +735,7 @@ subroutine init_fwbs_variables i_shield_mat = 0 secondary_cycle = 0 secondary_cycle_liq = 4 - coolwh = 1 + i_blkt_coolant_type = 1 afwi = 0.008D0 afwo = 0.008D0 i_fw_coolant_type = 'helium' diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index c5b538cc00..9a4ee8b683 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -219,7 +219,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) fhole, i_fw_blkt_vv_shape, coolp, temp_fw_max, irefprop, len_fw_channel, & li6enrich, etaiso, nblktmodto, fvoldw, i_shield_mat, i_bb_liq, & icooldual, ifci, inlet_temp_liq, outlet_temp_liq, bz_channel_conduct_liq, ipump, ims, & - coolwh, emult + i_blkt_coolant_type, emult use heat_transport_variables, only: htpmw_fw, baseel, fmgdmw, htpmw_div, & pwpm2, etath, vachtmw, iprimshld, fpumpdiv, pinjmax, htpmw_blkt, etatf, & htpmw_min, fpumpblkt, ipowerflow, htpmw_shld, fpumpshld, trithtmw, & @@ -1975,8 +1975,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('ims') call parse_int_variable('ims', ims, 0, 1, & ' Switch for Multi or Single Modle Segment (MMS or SMS)') - case ('coolwh') - call parse_int_variable('coolwh', coolwh, 1, 2, & + case ('i_blkt_coolant_type') + call parse_int_variable('i_blkt_coolant_type', i_blkt_coolant_type, 1, 2, & ' Blanket coolant type (1=He, 2=H20)') case ('secondary_cycle') diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index fab01e10b8..26f0803d11 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1508,7 +1508,7 @@ "convol": 0.0, "m_fw_blkt_div_coolant_total": 0.0, "coolp": 15500000.0, - "coolwh": 1.0, + "i_blkt_coolant_type": 1.0, "copper": null, "copperA_m2": 0.0, "copper_area": 0.0, @@ -9170,7 +9170,7 @@ "convol": "volume of control, protection and i&c building (m3)", "m_fw_blkt_div_coolant_total": "mass of water coolant (in shield, blanket, first wall, divertor) (kg)", "coolp": "blanket coolant pressure (Pa) (stellarator only)", - "coolwh": "Switch for blanket coolant (set via blkttype):\n
    \n
  • =1 helium
    • \n
  • =2 pressurized water
    • \n
", + "i_blkt_coolant_type": "Switch for blanket coolant (set via blkttype):\n
    \n
  • =1 helium
    • \n
  • =2 pressurized water
    • \n
", "copper": "", "copperA_m2": "TF coil current / copper area (A/m2)", "copper_area": "", @@ -10217,7 +10217,7 @@ "outfile": "", "outgasfactor": "outgassing prefactor kw: outgassing rate at 1 s per unit area (Pa m s-1)", "outgasindex": "outgassing decay index", - "outlet_temp": "Outlet temperature of blanket coolant (K) (`secondary_cycle>1`)\n
    \n
  • input if `coolwh=1` (helium)
    • \n
  • calculated if `coolwh=2` (water)
    • \n
", + "outlet_temp": "Outlet temperature of blanket coolant (K) (`secondary_cycle>1`)\n
    \n
  • input if `i_blkt_coolant_type=1` (helium)
    • \n
  • calculated if `i_blkt_coolant_type=2` (water)
    • \n
", "output_costs": "Switch for costs output:\n
    \n
  • =0 do not write cost-related outputs to file
    • \n
  • =1 write cost-related outputs to file
    • \n
", "output_huge": "", "output_prefix": "output file prefix", @@ -10926,7 +10926,7 @@ "ucgss": "cost of reactor structure ($/kg)", "uche3": "cost of helium-3 ($/kg)", "uchrs": "cost of heat rejection system ($)", - "uchts": "cost of heat transport system equipment per loop ($/W); dependent on coolant type (coolwh)", + "uchts": "cost of heat transport system equipment per loop ($/W); dependent on coolant type (i_blkt_coolant_type)", "uciac": "cost of instrumentation, control & diagnostics ($)", "ucich": "ICH system cost ($/W)", "ucint": "superconductor intercoil structure cost ($/kg)", @@ -10963,7 +10963,7 @@ "uctfsw": "cost of TF coil slow dump switches ($/A)", "uctpmp": "cost of turbomolecular pump ($)", "uctr": "cost of tritium building ($/m3)", - "ucturb": "cost of turbine plant equipment ($) (dependent on coolant type coolwh)", + "ucturb": "cost of turbine plant equipment ($) (dependent on coolant type i_blkt_coolant_type)", "ucvalv": "vacuum system valve cost ($)", "ucvdsh": "vacuum duct shield cost ($/kg)", "ucviac": "vacuum system instrumentation and control cost ($)", @@ -18079,7 +18079,7 @@ "primary_pumping", "i_shield_mat", "secondary_cycle", - "coolwh", + "i_blkt_coolant_type", "afwi", "afwo", "i_fw_coolant_type", diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 345d106817..4f59315951 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2419,8 +2419,8 @@ i_blkt_inboard = 0 *outlet_temp = * DESCRIPTION: Outlet temperature of blanket coolant [K] (`secondary_cycle>1`) -* input if `coolwh=1` (helium) -* calculated if `coolwh=2` (water) +* input if `i_blkt_coolant_type=1` (helium) +* calculated if `i_blkt_coolant_type=2` (water) * JUSTIFICATION: Not set as not used *blpressure = diff --git a/tests/unit/test_blanket_library.py b/tests/unit/test_blanket_library.py index a9703e854d..b4c804e479 100644 --- a/tests/unit/test_blanket_library.py +++ b/tests/unit/test_blanket_library.py @@ -41,7 +41,7 @@ class PrimaryCoolantPropertiesParam(NamedTuple): cv_fw: Any = None - coolwh: Any = None + i_blkt_coolant_type: Any = None inlet_temp: Any = None @@ -91,7 +91,7 @@ class PrimaryCoolantPropertiesParam(NamedTuple): den_fw_coolant=0, cp_fw=0, cv_fw=0, - coolwh=1, + i_blkt_coolant_type=1, inlet_temp=573, outlet_temp=773, blpressure=8000000, @@ -119,7 +119,7 @@ class PrimaryCoolantPropertiesParam(NamedTuple): den_fw_coolant=5.6389735407435868, cp_fw=5188.5588430173211, cv_fw=3123.5687263525392, - coolwh=1, + i_blkt_coolant_type=1, inlet_temp=573, outlet_temp=773, blpressure=8000000, @@ -186,7 +186,11 @@ def test_primary_coolant_properties( monkeypatch.setattr(fwbs_variables, "cv_fw", primarycoolantpropertiesparam.cv_fw) - monkeypatch.setattr(fwbs_variables, "coolwh", primarycoolantpropertiesparam.coolwh) + monkeypatch.setattr( + fwbs_variables, + "i_blkt_coolant_type", + primarycoolantpropertiesparam.i_blkt_coolant_type, + ) monkeypatch.setattr( fwbs_variables, "inlet_temp", primarycoolantpropertiesparam.inlet_temp diff --git a/tests/unit/test_ccfe_hcpb.py b/tests/unit/test_ccfe_hcpb.py index fa2d0b40f9..c8848a3d3d 100644 --- a/tests/unit/test_ccfe_hcpb.py +++ b/tests/unit/test_ccfe_hcpb.py @@ -796,7 +796,7 @@ class PowerflowCalcParam(NamedTuple): pradfw: Any = None - coolwh: Any = None + i_blkt_coolant_type: Any = None outlet_temp: Any = None @@ -887,7 +887,7 @@ class PowerflowCalcParam(NamedTuple): pradhcd=0, fhcd=0, pradfw=0, - coolwh=1, + i_blkt_coolant_type=1, outlet_temp=823, blpressure=15500000, primary_pumping=3, @@ -936,7 +936,7 @@ class PowerflowCalcParam(NamedTuple): pradhcd=0, fhcd=0, pradfw=254.39207240222791, - coolwh=1, + i_blkt_coolant_type=1, outlet_temp=823, blpressure=15500000, primary_pumping=3, @@ -1011,7 +1011,9 @@ def test_powerflow_calc(powerflowcalcparam, monkeypatch, ccfe_hcpb): monkeypatch.setattr(fwbs_variables, "pradfw", powerflowcalcparam.pradfw) - monkeypatch.setattr(fwbs_variables, "coolwh", powerflowcalcparam.coolwh) + monkeypatch.setattr( + fwbs_variables, "i_blkt_coolant_type", powerflowcalcparam.i_blkt_coolant_type + ) monkeypatch.setattr(fwbs_variables, "outlet_temp", powerflowcalcparam.outlet_temp) diff --git a/tests/unit/test_costs_1990.py b/tests/unit/test_costs_1990.py index 7d2bbb3178..830f288455 100644 --- a/tests/unit/test_costs_1990.py +++ b/tests/unit/test_costs_1990.py @@ -66,7 +66,7 @@ def acc2261_param(**kwargs): :rtype: dict """ # Default parameters - defaults = {"coolwh": 1, "expected": approx(49.68, abs=0.01)} + defaults = {"i_blkt_coolant_type": 1, "expected": approx(49.68, abs=0.01)} # Merge default dict with any optional keyword arguments to override values return {**defaults, **kwargs} @@ -83,7 +83,7 @@ def acc2261_params(): """ return [ acc2261_param(), - acc2261_param(coolwh=2, expected=approx(53.85, abs=0.01)), + acc2261_param(i_blkt_coolant_type=2, expected=approx(53.85, abs=0.01)), ] @@ -111,7 +111,7 @@ def acc2261_fix(costs, request, monkeypatch): monkeypatch.setattr(costs, "c2261", 0) # Parameterised mocks - monkeypatch.setattr(fv, "coolwh", param["coolwh"]) + monkeypatch.setattr(fv, "i_blkt_coolant_type", param["i_blkt_coolant_type"]) # Return the expected result for the given parameter list return param["expected"] @@ -408,7 +408,7 @@ def acc23_param(**kwargs): :rtype: dict """ # Default parameters - defaults = {"coolwh": 1, "expected": approx(230, abs=0.01)} + defaults = {"i_blkt_coolant_type": 1, "expected": approx(230, abs=0.01)} # Merge default dict with any optional keyword arguments to override values return {**defaults, **kwargs} @@ -423,7 +423,10 @@ def acc23_params(): :return: List of parameter dicts :rtype: list """ - return [acc23_param(), acc23_param(coolwh=2, expected=approx(245, abs=0.01))] + return [ + acc23_param(), + acc23_param(i_blkt_coolant_type=2, expected=approx(245, abs=0.01)), + ] @pytest.fixture(params=acc23_params(), ids=["he", "h2o"]) @@ -441,7 +444,7 @@ def acc23_fix(request, monkeypatch, costs): # Mock variables used by acc23() # Some may be parameterised - monkeypatch.setattr(fv, "coolwh", param["coolwh"]) + monkeypatch.setattr(fv, "i_blkt_coolant_type", param["i_blkt_coolant_type"]) monkeypatch.setattr(htv, "pgrossmw", 1200.0) monkeypatch.setattr(costs, "c23", 0) @@ -3806,7 +3809,7 @@ class Acc2261Param(NamedTuple): fkind: Any = None - coolwh: Any = None + i_blkt_coolant_type: Any = None pnucshld: Any = None @@ -3845,7 +3848,7 @@ class Acc2261Param(NamedTuple): ).transpose(), lsa=2, fkind=1, - coolwh=1, + i_blkt_coolant_type=1, pnucshld=1.3609360176065353, pnucblkt=1504.711566619962, pthermmw=2620.2218111502593, @@ -3867,7 +3870,7 @@ class Acc2261Param(NamedTuple): ).transpose(), lsa=2, fkind=1, - coolwh=1, + i_blkt_coolant_type=1, pnucshld=1.4036212304705389, pnucblkt=1549.9285082739402, pthermmw=2619.4223856129224, @@ -3903,7 +3906,9 @@ def test_acc2261_rut(acc2261param, monkeypatch, costs): monkeypatch.setattr(cost_variables, "fkind", acc2261param.fkind) - monkeypatch.setattr(fwbs_variables, "coolwh", acc2261param.coolwh) + monkeypatch.setattr( + fwbs_variables, "i_blkt_coolant_type", acc2261param.i_blkt_coolant_type + ) monkeypatch.setattr(fwbs_variables, "pnucshld", acc2261param.pnucshld) @@ -4650,7 +4655,7 @@ class Acc23Param(NamedTuple): ireactor: Any = None - coolwh: Any = None + i_blkt_coolant_type: Any = None pgrossmw: Any = None @@ -4667,7 +4672,7 @@ class Acc23Param(NamedTuple): np.array((230000000, 245000000), order="F"), order="F" ).transpose(), ireactor=1, - coolwh=1, + i_blkt_coolant_type=1, pgrossmw=982.58317918134742, c23=0, expected_c23=194.83812507173698, @@ -4677,7 +4682,7 @@ class Acc23Param(NamedTuple): np.array((230000000, 245000000), order="F"), order="F" ).transpose(), ireactor=1, - coolwh=1, + i_blkt_coolant_type=1, pgrossmw=982.28339460484608, c23=194.83812507173698, expected_c23=194.78878460447092, @@ -4701,7 +4706,9 @@ def test_acc23_rut(acc23param, monkeypatch, costs): monkeypatch.setattr(cost_variables, "ireactor", acc23param.ireactor) - monkeypatch.setattr(fwbs_variables, "coolwh", acc23param.coolwh) + monkeypatch.setattr( + fwbs_variables, "i_blkt_coolant_type", acc23param.i_blkt_coolant_type + ) monkeypatch.setattr(heat_transport_variables, "pgrossmw", acc23param.pgrossmw) From 23edda786ecd03ef28ff98ab42c847597d79f7e1 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 17 Feb 2025 13:23:12 +0000 Subject: [PATCH 07/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20`volblkt`=20to=20?= =?UTF-8?q?`vol=5Fblkt=5Ftotal`=20for=20clarity=20and=20consistency=20acro?= =?UTF-8?q?ss=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 ++++----- process/blanket_library.py | 25 +++++++----- process/dcll.py | 13 ++++--- process/hcpb.py | 16 ++++---- process/stellarator.py | 36 ++++++++++-------- source/fortran/fwbs_variables.f90 | 4 +- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++++++-------- tests/integration/data/scan_MFILE.DAT | 18 ++++----- tests/integration/ref_dicts.json | 6 +-- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_blanket_library.py | 38 +++++++++++-------- tests/unit/test_ccfe_hcpb.py | 18 +++++---- tests/unit/test_dcll.py | 10 +++-- 23 files changed, 140 insertions(+), 114 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 22aaeec929..15bcb1ea7f 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -961,7 +961,7 @@ Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 5.8692E+00 First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 1.9807E+01 - Blanket_Volume_(m3)_____________________________________________________ (volblkt)_____________________ 1.1849E+03 + Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 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 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 58d903fc47..aeef4f4b56 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -956,7 +956,7 @@ Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 5.8692E+00 First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 1.9807E+01 - Blanket_Volume_(m3)_____________________________________________________ (volblkt)_____________________ 1.1849E+03 + Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 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 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 77812e5d89..f8c447322b 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -956,7 +956,7 @@ Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 5.8692E+00 First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 1.9807E+01 - Blanket_Volume_(m3)_____________________________________________________ (volblkt)_____________________ 1.1849E+03 + Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 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 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index ec7f0b89a0..08e1cd4992 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -956,7 +956,7 @@ Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 5.8692E+00 First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 1.9807E+01 - Blanket_Volume_(m3)_____________________________________________________ (volblkt)_____________________ 1.1849E+03 + Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 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 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index c2a0cf50c8..d5145ec8d5 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -956,7 +956,7 @@ Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 5.8692E+00 First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 1.9807E+01 - Blanket_Volume_(m3)_____________________________________________________ (volblkt)_____________________ 1.1849E+03 + Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 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 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 1508d062cd..6860e400cc 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -785,7 +785,7 @@ Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 7.4780E+00 First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 2.4743E+01 - Blanket_Volume_(m3)_____________________________________________________ (volblkt)_____________________ 1.4825E+03 + Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.4825E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.7675E+02 Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP @@ -1780,7 +1780,7 @@ Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 7.4780E+00 First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 2.4743E+01 - Blanket_Volume_(m3)_____________________________________________________ (volblkt)_____________________ 1.4825E+03 + Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.4825E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.7675E+02 Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP @@ -2775,7 +2775,7 @@ Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 7.4780E+00 First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 2.4743E+01 - Blanket_Volume_(m3)_____________________________________________________ (volblkt)_____________________ 1.4825E+03 + Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.4825E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.7675E+02 Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP @@ -3770,7 +3770,7 @@ Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 7.4780E+00 First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 2.4743E+01 - Blanket_Volume_(m3)_____________________________________________________ (volblkt)_____________________ 1.4825E+03 + Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.4825E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.7675E+02 Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP @@ -4765,7 +4765,7 @@ Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 7.4780E+00 First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 2.4743E+01 - Blanket_Volume_(m3)_____________________________________________________ (volblkt)_____________________ 1.4825E+03 + Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.4825E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.7675E+02 Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP @@ -5760,7 +5760,7 @@ Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 7.4780E+00 First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 2.4743E+01 - Blanket_Volume_(m3)_____________________________________________________ (volblkt)_____________________ 1.4825E+03 + Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.4825E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.7675E+02 Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP @@ -6755,7 +6755,7 @@ Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 7.4780E+00 First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 2.4743E+01 - Blanket_Volume_(m3)_____________________________________________________ (volblkt)_____________________ 1.4825E+03 + Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.4825E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.7675E+02 Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP @@ -7750,7 +7750,7 @@ Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 7.4780E+00 First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 2.4743E+01 - Blanket_Volume_(m3)_____________________________________________________ (volblkt)_____________________ 1.4825E+03 + Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.4825E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.7675E+02 Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP @@ -8745,7 +8745,7 @@ Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 7.4780E+00 First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 2.4743E+01 - Blanket_Volume_(m3)_____________________________________________________ (volblkt)_____________________ 1.4825E+03 + Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.4825E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.7675E+02 Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP diff --git a/process/blanket_library.py b/process/blanket_library.py index 804f5a4b92..9eea725d80 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -194,7 +194,7 @@ def dshaped_component(self, icomponent: int): ( fwbs_variables.volblkti, fwbs_variables.volblkto, - fwbs_variables.volblkt, + fwbs_variables.vol_blkt_total, ) = dshellvol( r1, r2, @@ -284,7 +284,7 @@ def elliptical_component(self, icomponent: int): ( fwbs_variables.volblkti, fwbs_variables.volblkto, - fwbs_variables.volblkt, + fwbs_variables.vol_blkt_total, ) = eshellvol( r1, r2, @@ -347,10 +347,13 @@ def apply_coverage_factors(self): build_variables.blarea = build_variables.blareaib + build_variables.blareaob fwbs_variables.volblkto = ( - fwbs_variables.volblkt * (1.0 - fwbs_variables.fdiv - fwbs_variables.fhcd) + fwbs_variables.vol_blkt_total + * (1.0 - fwbs_variables.fdiv - fwbs_variables.fhcd) - fwbs_variables.volblkti ) - fwbs_variables.volblkt = fwbs_variables.volblkti + fwbs_variables.volblkto + fwbs_variables.vol_blkt_total = ( + fwbs_variables.volblkti + fwbs_variables.volblkto + ) # Apply shield coverage factors build_variables.shareaib = fwbs_variables.fvolsi * build_variables.shareaib @@ -1566,12 +1569,14 @@ def thermo_hydraulic_model(self, output: bool): blanket_library.pnucblkti = ( fwbs_variables.pnucblkt * fwbs_variables.volblkti - / fwbs_variables.volblkt + / fwbs_variables.vol_blkt_total ) # Neutron power deposited in outboard blanket (MW) blanket_library.pnucblkto = ( - fwbs_variables.pnucblkt * fwbs_variables.volblkto / fwbs_variables.volblkt + fwbs_variables.pnucblkt + * fwbs_variables.volblkto + / fwbs_variables.vol_blkt_total ) # For a dual-coolant blanket, some fraction of the power goes into the @@ -1585,15 +1590,15 @@ def thermo_hydraulic_model(self, output: bool): # Inboard blanket calc. Will return 0 if no inboard dr_shld_inboard thickness pnucblkti_struct = ( fwbs_variables.pnucblkt * fwbs_variables.f_nuc_pow_bz_struct - ) * (fwbs_variables.volblkti / fwbs_variables.volblkt) + ) * (fwbs_variables.volblkti / fwbs_variables.vol_blkt_total) pnucblkti_liq = (fwbs_variables.pnucblkt * f_nuc_pow_bz_liq) * ( - fwbs_variables.volblkti / fwbs_variables.volblkt + fwbs_variables.volblkti / fwbs_variables.vol_blkt_total ) pnucblkto_struct = ( fwbs_variables.pnucblkt * fwbs_variables.f_nuc_pow_bz_struct - ) * (fwbs_variables.volblkto / fwbs_variables.volblkt) + ) * (fwbs_variables.volblkto / fwbs_variables.vol_blkt_total) pnucblkto_liq = (fwbs_variables.pnucblkt * f_nuc_pow_bz_liq) * ( - fwbs_variables.volblkto / fwbs_variables.volblkt + fwbs_variables.volblkto / fwbs_variables.vol_blkt_total ) # FW and BB Mass Flow ########### diff --git a/process/dcll.py b/process/dcll.py index c593f0fe2e..6d6dddf76b 100644 --- a/process/dcll.py +++ b/process/dcll.py @@ -520,7 +520,7 @@ def dcll_masses(self, output: bool): if fwbs_variables.icooldual > 0: fwbs_variables.vfblkt = ( (1 - dcll_module.f_vol_stl_bz_struct) * dcll_module.vol_bz_struct - ) / fwbs_variables.volblkt + ) / fwbs_variables.vol_blkt_total dcll_module.vol_bz_liq = ( fwbs_variables.volblkti @@ -592,7 +592,7 @@ def dcll_masses(self, output: bool): if fwbs_variables.icooldual > 0: fwbs_variables.vfblkt = ( (1 - dcll_module.f_vol_stl_bz_struct) * dcll_module.vol_bz_struct - ) / fwbs_variables.volblkt + ) / fwbs_variables.vol_blkt_total dcll_module.vol_bz_liq = ( fwbs_variables.volblkto @@ -715,7 +715,7 @@ def dcll_masses(self, output: bool): if fwbs_variables.i_blkt_inboard == 1: dcll_module.mass_segm_ib = ( fwbs_variables.whtblkt - * (fwbs_variables.volblkti / fwbs_variables.volblkt) + * (fwbs_variables.volblkti / fwbs_variables.vol_blkt_total) + fwbs_variables.m_fw_total * ( build_variables.a_fw_inboard @@ -734,7 +734,8 @@ def dcll_masses(self, output: bool): ) / fwbs_variables.nblktmodti dcll_module.mass_segm_ob = ( - fwbs_variables.whtblkt * (fwbs_variables.volblkto / fwbs_variables.volblkt) + fwbs_variables.whtblkt + * (fwbs_variables.volblkto / fwbs_variables.vol_blkt_total) + fwbs_variables.m_fw_total * ( build_variables.a_fw_outboard @@ -908,8 +909,8 @@ def write_output(self): po.ovarrf( self.outfile, "Blanket Volume (m3)", - "(volblkt)", - fwbs_variables.volblkt, + "(vol_blkt_total)", + fwbs_variables.vol_blkt_total, "OP ", ) po.ovarrf( diff --git a/process/hcpb.py b/process/hcpb.py index 306ed596d2..fea71d0084 100644 --- a/process/hcpb.py +++ b/process/hcpb.py @@ -227,7 +227,7 @@ def component_masses(self): ) # Blanket coolant volume (m3) - coolvol = coolvol + fwbs_variables.volblkt * fwbs_variables.vfblkt + coolvol = coolvol + fwbs_variables.vol_blkt_total * fwbs_variables.vfblkt # Shield coolant volume (m3) coolvol = coolvol + fwbs_variables.volshld * fwbs_variables.vfshld @@ -335,13 +335,13 @@ def component_masses(self): fwbs_variables.breeder_multiplier - fwbs_variables.fblli2sio4 ) fwbs_variables.whtbltibe12 = ( - fwbs_variables.volblkt * fwbs_variables.fbltibe12 * 2260.0 + fwbs_variables.vol_blkt_total * fwbs_variables.fbltibe12 * 2260.0 ) # Blanket Lithium orthosilicate mass (kg) # Ref: www.rockwoodlithium.com... fwbs_variables.whtblli4sio4 = ( - fwbs_variables.volblkt * fwbs_variables.fblli2sio4 * 2400.0 + fwbs_variables.vol_blkt_total * fwbs_variables.fblli2sio4 * 2400.0 ) # TODO sort this out so that costs model uses new variables. @@ -360,7 +360,9 @@ def component_masses(self): # Steel mass (kg) fwbs_variables.whtblss = ( - fwbs_variables.volblkt * fwbs_variables.fblss_ccfe * fwbs_variables.denstl + fwbs_variables.vol_blkt_total + * fwbs_variables.fblss_ccfe + * fwbs_variables.denstl ) # Total blanket mass (kg) @@ -411,7 +413,7 @@ def nuclear_heating_magnets(self, output: bool): ccfe_hcpb_module.armour_density = constants.den_tungsten * (1.0 - vffwm) ccfe_hcpb_module.fw_density = fwbs_variables.denstl * (1.0 - vffwm) ccfe_hcpb_module.blanket_density = ( - fwbs_variables.whtblkt / fwbs_variables.volblkt + fwbs_variables.whtblkt / fwbs_variables.vol_blkt_total ) ccfe_hcpb_module.shield_density = ( fwbs_variables.whtshld / fwbs_variables.volshld @@ -1275,8 +1277,8 @@ def write_output(self): po.ovarrf( self.outfile, "Blanket Volume (m3)", - "(volblkt)", - fwbs_variables.volblkt, + "(vol_blkt_total)", + fwbs_variables.vol_blkt_total, "OP ", ) po.ovarrf( diff --git a/process/stellarator.py b/process/stellarator.py index d2c66be3ab..c5aa8aa2ec 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -1035,7 +1035,9 @@ def blanket_neutronics(self): ) fwbs_variables.densbreed = 2.12e3 - fwbs_variables.whtblkt = fwbs_variables.volblkt * fwbs_variables.densbreed + fwbs_variables.whtblkt = ( + fwbs_variables.vol_blkt_total * fwbs_variables.densbreed + ) self.hcpb.nuclear_heating_blanket() # Heating of the magnets @@ -1061,7 +1063,7 @@ def blanket_neutronics(self): # Tritium breeding ratio fwbs_variables.tbr = self.hcpb.tbr_shimwell( - fwbs_variables.volblkt, fwbs_variables.li6enrich, 1, output=False + fwbs_variables.vol_blkt_total, fwbs_variables.li6enrich, 1, output=False ) # Use older model to calculate neutron fluence since it @@ -1154,7 +1156,9 @@ def stfwbs(self, output: bool): fwbs_variables.volblkto = ( build_variables.blareaob * build_variables.dr_blkt_outboard ) - fwbs_variables.volblkt = fwbs_variables.volblkti + fwbs_variables.volblkto + fwbs_variables.vol_blkt_total = ( + fwbs_variables.volblkti + fwbs_variables.volblkto + ) # Shield volume # Uses fvolsi, fwbs_variables.fvolso as area coverage factors @@ -1605,30 +1609,32 @@ def stfwbs(self, output: bool): fwbs_variables.blkttype == 2 ): # liquid breeder (WCLL or HCLL) fwbs_variables.wtbllipb = ( - fwbs_variables.volblkt * fwbs_variables.fbllipb * 9400.0e0 + fwbs_variables.vol_blkt_total * fwbs_variables.fbllipb * 9400.0e0 ) fwbs_variables.whtblli = ( - fwbs_variables.volblkt * fwbs_variables.fblli * 534.0e0 + fwbs_variables.vol_blkt_total * fwbs_variables.fblli * 534.0e0 ) fwbs_variables.whtblkt = ( fwbs_variables.wtbllipb + fwbs_variables.whtblli ) else: # solid breeder (HCPB); always for ipowerflow=0 fwbs_variables.wtblli2o = ( - fwbs_variables.volblkt * fwbs_variables.fblli2o * 2010.0e0 + fwbs_variables.vol_blkt_total * fwbs_variables.fblli2o * 2010.0e0 ) fwbs_variables.whtblbe = ( - fwbs_variables.volblkt * fwbs_variables.fblbe * 1850.0e0 + fwbs_variables.vol_blkt_total * fwbs_variables.fblbe * 1850.0e0 ) fwbs_variables.whtblkt = ( fwbs_variables.wtblli2o + fwbs_variables.whtblbe ) fwbs_variables.whtblss = ( - fwbs_variables.volblkt * fwbs_variables.denstl * fwbs_variables.fblss + fwbs_variables.vol_blkt_total + * fwbs_variables.denstl + * fwbs_variables.fblss ) fwbs_variables.whtblvd = ( - fwbs_variables.volblkt * 5870.0e0 * fwbs_variables.fblvd + fwbs_variables.vol_blkt_total * 5870.0e0 * fwbs_variables.fblvd ) fwbs_variables.whtblkt = ( @@ -1692,7 +1698,7 @@ def stfwbs(self, output: bool): fwbs_variables.vfblkt = ( fwbs_variables.volblkti - / fwbs_variables.volblkt + / fwbs_variables.vol_blkt_total * ( # inboard portion (build_variables.blbuith / build_variables.dr_blkt_inboard) * ( @@ -1710,7 +1716,7 @@ def stfwbs(self, output: bool): fwbs_variables.vfblkt = ( fwbs_variables.vfblkt + fwbs_variables.volblkto - / fwbs_variables.volblkt + / fwbs_variables.vol_blkt_total * ( # outboard portion (build_variables.blbuoth / build_variables.dr_blkt_outboard) * ( @@ -1733,7 +1739,7 @@ def stfwbs(self, output: bool): # in the blanket. if fwbs_variables.blktmodel == 0: - coolvol = coolvol + fwbs_variables.volblkt * fwbs_variables.vfblkt + coolvol = coolvol + fwbs_variables.vol_blkt_total * fwbs_variables.vfblkt # Shield mass fwbs_variables.whtshld = ( @@ -2200,12 +2206,12 @@ def stfwbs(self, output: bool): # if (fwbs_variables.blktmodel == 0) : # if ((fwbs_variables.blkttype == 1)or(fwbs_variables.blkttype == 2)) : - # po.write(self.outfile,601) volblkti, volblkto, volblkt, whtblkt, vfblkt, fbllipb, wtbllipb, fblli, whtblli, fblss, whtblss, fblvd, whtblvd, volshldi, volshldo, volshld, whtshld, vfshld, fwbs_variables.wpenshld + # po.write(self.outfile,601) volblkti, volblkto, vol_blkt_total, whtblkt, vfblkt, fbllipb, wtbllipb, fblli, whtblli, fblss, whtblss, fblvd, whtblvd, volshldi, volshldo, volshld, whtshld, vfshld, fwbs_variables.wpenshld # else: # (also if ipowerflow=0) - # po.write(self.outfile,600) volblkti, volblkto, volblkt, whtblkt, vfblkt, fblbe, whtblbe, fblli2o, wtblli2o, fblss, whtblss, fblvd, whtblvd, volshldi, volshldo, volshld, whtshld, vfshld, fwbs_variables.wpenshld + # po.write(self.outfile,600) volblkti, volblkto, vol_blkt_total, whtblkt, vfblkt, fblbe, whtblbe, fblli2o, wtblli2o, fblss, whtblss, fblvd, whtblvd, volshldi, volshldo, volshld, whtshld, vfshld, fwbs_variables.wpenshld # else: - # po.write(self.outfile,602) volblkti, volblkto, volblkt, whtblkt, vfblkt, (fwbs_variables.volblkti/fwbs_variables.volblkt * build_variables.blbuith/build_variables.dr_blkt_inboard + fwbs_variables.volblkto/fwbs_variables.volblkt * build_variables.blbuoth/build_variables.dr_blkt_outboard) * fblbe, whtblbe, (fwbs_variables.volblkti/fwbs_variables.volblkt * build_variables.blbuith/build_variables.dr_blkt_inboard + fwbs_variables.volblkto/fwbs_variables.volblkt * build_variables.blbuoth/build_variables.dr_blkt_outboard) * fblbreed, whtblbreed, fwbs_variables.volblkti/fwbs_variables.volblkt/build_variables.dr_blkt_inboard * (build_variables.blbuith * fwbs_variables.fblss + build_variables.blbmith * (1.0e0-fwbs_variables.fblhebmi) + build_variables.blbpith * (1.0e0-fwbs_variables.fblhebpi)) + fwbs_variables.volblkto/fwbs_variables.volblkt/build_variables.dr_blkt_outboard * (build_variables.blbuoth * fwbs_variables.fblss + build_variables.blbmoth * (1.0e0-fwbs_variables.fblhebmo) + build_variables.blbpoth * (1.0e0-fwbs_variables.fblhebpo)), whtblss, volshldi, volshldo, volshld, whtshld, vfshld, fwbs_variables.wpenshld + # po.write(self.outfile,602) volblkti, volblkto, vol_blkt_total, whtblkt, vfblkt, (fwbs_variables.volblkti/fwbs_variables.vol_blkt_total * build_variables.blbuith/build_variables.dr_blkt_inboard + fwbs_variables.volblkto/fwbs_variables.vol_blkt_total * build_variables.blbuoth/build_variables.dr_blkt_outboard) * fblbe, whtblbe, (fwbs_variables.volblkti/fwbs_variables.vol_blkt_total * build_variables.blbuith/build_variables.dr_blkt_inboard + fwbs_variables.volblkto/fwbs_variables.vol_blkt_total * build_variables.blbuoth/build_variables.dr_blkt_outboard) * fblbreed, whtblbreed, fwbs_variables.volblkti/fwbs_variables.vol_blkt_total/build_variables.dr_blkt_inboard * (build_variables.blbuith * fwbs_variables.fblss + build_variables.blbmith * (1.0e0-fwbs_variables.fblhebmi) + build_variables.blbpith * (1.0e0-fwbs_variables.fblhebpi)) + fwbs_variables.volblkto/fwbs_variables.vol_blkt_total/build_variables.dr_blkt_outboard * (build_variables.blbuoth * fwbs_variables.fblss + build_variables.blbmoth * (1.0e0-fwbs_variables.fblhebmo) + build_variables.blbpoth * (1.0e0-fwbs_variables.fblhebpo)), whtblss, volshldi, volshldo, volshld, whtshld, vfshld, fwbs_variables.wpenshld # 600 format( t32,'volume (m3)',t45,'vol fraction',t62,'weight (kg)'/ t32,'-----------',t45,'------------',t62,'-----------'/ ' Inboard blanket' ,t32,1pe10.3,/ ' Outboard blanket' ,t32,1pe10.3,/ ' Total blanket' ,t32,1pe10.3,t62,1pe10.3/ ' Void fraction' ,t45,1pe10.3,/ ' Blanket Be ',t45,1pe10.3,t62,1pe10.3/ ' Blanket Li2O ',t45,1pe10.3,t62,1pe10.3/ ' Blanket ss ',t45,1pe10.3,t62,1pe10.3/ ' Blanket Vd ',t45,1pe10.3,t62,1pe10.3/ ' Inboard shield' ,t32,1pe10.3,/ ' Outboard shield' ,t32,1pe10.3,/ ' Primary shield',t32,1pe10.3,t62,1pe10.3/ ' Void fraction' ,t45,1pe10.3,/ ' Penetration shield' ,t62,1pe10.3) diff --git a/source/fortran/fwbs_variables.f90 b/source/fortran/fwbs_variables.f90 index 55b3081104..e82232ce38 100644 --- a/source/fortran/fwbs_variables.f90 +++ b/source/fortran/fwbs_variables.f90 @@ -435,7 +435,7 @@ module fwbs_variables real(dp) :: vfshld !! coolant void fraction in shield - real(dp) :: volblkt + real(dp) :: vol_blkt_total !! volume of blanket [m^3] real(dp) :: volblkti @@ -776,7 +776,7 @@ subroutine init_fwbs_variables vol_cryostat_internal = 0.0D0 vdewin = 0.0D0 vfshld = 0.25D0 - volblkt = 0.0D0 + vol_blkt_total = 0.0D0 volblkti = 0.0D0 volblkto = 0.0D0 volshld = 0.0D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 68639f3dae..f88c6edbe1 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -955,7 +955,7 @@ Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 5.8692E+00 First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 1.9807E+01 - Blanket_Volume_(m3)_____________________________________________________ (volblkt)_____________________ 1.1849E+03 + Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 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 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 76fae18cc6..bec568a4c6 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -956,7 +956,7 @@ Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 5.8692E+00 First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 1.9807E+01 - Blanket_Volume_(m3)_____________________________________________________ (volblkt)_____________________ 1.1849E+03 + Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 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 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 828dc75da1..6d512c9f09 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -956,7 +956,7 @@ Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 5.8692E+00 First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 1.9807E+01 - Blanket_Volume_(m3)_____________________________________________________ (volblkt)_____________________ 1.1849E+03 + Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 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 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 35d8f2f214..3ac59b0597 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -956,7 +956,7 @@ Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 5.8692E+00 First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 1.9807E+01 - Blanket_Volume_(m3)_____________________________________________________ (volblkt)_____________________ 1.1849E+03 + Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 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 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index b3564527c0..548bbb6531 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -959,7 +959,7 @@ Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 5.8692E+00 First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 1.9807E+01 - Blanket_Volume_(m3)_____________________________________________________ (volblkt)_____________________ 1.1849E+03 + Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 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 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index ee070c5f60..6716c8b341 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -957,7 +957,7 @@ Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 5.8692E+00 First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 1.9807E+01 - Blanket_Volume_(m3)_____________________________________________________ (volblkt)_____________________ 1.1849E+03 + Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 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 @@ -2120,7 +2120,7 @@ Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 5.8692E+00 First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 1.9807E+01 - Blanket_Volume_(m3)_____________________________________________________ (volblkt)_____________________ 1.1849E+03 + Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 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 @@ -3283,7 +3283,7 @@ Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 5.8692E+00 First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 1.9807E+01 - Blanket_Volume_(m3)_____________________________________________________ (volblkt)_____________________ 1.1849E+03 + Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 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 @@ -4446,7 +4446,7 @@ Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 5.8692E+00 First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 1.9807E+01 - Blanket_Volume_(m3)_____________________________________________________ (volblkt)_____________________ 1.1849E+03 + Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 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 @@ -5609,7 +5609,7 @@ Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 5.8692E+00 First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 1.9807E+01 - Blanket_Volume_(m3)_____________________________________________________ (volblkt)_____________________ 1.1849E+03 + Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 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 @@ -6772,7 +6772,7 @@ Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 5.8692E+00 First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 1.9807E+01 - Blanket_Volume_(m3)_____________________________________________________ (volblkt)_____________________ 1.1849E+03 + Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 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 @@ -7935,7 +7935,7 @@ Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 5.8692E+00 First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 1.9807E+01 - Blanket_Volume_(m3)_____________________________________________________ (volblkt)_____________________ 1.1849E+03 + Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 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 @@ -9098,7 +9098,7 @@ Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 5.8692E+00 First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 1.9807E+01 - Blanket_Volume_(m3)_____________________________________________________ (volblkt)_____________________ 1.1849E+03 + Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 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 @@ -10261,7 +10261,7 @@ Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 5.8692E+00 First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 1.9807E+01 - Blanket_Volume_(m3)_____________________________________________________ (volblkt)_____________________ 1.1849E+03 + Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 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 @@ -11424,7 +11424,7 @@ Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 5.8692E+00 First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 1.9807E+01 - Blanket_Volume_(m3)_____________________________________________________ (volblkt)_____________________ 1.1849E+03 + Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 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 @@ -12587,7 +12587,7 @@ Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 5.8692E+00 First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 1.9807E+01 - Blanket_Volume_(m3)_____________________________________________________ (volblkt)_____________________ 1.1849E+03 + Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 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 @@ -13750,7 +13750,7 @@ Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 5.8692E+00 First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 1.9807E+01 - Blanket_Volume_(m3)_____________________________________________________ (volblkt)_____________________ 1.1849E+03 + Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 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 @@ -14913,7 +14913,7 @@ Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 5.8692E+00 First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 1.9807E+01 - Blanket_Volume_(m3)_____________________________________________________ (volblkt)_____________________ 1.1849E+03 + Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 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 @@ -16076,7 +16076,7 @@ Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 5.8692E+00 First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 1.9807E+01 - Blanket_Volume_(m3)_____________________________________________________ (volblkt)_____________________ 1.1849E+03 + Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 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 @@ -17239,7 +17239,7 @@ Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 5.8692E+00 First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 1.9807E+01 - Blanket_Volume_(m3)_____________________________________________________ (volblkt)_____________________ 1.1849E+03 + Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 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 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index b1cdd93d28..475800ae90 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -785,7 +785,7 @@ Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 7.4780E+00 First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 2.4743E+01 - Blanket_Volume_(m3)_____________________________________________________ (volblkt)_____________________ 1.4825E+03 + Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.4825E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.7675E+02 Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP @@ -1780,7 +1780,7 @@ Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 7.4780E+00 First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 2.4743E+01 - Blanket_Volume_(m3)_____________________________________________________ (volblkt)_____________________ 1.4825E+03 + Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.4825E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.7675E+02 Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP @@ -2775,7 +2775,7 @@ Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 7.4780E+00 First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 2.4743E+01 - Blanket_Volume_(m3)_____________________________________________________ (volblkt)_____________________ 1.4825E+03 + Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.4825E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.7675E+02 Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP @@ -3770,7 +3770,7 @@ Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 7.4780E+00 First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 2.4743E+01 - Blanket_Volume_(m3)_____________________________________________________ (volblkt)_____________________ 1.4825E+03 + Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.4825E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.7675E+02 Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP @@ -4765,7 +4765,7 @@ Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 7.4780E+00 First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 2.4743E+01 - Blanket_Volume_(m3)_____________________________________________________ (volblkt)_____________________ 1.4825E+03 + Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.4825E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.7675E+02 Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP @@ -5760,7 +5760,7 @@ Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 7.4780E+00 First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 2.4743E+01 - Blanket_Volume_(m3)_____________________________________________________ (volblkt)_____________________ 1.4825E+03 + Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.4825E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.7675E+02 Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP @@ -6755,7 +6755,7 @@ Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 7.4780E+00 First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 2.4743E+01 - Blanket_Volume_(m3)_____________________________________________________ (volblkt)_____________________ 1.4825E+03 + Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.4825E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.7675E+02 Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP @@ -7750,7 +7750,7 @@ Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 7.4780E+00 First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 2.4743E+01 - Blanket_Volume_(m3)_____________________________________________________ (volblkt)_____________________ 1.4825E+03 + Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.4825E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.7675E+02 Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP @@ -8745,7 +8745,7 @@ Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 7.4780E+00 First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 2.4743E+01 - Blanket_Volume_(m3)_____________________________________________________ (volblkt)_____________________ 1.4825E+03 + Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.4825E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.7675E+02 Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 26f0803d11..a106d61d6e 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -7971,7 +7971,7 @@ "vol_steel_mf_ob": 0.0, "vol_w_fw_ib": 0.0, "vol_w_fw_ob": 0.0, - "volblkt": 0.0, + "vol_blkt_total": 0.0, "volblkti": 0.0, "volblkto": 0.0, "vol_fw_total": 0.0, @@ -11080,7 +11080,7 @@ "vol_steel_mf_ob": "", "vol_w_fw_ib": "", "vol_w_fw_ob": "", - "volblkt": "volume of blanket (m3)", + "vol_blkt_total": "volume of blanket (m3)", "volblkti": "volume of inboard blanket (m3)", "volblkto": "volume of outboard blanket (m3)", "vol_fw_total": "First wall volume [m3]", @@ -18119,7 +18119,7 @@ "vol_cryostat", "vdewin", "vfshld", - "volblkt", + "vol_blkt_total", "volblkti", "volblkto", "volshld", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index ef1aa4d773..336edf91ac 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -959,7 +959,7 @@ Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 5.8692E+00 First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 1.9807E+01 - Blanket_Volume_(m3)_____________________________________________________ (volblkt)_____________________ 1.1849E+03 + Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 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 diff --git a/tests/unit/test_blanket_library.py b/tests/unit/test_blanket_library.py index b4c804e479..32dd3ce740 100644 --- a/tests/unit/test_blanket_library.py +++ b/tests/unit/test_blanket_library.py @@ -506,7 +506,7 @@ class DshapedComponentParam(NamedTuple): dz_vv_lower: Any = None volblkti: Any = None volblkto: Any = None - volblkt: Any = None + vol_blkt_total: Any = None volshld: Any = None vdewin: Any = None rminor: Any = None @@ -563,7 +563,7 @@ class DshapedComponentParam(NamedTuple): dz_vv_lower=0.30000000000000004, volblkti=0, volblkto=0, - volblkt=0, + vol_blkt_total=0, volshld=0, vdewin=0, rminor=2.5, @@ -616,7 +616,7 @@ class DshapedComponentParam(NamedTuple): dz_vv_lower=0.30000000000000004, volblkti=0, volblkto=691.06561956756764, - volblkt=691.06561956756764, + vol_blkt_total=691.06561956756764, volshld=0, vdewin=0, rminor=2.5, @@ -669,7 +669,7 @@ class DshapedComponentParam(NamedTuple): dz_vv_lower=0.30000000000000004, volblkti=0, volblkto=691.06561956756764, - volblkt=691.06561956756764, + vol_blkt_total=691.06561956756764, volshld=450.46122947809488, vdewin=0, rminor=2.5, @@ -767,7 +767,9 @@ def test_dshaped_component(dshapedcomponentparam, monkeypatch, blanket_library_f ) monkeypatch.setattr(fwbs_variables, "volblkti", dshapedcomponentparam.volblkti) monkeypatch.setattr(fwbs_variables, "volblkto", dshapedcomponentparam.volblkto) - monkeypatch.setattr(fwbs_variables, "volblkt", dshapedcomponentparam.volblkt) + monkeypatch.setattr( + fwbs_variables, "vol_blkt_total", dshapedcomponentparam.vol_blkt_total + ) monkeypatch.setattr(fwbs_variables, "volshld", dshapedcomponentparam.volshld) monkeypatch.setattr(fwbs_variables, "vdewin", dshapedcomponentparam.vdewin) monkeypatch.setattr(physics_variables, "rminor", dshapedcomponentparam.rminor) @@ -793,7 +795,7 @@ def test_dshaped_component(dshapedcomponentparam, monkeypatch, blanket_library_f assert fwbs_variables.volblkto == pytest.approx( dshapedcomponentparam.expected_volblkto ) - assert fwbs_variables.volblkt == pytest.approx( + assert fwbs_variables.vol_blkt_total == pytest.approx( dshapedcomponentparam.expected_volblkt ) @@ -819,7 +821,7 @@ class EllipticalComponentParam(NamedTuple): dz_vv_lower: Any = None volblkti: Any = None volblkto: Any = None - volblkt: Any = None + vol_blkt_total: Any = None volshld: Any = None vdewin: Any = None rmajor: Any = None @@ -875,7 +877,7 @@ class EllipticalComponentParam(NamedTuple): dz_vv_lower=0.30000000000000004, volblkti=0, volblkto=0, - volblkt=0, + vol_blkt_total=0, volshld=0, vdewin=0, rmajor=8, @@ -927,7 +929,7 @@ class EllipticalComponentParam(NamedTuple): dz_vv_lower=0.30000000000000004, volblkti=315.83946385183026, volblkto=1020.3677420460117, - volblkt=1336.207205897842, + vol_blkt_total=1336.207205897842, volshld=0, vdewin=0, rmajor=8, @@ -979,7 +981,7 @@ class EllipticalComponentParam(NamedTuple): dz_vv_lower=0.30000000000000004, volblkti=315.83946385183026, volblkto=1020.3677420460117, - volblkt=1336.207205897842, + vol_blkt_total=1336.207205897842, volshld=1124.4621612595051, vdewin=0, rmajor=8, @@ -1066,7 +1068,9 @@ def test_elliptical_component( ) monkeypatch.setattr(fwbs_variables, "volblkti", ellipticalcomponentparam.volblkti) monkeypatch.setattr(fwbs_variables, "volblkto", ellipticalcomponentparam.volblkto) - monkeypatch.setattr(fwbs_variables, "volblkt", ellipticalcomponentparam.volblkt) + monkeypatch.setattr( + fwbs_variables, "vol_blkt_total", ellipticalcomponentparam.vol_blkt_total + ) monkeypatch.setattr(fwbs_variables, "volshld", ellipticalcomponentparam.volshld) monkeypatch.setattr(fwbs_variables, "vdewin", ellipticalcomponentparam.vdewin) monkeypatch.setattr(physics_variables, "rmajor", ellipticalcomponentparam.rmajor) @@ -1106,7 +1110,7 @@ def test_elliptical_component( assert fwbs_variables.volblkto == pytest.approx( ellipticalcomponentparam.expected_volblkto ) - assert fwbs_variables.volblkt == pytest.approx( + assert fwbs_variables.vol_blkt_total == pytest.approx( ellipticalcomponentparam.expected_volblkt ) assert fwbs_variables.volshld == pytest.approx( @@ -1140,7 +1144,7 @@ class ApplyCoverageFactorsParam(NamedTuple): fhcd: Any = None volblkto: Any = None volblkti: Any = None - volblkt: Any = None + vol_blkt_total: Any = None fvolsi: Any = None fvolso: Any = None volshld: Any = None @@ -1174,7 +1178,7 @@ class ApplyCoverageFactorsParam(NamedTuple): fhcd=0, volblkto=1020.3677420460117, volblkti=315.83946385183026, - volblkt=1336.207205897842, + vol_blkt_total=1336.207205897842, fvolsi=1, fvolso=0.64000000000000001, volshld=1124.4621612595051, @@ -1219,7 +1223,9 @@ def test_apply_coverage_factors( monkeypatch.setattr(fwbs_variables, "fhcd", applycoveragefactorsparam.fhcd) monkeypatch.setattr(fwbs_variables, "volblkto", applycoveragefactorsparam.volblkto) monkeypatch.setattr(fwbs_variables, "volblkti", applycoveragefactorsparam.volblkti) - monkeypatch.setattr(fwbs_variables, "volblkt", applycoveragefactorsparam.volblkt) + monkeypatch.setattr( + fwbs_variables, "vol_blkt_total", applycoveragefactorsparam.vol_blkt_total + ) monkeypatch.setattr(fwbs_variables, "fvolsi", applycoveragefactorsparam.fvolsi) monkeypatch.setattr(fwbs_variables, "fvolso", applycoveragefactorsparam.fvolso) monkeypatch.setattr(fwbs_variables, "volshld", applycoveragefactorsparam.volshld) @@ -1246,7 +1252,7 @@ def test_apply_coverage_factors( assert fwbs_variables.volblkto == pytest.approx( applycoveragefactorsparam.expected_volblkto ) - assert fwbs_variables.volblkt == pytest.approx( + assert fwbs_variables.vol_blkt_total == pytest.approx( applycoveragefactorsparam.expected_volblkt ) assert fwbs_variables.volshld == pytest.approx( diff --git a/tests/unit/test_ccfe_hcpb.py b/tests/unit/test_ccfe_hcpb.py index c8848a3d3d..63a6d1c4e7 100644 --- a/tests/unit/test_ccfe_hcpb.py +++ b/tests/unit/test_ccfe_hcpb.py @@ -55,7 +55,7 @@ class NuclearHeatingMagnetsParam(NamedTuple): whtblkt: Any = None - volblkt: Any = None + vol_blkt_total: Any = None whtshld: Any = None @@ -142,7 +142,7 @@ class NuclearHeatingMagnetsParam(NamedTuple): dx_fw_module=0.02, denstl=7800, whtblkt=3501027.3252278985, - volblkt=1397.9003011502937, + vol_blkt_total=1397.9003011502937, whtshld=2294873.8131476045, volshld=735.53647857295027, vvmass=9043937.8018644415, @@ -191,7 +191,7 @@ class NuclearHeatingMagnetsParam(NamedTuple): dx_fw_module=0.02, denstl=7800, whtblkt=3507503.3737008357, - volblkt=1400.4860764869636, + vol_blkt_total=1400.4860764869636, whtshld=2297808.3935174854, volshld=736.47704920432227, vvmass=9056931.558219457, @@ -288,7 +288,9 @@ def test_nuclear_heating_magnets(nuclearheatingmagnetsparam, monkeypatch, ccfe_h monkeypatch.setattr(fwbs_variables, "whtblkt", nuclearheatingmagnetsparam.whtblkt) - monkeypatch.setattr(fwbs_variables, "volblkt", nuclearheatingmagnetsparam.volblkt) + monkeypatch.setattr( + fwbs_variables, "vol_blkt_total", nuclearheatingmagnetsparam.vol_blkt_total + ) monkeypatch.setattr(fwbs_variables, "whtshld", nuclearheatingmagnetsparam.whtshld) @@ -1431,7 +1433,7 @@ class ComponentMassesParam(NamedTuple): a_fw_outboard: Any = None dr_fw_outboard: Any = None a_fw_total: Any = None - volblkt: Any = None + vol_blkt_total: Any = None vfblkt: Any = None whtblbe: Any = None whtblss: Any = None @@ -1522,7 +1524,7 @@ class ComponentMassesParam(NamedTuple): a_fw_outboard=838.00728058362097, dr_fw_outboard=0.018000000000000002, a_fw_total=1343.9683762356615, - volblkt=1182.5433772195902, + vol_blkt_total=1182.5433772195902, vfblkt=0.25, whtblbe=0, whtblss=0, @@ -1636,7 +1638,9 @@ def test_component_masses(componentmassesparam, monkeypatch, ccfe_hcpb): build_variables, "dr_fw_outboard", componentmassesparam.dr_fw_outboard ) monkeypatch.setattr(build_variables, "a_fw_total", componentmassesparam.a_fw_total) - monkeypatch.setattr(fwbs_variables, "volblkt", componentmassesparam.volblkt) + monkeypatch.setattr( + fwbs_variables, "vol_blkt_total", componentmassesparam.vol_blkt_total + ) monkeypatch.setattr(fwbs_variables, "vfblkt", componentmassesparam.vfblkt) monkeypatch.setattr(fwbs_variables, "whtblbe", componentmassesparam.whtblbe) monkeypatch.setattr(fwbs_variables, "whtblss", componentmassesparam.whtblss) diff --git a/tests/unit/test_dcll.py b/tests/unit/test_dcll.py index 11291ed395..1955198bfe 100644 --- a/tests/unit/test_dcll.py +++ b/tests/unit/test_dcll.py @@ -308,7 +308,7 @@ class DcllMassesParam(NamedTuple): i_blkt_inboard: Any = None - volblkt: Any = None + vol_blkt_total: Any = None volblkti: Any = None @@ -534,7 +534,7 @@ class DcllMassesParam(NamedTuple): a_plasma_surface=1403.2719775669307, a_plasma_surface_outboard=949.22962703393853, i_blkt_inboard=1, - volblkt=1397.9003011502937, + vol_blkt_total=1397.9003011502937, volblkti=401.90579863726225, volblkto=995.99450251303142, whtblkt=0, @@ -653,7 +653,7 @@ class DcllMassesParam(NamedTuple): a_plasma_surface=1403.2719775669307, a_plasma_surface_outboard=949.22962703393853, i_blkt_inboard=1, - volblkt=1400.4860764869636, + vol_blkt_total=1400.4860764869636, volblkti=402.02180553751157, volblkto=998.46427094945204, whtblkt=10654509.24412049, @@ -813,7 +813,9 @@ def test_dcll_masses(dcllmassesparam, monkeypatch, dcll): fwbs_variables, "i_blkt_inboard", dcllmassesparam.i_blkt_inboard ) - monkeypatch.setattr(fwbs_variables, "volblkt", dcllmassesparam.volblkt) + monkeypatch.setattr( + fwbs_variables, "vol_blkt_total", dcllmassesparam.vol_blkt_total + ) monkeypatch.setattr(fwbs_variables, "volblkti", dcllmassesparam.volblkti) From 39a8936afb2c6dde6c26639c99a5530999714536 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 17 Feb 2025 13:24:34 +0000 Subject: [PATCH 08/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20`volblkti`=20to?= =?UTF-8?q?=20`vol=5Fblkt=5Finboard`=20for=20clarity=20and=20consistency?= =?UTF-8?q?=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/blanket_library.py | 20 +++++++------- process/dcll.py | 14 +++++----- process/stellarator.py | 18 ++++++------ source/fortran/fwbs_variables.f90 | 4 +-- tests/integration/ref_dicts.json | 6 ++-- tests/unit/test_blanket_library.py | 44 +++++++++++++++++------------- tests/unit/test_ccfe_hcpb.py | 8 ++++-- tests/unit/test_dcll.py | 10 ++++--- 8 files changed, 67 insertions(+), 57 deletions(-) diff --git a/process/blanket_library.py b/process/blanket_library.py index 9eea725d80..38ebfef6ed 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -192,7 +192,7 @@ def dshaped_component(self, icomponent: int): # Calculate volumes, assuming 100% coverage if icomponent == 0: ( - fwbs_variables.volblkti, + fwbs_variables.vol_blkt_inboard, fwbs_variables.volblkto, fwbs_variables.vol_blkt_total, ) = dshellvol( @@ -282,7 +282,7 @@ def elliptical_component(self, icomponent: int): # Calculate volumes, assuming 100% coverage if icomponent == 0: ( - fwbs_variables.volblkti, + fwbs_variables.vol_blkt_inboard, fwbs_variables.volblkto, fwbs_variables.vol_blkt_total, ) = eshellvol( @@ -349,10 +349,10 @@ def apply_coverage_factors(self): fwbs_variables.volblkto = ( fwbs_variables.vol_blkt_total * (1.0 - fwbs_variables.fdiv - fwbs_variables.fhcd) - - fwbs_variables.volblkti + - fwbs_variables.vol_blkt_inboard ) fwbs_variables.vol_blkt_total = ( - fwbs_variables.volblkti + fwbs_variables.volblkto + fwbs_variables.vol_blkt_inboard + fwbs_variables.volblkto ) # Apply shield coverage factors @@ -828,7 +828,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): # coolant frac and channel dimensions # Assumes up/down flow, two 90 deg bends per length blanket_library.npblkti = ( - fwbs_variables.vfblkt * fwbs_variables.volblkti + fwbs_variables.vfblkt * fwbs_variables.vol_blkt_inboard ) / ( np.pi * fwbs_variables.radius_fw_channel @@ -909,7 +909,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): # coolant frac and channel dimensions # Assumes up/down flow, two 90 deg bends per length blanket_library.npblkti = ( - fwbs_variables.vfblkt * fwbs_variables.volblkti + fwbs_variables.vfblkt * fwbs_variables.vol_blkt_inboard ) / ( np.pi * fwbs_variables.radius_fw_channel @@ -978,7 +978,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): # coolant frac and channel dimensions # Assumes up/down flow, two 90 deg bends per length blanket_library.npblkti = ( - fwbs_variables.vfblkt * fwbs_variables.volblkti + fwbs_variables.vfblkt * fwbs_variables.vol_blkt_inboard ) / ( np.pi * fwbs_variables.radius_fw_channel @@ -1568,7 +1568,7 @@ def thermo_hydraulic_model(self, output: bool): if fwbs_variables.i_blkt_inboard == 1: blanket_library.pnucblkti = ( fwbs_variables.pnucblkt - * fwbs_variables.volblkti + * fwbs_variables.vol_blkt_inboard / fwbs_variables.vol_blkt_total ) @@ -1590,9 +1590,9 @@ def thermo_hydraulic_model(self, output: bool): # Inboard blanket calc. Will return 0 if no inboard dr_shld_inboard thickness pnucblkti_struct = ( fwbs_variables.pnucblkt * fwbs_variables.f_nuc_pow_bz_struct - ) * (fwbs_variables.volblkti / fwbs_variables.vol_blkt_total) + ) * (fwbs_variables.vol_blkt_inboard / fwbs_variables.vol_blkt_total) pnucblkti_liq = (fwbs_variables.pnucblkt * f_nuc_pow_bz_liq) * ( - fwbs_variables.volblkti / fwbs_variables.vol_blkt_total + fwbs_variables.vol_blkt_inboard / fwbs_variables.vol_blkt_total ) pnucblkto_struct = ( fwbs_variables.pnucblkt * fwbs_variables.f_nuc_pow_bz_struct diff --git a/process/dcll.py b/process/dcll.py index 6d6dddf76b..b7072133e2 100644 --- a/process/dcll.py +++ b/process/dcll.py @@ -508,7 +508,7 @@ def dcll_masses(self, output: bool): # BZ dcll_module.vol_bz_struct = ( - fwbs_variables.volblkti + fwbs_variables.vol_blkt_inboard * dcll_module.bz_r_ib * (1 - fwbs_variables.r_f_liq_ib) / build_variables.dr_blkt_inboard @@ -523,7 +523,7 @@ def dcll_masses(self, output: bool): ) / fwbs_variables.vol_blkt_total dcll_module.vol_bz_liq = ( - fwbs_variables.volblkti + fwbs_variables.vol_blkt_inboard * dcll_module.bz_r_ib * fwbs_variables.r_f_liq_ib / build_variables.dr_blkt_inboard @@ -534,7 +534,7 @@ def dcll_masses(self, output: bool): / build_variables.dr_blkt_outboard ) dcll_module.vol_bz_liq_ib = ( - fwbs_variables.volblkti + fwbs_variables.vol_blkt_inboard * dcll_module.bz_r_ib * fwbs_variables.r_f_liq_ib / build_variables.dr_blkt_inboard @@ -548,7 +548,7 @@ def dcll_masses(self, output: bool): if fwbs_variables.ifci > 0: dcll_module.vol_fci = ( - fwbs_variables.volblkti + fwbs_variables.vol_blkt_inboard * dcll_module.r_fci / build_variables.dr_blkt_inboard ) + ( @@ -559,7 +559,7 @@ def dcll_masses(self, output: bool): # Back Wall dcll_module.vol_bw = ( - fwbs_variables.volblkti + fwbs_variables.vol_blkt_inboard * dcll_module.r_backwall / build_variables.dr_blkt_inboard ) + ( @@ -570,7 +570,7 @@ def dcll_masses(self, output: bool): # Manifold/BSS dcll_module.vol_bss = ( - fwbs_variables.volblkti + fwbs_variables.vol_blkt_inboard * build_variables.blbmith / build_variables.dr_blkt_inboard ) + ( @@ -715,7 +715,7 @@ def dcll_masses(self, output: bool): if fwbs_variables.i_blkt_inboard == 1: dcll_module.mass_segm_ib = ( fwbs_variables.whtblkt - * (fwbs_variables.volblkti / fwbs_variables.vol_blkt_total) + * (fwbs_variables.vol_blkt_inboard / fwbs_variables.vol_blkt_total) + fwbs_variables.m_fw_total * ( build_variables.a_fw_inboard diff --git a/process/stellarator.py b/process/stellarator.py index c5aa8aa2ec..7ef7d60e1c 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -1150,14 +1150,14 @@ def stfwbs(self, output: bool): build_variables.blareaib = 0.5e0 * build_variables.blarea build_variables.blareaob = 0.5e0 * build_variables.blarea - fwbs_variables.volblkti = ( + fwbs_variables.vol_blkt_inboard = ( build_variables.blareaib * build_variables.dr_blkt_inboard ) fwbs_variables.volblkto = ( build_variables.blareaob * build_variables.dr_blkt_outboard ) fwbs_variables.vol_blkt_total = ( - fwbs_variables.volblkti + fwbs_variables.volblkto + fwbs_variables.vol_blkt_inboard + fwbs_variables.volblkto ) # Shield volume @@ -1643,7 +1643,7 @@ def stfwbs(self, output: bool): else: # volume fractions proportional to sub-assembly thicknesses fwbs_variables.whtblss = fwbs_variables.denstl * ( - fwbs_variables.volblkti + fwbs_variables.vol_blkt_inboard / build_variables.dr_blkt_inboard * ( build_variables.blbuith * fwbs_variables.fblss @@ -1663,7 +1663,7 @@ def stfwbs(self, output: bool): * fwbs_variables.fblbe * ( ( - fwbs_variables.volblkti + fwbs_variables.vol_blkt_inboard * build_variables.blbuith / build_variables.dr_blkt_inboard ) @@ -1679,7 +1679,7 @@ def stfwbs(self, output: bool): * fwbs_variables.fblbreed * ( ( - fwbs_variables.volblkti + fwbs_variables.vol_blkt_inboard * build_variables.blbuith / build_variables.dr_blkt_inboard ) @@ -1697,7 +1697,7 @@ def stfwbs(self, output: bool): ) fwbs_variables.vfblkt = ( - fwbs_variables.volblkti + fwbs_variables.vol_blkt_inboard / fwbs_variables.vol_blkt_total * ( # inboard portion (build_variables.blbuith / build_variables.dr_blkt_inboard) @@ -2206,12 +2206,12 @@ def stfwbs(self, output: bool): # if (fwbs_variables.blktmodel == 0) : # if ((fwbs_variables.blkttype == 1)or(fwbs_variables.blkttype == 2)) : - # po.write(self.outfile,601) volblkti, volblkto, vol_blkt_total, whtblkt, vfblkt, fbllipb, wtbllipb, fblli, whtblli, fblss, whtblss, fblvd, whtblvd, volshldi, volshldo, volshld, whtshld, vfshld, fwbs_variables.wpenshld + # po.write(self.outfile,601) vol_blkt_inboard, volblkto, vol_blkt_total, whtblkt, vfblkt, fbllipb, wtbllipb, fblli, whtblli, fblss, whtblss, fblvd, whtblvd, volshldi, volshldo, volshld, whtshld, vfshld, fwbs_variables.wpenshld # else: # (also if ipowerflow=0) - # po.write(self.outfile,600) volblkti, volblkto, vol_blkt_total, whtblkt, vfblkt, fblbe, whtblbe, fblli2o, wtblli2o, fblss, whtblss, fblvd, whtblvd, volshldi, volshldo, volshld, whtshld, vfshld, fwbs_variables.wpenshld + # po.write(self.outfile,600) vol_blkt_inboard, volblkto, vol_blkt_total, whtblkt, vfblkt, fblbe, whtblbe, fblli2o, wtblli2o, fblss, whtblss, fblvd, whtblvd, volshldi, volshldo, volshld, whtshld, vfshld, fwbs_variables.wpenshld # else: - # po.write(self.outfile,602) volblkti, volblkto, vol_blkt_total, whtblkt, vfblkt, (fwbs_variables.volblkti/fwbs_variables.vol_blkt_total * build_variables.blbuith/build_variables.dr_blkt_inboard + fwbs_variables.volblkto/fwbs_variables.vol_blkt_total * build_variables.blbuoth/build_variables.dr_blkt_outboard) * fblbe, whtblbe, (fwbs_variables.volblkti/fwbs_variables.vol_blkt_total * build_variables.blbuith/build_variables.dr_blkt_inboard + fwbs_variables.volblkto/fwbs_variables.vol_blkt_total * build_variables.blbuoth/build_variables.dr_blkt_outboard) * fblbreed, whtblbreed, fwbs_variables.volblkti/fwbs_variables.vol_blkt_total/build_variables.dr_blkt_inboard * (build_variables.blbuith * fwbs_variables.fblss + build_variables.blbmith * (1.0e0-fwbs_variables.fblhebmi) + build_variables.blbpith * (1.0e0-fwbs_variables.fblhebpi)) + fwbs_variables.volblkto/fwbs_variables.vol_blkt_total/build_variables.dr_blkt_outboard * (build_variables.blbuoth * fwbs_variables.fblss + build_variables.blbmoth * (1.0e0-fwbs_variables.fblhebmo) + build_variables.blbpoth * (1.0e0-fwbs_variables.fblhebpo)), whtblss, volshldi, volshldo, volshld, whtshld, vfshld, fwbs_variables.wpenshld + # po.write(self.outfile,602) vol_blkt_inboard, volblkto, vol_blkt_total, whtblkt, vfblkt, (fwbs_variables.vol_blkt_inboard/fwbs_variables.vol_blkt_total * build_variables.blbuith/build_variables.dr_blkt_inboard + fwbs_variables.volblkto/fwbs_variables.vol_blkt_total * build_variables.blbuoth/build_variables.dr_blkt_outboard) * fblbe, whtblbe, (fwbs_variables.vol_blkt_inboard/fwbs_variables.vol_blkt_total * build_variables.blbuith/build_variables.dr_blkt_inboard + fwbs_variables.volblkto/fwbs_variables.vol_blkt_total * build_variables.blbuoth/build_variables.dr_blkt_outboard) * fblbreed, whtblbreed, fwbs_variables.vol_blkt_inboard/fwbs_variables.vol_blkt_total/build_variables.dr_blkt_inboard * (build_variables.blbuith * fwbs_variables.fblss + build_variables.blbmith * (1.0e0-fwbs_variables.fblhebmi) + build_variables.blbpith * (1.0e0-fwbs_variables.fblhebpi)) + fwbs_variables.volblkto/fwbs_variables.vol_blkt_total/build_variables.dr_blkt_outboard * (build_variables.blbuoth * fwbs_variables.fblss + build_variables.blbmoth * (1.0e0-fwbs_variables.fblhebmo) + build_variables.blbpoth * (1.0e0-fwbs_variables.fblhebpo)), whtblss, volshldi, volshldo, volshld, whtshld, vfshld, fwbs_variables.wpenshld # 600 format( t32,'volume (m3)',t45,'vol fraction',t62,'weight (kg)'/ t32,'-----------',t45,'------------',t62,'-----------'/ ' Inboard blanket' ,t32,1pe10.3,/ ' Outboard blanket' ,t32,1pe10.3,/ ' Total blanket' ,t32,1pe10.3,t62,1pe10.3/ ' Void fraction' ,t45,1pe10.3,/ ' Blanket Be ',t45,1pe10.3,t62,1pe10.3/ ' Blanket Li2O ',t45,1pe10.3,t62,1pe10.3/ ' Blanket ss ',t45,1pe10.3,t62,1pe10.3/ ' Blanket Vd ',t45,1pe10.3,t62,1pe10.3/ ' Inboard shield' ,t32,1pe10.3,/ ' Outboard shield' ,t32,1pe10.3,/ ' Primary shield',t32,1pe10.3,t62,1pe10.3/ ' Void fraction' ,t45,1pe10.3,/ ' Penetration shield' ,t62,1pe10.3) diff --git a/source/fortran/fwbs_variables.f90 b/source/fortran/fwbs_variables.f90 index e82232ce38..6a4fd8fbcd 100644 --- a/source/fortran/fwbs_variables.f90 +++ b/source/fortran/fwbs_variables.f90 @@ -438,7 +438,7 @@ module fwbs_variables real(dp) :: vol_blkt_total !! volume of blanket [m^3] - real(dp) :: volblkti + real(dp) :: vol_blkt_inboard !! volume of inboard blanket [m^3] real(dp) :: volblkto @@ -777,7 +777,7 @@ subroutine init_fwbs_variables vdewin = 0.0D0 vfshld = 0.25D0 vol_blkt_total = 0.0D0 - volblkti = 0.0D0 + vol_blkt_inboard = 0.0D0 volblkto = 0.0D0 volshld = 0.0D0 whtshld = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index a106d61d6e..855272df27 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -7972,7 +7972,7 @@ "vol_w_fw_ib": 0.0, "vol_w_fw_ob": 0.0, "vol_blkt_total": 0.0, - "volblkti": 0.0, + "vol_blkt_inboard": 0.0, "volblkto": 0.0, "vol_fw_total": 0.0, "volheat": 0.0, @@ -11081,7 +11081,7 @@ "vol_w_fw_ib": "", "vol_w_fw_ob": "", "vol_blkt_total": "volume of blanket (m3)", - "volblkti": "volume of inboard blanket (m3)", + "vol_blkt_inboard": "volume of inboard blanket (m3)", "volblkto": "volume of outboard blanket (m3)", "vol_fw_total": "First wall volume [m3]", "volheat": "volumetric heat of vaporization (J/m3)", @@ -18120,7 +18120,7 @@ "vdewin", "vfshld", "vol_blkt_total", - "volblkti", + "vol_blkt_inboard", "volblkto", "volshld", "whtshld", diff --git a/tests/unit/test_blanket_library.py b/tests/unit/test_blanket_library.py index 32dd3ce740..074ab9ecbe 100644 --- a/tests/unit/test_blanket_library.py +++ b/tests/unit/test_blanket_library.py @@ -504,7 +504,7 @@ class DshapedComponentParam(NamedTuple): dr_vv_outboard: Any = None dz_vv_upper: Any = None dz_vv_lower: Any = None - volblkti: Any = None + vol_blkt_inboard: Any = None volblkto: Any = None vol_blkt_total: Any = None volshld: Any = None @@ -561,7 +561,7 @@ class DshapedComponentParam(NamedTuple): dr_vv_outboard=0.30000000000000004, dz_vv_upper=0.30000000000000004, dz_vv_lower=0.30000000000000004, - volblkti=0, + vol_blkt_inboard=0, volblkto=0, vol_blkt_total=0, volshld=0, @@ -614,7 +614,7 @@ class DshapedComponentParam(NamedTuple): dr_vv_outboard=0.30000000000000004, dz_vv_upper=0.30000000000000004, dz_vv_lower=0.30000000000000004, - volblkti=0, + vol_blkt_inboard=0, volblkto=691.06561956756764, vol_blkt_total=691.06561956756764, volshld=0, @@ -667,7 +667,7 @@ class DshapedComponentParam(NamedTuple): dr_vv_outboard=0.30000000000000004, dz_vv_upper=0.30000000000000004, dz_vv_lower=0.30000000000000004, - volblkti=0, + vol_blkt_inboard=0, volblkto=691.06561956756764, vol_blkt_total=691.06561956756764, volshld=450.46122947809488, @@ -765,7 +765,9 @@ def test_dshaped_component(dshapedcomponentparam, monkeypatch, blanket_library_f monkeypatch.setattr( build_variables, "dz_vv_lower", dshapedcomponentparam.dz_vv_lower ) - monkeypatch.setattr(fwbs_variables, "volblkti", dshapedcomponentparam.volblkti) + monkeypatch.setattr( + fwbs_variables, "vol_blkt_inboard", dshapedcomponentparam.vol_blkt_inboard + ) monkeypatch.setattr(fwbs_variables, "volblkto", dshapedcomponentparam.volblkto) monkeypatch.setattr( fwbs_variables, "vol_blkt_total", dshapedcomponentparam.vol_blkt_total @@ -819,7 +821,7 @@ class EllipticalComponentParam(NamedTuple): dr_vv_outboard: Any = None dz_vv_upper: Any = None dz_vv_lower: Any = None - volblkti: Any = None + vol_blkt_inboard: Any = None volblkto: Any = None vol_blkt_total: Any = None volshld: Any = None @@ -841,7 +843,7 @@ class EllipticalComponentParam(NamedTuple): expected_shareaib: Any = None expected_shareaob: Any = None expected_sharea: Any = None - expected_volblkti: Any = None + expected_vol_blkt_inboard: Any = None expected_volblkto: Any = None expected_volblkt: Any = None expected_volshld: Any = None @@ -875,7 +877,7 @@ class EllipticalComponentParam(NamedTuple): dr_vv_outboard=0.30000000000000004, dz_vv_upper=0.30000000000000004, dz_vv_lower=0.30000000000000004, - volblkti=0, + vol_blkt_inboard=0, volblkto=0, vol_blkt_total=0, volshld=0, @@ -897,7 +899,7 @@ class EllipticalComponentParam(NamedTuple): expected_shareaib=0, expected_shareaob=0, expected_sharea=0, - expected_volblkti=315.83946385183026, + expected_vol_blkt_inboard=315.83946385183026, expected_volblkto=1020.3677420460117, expected_volblkt=1336.207205897842, expected_volshld=0, @@ -927,7 +929,7 @@ class EllipticalComponentParam(NamedTuple): dr_vv_outboard=0.30000000000000004, dz_vv_upper=0.30000000000000004, dz_vv_lower=0.30000000000000004, - volblkti=315.83946385183026, + vol_blkt_inboard=315.83946385183026, volblkto=1020.3677420460117, vol_blkt_total=1336.207205897842, volshld=0, @@ -949,7 +951,7 @@ class EllipticalComponentParam(NamedTuple): expected_shareaib=700.06731267447844, expected_shareaob=1344.1106481995357, expected_sharea=2044.1779608740142, - expected_volblkti=315.83946385183026, + expected_vol_blkt_inboard=315.83946385183026, expected_volblkto=1020.3677420460117, expected_volblkt=1336.207205897842, expected_volshld=1124.4621612595051, @@ -979,7 +981,7 @@ class EllipticalComponentParam(NamedTuple): dr_vv_outboard=0.30000000000000004, dz_vv_upper=0.30000000000000004, dz_vv_lower=0.30000000000000004, - volblkti=315.83946385183026, + vol_blkt_inboard=315.83946385183026, volblkto=1020.3677420460117, vol_blkt_total=1336.207205897842, volshld=1124.4621612595051, @@ -1001,7 +1003,7 @@ class EllipticalComponentParam(NamedTuple): expected_shareaib=700.06731267447844, expected_shareaob=1344.1106481995357, expected_sharea=2044.1779608740142, - expected_volblkti=315.83946385183026, + expected_vol_blkt_inboard=315.83946385183026, expected_volblkto=1020.3677420460117, expected_volblkt=1336.207205897842, expected_volshld=1124.4621612595051, @@ -1066,7 +1068,9 @@ def test_elliptical_component( monkeypatch.setattr( build_variables, "dz_vv_lower", ellipticalcomponentparam.dz_vv_lower ) - monkeypatch.setattr(fwbs_variables, "volblkti", ellipticalcomponentparam.volblkti) + monkeypatch.setattr( + fwbs_variables, "vol_blkt_inboard", ellipticalcomponentparam.vol_blkt_inboard + ) monkeypatch.setattr(fwbs_variables, "volblkto", ellipticalcomponentparam.volblkto) monkeypatch.setattr( fwbs_variables, "vol_blkt_total", ellipticalcomponentparam.vol_blkt_total @@ -1104,8 +1108,8 @@ def test_elliptical_component( assert build_variables.sharea == pytest.approx( ellipticalcomponentparam.expected_sharea ) - assert fwbs_variables.volblkti == pytest.approx( - ellipticalcomponentparam.expected_volblkti + assert fwbs_variables.vol_blkt_inboard == pytest.approx( + ellipticalcomponentparam.expected_vol_blkt_inboard ) assert fwbs_variables.volblkto == pytest.approx( ellipticalcomponentparam.expected_volblkto @@ -1143,7 +1147,7 @@ class ApplyCoverageFactorsParam(NamedTuple): fdiv: Any = None fhcd: Any = None volblkto: Any = None - volblkti: Any = None + vol_blkt_inboard: Any = None vol_blkt_total: Any = None fvolsi: Any = None fvolso: Any = None @@ -1177,7 +1181,7 @@ class ApplyCoverageFactorsParam(NamedTuple): fdiv=0.115, fhcd=0, volblkto=1020.3677420460117, - volblkti=315.83946385183026, + vol_blkt_inboard=315.83946385183026, vol_blkt_total=1336.207205897842, fvolsi=1, fvolso=0.64000000000000001, @@ -1222,7 +1226,9 @@ def test_apply_coverage_factors( monkeypatch.setattr(fwbs_variables, "fdiv", applycoveragefactorsparam.fdiv) monkeypatch.setattr(fwbs_variables, "fhcd", applycoveragefactorsparam.fhcd) monkeypatch.setattr(fwbs_variables, "volblkto", applycoveragefactorsparam.volblkto) - monkeypatch.setattr(fwbs_variables, "volblkti", applycoveragefactorsparam.volblkti) + monkeypatch.setattr( + fwbs_variables, "vol_blkt_inboard", applycoveragefactorsparam.vol_blkt_inboard + ) monkeypatch.setattr( fwbs_variables, "vol_blkt_total", applycoveragefactorsparam.vol_blkt_total ) diff --git a/tests/unit/test_ccfe_hcpb.py b/tests/unit/test_ccfe_hcpb.py index 63a6d1c4e7..365fcc5ad9 100644 --- a/tests/unit/test_ccfe_hcpb.py +++ b/tests/unit/test_ccfe_hcpb.py @@ -1457,7 +1457,7 @@ class ComponentMassesParam(NamedTuple): fw_armour_thickness: Any = None fw_armour_mass: Any = None armour_fw_bl_mass: Any = None - volblkti: Any = None + vol_blkt_inboard: Any = None volblkto: Any = None i_blkt_inboard: Any = None fblhebmi: Any = None @@ -1548,7 +1548,7 @@ class ComponentMassesParam(NamedTuple): fw_armour_thickness=0.0050000000000000001, fw_armour_mass=0, armour_fw_bl_mass=0, - volblkti=315.83946385183026, + vol_blkt_inboard=315.83946385183026, volblkto=866.70391336775992, i_blkt_inboard=1, fblhebmi=0.40000000000000002, @@ -1680,7 +1680,9 @@ def test_component_masses(componentmassesparam, monkeypatch, ccfe_hcpb): monkeypatch.setattr( fwbs_variables, "armour_fw_bl_mass", componentmassesparam.armour_fw_bl_mass ) - monkeypatch.setattr(fwbs_variables, "volblkti", componentmassesparam.volblkti) + monkeypatch.setattr( + fwbs_variables, "vol_blkt_inboard", componentmassesparam.vol_blkt_inboard + ) monkeypatch.setattr(fwbs_variables, "volblkto", componentmassesparam.volblkto) monkeypatch.setattr( fwbs_variables, "i_blkt_inboard", componentmassesparam.i_blkt_inboard diff --git a/tests/unit/test_dcll.py b/tests/unit/test_dcll.py index 1955198bfe..499a8c3ae7 100644 --- a/tests/unit/test_dcll.py +++ b/tests/unit/test_dcll.py @@ -310,7 +310,7 @@ class DcllMassesParam(NamedTuple): vol_blkt_total: Any = None - volblkti: Any = None + vol_blkt_inboard: Any = None volblkto: Any = None @@ -535,7 +535,7 @@ class DcllMassesParam(NamedTuple): a_plasma_surface_outboard=949.22962703393853, i_blkt_inboard=1, vol_blkt_total=1397.9003011502937, - volblkti=401.90579863726225, + vol_blkt_inboard=401.90579863726225, volblkto=995.99450251303142, whtblkt=0, m_fw_total=0, @@ -654,7 +654,7 @@ class DcllMassesParam(NamedTuple): a_plasma_surface_outboard=949.22962703393853, i_blkt_inboard=1, vol_blkt_total=1400.4860764869636, - volblkti=402.02180553751157, + vol_blkt_inboard=402.02180553751157, volblkto=998.46427094945204, whtblkt=10654509.24412049, m_fw_total=193353.16636179245, @@ -817,7 +817,9 @@ def test_dcll_masses(dcllmassesparam, monkeypatch, dcll): fwbs_variables, "vol_blkt_total", dcllmassesparam.vol_blkt_total ) - monkeypatch.setattr(fwbs_variables, "volblkti", dcllmassesparam.volblkti) + monkeypatch.setattr( + fwbs_variables, "vol_blkt_inboard", dcllmassesparam.vol_blkt_inboard + ) monkeypatch.setattr(fwbs_variables, "volblkto", dcllmassesparam.volblkto) From 5d9183e0755de78493d3b2ba9ba0ea9961c2bb39 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 17 Feb 2025 13:25:22 +0000 Subject: [PATCH 09/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20`volblkto`=20to?= =?UTF-8?q?=20`vol=5Fblkt=5Foutboard`=20for=20clarity=20and=20consistency?= =?UTF-8?q?=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/blanket_library.py | 20 +++++----- process/dcll.py | 26 ++++++------ process/stellarator.py | 18 ++++----- source/fortran/fwbs_variables.f90 | 4 +- tests/integration/ref_dicts.json | 6 +-- tests/unit/test_blanket_library.py | 64 ++++++++++++++++-------------- tests/unit/test_ccfe_hcpb.py | 8 ++-- tests/unit/test_dcll.py | 10 +++-- 8 files changed, 83 insertions(+), 73 deletions(-) diff --git a/process/blanket_library.py b/process/blanket_library.py index 38ebfef6ed..8ba1d430a1 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -193,7 +193,7 @@ def dshaped_component(self, icomponent: int): if icomponent == 0: ( fwbs_variables.vol_blkt_inboard, - fwbs_variables.volblkto, + fwbs_variables.vol_blkt_outboard, fwbs_variables.vol_blkt_total, ) = dshellvol( r1, @@ -283,7 +283,7 @@ def elliptical_component(self, icomponent: int): if icomponent == 0: ( fwbs_variables.vol_blkt_inboard, - fwbs_variables.volblkto, + fwbs_variables.vol_blkt_outboard, fwbs_variables.vol_blkt_total, ) = eshellvol( r1, @@ -346,13 +346,13 @@ def apply_coverage_factors(self): build_variables.blarea = build_variables.blareaib + build_variables.blareaob - fwbs_variables.volblkto = ( + fwbs_variables.vol_blkt_outboard = ( fwbs_variables.vol_blkt_total * (1.0 - fwbs_variables.fdiv - fwbs_variables.fhcd) - fwbs_variables.vol_blkt_inboard ) fwbs_variables.vol_blkt_total = ( - fwbs_variables.vol_blkt_inboard + fwbs_variables.volblkto + fwbs_variables.vol_blkt_inboard + fwbs_variables.vol_blkt_outboard ) # Apply shield coverage factors @@ -794,7 +794,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): # coolant frac and channel dimensions # Assumes up/down flow, two 90 deg bends per length blanket_library.npblkto = ( - fwbs_variables.vfblkt * fwbs_variables.volblkto + fwbs_variables.vfblkt * fwbs_variables.vol_blkt_outboard ) / ( np.pi * fwbs_variables.radius_fw_channel @@ -867,7 +867,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): # coolant frac and channel dimensions # Assumes up/down flow, two 90 deg bends per length blanket_library.npblkto = ( - fwbs_variables.vfblkt * fwbs_variables.volblkto + fwbs_variables.vfblkt * fwbs_variables.vol_blkt_outboard ) / ( np.pi * fwbs_variables.radius_fw_channel @@ -954,7 +954,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): # Calculate total number of pipes (in all outboard modules) from coolant fraction and # channel dimensions (assumes up/down flow, two 90 deg bends per length) blanket_library.npblkto = ( - fwbs_variables.vfblkt * fwbs_variables.volblkto + fwbs_variables.vfblkt * fwbs_variables.vol_blkt_outboard ) / ( np.pi * fwbs_variables.radius_fw_channel @@ -1575,7 +1575,7 @@ def thermo_hydraulic_model(self, output: bool): # Neutron power deposited in outboard blanket (MW) blanket_library.pnucblkto = ( fwbs_variables.pnucblkt - * fwbs_variables.volblkto + * fwbs_variables.vol_blkt_outboard / fwbs_variables.vol_blkt_total ) @@ -1596,9 +1596,9 @@ def thermo_hydraulic_model(self, output: bool): ) pnucblkto_struct = ( fwbs_variables.pnucblkt * fwbs_variables.f_nuc_pow_bz_struct - ) * (fwbs_variables.volblkto / fwbs_variables.vol_blkt_total) + ) * (fwbs_variables.vol_blkt_outboard / fwbs_variables.vol_blkt_total) pnucblkto_liq = (fwbs_variables.pnucblkt * f_nuc_pow_bz_liq) * ( - fwbs_variables.volblkto / fwbs_variables.vol_blkt_total + fwbs_variables.vol_blkt_outboard / fwbs_variables.vol_blkt_total ) # FW and BB Mass Flow ########### diff --git a/process/dcll.py b/process/dcll.py index b7072133e2..bbe7887364 100644 --- a/process/dcll.py +++ b/process/dcll.py @@ -513,7 +513,7 @@ def dcll_masses(self, output: bool): * (1 - fwbs_variables.r_f_liq_ib) / build_variables.dr_blkt_inboard ) + ( - fwbs_variables.volblkto + fwbs_variables.vol_blkt_outboard * (dcll_module.bz_r_ob * (1 - fwbs_variables.r_f_liq_ob)) / build_variables.dr_blkt_outboard ) @@ -528,7 +528,7 @@ def dcll_masses(self, output: bool): * fwbs_variables.r_f_liq_ib / build_variables.dr_blkt_inboard ) + ( - fwbs_variables.volblkto + fwbs_variables.vol_blkt_outboard * dcll_module.bz_r_ob * fwbs_variables.r_f_liq_ob / build_variables.dr_blkt_outboard @@ -540,7 +540,7 @@ def dcll_masses(self, output: bool): / build_variables.dr_blkt_inboard ) dcll_module.vol_bz_liq_ob = ( - fwbs_variables.volblkto + fwbs_variables.vol_blkt_outboard * dcll_module.bz_r_ob * fwbs_variables.r_f_liq_ob / build_variables.dr_blkt_outboard @@ -552,7 +552,7 @@ def dcll_masses(self, output: bool): * dcll_module.r_fci / build_variables.dr_blkt_inboard ) + ( - fwbs_variables.volblkto + fwbs_variables.vol_blkt_outboard * dcll_module.r_fci / build_variables.dr_blkt_outboard ) @@ -563,7 +563,7 @@ def dcll_masses(self, output: bool): * dcll_module.r_backwall / build_variables.dr_blkt_inboard ) + ( - fwbs_variables.volblkto + fwbs_variables.vol_blkt_outboard * dcll_module.r_backwall / build_variables.dr_blkt_outboard ) @@ -574,7 +574,7 @@ def dcll_masses(self, output: bool): * build_variables.blbmith / build_variables.dr_blkt_inboard ) + ( - fwbs_variables.volblkto + fwbs_variables.vol_blkt_outboard * build_variables.blbmoth / build_variables.dr_blkt_outboard ) @@ -584,7 +584,7 @@ def dcll_masses(self, output: bool): # BZ dcll_module.vol_bz_struct = ( - fwbs_variables.volblkto + fwbs_variables.vol_blkt_outboard * dcll_module.bz_r_ob * (1 - fwbs_variables.r_f_liq_ob) / build_variables.dr_blkt_outboard @@ -595,34 +595,34 @@ def dcll_masses(self, output: bool): ) / fwbs_variables.vol_blkt_total dcll_module.vol_bz_liq = ( - fwbs_variables.volblkto + fwbs_variables.vol_blkt_outboard * dcll_module.bz_r_ob * fwbs_variables.r_f_liq_ob / build_variables.dr_blkt_outboard ) dcll_module.vol_bz_liq_ob = ( - fwbs_variables.volblkto + fwbs_variables.vol_blkt_outboard * dcll_module.bz_r_ob * fwbs_variables.r_f_liq_ob / build_variables.dr_blkt_outboard ) if fwbs_variables.ifci > 0: dcll_module.vol_fci = ( - fwbs_variables.volblkto + fwbs_variables.vol_blkt_outboard * dcll_module.r_fci / build_variables.dr_blkt_outboard ) # Back Wall dcll_module.vol_bw = ( - fwbs_variables.volblkto + fwbs_variables.vol_blkt_outboard * dcll_module.r_backwall / build_variables.dr_blkt_outboard ) # Manifold/BSS dcll_module.vol_bss = ( - fwbs_variables.volblkto + fwbs_variables.vol_blkt_outboard * build_variables.blbmoth / build_variables.dr_blkt_outboard ) @@ -735,7 +735,7 @@ def dcll_masses(self, output: bool): dcll_module.mass_segm_ob = ( fwbs_variables.whtblkt - * (fwbs_variables.volblkto / fwbs_variables.vol_blkt_total) + * (fwbs_variables.vol_blkt_outboard / fwbs_variables.vol_blkt_total) + fwbs_variables.m_fw_total * ( build_variables.a_fw_outboard diff --git a/process/stellarator.py b/process/stellarator.py index 7ef7d60e1c..0daf852b08 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -1153,11 +1153,11 @@ def stfwbs(self, output: bool): fwbs_variables.vol_blkt_inboard = ( build_variables.blareaib * build_variables.dr_blkt_inboard ) - fwbs_variables.volblkto = ( + fwbs_variables.vol_blkt_outboard = ( build_variables.blareaob * build_variables.dr_blkt_outboard ) fwbs_variables.vol_blkt_total = ( - fwbs_variables.vol_blkt_inboard + fwbs_variables.volblkto + fwbs_variables.vol_blkt_inboard + fwbs_variables.vol_blkt_outboard ) # Shield volume @@ -1650,7 +1650,7 @@ def stfwbs(self, output: bool): + build_variables.blbmith * (1.0e0 - fwbs_variables.fblhebmi) + build_variables.blbpith * (1.0e0 - fwbs_variables.fblhebpi) ) - + fwbs_variables.volblkto + + fwbs_variables.vol_blkt_outboard / build_variables.dr_blkt_outboard * ( build_variables.blbuoth * fwbs_variables.fblss @@ -1668,7 +1668,7 @@ def stfwbs(self, output: bool): / build_variables.dr_blkt_inboard ) + ( - fwbs_variables.volblkto + fwbs_variables.vol_blkt_outboard * build_variables.blbuoth / build_variables.dr_blkt_outboard ) @@ -1684,7 +1684,7 @@ def stfwbs(self, output: bool): / build_variables.dr_blkt_inboard ) + ( - fwbs_variables.volblkto + fwbs_variables.vol_blkt_outboard * build_variables.blbuoth / build_variables.dr_blkt_outboard ) @@ -1715,7 +1715,7 @@ def stfwbs(self, output: bool): ) fwbs_variables.vfblkt = ( fwbs_variables.vfblkt - + fwbs_variables.volblkto + + fwbs_variables.vol_blkt_outboard / fwbs_variables.vol_blkt_total * ( # outboard portion (build_variables.blbuoth / build_variables.dr_blkt_outboard) @@ -2206,12 +2206,12 @@ def stfwbs(self, output: bool): # if (fwbs_variables.blktmodel == 0) : # if ((fwbs_variables.blkttype == 1)or(fwbs_variables.blkttype == 2)) : - # po.write(self.outfile,601) vol_blkt_inboard, volblkto, vol_blkt_total, whtblkt, vfblkt, fbllipb, wtbllipb, fblli, whtblli, fblss, whtblss, fblvd, whtblvd, volshldi, volshldo, volshld, whtshld, vfshld, fwbs_variables.wpenshld + # po.write(self.outfile,601) vol_blkt_inboard, vol_blkt_outboard, vol_blkt_total, whtblkt, vfblkt, fbllipb, wtbllipb, fblli, whtblli, fblss, whtblss, fblvd, whtblvd, volshldi, volshldo, volshld, whtshld, vfshld, fwbs_variables.wpenshld # else: # (also if ipowerflow=0) - # po.write(self.outfile,600) vol_blkt_inboard, volblkto, vol_blkt_total, whtblkt, vfblkt, fblbe, whtblbe, fblli2o, wtblli2o, fblss, whtblss, fblvd, whtblvd, volshldi, volshldo, volshld, whtshld, vfshld, fwbs_variables.wpenshld + # po.write(self.outfile,600) vol_blkt_inboard, vol_blkt_outboard, vol_blkt_total, whtblkt, vfblkt, fblbe, whtblbe, fblli2o, wtblli2o, fblss, whtblss, fblvd, whtblvd, volshldi, volshldo, volshld, whtshld, vfshld, fwbs_variables.wpenshld # else: - # po.write(self.outfile,602) vol_blkt_inboard, volblkto, vol_blkt_total, whtblkt, vfblkt, (fwbs_variables.vol_blkt_inboard/fwbs_variables.vol_blkt_total * build_variables.blbuith/build_variables.dr_blkt_inboard + fwbs_variables.volblkto/fwbs_variables.vol_blkt_total * build_variables.blbuoth/build_variables.dr_blkt_outboard) * fblbe, whtblbe, (fwbs_variables.vol_blkt_inboard/fwbs_variables.vol_blkt_total * build_variables.blbuith/build_variables.dr_blkt_inboard + fwbs_variables.volblkto/fwbs_variables.vol_blkt_total * build_variables.blbuoth/build_variables.dr_blkt_outboard) * fblbreed, whtblbreed, fwbs_variables.vol_blkt_inboard/fwbs_variables.vol_blkt_total/build_variables.dr_blkt_inboard * (build_variables.blbuith * fwbs_variables.fblss + build_variables.blbmith * (1.0e0-fwbs_variables.fblhebmi) + build_variables.blbpith * (1.0e0-fwbs_variables.fblhebpi)) + fwbs_variables.volblkto/fwbs_variables.vol_blkt_total/build_variables.dr_blkt_outboard * (build_variables.blbuoth * fwbs_variables.fblss + build_variables.blbmoth * (1.0e0-fwbs_variables.fblhebmo) + build_variables.blbpoth * (1.0e0-fwbs_variables.fblhebpo)), whtblss, volshldi, volshldo, volshld, whtshld, vfshld, fwbs_variables.wpenshld + # po.write(self.outfile,602) vol_blkt_inboard, vol_blkt_outboard, vol_blkt_total, whtblkt, vfblkt, (fwbs_variables.vol_blkt_inboard/fwbs_variables.vol_blkt_total * build_variables.blbuith/build_variables.dr_blkt_inboard + fwbs_variables.vol_blkt_outboard/fwbs_variables.vol_blkt_total * build_variables.blbuoth/build_variables.dr_blkt_outboard) * fblbe, whtblbe, (fwbs_variables.vol_blkt_inboard/fwbs_variables.vol_blkt_total * build_variables.blbuith/build_variables.dr_blkt_inboard + fwbs_variables.vol_blkt_outboard/fwbs_variables.vol_blkt_total * build_variables.blbuoth/build_variables.dr_blkt_outboard) * fblbreed, whtblbreed, fwbs_variables.vol_blkt_inboard/fwbs_variables.vol_blkt_total/build_variables.dr_blkt_inboard * (build_variables.blbuith * fwbs_variables.fblss + build_variables.blbmith * (1.0e0-fwbs_variables.fblhebmi) + build_variables.blbpith * (1.0e0-fwbs_variables.fblhebpi)) + fwbs_variables.vol_blkt_outboard/fwbs_variables.vol_blkt_total/build_variables.dr_blkt_outboard * (build_variables.blbuoth * fwbs_variables.fblss + build_variables.blbmoth * (1.0e0-fwbs_variables.fblhebmo) + build_variables.blbpoth * (1.0e0-fwbs_variables.fblhebpo)), whtblss, volshldi, volshldo, volshld, whtshld, vfshld, fwbs_variables.wpenshld # 600 format( t32,'volume (m3)',t45,'vol fraction',t62,'weight (kg)'/ t32,'-----------',t45,'------------',t62,'-----------'/ ' Inboard blanket' ,t32,1pe10.3,/ ' Outboard blanket' ,t32,1pe10.3,/ ' Total blanket' ,t32,1pe10.3,t62,1pe10.3/ ' Void fraction' ,t45,1pe10.3,/ ' Blanket Be ',t45,1pe10.3,t62,1pe10.3/ ' Blanket Li2O ',t45,1pe10.3,t62,1pe10.3/ ' Blanket ss ',t45,1pe10.3,t62,1pe10.3/ ' Blanket Vd ',t45,1pe10.3,t62,1pe10.3/ ' Inboard shield' ,t32,1pe10.3,/ ' Outboard shield' ,t32,1pe10.3,/ ' Primary shield',t32,1pe10.3,t62,1pe10.3/ ' Void fraction' ,t45,1pe10.3,/ ' Penetration shield' ,t62,1pe10.3) diff --git a/source/fortran/fwbs_variables.f90 b/source/fortran/fwbs_variables.f90 index 6a4fd8fbcd..812c3ad6d9 100644 --- a/source/fortran/fwbs_variables.f90 +++ b/source/fortran/fwbs_variables.f90 @@ -441,7 +441,7 @@ module fwbs_variables real(dp) :: vol_blkt_inboard !! volume of inboard blanket [m^3] - real(dp) :: volblkto + real(dp) :: vol_blkt_outboard !! volume of outboard blanket [m^3] real(dp) :: volshld @@ -778,7 +778,7 @@ subroutine init_fwbs_variables vfshld = 0.25D0 vol_blkt_total = 0.0D0 vol_blkt_inboard = 0.0D0 - volblkto = 0.0D0 + vol_blkt_outboard = 0.0D0 volshld = 0.0D0 whtshld = 0.0D0 wpenshld = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 855272df27..735b3ef2d0 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -7973,7 +7973,7 @@ "vol_w_fw_ob": 0.0, "vol_blkt_total": 0.0, "vol_blkt_inboard": 0.0, - "volblkto": 0.0, + "vol_blkt_outboard": 0.0, "vol_fw_total": 0.0, "volheat": 0.0, "volnucb": 0.0, @@ -11082,7 +11082,7 @@ "vol_w_fw_ob": "", "vol_blkt_total": "volume of blanket (m3)", "vol_blkt_inboard": "volume of inboard blanket (m3)", - "volblkto": "volume of outboard blanket (m3)", + "vol_blkt_outboard": "volume of outboard blanket (m3)", "vol_fw_total": "First wall volume [m3]", "volheat": "volumetric heat of vaporization (J/m3)", "volnucb": "sum of nuclear buildings volumes (m3)", @@ -18121,7 +18121,7 @@ "vfshld", "vol_blkt_total", "vol_blkt_inboard", - "volblkto", + "vol_blkt_outboard", "volshld", "whtshld", "wpenshld", diff --git a/tests/unit/test_blanket_library.py b/tests/unit/test_blanket_library.py index 074ab9ecbe..4bf506e2ef 100644 --- a/tests/unit/test_blanket_library.py +++ b/tests/unit/test_blanket_library.py @@ -505,7 +505,7 @@ class DshapedComponentParam(NamedTuple): dz_vv_upper: Any = None dz_vv_lower: Any = None vol_blkt_inboard: Any = None - volblkto: Any = None + vol_blkt_outboard: Any = None vol_blkt_total: Any = None volshld: Any = None vdewin: Any = None @@ -524,7 +524,7 @@ class DshapedComponentParam(NamedTuple): expected_shareaib: Any = None expected_shareaob: Any = None expected_sharea: Any = None - expected_volblkto: Any = None + expected_vol_blkt_outboard: Any = None expected_volblkt: Any = None expected_volshld: Any = None expected_vdewin: Any = None @@ -562,7 +562,7 @@ class DshapedComponentParam(NamedTuple): dz_vv_upper=0.30000000000000004, dz_vv_lower=0.30000000000000004, vol_blkt_inboard=0, - volblkto=0, + vol_blkt_outboard=0, vol_blkt_total=0, volshld=0, vdewin=0, @@ -581,7 +581,7 @@ class DshapedComponentParam(NamedTuple): expected_shareaib=0, expected_shareaob=0, expected_sharea=0, - expected_volblkto=691.06561956756764, + expected_vol_blkt_outboard=691.06561956756764, expected_volblkt=691.06561956756764, expected_volshld=0, expected_vdewin=0, @@ -615,7 +615,7 @@ class DshapedComponentParam(NamedTuple): dz_vv_upper=0.30000000000000004, dz_vv_lower=0.30000000000000004, vol_blkt_inboard=0, - volblkto=691.06561956756764, + vol_blkt_outboard=691.06561956756764, vol_blkt_total=691.06561956756764, volshld=0, vdewin=0, @@ -634,7 +634,7 @@ class DshapedComponentParam(NamedTuple): expected_shareaib=208.91591146372122, expected_shareaob=1013.8483589087293, expected_sharea=1222.7642703724505, - expected_volblkto=691.06561956756764, + expected_vol_blkt_outboard=691.06561956756764, expected_volblkt=691.06561956756764, expected_volshld=450.46122947809488, expected_vdewin=0, @@ -668,7 +668,7 @@ class DshapedComponentParam(NamedTuple): dz_vv_upper=0.30000000000000004, dz_vv_lower=0.30000000000000004, vol_blkt_inboard=0, - volblkto=691.06561956756764, + vol_blkt_outboard=691.06561956756764, vol_blkt_total=691.06561956756764, volshld=450.46122947809488, vdewin=0, @@ -687,7 +687,7 @@ class DshapedComponentParam(NamedTuple): expected_shareaib=208.91591146372122, expected_shareaob=1013.8483589087293, expected_sharea=1222.7642703724505, - expected_volblkto=691.06561956756764, + expected_vol_blkt_outboard=691.06561956756764, expected_volblkt=691.06561956756764, expected_volshld=450.46122947809488, expected_vdewin=340.45369594344834, @@ -768,7 +768,9 @@ def test_dshaped_component(dshapedcomponentparam, monkeypatch, blanket_library_f monkeypatch.setattr( fwbs_variables, "vol_blkt_inboard", dshapedcomponentparam.vol_blkt_inboard ) - monkeypatch.setattr(fwbs_variables, "volblkto", dshapedcomponentparam.volblkto) + monkeypatch.setattr( + fwbs_variables, "vol_blkt_outboard", dshapedcomponentparam.vol_blkt_outboard + ) monkeypatch.setattr( fwbs_variables, "vol_blkt_total", dshapedcomponentparam.vol_blkt_total ) @@ -794,8 +796,8 @@ def test_dshaped_component(dshapedcomponentparam, monkeypatch, blanket_library_f assert build_variables.blarea == pytest.approx( dshapedcomponentparam.expected_blarea ) - assert fwbs_variables.volblkto == pytest.approx( - dshapedcomponentparam.expected_volblkto + assert fwbs_variables.vol_blkt_outboard == pytest.approx( + dshapedcomponentparam.expected_vol_blkt_outboard ) assert fwbs_variables.vol_blkt_total == pytest.approx( dshapedcomponentparam.expected_volblkt @@ -822,7 +824,7 @@ class EllipticalComponentParam(NamedTuple): dz_vv_upper: Any = None dz_vv_lower: Any = None vol_blkt_inboard: Any = None - volblkto: Any = None + vol_blkt_outboard: Any = None vol_blkt_total: Any = None volshld: Any = None vdewin: Any = None @@ -844,7 +846,7 @@ class EllipticalComponentParam(NamedTuple): expected_shareaob: Any = None expected_sharea: Any = None expected_vol_blkt_inboard: Any = None - expected_volblkto: Any = None + expected_vol_blkt_outboard: Any = None expected_volblkt: Any = None expected_volshld: Any = None expected_vdewin: Any = None @@ -878,7 +880,7 @@ class EllipticalComponentParam(NamedTuple): dz_vv_upper=0.30000000000000004, dz_vv_lower=0.30000000000000004, vol_blkt_inboard=0, - volblkto=0, + vol_blkt_outboard=0, vol_blkt_total=0, volshld=0, vdewin=0, @@ -900,7 +902,7 @@ class EllipticalComponentParam(NamedTuple): expected_shareaob=0, expected_sharea=0, expected_vol_blkt_inboard=315.83946385183026, - expected_volblkto=1020.3677420460117, + expected_vol_blkt_outboard=1020.3677420460117, expected_volblkt=1336.207205897842, expected_volshld=0, expected_vdewin=0, @@ -930,7 +932,7 @@ class EllipticalComponentParam(NamedTuple): dz_vv_upper=0.30000000000000004, dz_vv_lower=0.30000000000000004, vol_blkt_inboard=315.83946385183026, - volblkto=1020.3677420460117, + vol_blkt_outboard=1020.3677420460117, vol_blkt_total=1336.207205897842, volshld=0, vdewin=0, @@ -952,7 +954,7 @@ class EllipticalComponentParam(NamedTuple): expected_shareaob=1344.1106481995357, expected_sharea=2044.1779608740142, expected_vol_blkt_inboard=315.83946385183026, - expected_volblkto=1020.3677420460117, + expected_vol_blkt_outboard=1020.3677420460117, expected_volblkt=1336.207205897842, expected_volshld=1124.4621612595051, expected_vdewin=0, @@ -982,7 +984,7 @@ class EllipticalComponentParam(NamedTuple): dz_vv_upper=0.30000000000000004, dz_vv_lower=0.30000000000000004, vol_blkt_inboard=315.83946385183026, - volblkto=1020.3677420460117, + vol_blkt_outboard=1020.3677420460117, vol_blkt_total=1336.207205897842, volshld=1124.4621612595051, vdewin=0, @@ -1004,7 +1006,7 @@ class EllipticalComponentParam(NamedTuple): expected_shareaob=1344.1106481995357, expected_sharea=2044.1779608740142, expected_vol_blkt_inboard=315.83946385183026, - expected_volblkto=1020.3677420460117, + expected_vol_blkt_outboard=1020.3677420460117, expected_volblkt=1336.207205897842, expected_volshld=1124.4621612595051, expected_vdewin=584.07334775041659, @@ -1071,7 +1073,9 @@ def test_elliptical_component( monkeypatch.setattr( fwbs_variables, "vol_blkt_inboard", ellipticalcomponentparam.vol_blkt_inboard ) - monkeypatch.setattr(fwbs_variables, "volblkto", ellipticalcomponentparam.volblkto) + monkeypatch.setattr( + fwbs_variables, "vol_blkt_outboard", ellipticalcomponentparam.vol_blkt_outboard + ) monkeypatch.setattr( fwbs_variables, "vol_blkt_total", ellipticalcomponentparam.vol_blkt_total ) @@ -1111,8 +1115,8 @@ def test_elliptical_component( assert fwbs_variables.vol_blkt_inboard == pytest.approx( ellipticalcomponentparam.expected_vol_blkt_inboard ) - assert fwbs_variables.volblkto == pytest.approx( - ellipticalcomponentparam.expected_volblkto + assert fwbs_variables.vol_blkt_outboard == pytest.approx( + ellipticalcomponentparam.expected_vol_blkt_outboard ) assert fwbs_variables.vol_blkt_total == pytest.approx( ellipticalcomponentparam.expected_volblkt @@ -1146,7 +1150,7 @@ class ApplyCoverageFactorsParam(NamedTuple): sharea: Any = None fdiv: Any = None fhcd: Any = None - volblkto: Any = None + vol_blkt_outboard: Any = None vol_blkt_inboard: Any = None vol_blkt_total: Any = None fvolsi: Any = None @@ -1161,7 +1165,7 @@ class ApplyCoverageFactorsParam(NamedTuple): expected_blarea: Any = None expected_shareaob: Any = None expected_sharea: Any = None - expected_volblkto: Any = None + expected_vol_blkt_outboard: Any = None expected_volblkt: Any = None expected_volshld: Any = None expected_vdewin: Any = None @@ -1180,7 +1184,7 @@ class ApplyCoverageFactorsParam(NamedTuple): sharea=2044.1779608740142, fdiv=0.115, fhcd=0, - volblkto=1020.3677420460117, + vol_blkt_outboard=1020.3677420460117, vol_blkt_inboard=315.83946385183026, vol_blkt_total=1336.207205897842, fvolsi=1, @@ -1195,7 +1199,7 @@ class ApplyCoverageFactorsParam(NamedTuple): expected_blarea=1563.2068386818949, expected_shareaob=860.23081484770285, expected_sharea=1560.2981275221814, - expected_volblkto=866.70391336775992, + expected_vol_blkt_outboard=866.70391336775992, expected_volblkt=1182.5433772195902, expected_volshld=783.69914576548854, expected_vdewin=1016.2876250857248, @@ -1225,7 +1229,9 @@ def test_apply_coverage_factors( monkeypatch.setattr(build_variables, "sharea", applycoveragefactorsparam.sharea) monkeypatch.setattr(fwbs_variables, "fdiv", applycoveragefactorsparam.fdiv) monkeypatch.setattr(fwbs_variables, "fhcd", applycoveragefactorsparam.fhcd) - monkeypatch.setattr(fwbs_variables, "volblkto", applycoveragefactorsparam.volblkto) + monkeypatch.setattr( + fwbs_variables, "vol_blkt_outboard", applycoveragefactorsparam.vol_blkt_outboard + ) monkeypatch.setattr( fwbs_variables, "vol_blkt_inboard", applycoveragefactorsparam.vol_blkt_inboard ) @@ -1255,8 +1261,8 @@ def test_apply_coverage_factors( assert build_variables.sharea == pytest.approx( applycoveragefactorsparam.expected_sharea ) - assert fwbs_variables.volblkto == pytest.approx( - applycoveragefactorsparam.expected_volblkto + assert fwbs_variables.vol_blkt_outboard == pytest.approx( + applycoveragefactorsparam.expected_vol_blkt_outboard ) assert fwbs_variables.vol_blkt_total == pytest.approx( applycoveragefactorsparam.expected_volblkt diff --git a/tests/unit/test_ccfe_hcpb.py b/tests/unit/test_ccfe_hcpb.py index 365fcc5ad9..47a9501319 100644 --- a/tests/unit/test_ccfe_hcpb.py +++ b/tests/unit/test_ccfe_hcpb.py @@ -1458,7 +1458,7 @@ class ComponentMassesParam(NamedTuple): fw_armour_mass: Any = None armour_fw_bl_mass: Any = None vol_blkt_inboard: Any = None - volblkto: Any = None + vol_blkt_outboard: Any = None i_blkt_inboard: Any = None fblhebmi: Any = None fblhebpi: Any = None @@ -1549,7 +1549,7 @@ class ComponentMassesParam(NamedTuple): fw_armour_mass=0, armour_fw_bl_mass=0, vol_blkt_inboard=315.83946385183026, - volblkto=866.70391336775992, + vol_blkt_outboard=866.70391336775992, i_blkt_inboard=1, fblhebmi=0.40000000000000002, fblhebpi=0.65949999999999998, @@ -1683,7 +1683,9 @@ def test_component_masses(componentmassesparam, monkeypatch, ccfe_hcpb): monkeypatch.setattr( fwbs_variables, "vol_blkt_inboard", componentmassesparam.vol_blkt_inboard ) - monkeypatch.setattr(fwbs_variables, "volblkto", componentmassesparam.volblkto) + monkeypatch.setattr( + fwbs_variables, "vol_blkt_outboard", componentmassesparam.vol_blkt_outboard + ) monkeypatch.setattr( fwbs_variables, "i_blkt_inboard", componentmassesparam.i_blkt_inboard ) diff --git a/tests/unit/test_dcll.py b/tests/unit/test_dcll.py index 499a8c3ae7..c5cce13681 100644 --- a/tests/unit/test_dcll.py +++ b/tests/unit/test_dcll.py @@ -312,7 +312,7 @@ class DcllMassesParam(NamedTuple): vol_blkt_inboard: Any = None - volblkto: Any = None + vol_blkt_outboard: Any = None whtblkt: Any = None @@ -536,7 +536,7 @@ class DcllMassesParam(NamedTuple): i_blkt_inboard=1, vol_blkt_total=1397.9003011502937, vol_blkt_inboard=401.90579863726225, - volblkto=995.99450251303142, + vol_blkt_outboard=995.99450251303142, whtblkt=0, m_fw_total=0, fw_armour_vol=0, @@ -655,7 +655,7 @@ class DcllMassesParam(NamedTuple): i_blkt_inboard=1, vol_blkt_total=1400.4860764869636, vol_blkt_inboard=402.02180553751157, - volblkto=998.46427094945204, + vol_blkt_outboard=998.46427094945204, whtblkt=10654509.24412049, m_fw_total=193353.16636179245, fw_armour_vol=7.0163598878346534, @@ -821,7 +821,9 @@ def test_dcll_masses(dcllmassesparam, monkeypatch, dcll): fwbs_variables, "vol_blkt_inboard", dcllmassesparam.vol_blkt_inboard ) - monkeypatch.setattr(fwbs_variables, "volblkto", dcllmassesparam.volblkto) + monkeypatch.setattr( + fwbs_variables, "vol_blkt_outboard", dcllmassesparam.vol_blkt_outboard + ) monkeypatch.setattr(fwbs_variables, "whtblkt", dcllmassesparam.whtblkt) From a983bc26e267bf63702b58b461c630ab3ff24481 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 17 Feb 2025 13:32:10 +0000 Subject: [PATCH 10/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20`vdewin`=20to=20`?= =?UTF-8?q?vol=5Fvv`=20for=20clarity=20and=20consistency=20across=20the=20?= =?UTF-8?q?codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++--- process/blanket_library.py | 10 ++-- process/dcll.py | 4 +- process/hcpb.py | 6 +- process/stellarator.py | 10 ++-- source/fortran/fwbs_variables.f90 | 4 +- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++++----- tests/integration/data/scan_MFILE.DAT | 18 +++--- tests/integration/ref_dicts.json | 6 +- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_blanket_library.py | 60 +++++++++---------- tests/unit/test_ccfe_hcpb.py | 8 +-- 22 files changed, 98 insertions(+), 98 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 15bcb1ea7f..b42350d570 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -963,7 +963,7 @@ First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 1.9807E+01 Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.1849E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.8520E+02 - Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.0178E+03 + Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.0178E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 2.9676E+06 OP diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index aeef4f4b56..eaab37fcec 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -958,7 +958,7 @@ First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 1.9807E+01 Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.1849E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.8520E+02 - Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.0178E+03 + Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.0178E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 2.9676E+06 OP diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index f8c447322b..ed078d8ff5 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -958,7 +958,7 @@ First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 1.9807E+01 Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.1849E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.8520E+02 - Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.0178E+03 + Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.0178E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 2.9676E+06 OP diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 08e1cd4992..7e5499ab26 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -958,7 +958,7 @@ First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 1.9807E+01 Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.1849E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.8520E+02 - Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.0178E+03 + Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.0178E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 2.9676E+06 OP diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index d5145ec8d5..4ccce9e8c1 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -958,7 +958,7 @@ First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 1.9807E+01 Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.1849E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.8520E+02 - Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.0178E+03 + Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.0178E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 2.9676E+06 OP diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 6860e400cc..100e9a028e 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -787,7 +787,7 @@ First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 2.4743E+01 Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.4825E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.7675E+02 - Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.2227E+03 + Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 3.7129E+06 OP @@ -1782,7 +1782,7 @@ First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 2.4743E+01 Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.4825E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.7675E+02 - Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.2227E+03 + Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 3.7129E+06 OP @@ -2777,7 +2777,7 @@ First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 2.4743E+01 Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.4825E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.7675E+02 - Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.2227E+03 + Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 3.7129E+06 OP @@ -3772,7 +3772,7 @@ First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 2.4743E+01 Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.4825E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.7675E+02 - Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.2227E+03 + Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 3.7129E+06 OP @@ -4767,7 +4767,7 @@ First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 2.4743E+01 Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.4825E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.7675E+02 - Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.2227E+03 + Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 3.7129E+06 OP @@ -5762,7 +5762,7 @@ First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 2.4743E+01 Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.4825E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.7675E+02 - Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.2227E+03 + Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 3.7129E+06 OP @@ -6757,7 +6757,7 @@ First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 2.4743E+01 Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.4825E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.7675E+02 - Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.2227E+03 + Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 3.7129E+06 OP @@ -7752,7 +7752,7 @@ First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 2.4743E+01 Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.4825E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.7675E+02 - Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.2227E+03 + Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 3.7129E+06 OP @@ -8747,7 +8747,7 @@ First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 2.4743E+01 Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.4825E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.7675E+02 - Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.2227E+03 + Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 3.7129E+06 OP diff --git a/process/blanket_library.py b/process/blanket_library.py index 8ba1d430a1..cb493755d7 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -220,7 +220,7 @@ def dshaped_component(self, icomponent: int): ( blanket_library.volvvi, blanket_library.volvvo, - fwbs_variables.vdewin, + fwbs_variables.vol_vv, ) = dshellvol( r1, r2, @@ -312,7 +312,7 @@ def elliptical_component(self, icomponent: int): ( blanket_library.volvvi, blanket_library.volvvo, - fwbs_variables.vdewin, + fwbs_variables.vol_vv, ) = eshellvol( r1, r2, @@ -367,7 +367,7 @@ def apply_coverage_factors(self): # Apply vacuum vessel coverage factor # moved from dshaped_* and elliptical_* to keep coverage factor # changes in the same location. - fwbs_variables.vdewin = fwbs_variables.fvoldw * fwbs_variables.vdewin + fwbs_variables.vol_vv = fwbs_variables.fvoldw * fwbs_variables.vol_vv @staticmethod def external_cryo_geometry() -> None: @@ -425,11 +425,11 @@ def external_cryo_geometry() -> None: ) - (fwbs_variables.vol_cryostat_internal) # Vacuum vessel mass (kg) - fwbs_variables.vvmass = fwbs_variables.vdewin * fwbs_variables.denstl + fwbs_variables.vvmass = fwbs_variables.vol_vv * fwbs_variables.denstl # Sum of internal vacuum vessel and cryostat masses (kg) fwbs_variables.dewmkg = ( - fwbs_variables.vdewin + fwbs_variables.vol_cryostat + fwbs_variables.vol_vv + fwbs_variables.vol_cryostat ) * fwbs_variables.denstl def primary_coolant_properties(self, output: bool): diff --git a/process/dcll.py b/process/dcll.py index bbe7887364..4d99607dc5 100644 --- a/process/dcll.py +++ b/process/dcll.py @@ -923,7 +923,7 @@ def write_output(self): po.ovarrf( self.outfile, "Vacuum vessel volume (m3)", - "(vdewin)", - fwbs_variables.vdewin, + "(vol_vv)", + fwbs_variables.vol_vv, "OP ", ) diff --git a/process/hcpb.py b/process/hcpb.py index fea71d0084..0b7eaaed89 100644 --- a/process/hcpb.py +++ b/process/hcpb.py @@ -424,7 +424,7 @@ def nuclear_heating_magnets(self, output: bool): d_vv_all = build_variables.dr_vv_outboard if d_vv_all > 1.0e-6: - ccfe_hcpb_module.vv_density = fwbs_variables.vvmass / fwbs_variables.vdewin + ccfe_hcpb_module.vv_density = fwbs_variables.vvmass / fwbs_variables.vol_vv else: ccfe_hcpb_module.vv_density = 0.0 @@ -1291,8 +1291,8 @@ def write_output(self): po.ovarrf( self.outfile, "Vacuum vessel volume (m3)", - "(vdewin)", - fwbs_variables.vdewin, + "(vol_vv)", + fwbs_variables.vol_vv, "OP ", ) diff --git a/process/stellarator.py b/process/stellarator.py index 0daf852b08..8985a6d576 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -1859,7 +1859,7 @@ def stfwbs(self, output: bool): + build_variables.dr_blkt_outboard + build_variables.dr_shld_outboard ) - fwbs_variables.vdewin = ( + fwbs_variables.vol_vv = ( (build_variables.dr_vv_inboard + build_variables.dr_vv_outboard) / 2.0e0 * physics_variables.a_plasma_surface @@ -1870,12 +1870,12 @@ def stfwbs(self, output: bool): # Vacuum vessel mass - fwbs_variables.vvmass = fwbs_variables.vdewin * fwbs_variables.denstl + fwbs_variables.vvmass = fwbs_variables.vol_vv * fwbs_variables.denstl # Sum of internal vacuum vessel and external cryostat masses fwbs_variables.dewmkg = ( - fwbs_variables.vdewin + fwbs_variables.vol_cryostat + fwbs_variables.vol_vv + fwbs_variables.vol_cryostat ) * fwbs_variables.denstl if output: @@ -2268,8 +2268,8 @@ def stfwbs(self, output: bool): po.ovarre( self.outfile, "Internal vacuum vessel shell volume (m3)", - "(vdewin)", - fwbs_variables.vdewin, + "(vol_vv)", + fwbs_variables.vol_vv, ) po.ovarre( self.outfile, diff --git a/source/fortran/fwbs_variables.f90 b/source/fortran/fwbs_variables.f90 index 812c3ad6d9..b84a033ba6 100644 --- a/source/fortran/fwbs_variables.f90 +++ b/source/fortran/fwbs_variables.f90 @@ -429,7 +429,7 @@ module fwbs_variables real(dp) :: vol_cryostat_internal !! Internal volume of the cryostat [m^3] - real(dp) :: vdewin + real(dp) :: vol_vv !! vacuum vessel volume [m^3] real(dp) :: vfshld @@ -774,7 +774,7 @@ subroutine init_fwbs_variables dr_pf_cryostat = 0.5D0 vol_cryostat = 0.0D0 vol_cryostat_internal = 0.0D0 - vdewin = 0.0D0 + vol_vv = 0.0D0 vfshld = 0.25D0 vol_blkt_total = 0.0D0 vol_blkt_inboard = 0.0D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index f88c6edbe1..e789cb14ba 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -957,7 +957,7 @@ First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 1.9807E+01 Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.1849E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.8520E+02 - Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.0178E+03 + Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.0178E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 2.9676E+06 OP diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index bec568a4c6..f9edeee9a0 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -958,7 +958,7 @@ First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 1.9807E+01 Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.1849E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.8520E+02 - Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.0178E+03 + Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.0178E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 2.9676E+06 OP diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 6d512c9f09..ec44213e2d 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -958,7 +958,7 @@ First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 1.9807E+01 Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.1849E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.8520E+02 - Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.0178E+03 + Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.0178E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 2.9676E+06 OP diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 3ac59b0597..4a03170256 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -958,7 +958,7 @@ First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 1.9807E+01 Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.1849E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.8520E+02 - Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.0178E+03 + Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.0178E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 2.9676E+06 OP diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 548bbb6531..7038aa0cd1 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -961,7 +961,7 @@ First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 1.9807E+01 Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.1849E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.8520E+02 - Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.0178E+03 + Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.0178E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 2.9676E+06 OP diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 6716c8b341..69c1d1e4d3 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -959,7 +959,7 @@ First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 1.9807E+01 Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.1849E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.8520E+02 - Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.0178E+03 + Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.0178E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 2.9676E+06 OP @@ -2122,7 +2122,7 @@ First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 1.9807E+01 Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.1849E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.8520E+02 - Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.0178E+03 + Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.0178E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 2.9676E+06 OP @@ -3285,7 +3285,7 @@ First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 1.9807E+01 Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.1849E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.8520E+02 - Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.0178E+03 + Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.0178E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 2.9676E+06 OP @@ -4448,7 +4448,7 @@ First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 1.9807E+01 Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.1849E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.8520E+02 - Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.0178E+03 + Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.0178E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 2.9676E+06 OP @@ -5611,7 +5611,7 @@ First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 1.9807E+01 Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.1849E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.8520E+02 - Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.0178E+03 + Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.0178E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 2.9676E+06 OP @@ -6774,7 +6774,7 @@ First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 1.9807E+01 Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.1849E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.8520E+02 - Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.0178E+03 + Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.0178E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 2.9676E+06 OP @@ -7937,7 +7937,7 @@ First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 1.9807E+01 Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.1849E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.8520E+02 - Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.0178E+03 + Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.0178E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 2.9676E+06 OP @@ -9100,7 +9100,7 @@ First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 1.9807E+01 Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.1849E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.8520E+02 - Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.0178E+03 + Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.0178E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 2.9676E+06 OP @@ -10263,7 +10263,7 @@ First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 1.9807E+01 Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.1849E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.8520E+02 - Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.0178E+03 + Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.0178E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 2.9676E+06 OP @@ -11426,7 +11426,7 @@ First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 1.9807E+01 Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.1849E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.8520E+02 - Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.0178E+03 + Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.0178E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 2.9676E+06 OP @@ -12589,7 +12589,7 @@ First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 1.9807E+01 Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.1849E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.8520E+02 - Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.0178E+03 + Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.0178E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 2.9676E+06 OP @@ -13752,7 +13752,7 @@ First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 1.9807E+01 Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.1849E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.8520E+02 - Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.0178E+03 + Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.0178E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 2.9676E+06 OP @@ -14915,7 +14915,7 @@ First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 1.9807E+01 Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.1849E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.8520E+02 - Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.0178E+03 + Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.0178E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 2.9676E+06 OP @@ -16078,7 +16078,7 @@ First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 1.9807E+01 Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.1849E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.8520E+02 - Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.0178E+03 + Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.0178E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 2.9676E+06 OP @@ -17241,7 +17241,7 @@ First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 1.9807E+01 Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.1849E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.8520E+02 - Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.0178E+03 + Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.0178E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 2.9676E+06 OP diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 475800ae90..0b8c12c3ef 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -787,7 +787,7 @@ First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 2.4743E+01 Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.4825E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.7675E+02 - Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.2227E+03 + Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 3.7129E+06 OP @@ -1782,7 +1782,7 @@ First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 2.4743E+01 Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.4825E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.7675E+02 - Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.2227E+03 + Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 3.7129E+06 OP @@ -2777,7 +2777,7 @@ First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 2.4743E+01 Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.4825E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.7675E+02 - Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.2227E+03 + Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 3.7129E+06 OP @@ -3772,7 +3772,7 @@ First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 2.4743E+01 Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.4825E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.7675E+02 - Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.2227E+03 + Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 3.7129E+06 OP @@ -4767,7 +4767,7 @@ First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 2.4743E+01 Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.4825E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.7675E+02 - Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.2227E+03 + Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 3.7129E+06 OP @@ -5762,7 +5762,7 @@ First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 2.4743E+01 Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.4825E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.7675E+02 - Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.2227E+03 + Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 3.7129E+06 OP @@ -6757,7 +6757,7 @@ First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 2.4743E+01 Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.4825E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.7675E+02 - Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.2227E+03 + Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 3.7129E+06 OP @@ -7752,7 +7752,7 @@ First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 2.4743E+01 Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.4825E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.7675E+02 - Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.2227E+03 + Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 3.7129E+06 OP @@ -8747,7 +8747,7 @@ First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 2.4743E+01 Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.4825E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.7675E+02 - Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.2227E+03 + Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 3.7129E+06 OP diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 735b3ef2d0..531a139650 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -7903,7 +7903,7 @@ "vcritx": 0.0, "vdalw": 20.0, "vol_cryostat": 0.0, - "vdewin": 0.0, + "vol_vv": 0.0, "velblkti": 0.0, "velblkto": 0.0, "verbose": 0.0, @@ -11012,7 +11012,7 @@ "vcritx": "", "vdalw": "max voltage across TF coil during quench (kV) (`iteration variable 52`)", "vol_cryostat": "cryostat volume (m3)", - "vdewin": "vacuum vessel volume (m3)", + "vol_vv": "vacuum vessel volume (m3)", "velblkti": "Inboard/outboard coolant velocity in blanket (m/s)", "velblkto": "Inboard/outboard coolant velocity in blanket (m/s)", "verbose": "switch for turning on/off diagnostic messages\n
    \n
  • =0 turn off diagnostics
    • \n
  • =1 turn on diagnostics
    • \n
", @@ -18117,7 +18117,7 @@ "z_cryostat_half_inside", "dr_pf_cryostat", "vol_cryostat", - "vdewin", + "vol_vv", "vfshld", "vol_blkt_total", "vol_blkt_inboard", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 336edf91ac..4092d5e101 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -961,7 +961,7 @@ First_Wall_Volume_(m3)__________________________________________________ (vol_fw_total)_______________________ 1.9807E+01 Blanket_Volume_(m3)_____________________________________________________ (vol_blkt_total)_____________________ 1.1849E+03 Shield_Volume_(m3)______________________________________________________ (volshld)_____________________ 7.8520E+02 - Vacuum_vessel_volume_(m3)_______________________________________________ (vdewin)______________________ 1.0178E+03 + Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.0178E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 2.9676E+06 OP diff --git a/tests/unit/test_blanket_library.py b/tests/unit/test_blanket_library.py index 4bf506e2ef..94cb1dd89e 100644 --- a/tests/unit/test_blanket_library.py +++ b/tests/unit/test_blanket_library.py @@ -508,7 +508,7 @@ class DshapedComponentParam(NamedTuple): vol_blkt_outboard: Any = None vol_blkt_total: Any = None volshld: Any = None - vdewin: Any = None + vol_vv: Any = None rminor: Any = None volshldi: Any = None volshldo: Any = None @@ -527,7 +527,7 @@ class DshapedComponentParam(NamedTuple): expected_vol_blkt_outboard: Any = None expected_volblkt: Any = None expected_volshld: Any = None - expected_vdewin: Any = None + expected_vol_vv: Any = None expected_volshldi: Any = None expected_volshldo: Any = None expected_volvvi: Any = None @@ -565,7 +565,7 @@ class DshapedComponentParam(NamedTuple): vol_blkt_outboard=0, vol_blkt_total=0, volshld=0, - vdewin=0, + vol_vv=0, rminor=2.5, volshldi=0, volshldo=0, @@ -584,7 +584,7 @@ class DshapedComponentParam(NamedTuple): expected_vol_blkt_outboard=691.06561956756764, expected_volblkt=691.06561956756764, expected_volshld=0, - expected_vdewin=0, + expected_vol_vv=0, expected_volshldi=0, expected_volshldo=0, expected_volvvi=0, @@ -618,7 +618,7 @@ class DshapedComponentParam(NamedTuple): vol_blkt_outboard=691.06561956756764, vol_blkt_total=691.06561956756764, volshld=0, - vdewin=0, + vol_vv=0, rminor=2.5, volshldi=0, volshldo=0, @@ -637,7 +637,7 @@ class DshapedComponentParam(NamedTuple): expected_vol_blkt_outboard=691.06561956756764, expected_volblkt=691.06561956756764, expected_volshld=450.46122947809488, - expected_vdewin=0, + expected_vol_vv=0, expected_volshldi=79.896984366095609, expected_volshldo=370.5642451119993, expected_volvvi=0, @@ -671,7 +671,7 @@ class DshapedComponentParam(NamedTuple): vol_blkt_outboard=691.06561956756764, vol_blkt_total=691.06561956756764, volshld=450.46122947809488, - vdewin=0, + vol_vv=0, rminor=2.5, volshldi=79.896984366095609, volshldo=370.5642451119993, @@ -690,7 +690,7 @@ class DshapedComponentParam(NamedTuple): expected_vol_blkt_outboard=691.06561956756764, expected_volblkt=691.06561956756764, expected_volshld=450.46122947809488, - expected_vdewin=340.45369594344834, + expected_vol_vv=340.45369594344834, expected_volshldi=79.896984366095609, expected_volshldo=370.5642451119993, expected_volvvi=34.253413020620215, @@ -775,7 +775,7 @@ def test_dshaped_component(dshapedcomponentparam, monkeypatch, blanket_library_f fwbs_variables, "vol_blkt_total", dshapedcomponentparam.vol_blkt_total ) monkeypatch.setattr(fwbs_variables, "volshld", dshapedcomponentparam.volshld) - monkeypatch.setattr(fwbs_variables, "vdewin", dshapedcomponentparam.vdewin) + monkeypatch.setattr(fwbs_variables, "vol_vv", dshapedcomponentparam.vol_vv) monkeypatch.setattr(physics_variables, "rminor", dshapedcomponentparam.rminor) monkeypatch.setattr(blanket_library, "volshldi", dshapedcomponentparam.volshldi) monkeypatch.setattr(blanket_library, "volshldo", dshapedcomponentparam.volshldo) @@ -827,7 +827,7 @@ class EllipticalComponentParam(NamedTuple): vol_blkt_outboard: Any = None vol_blkt_total: Any = None volshld: Any = None - vdewin: Any = None + vol_vv: Any = None rmajor: Any = None rminor: Any = None triang: Any = None @@ -849,7 +849,7 @@ class EllipticalComponentParam(NamedTuple): expected_vol_blkt_outboard: Any = None expected_volblkt: Any = None expected_volshld: Any = None - expected_vdewin: Any = None + expected_vol_vv: Any = None expected_volshldi: Any = None expected_volshldo: Any = None expected_volvvi: Any = None @@ -883,7 +883,7 @@ class EllipticalComponentParam(NamedTuple): vol_blkt_outboard=0, vol_blkt_total=0, volshld=0, - vdewin=0, + vol_vv=0, rmajor=8, rminor=2.6666666666666665, triang=0.5, @@ -905,7 +905,7 @@ class EllipticalComponentParam(NamedTuple): expected_vol_blkt_outboard=1020.3677420460117, expected_volblkt=1336.207205897842, expected_volshld=0, - expected_vdewin=0, + expected_vol_vv=0, expected_volshldi=0, expected_volshldo=0, expected_volvvi=0, @@ -935,7 +935,7 @@ class EllipticalComponentParam(NamedTuple): vol_blkt_outboard=1020.3677420460117, vol_blkt_total=1336.207205897842, volshld=0, - vdewin=0, + vol_vv=0, rmajor=8, rminor=2.6666666666666665, triang=0.5, @@ -957,7 +957,7 @@ class EllipticalComponentParam(NamedTuple): expected_vol_blkt_outboard=1020.3677420460117, expected_volblkt=1336.207205897842, expected_volshld=1124.4621612595051, - expected_vdewin=0, + expected_vol_vv=0, expected_volshldi=177.89822933168091, expected_volshldo=946.56393192782434, expected_volvvi=0, @@ -987,7 +987,7 @@ class EllipticalComponentParam(NamedTuple): vol_blkt_outboard=1020.3677420460117, vol_blkt_total=1336.207205897842, volshld=1124.4621612595051, - vdewin=0, + vol_vv=0, rmajor=8, rminor=2.6666666666666665, triang=0.5, @@ -1009,7 +1009,7 @@ class EllipticalComponentParam(NamedTuple): expected_vol_blkt_outboard=1020.3677420460117, expected_volblkt=1336.207205897842, expected_volshld=1124.4621612595051, - expected_vdewin=584.07334775041659, + expected_vol_vv=584.07334775041659, expected_volshldi=177.89822933168091, expected_volshldo=946.56393192782434, expected_volvvi=143.03162449152501, @@ -1080,7 +1080,7 @@ def test_elliptical_component( fwbs_variables, "vol_blkt_total", ellipticalcomponentparam.vol_blkt_total ) monkeypatch.setattr(fwbs_variables, "volshld", ellipticalcomponentparam.volshld) - monkeypatch.setattr(fwbs_variables, "vdewin", ellipticalcomponentparam.vdewin) + monkeypatch.setattr(fwbs_variables, "vol_vv", ellipticalcomponentparam.vol_vv) monkeypatch.setattr(physics_variables, "rmajor", ellipticalcomponentparam.rmajor) monkeypatch.setattr(physics_variables, "rminor", ellipticalcomponentparam.rminor) monkeypatch.setattr(physics_variables, "triang", ellipticalcomponentparam.triang) @@ -1124,8 +1124,8 @@ def test_elliptical_component( assert fwbs_variables.volshld == pytest.approx( ellipticalcomponentparam.expected_volshld ) - assert fwbs_variables.vdewin == pytest.approx( - ellipticalcomponentparam.expected_vdewin + assert fwbs_variables.vol_vv == pytest.approx( + ellipticalcomponentparam.expected_vol_vv ) assert blanket_library.volshldi == pytest.approx( ellipticalcomponentparam.expected_volshldi @@ -1156,7 +1156,7 @@ class ApplyCoverageFactorsParam(NamedTuple): fvolsi: Any = None fvolso: Any = None volshld: Any = None - vdewin: Any = None + vol_vv: Any = None fvoldw: Any = None idivrt: Any = None volshldi: Any = None @@ -1168,7 +1168,7 @@ class ApplyCoverageFactorsParam(NamedTuple): expected_vol_blkt_outboard: Any = None expected_volblkt: Any = None expected_volshld: Any = None - expected_vdewin: Any = None + expected_vol_vv: Any = None expected_volshldo: Any = None @@ -1190,7 +1190,7 @@ class ApplyCoverageFactorsParam(NamedTuple): fvolsi=1, fvolso=0.64000000000000001, volshld=1124.4621612595051, - vdewin=584.07334775041659, + vol_vv=584.07334775041659, fvoldw=1.74, idivrt=1, volshldi=177.89822933168091, @@ -1202,7 +1202,7 @@ class ApplyCoverageFactorsParam(NamedTuple): expected_vol_blkt_outboard=866.70391336775992, expected_volblkt=1182.5433772195902, expected_volshld=783.69914576548854, - expected_vdewin=1016.2876250857248, + expected_vol_vv=1016.2876250857248, expected_volshldo=605.80091643380763, ), ), @@ -1241,7 +1241,7 @@ def test_apply_coverage_factors( monkeypatch.setattr(fwbs_variables, "fvolsi", applycoveragefactorsparam.fvolsi) monkeypatch.setattr(fwbs_variables, "fvolso", applycoveragefactorsparam.fvolso) monkeypatch.setattr(fwbs_variables, "volshld", applycoveragefactorsparam.volshld) - monkeypatch.setattr(fwbs_variables, "vdewin", applycoveragefactorsparam.vdewin) + monkeypatch.setattr(fwbs_variables, "vol_vv", applycoveragefactorsparam.vol_vv) monkeypatch.setattr(fwbs_variables, "fvoldw", applycoveragefactorsparam.fvoldw) monkeypatch.setattr(physics_variables, "idivrt", applycoveragefactorsparam.idivrt) monkeypatch.setattr(blanket_library, "volshldi", applycoveragefactorsparam.volshldi) @@ -1270,8 +1270,8 @@ def test_apply_coverage_factors( assert fwbs_variables.volshld == pytest.approx( applycoveragefactorsparam.expected_volshld ) - assert fwbs_variables.vdewin == pytest.approx( - applycoveragefactorsparam.expected_vdewin + assert fwbs_variables.vol_vv == pytest.approx( + applycoveragefactorsparam.expected_vol_vv ) assert blanket_library.volshldo == pytest.approx( applycoveragefactorsparam.expected_volshldo @@ -1288,7 +1288,7 @@ class ExternalCryoGeometryParam(NamedTuple): z_cryostat_half_inside: Any = None vol_cryostat: Any = None vvmass: Any = None - vdewin: Any = None + vol_vv: Any = None denstl: Any = None dewmkg: Any = None r_pf_coil_outer: Any = None @@ -1317,7 +1317,7 @@ class ExternalCryoGeometryParam(NamedTuple): z_cryostat_half_inside=0, vol_cryostat=0, vvmass=0, - vdewin=1016.2876250857248, + vol_vv=1016.2876250857248, denstl=7800, dewmkg=0, r_pf_coil_outer=np.array( @@ -1433,7 +1433,7 @@ def test_external_cryo_geometry( fwbs_variables, "vol_cryostat", externalcryogeometryparam.vol_cryostat ) monkeypatch.setattr(fwbs_variables, "vvmass", externalcryogeometryparam.vvmass) - monkeypatch.setattr(fwbs_variables, "vdewin", externalcryogeometryparam.vdewin) + monkeypatch.setattr(fwbs_variables, "vol_vv", externalcryogeometryparam.vol_vv) monkeypatch.setattr(fwbs_variables, "denstl", externalcryogeometryparam.denstl) monkeypatch.setattr(fwbs_variables, "dewmkg", externalcryogeometryparam.dewmkg) monkeypatch.setattr( diff --git a/tests/unit/test_ccfe_hcpb.py b/tests/unit/test_ccfe_hcpb.py index 47a9501319..8626256162 100644 --- a/tests/unit/test_ccfe_hcpb.py +++ b/tests/unit/test_ccfe_hcpb.py @@ -63,7 +63,7 @@ class NuclearHeatingMagnetsParam(NamedTuple): vvmass: Any = None - vdewin: Any = None + vol_vv: Any = None fw_armour_thickness: Any = None @@ -146,7 +146,7 @@ class NuclearHeatingMagnetsParam(NamedTuple): whtshld=2294873.8131476045, volshld=735.53647857295027, vvmass=9043937.8018644415, - vdewin=1159.4792053672361, + vol_vv=1159.4792053672361, fw_armour_thickness=0.0050000000000000001, ptfnuc=0, f_a_fw_coolant_inboard=0, @@ -195,7 +195,7 @@ class NuclearHeatingMagnetsParam(NamedTuple): whtshld=2297808.3935174854, volshld=736.47704920432227, vvmass=9056931.558219457, - vdewin=1161.1450715665972, + vol_vv=1161.1450715665972, fw_armour_thickness=0.0050000000000000001, ptfnuc=0.044184461825198453, f_a_fw_coolant_inboard=0.31415926535897931, @@ -298,7 +298,7 @@ def test_nuclear_heating_magnets(nuclearheatingmagnetsparam, monkeypatch, ccfe_h monkeypatch.setattr(fwbs_variables, "vvmass", nuclearheatingmagnetsparam.vvmass) - monkeypatch.setattr(fwbs_variables, "vdewin", nuclearheatingmagnetsparam.vdewin) + monkeypatch.setattr(fwbs_variables, "vol_vv", nuclearheatingmagnetsparam.vol_vv) monkeypatch.setattr( fwbs_variables, From fb1acba19d55dd0748daa31beadfbcc067a9239c Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 17 Feb 2025 13:38:46 +0000 Subject: [PATCH 11/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20pnucblkt=20to=20p?= =?UTF-8?q?=5Fblkt=5Fnuclear=5Fheat=5Ftotal=5Fmw=20for=20clarity=20and=20c?= =?UTF-8?q?onsistency=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++++----- process/blanket_library.py | 22 ++++++------ process/costs.py | 2 +- process/dcll.py | 9 ++--- process/hcpb.py | 28 ++++++++------- process/ife.py | 10 +++--- process/io/mfile_comparison.py | 6 ++-- process/io/plot_proc.py | 2 +- process/io/sankey_funcs.py | 21 +++++++++--- process/power.py | 32 +++++++++++------ process/stellarator.py | 21 +++++++----- source/fortran/fwbs_variables.f90 | 4 +-- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 ++++++++-------- tests/integration/data/scan_MFILE.DAT | 18 +++++----- tests/integration/ref_dicts.json | 6 ++-- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_ccfe_hcpb.py | 34 ++++++++++++------- tests/unit/test_costs_1990.py | 14 +++++--- tests/unit/test_dcll.py | 20 ++++++----- tests/unit/test_ife.py | 28 ++++++++++----- tests/unit/test_power.py | 12 ++++--- tracking/tracking_data.py | 2 +- 32 files changed, 213 insertions(+), 148 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index b42350d570..2c5760900b 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -975,7 +975,7 @@ 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_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6038E+02 OP - Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (pnucblkt)____________________ 1.2682E+03 OP + Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2682E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.3897E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.4652E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index eaab37fcec..96a33ff701 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -970,7 +970,7 @@ 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_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6315E+02 OP - Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (pnucblkt)____________________ 1.2901E+03 OP + Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2901E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4138E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.4906E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index ed078d8ff5..67f7e91495 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -970,7 +970,7 @@ 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_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6315E+02 OP - Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (pnucblkt)____________________ 1.2901E+03 OP + Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2901E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4138E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.4906E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 7e5499ab26..9a95de4fdb 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -970,7 +970,7 @@ 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_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6315E+02 OP - Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (pnucblkt)____________________ 1.2901E+03 OP + Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2901E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4138E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.4906E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 4ccce9e8c1..533f4d15ec 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -970,7 +970,7 @@ 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_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6315E+02 OP - Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (pnucblkt)____________________ 1.2901E+03 OP + Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2901E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4138E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.4906E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 100e9a028e..fca6161477 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -799,7 +799,7 @@ Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 5.8227E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_mw)______________________ 2.4609E+02 OP - Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (pnucblkt)____________________ 1.5585E+03 OP + Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4885E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.8507E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP @@ -1794,7 +1794,7 @@ Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 5.8227E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_mw)______________________ 2.4609E+02 OP - Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (pnucblkt)____________________ 1.5585E+03 OP + Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4885E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.8507E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP @@ -2789,7 +2789,7 @@ Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 5.8228E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_mw)______________________ 2.4609E+02 OP - Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (pnucblkt)____________________ 1.5585E+03 OP + Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4885E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.8507E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP @@ -3784,7 +3784,7 @@ Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 5.8228E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_mw)______________________ 2.4609E+02 OP - Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (pnucblkt)____________________ 1.5585E+03 OP + Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4885E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.8507E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP @@ -4779,7 +4779,7 @@ Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 5.8228E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_mw)______________________ 2.4609E+02 OP - Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (pnucblkt)____________________ 1.5585E+03 OP + Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4885E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.8507E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP @@ -5774,7 +5774,7 @@ Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 5.8228E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_mw)______________________ 2.4609E+02 OP - Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (pnucblkt)____________________ 1.5585E+03 OP + Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4885E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.8507E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP @@ -6769,7 +6769,7 @@ Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 5.8228E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_mw)______________________ 2.4609E+02 OP - Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (pnucblkt)____________________ 1.5585E+03 OP + Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4885E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.8507E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP @@ -7764,7 +7764,7 @@ Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 5.8228E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_mw)______________________ 2.4609E+02 OP - Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (pnucblkt)____________________ 1.5585E+03 OP + Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4885E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.8507E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP @@ -8759,7 +8759,7 @@ Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 5.8228E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_mw)______________________ 2.4609E+02 OP - Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (pnucblkt)____________________ 1.5585E+03 OP + Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4885E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.8507E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP diff --git a/process/blanket_library.py b/process/blanket_library.py index cb493755d7..74f0f3dff6 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -1567,14 +1567,14 @@ def thermo_hydraulic_model(self, output: bool): # Neutron power deposited in inboard blanket (MW) if fwbs_variables.i_blkt_inboard == 1: blanket_library.pnucblkti = ( - fwbs_variables.pnucblkt + fwbs_variables.p_blkt_nuclear_heat_total_mw * fwbs_variables.vol_blkt_inboard / fwbs_variables.vol_blkt_total ) # Neutron power deposited in outboard blanket (MW) blanket_library.pnucblkto = ( - fwbs_variables.pnucblkt + fwbs_variables.p_blkt_nuclear_heat_total_mw * fwbs_variables.vol_blkt_outboard / fwbs_variables.vol_blkt_total ) @@ -1589,17 +1589,19 @@ def thermo_hydraulic_model(self, output: bool): # Inboard blanket calc. Will return 0 if no inboard dr_shld_inboard thickness pnucblkti_struct = ( - fwbs_variables.pnucblkt * fwbs_variables.f_nuc_pow_bz_struct + fwbs_variables.p_blkt_nuclear_heat_total_mw + * fwbs_variables.f_nuc_pow_bz_struct + ) * (fwbs_variables.vol_blkt_inboard / fwbs_variables.vol_blkt_total) + pnucblkti_liq = ( + fwbs_variables.p_blkt_nuclear_heat_total_mw * f_nuc_pow_bz_liq ) * (fwbs_variables.vol_blkt_inboard / fwbs_variables.vol_blkt_total) - pnucblkti_liq = (fwbs_variables.pnucblkt * f_nuc_pow_bz_liq) * ( - fwbs_variables.vol_blkt_inboard / fwbs_variables.vol_blkt_total - ) pnucblkto_struct = ( - fwbs_variables.pnucblkt * fwbs_variables.f_nuc_pow_bz_struct + fwbs_variables.p_blkt_nuclear_heat_total_mw + * fwbs_variables.f_nuc_pow_bz_struct + ) * (fwbs_variables.vol_blkt_outboard / fwbs_variables.vol_blkt_total) + pnucblkto_liq = ( + fwbs_variables.p_blkt_nuclear_heat_total_mw * f_nuc_pow_bz_liq ) * (fwbs_variables.vol_blkt_outboard / fwbs_variables.vol_blkt_total) - pnucblkto_liq = (fwbs_variables.pnucblkt * f_nuc_pow_bz_liq) * ( - fwbs_variables.vol_blkt_outboard / fwbs_variables.vol_blkt_total - ) # FW and BB Mass Flow ########### diff --git a/process/costs.py b/process/costs.py index 482ebd86aa..cb025a5c4e 100644 --- a/process/costs.py +++ b/process/costs.py @@ -2120,7 +2120,7 @@ def acc2261(self): * cost_variables.uchts[fwbs_variables.i_blkt_coolant_type - 1] * ( (1.0e6 * heat_transport_variables.pfwdiv) ** exphts - + (1.0e6 * fwbs_variables.pnucblkt) ** exphts + + (1.0e6 * fwbs_variables.p_blkt_nuclear_heat_total_mw) ** exphts + (1.0e6 * fwbs_variables.pnucshld) ** exphts ) ) diff --git a/process/dcll.py b/process/dcll.py index 4d99607dc5..d7263ff195 100644 --- a/process/dcll.py +++ b/process/dcll.py @@ -137,7 +137,7 @@ def dcll_neutronics_and_power(self, output: bool): # Nuclear heating in the blanket with energy multiplication (MW) fwbs_variables.pnuc_blkt_ratio_dcll = 1 - fwbs_variables.pnuc_fw_ratio_dcll - fwbs_variables.pnucblkt = ( + fwbs_variables.p_blkt_nuclear_heat_total_mw = ( physics_variables.neutron_power_total * fwbs_variables.pnuc_blkt_ratio_dcll * fwbs_variables.emult @@ -243,8 +243,8 @@ def dcll_neutronics_and_power(self, output: bool): po.ovarre( self.outfile, "Total nuclear heating in the blanket (including emult) (MW)", - "(pnucblkt)", - fwbs_variables.pnucblkt, + "(p_blkt_nuclear_heat_total_mw)", + fwbs_variables.p_blkt_nuclear_heat_total_mw, "OP ", ) po.ovarre( @@ -302,7 +302,8 @@ def dcll_power_and_heating(self, output: bool): + fwbs_variables.psurffwo ) primary_pumping_variables.htpmw_blkt = ( - heat_transport_variables.fpumpblkt * fwbs_variables.pnucblkt + heat_transport_variables.fpumpblkt + * fwbs_variables.p_blkt_nuclear_heat_total_mw ) # For CCFE HCPB: htpmw_shld = fpumpshld * ( pnucshld + pnuc_cp_sh ) # Use same as KIT HCLL for now "pnucshld is not available and is very small diff --git a/process/hcpb.py b/process/hcpb.py index 0b7eaaed89..4a61cbfea5 100644 --- a/process/hcpb.py +++ b/process/hcpb.py @@ -127,7 +127,7 @@ def run(self, output: bool): # Total nuclear power deposited in the blancket sector (MW) ccfe_hcpb_module.pnuc_tot_blk_sector = ( fwbs_variables.p_fw_nuclear_heat_total_mw - + fwbs_variables.pnucblkt + + fwbs_variables.p_blkt_nuclear_heat_total_mw + fwbs_variables.pnucshld + fwbs_variables.ptfnuc ) @@ -135,7 +135,7 @@ def run(self, output: bool): # Total nuclear power deposited in the # if ( pnuc_tot_blk_sector < 1.0d0 .or. pnuc_tot_blk_sector /= pnuc_tot_blk_sector ) then # #TODO This can flood the terminal, and should be logged once in Python - # write(*,*)'p_fw_nuclear_heat_total_mw =', p_fw_nuclear_heat_total_mw, ' and ', 'pnucblkt =', pnucblkt + # write(*,*)'p_fw_nuclear_heat_total_mw =', p_fw_nuclear_heat_total_mw, ' and ', 'p_blkt_nuclear_heat_total_mw =', p_blkt_nuclear_heat_total_mw # write(*,*)'pnucshld =', pnucshld, ' ptfnuc =', ptfnuc # end if @@ -154,8 +154,11 @@ def run(self, output: bool): ) # Power to the blanket (MW) - fwbs_variables.pnucblkt = ( - (fwbs_variables.pnucblkt / ccfe_hcpb_module.pnuc_tot_blk_sector) + fwbs_variables.p_blkt_nuclear_heat_total_mw = ( + ( + fwbs_variables.p_blkt_nuclear_heat_total_mw + / ccfe_hcpb_module.pnuc_tot_blk_sector + ) * fwbs_variables.emult * f_geom_blanket * physics_variables.neutron_power_total @@ -190,7 +193,7 @@ def run(self, output: bool): # --- # pnucdiv is not changed. # The energy due to multiplication, by subtraction: - # emultmw = p_fw_nuclear_heat_total_mw + pnucblkt + pnucshld + ptfnuc + pnucdiv - neutron_power_total + # emultmw = p_fw_nuclear_heat_total_mw + p_blkt_nuclear_heat_total_mw + pnucshld + ptfnuc + pnucdiv - neutron_power_total # --- # New code, a bit simpler @@ -567,12 +570,12 @@ def nuclear_heating_blanket(self): # Total blanket nuclear heating (MW) ccfe_hcpb_module.exp_blanket = 1 - np.exp(-b * mass) - fwbs_variables.pnucblkt = ( + fwbs_variables.p_blkt_nuclear_heat_total_mw = ( physics_variables.fusion_power * a * ccfe_hcpb_module.exp_blanket ) - if fwbs_variables.pnucblkt < 1: - eh.fdiags[0] = fwbs_variables.pnucblkt + if fwbs_variables.p_blkt_nuclear_heat_total_mw < 1: + eh.fdiags[0] = fwbs_variables.p_blkt_nuclear_heat_total_mw eh.fdiags[1] = ccfe_hcpb_module.exp_blanket eh.fdiags[2] = physics_variables.fusion_power eh.fdiags[3] = mass @@ -709,7 +712,8 @@ def powerflow_calc(self, output: bool): + fwbs_variables.psurffwo ) heat_transport_variables.htpmw_blkt = ( - heat_transport_variables.fpumpblkt * fwbs_variables.pnucblkt + heat_transport_variables.fpumpblkt + * fwbs_variables.p_blkt_nuclear_heat_total_mw ) heat_transport_variables.htpmw_shld = heat_transport_variables.fpumpshld * ( fwbs_variables.pnucshld + fwbs_variables.pnuc_cp_sh @@ -765,7 +769,7 @@ def powerflow_calc(self, output: bool): fwbs_variables.p_fw_nuclear_heat_total_mw + fwbs_variables.psurffwi + fwbs_variables.psurffwo - + fwbs_variables.pnucblkt + + fwbs_variables.p_blkt_nuclear_heat_total_mw ) primary_pumping_variables.htpmw_fw_blkt = fpump / (1 - fpump) * p_plasma @@ -1416,8 +1420,8 @@ def write_output(self): po.ovarre( self.outfile, "Total nuclear heating in the blanket (including emult) (MW)", - "(pnucblkt)", - fwbs_variables.pnucblkt, + "(p_blkt_nuclear_heat_total_mw)", + fwbs_variables.p_blkt_nuclear_heat_total_mw, "OP ", ) po.ocmmnt(self.outfile, "(Note: emult is fixed for this model inside the code)") diff --git a/process/ife.py b/process/ife.py index 23fa776771..bf953e34b8 100644 --- a/process/ife.py +++ b/process/ife.py @@ -1914,12 +1914,14 @@ def ifepw1(self): if (ife_variables.ifetyp != 3) and (ife_variables.ifetyp != 4): heat_transport_variables.pfwdiv = 0.24 * heat_transport_variables.pthermmw - fwbs_variables.pnucblkt = ( + fwbs_variables.p_blkt_nuclear_heat_total_mw = ( heat_transport_variables.pthermmw - heat_transport_variables.pfwdiv ) else: heat_transport_variables.pfwdiv = 0.0 - fwbs_variables.pnucblkt = heat_transport_variables.pthermmw + fwbs_variables.p_blkt_nuclear_heat_total_mw = ( + heat_transport_variables.pthermmw + ) fwbs_variables.pnucshld = 0.0 @@ -2050,8 +2052,8 @@ def ifepw2(self, output: bool = False): process_output.ovarre( self.outfile, "Blanket nuclear heating (MW)", - "(pnucblkt)", - fwbs_variables.pnucblkt, + "(p_blkt_nuclear_heat_total_mw)", + fwbs_variables.p_blkt_nuclear_heat_total_mw, ) process_output.ovarre( self.outfile, diff --git a/process/io/mfile_comparison.py b/process/io/mfile_comparison.py index 0a643c5e3a..1b660fd07e 100644 --- a/process/io/mfile_comparison.py +++ b/process/io/mfile_comparison.py @@ -81,7 +81,7 @@ "f_nd_alpha_electron", "p_plasma_inner_rad_mw", "p_plasma_rad_mw", - "pnucblkt", + "p_blkt_nuclear_heat_total_mw", "pnucshld", "pdivt", "pheat", @@ -138,7 +138,7 @@ "p_plasma_inner_rad_mw", "p_plasma_sync_mw", "p_plasma_rad_mw", - "pnucblkt", + "p_blkt_nuclear_heat_total_mw", "pnucshld", "pdivt", "divlife", @@ -197,7 +197,7 @@ "dr_blkt_inboard", "dr_blkt_outboard", "fusion_power", - "pnucblkt", + "p_blkt_nuclear_heat_total_mw", "p_fw_nuclear_heat_total_mw", "ptfnuc", "pnucshld", diff --git a/process/io/plot_proc.py b/process/io/plot_proc.py index 677fcc1620..c89ff17ede 100644 --- a/process/io/plot_proc.py +++ b/process/io/plot_proc.py @@ -2753,7 +2753,7 @@ def plot_power_info(axis, mfile_data, scan): ped_pos, ("p_plasma_inner_rad_mw", "Inner zone radiation", "MW"), ("p_plasma_rad_mw", "Total radiation in LCFS", "MW"), - ("pnucblkt", "Nuclear heating in blanket", "MW"), + ("p_blkt_nuclear_heat_total_mw", "Nuclear heating in blanket", "MW"), ("pnucshld", "Nuclear heating in shield", "MW"), (crypmw, "TF cryogenic power", "MW"), ("pdivt", "Power to divertor", "MW"), diff --git a/process/io/sankey_funcs.py b/process/io/sankey_funcs.py index 24ccf10003..8c35a4505f 100644 --- a/process/io/sankey_funcs.py +++ b/process/io/sankey_funcs.py @@ -49,10 +49,12 @@ def plot_full_sankey( emultmw = m_file.data["emultmw"].get_scan( -1 ) # Energy multiplication in blanket (MW) - pnucblkt = m_file.data["pnucblkt"].get_scan( + p_blkt_nuclear_heat_total_mw = m_file.data["p_blkt_nuclear_heat_total_mw"].get_scan( -1 ) # Total Nuclear heating in the blanket (MW) - pnucemblkt = pnucblkt - emultmw # External nuclear heating in blanket (MW) + pnucemblkt = ( + p_blkt_nuclear_heat_total_mw - emultmw + ) # External nuclear heating in blanket (MW) pnucdiv = m_file.data["pnucdiv"].get_scan( -1 ) # Nuclear heating in the divertor (MW) @@ -102,7 +104,9 @@ def plot_full_sankey( ) # Pump Power in FW and blanket (MW) htpmwblkt = htpmw_fw_blkt / 2 # Pump power in blanket (MW) htpmwfw = htpmw_fw_blkt / 2 # Pump power in FW (MW) - pthermfw = pthermfw_blkt - htpmwblkt - pnucblkt # Power extracted 1st wall (MW) + pthermfw = ( + pthermfw_blkt - htpmwblkt - p_blkt_nuclear_heat_total_mw + ) # Power extracted 1st wall (MW) # porbitloss = m_file.data['porbitloss'].get_scan(-1) # Charged P. on FW before thermalising # nbshinemw = m_file.data['nbshinemw'].get_scan(-1) # Injection shine-through to 1st wall @@ -521,7 +525,7 @@ def plot_sankey(mfilename="MFILE.DAT"): # Plot simplified power flow Sankey Dia p_fw_nuclear_heat_total_mw = m_file.data["p_fw_nuclear_heat_total_mw"].get_scan( -1 ) # nuclear heating in the first wall (MW) - pnucblkt = m_file.data["pnucblkt"].get_scan( + p_blkt_nuclear_heat_total_mw = m_file.data["p_blkt_nuclear_heat_total_mw"].get_scan( -1 ) # nuclear heating in the blanket (MW) pnucshld = m_file.data["pnucshld"].get_scan( @@ -548,13 +552,20 @@ def plot_sankey(mfilename="MFILE.DAT"): # Plot simplified power flow Sankey Dia totaldivetc = pdivt + pnucdiv + praddiv # Power deposited on Blanket (MW) totalblktetc = ( + ( p_fw_nuclear_heat_total_mw - + pnucblkt + + + p_blkt + _nuclear_heat_total_mw + pnucshld + + pradfw + + p_fw_alpha_mw + - emultmw ) + ) if itart == 0: # Power deposited in CP (MW) (None here) diff --git a/process/power.py b/process/power.py index f13c5f26e8..e1216eb69f 100644 --- a/process/power.py +++ b/process/power.py @@ -620,13 +620,14 @@ def power1(self): heat_transport_variables.htpmw - self.htpmw_mech ) - # Calculate total deposited power (MW), n.b. energy multiplication in pnucblkt already + # Calculate total deposited power (MW), n.b. energy multiplication in p_blkt_nuclear_heat_total_mw already if fwbs_variables.primary_pumping == 2: # Liquid metal breeder/coolant if fwbs_variables.icooldual == 2: self.pthermblkt_liq = ( - fwbs_variables.pnucblkt * fwbs_variables.f_nuc_pow_bz_liq + fwbs_variables.p_blkt_nuclear_heat_total_mw + * fwbs_variables.f_nuc_pow_bz_liq ) + heat_transport_variables.htpmw_blkt_liq elif fwbs_variables.icooldual == 1: self.pthermblkt_liq = heat_transport_variables.htpmw_blkt_liq @@ -637,7 +638,10 @@ def power1(self): self.pthermblkt_liq + fwbs_variables.p_fw_nuclear_heat_total_mw + fwbs_variables.pradfw - + (fwbs_variables.pnucblkt * (1 - fwbs_variables.f_nuc_pow_bz_liq)) + + ( + fwbs_variables.p_blkt_nuclear_heat_total_mw + * (1 - fwbs_variables.f_nuc_pow_bz_liq) + ) + primary_pumping_variables.htpmw_fw_blkt + current_drive_variables.porbitlossmw + physics_variables.p_fw_alpha_mw @@ -648,7 +652,7 @@ def power1(self): self.pthermblkt_liq + fwbs_variables.p_fw_nuclear_heat_total_mw + fwbs_variables.pradfw - + fwbs_variables.pnucblkt + + fwbs_variables.p_blkt_nuclear_heat_total_mw + primary_pumping_variables.htpmw_fw_blkt + current_drive_variables.porbitlossmw + physics_variables.p_fw_alpha_mw @@ -658,7 +662,7 @@ def power1(self): self.pthermfw_blkt = ( fwbs_variables.p_fw_nuclear_heat_total_mw + fwbs_variables.pradfw - + fwbs_variables.pnucblkt + + fwbs_variables.p_blkt_nuclear_heat_total_mw + primary_pumping_variables.htpmw_fw_blkt + current_drive_variables.porbitlossmw + physics_variables.p_fw_alpha_mw @@ -670,7 +674,7 @@ def power1(self): self.pthermfw_blkt = ( fwbs_variables.p_fw_nuclear_heat_total_mw + fwbs_variables.pradfw - + fwbs_variables.pnucblkt + + fwbs_variables.p_blkt_nuclear_heat_total_mw + primary_pumping_variables.htpmw_fw_blkt + current_drive_variables.porbitlossmw + physics_variables.p_fw_alpha_mw @@ -687,9 +691,10 @@ def power1(self): + physics_variables.p_fw_alpha_mw + current_drive_variables.nbshinemw ) - # Total power deposited in blanket coolant (MW) (energy multiplication in fwbs_variables.pnucblkt already) + # Total power deposited in blanket coolant (MW) (energy multiplication in fwbs_variables.p_blkt_nuclear_heat_total_mw already) self.pthermblkt = ( - fwbs_variables.pnucblkt + heat_transport_variables.htpmw_blkt + fwbs_variables.p_blkt_nuclear_heat_total_mw + + heat_transport_variables.htpmw_blkt ) self.pthermfw_blkt = self.pthermfw + self.pthermblkt @@ -1350,7 +1355,12 @@ def power2(self, output: bool): po.oblnkl(self.outfile) po.write(self.outfile, "Blanket:") - po.dblcol(self.outfile, "pnucblkt", 0.0e0, fwbs_variables.pnucblkt) + po.dblcol( + self.outfile, + "p_blkt_nuclear_heat_total_mw", + 0.0e0, + fwbs_variables.p_blkt_nuclear_heat_total_mw, + ) po.write(self.outfile, "0.0e0 0.0e0 0.0e0") po.write(self.outfile, "0.0e0 0.0e0 0.0e0") po.dblcol( @@ -1358,7 +1368,9 @@ def power2(self, output: bool): ) primsum = ( - primsum + fwbs_variables.pnucblkt + heat_transport_variables.htpmw_blkt + primsum + + fwbs_variables.p_blkt_nuclear_heat_total_mw + + heat_transport_variables.htpmw_blkt ) secsum = secsum diff --git a/process/stellarator.py b/process/stellarator.py index 8985a6d576..b052142bb3 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -1232,7 +1232,8 @@ def stfwbs(self, output: bool): + current_drive_variables.porbitlossmw ) heat_transport_variables.htpmw_blkt = ( - heat_transport_variables.fpumpblkt * fwbs_variables.pnucblkt + heat_transport_variables.fpumpblkt + * fwbs_variables.p_blkt_nuclear_heat_total_mw ) heat_transport_variables.htpmw_shld = ( heat_transport_variables.fpumpshld * fwbs_variables.pnucshld @@ -1284,12 +1285,14 @@ def stfwbs(self, output: bool): - fwbs_variables.fblbe ) - fwbs_variables.pnucblkt = pneut2 * ( + fwbs_variables.p_blkt_nuclear_heat_total_mw = pneut2 * ( 1.0e0 - np.exp(-build_variables.dr_blkt_outboard / decaybl) ) # Nuclear heating in the shield - fwbs_variables.pnucshld = pneut2 - fwbs_variables.pnucblkt + fwbs_variables.pnucshld = ( + pneut2 - fwbs_variables.p_blkt_nuclear_heat_total_mw + ) # Superconducting coil shielding calculations ( @@ -1497,7 +1500,9 @@ def stfwbs(self, output: bool): # Total nuclear heating of blanket (MW) - fwbs_variables.pnucblkt = (pnucbzi + pnucbzo) * fwbs_variables.emult + fwbs_variables.p_blkt_nuclear_heat_total_mw = ( + pnucbzi + pnucbzo + ) * fwbs_variables.emult fwbs_variables.emultmw = fwbs_variables.emultmw + ( pnucbzi + pnucbzo @@ -2028,8 +2033,8 @@ def stfwbs(self, output: bool): po.ovarre( self.outfile, "Blanket heating (including energy multiplication) (MW)", - "(pnucblkt)", - fwbs_variables.pnucblkt, + "(p_blkt_nuclear_heat_total_mw)", + fwbs_variables.p_blkt_nuclear_heat_total_mw, ) po.ovarre( self.outfile, @@ -2048,8 +2053,8 @@ def stfwbs(self, output: bool): po.ovarre( self.outfile, "Blanket heating (including energy multiplication) (MW)", - "(pnucblkt)", - fwbs_variables.pnucblkt, + "(p_blkt_nuclear_heat_total_mw)", + fwbs_variables.p_blkt_nuclear_heat_total_mw, ) po.ovarre( self.outfile, diff --git a/source/fortran/fwbs_variables.f90 b/source/fortran/fwbs_variables.f90 index b84a033ba6..0f2da1c41e 100644 --- a/source/fortran/fwbs_variables.f90 +++ b/source/fortran/fwbs_variables.f90 @@ -106,7 +106,7 @@ module fwbs_variables real(dp) :: li6enrich !! lithium-6 enrichment of breeding material (%) - real(dp) :: pnucblkt + real(dp) :: p_blkt_nuclear_heat_total_mw !! nuclear heating in the blanket [MW] real(dp) :: pnuc_cp @@ -687,7 +687,7 @@ subroutine init_fwbs_variables inuclear = 0 qnuc = 0.0D0 li6enrich = 30.0D0 - pnucblkt = 0.0D0 + p_blkt_nuclear_heat_total_mw = 0.0D0 pnucdiv = 0.0D0 p_fw_nuclear_heat_total_mw = 0.0D0 pnuchcd = 0.0D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index e789cb14ba..811c038611 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -969,7 +969,7 @@ 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_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6315E+02 OP - Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (pnucblkt)____________________ 1.2901E+03 OP + Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2901E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4138E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.4906E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index f9edeee9a0..c85b7aed71 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -970,7 +970,7 @@ 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_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6315E+02 OP - Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (pnucblkt)____________________ 1.2901E+03 OP + Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2901E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4138E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.4906E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index ec44213e2d..5a7e5cbc3f 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -970,7 +970,7 @@ 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_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6315E+02 OP - Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (pnucblkt)____________________ 1.2901E+03 OP + Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2901E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4138E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.4906E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 4a03170256..24b1776cb8 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -970,7 +970,7 @@ 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_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6315E+02 OP - Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (pnucblkt)____________________ 1.2901E+03 OP + Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2901E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4138E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.4906E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 7038aa0cd1..223e24da68 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -973,7 +973,7 @@ Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 7.9388E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 2.5460E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6290E+02 OP - Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (pnucblkt)____________________ 1.2880E+03 OP + Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2880E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4115E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.4882E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 69c1d1e4d3..247ba989d1 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -971,7 +971,7 @@ Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 7.9388E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 2.3700E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6103E+02 OP - Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (pnucblkt)____________________ 1.2733E+03 OP + Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2733E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.3954E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.4712E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP @@ -2134,7 +2134,7 @@ Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 7.9388E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 2.3421E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6251E+02 OP - Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (pnucblkt)____________________ 1.2850E+03 OP + Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2850E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4082E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.4847E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP @@ -3297,7 +3297,7 @@ Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 7.9388E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 2.3152E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6329E+02 OP - Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (pnucblkt)____________________ 1.2912E+03 OP + Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2912E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4150E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.4918E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP @@ -4460,7 +4460,7 @@ Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 7.9388E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 2.3227E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6357E+02 OP - Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (pnucblkt)____________________ 1.2934E+03 OP + Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2934E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4174E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.4944E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP @@ -5623,7 +5623,7 @@ Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 7.9388E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 2.3582E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6383E+02 OP - Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (pnucblkt)____________________ 1.2955E+03 OP + Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2955E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4196E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.4968E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP @@ -6786,7 +6786,7 @@ Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 7.9388E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 2.3988E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6332E+02 OP - Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (pnucblkt)____________________ 1.2914E+03 OP + Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2914E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4152E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.4920E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP @@ -7949,7 +7949,7 @@ Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 7.9388E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 2.4079E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6364E+02 OP - Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (pnucblkt)____________________ 1.2940E+03 OP + Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2940E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4180E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.4951E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP @@ -9112,7 +9112,7 @@ Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 7.9388E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 2.3702E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6387E+02 OP - Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (pnucblkt)____________________ 1.2958E+03 OP + Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2958E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4200E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.4971E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP @@ -10275,7 +10275,7 @@ Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 7.9388E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 2.3232E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6326E+02 OP - Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (pnucblkt)____________________ 1.2909E+03 OP + Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2909E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4147E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.4915E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP @@ -11438,7 +11438,7 @@ Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 7.9388E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 2.3404E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6432E+02 OP - Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (pnucblkt)____________________ 1.2993E+03 OP + Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2993E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4239E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.5012E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP @@ -12601,7 +12601,7 @@ Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 7.9388E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 2.3925E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6529E+02 OP - Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (pnucblkt)____________________ 1.3070E+03 OP + Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.3070E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4323E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.5101E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP @@ -13764,7 +13764,7 @@ Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 7.9388E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 2.4316E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6523E+02 OP - Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (pnucblkt)____________________ 1.3065E+03 OP + Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.3065E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4317E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.5095E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP @@ -14927,7 +14927,7 @@ Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 7.9388E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 2.4474E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6612E+02 OP - Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (pnucblkt)____________________ 1.3135E+03 OP + Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.3135E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4394E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.5176E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP @@ -16090,7 +16090,7 @@ Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 7.9388E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 2.4190E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6699E+02 OP - Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (pnucblkt)____________________ 1.3204E+03 OP + Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.3204E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4470E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.5256E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP @@ -17253,7 +17253,7 @@ Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 7.9388E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 2.3908E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6791E+02 OP - Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (pnucblkt)____________________ 1.3277E+03 OP + Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.3277E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4550E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.5340E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 0b8c12c3ef..f8e2d585dc 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -799,7 +799,7 @@ Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 5.8227E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 2.4609E+02 OP - Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (pnucblkt)____________________ 1.5585E+03 OP + Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4885E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.8507E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP @@ -1794,7 +1794,7 @@ Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 5.8227E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 2.4609E+02 OP - Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (pnucblkt)____________________ 1.5585E+03 OP + Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4885E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.8507E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP @@ -2789,7 +2789,7 @@ Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 5.8228E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 2.4609E+02 OP - Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (pnucblkt)____________________ 1.5585E+03 OP + Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4885E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.8507E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP @@ -3784,7 +3784,7 @@ Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 5.8228E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 2.4609E+02 OP - Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (pnucblkt)____________________ 1.5585E+03 OP + Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4885E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.8507E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP @@ -4779,7 +4779,7 @@ Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 5.8228E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 2.4609E+02 OP - Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (pnucblkt)____________________ 1.5585E+03 OP + Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4885E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.8507E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP @@ -5774,7 +5774,7 @@ Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 5.8228E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 2.4609E+02 OP - Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (pnucblkt)____________________ 1.5585E+03 OP + Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4885E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.8507E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP @@ -6769,7 +6769,7 @@ Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 5.8228E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 2.4609E+02 OP - Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (pnucblkt)____________________ 1.5585E+03 OP + Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4885E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.8507E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP @@ -7764,7 +7764,7 @@ Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 5.8228E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 2.4609E+02 OP - Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (pnucblkt)____________________ 1.5585E+03 OP + Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4885E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.8507E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP @@ -8759,7 +8759,7 @@ Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 5.8228E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 2.4609E+02 OP - Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (pnucblkt)____________________ 1.5585E+03 OP + Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4885E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.8507E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 531a139650..b8b6f4182b 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3564,7 +3564,7 @@ "pnuc_cp_tf": 0.0, "pnuc_fw_ratio": 0.0, "pnuc_tot_blk_sector": null, - "pnucblkt": 0.0, + "p_blkt_nuclear_heat_total_mw": 0.0, "pnucblkti": 0.0, "pnucblkto": 0.0, "pnucdiv": 0.0, @@ -10322,7 +10322,7 @@ "pnuc_cp_tf": "TF neutronic nuclear heating in the ST centrepost (MW)", "pnuc_fw_ratio": "", "pnuc_tot_blk_sector": "Total nuclear power deposited in blanket covered sector (FW, BLKT, SHLD, TF) (MW)", - "pnucblkt": "nuclear heating in the blanket (MW)", + "p_blkt_nuclear_heat_total_mw": "nuclear heating in the blanket (MW)", "pnucblkti": "Neutron power deposited inboard/outboard blanket blanket (MW)", "pnucblkto": "Neutron power deposited inboard/outboard blanket blanket (MW)", "pnucdiv": "nuclear heating in the divertor (MW)", @@ -18035,7 +18035,7 @@ "inuclear", "qnuc", "li6enrich", - "pnucblkt", + "p_blkt_nuclear_heat_total_mw", "pnuc_cp", "pnuc_cp_sh", "pnuc_cp_tf", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 4092d5e101..46b25b4cbb 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -973,7 +973,7 @@ Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 7.9388E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 2.5460E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_mw)______________________ 1.6290E+02 OP - Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (pnucblkt)____________________ 1.2880E+03 OP + Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2880E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4115E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.4882E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP diff --git a/tests/unit/test_ccfe_hcpb.py b/tests/unit/test_ccfe_hcpb.py index 8626256162..d1403993c9 100644 --- a/tests/unit/test_ccfe_hcpb.py +++ b/tests/unit/test_ccfe_hcpb.py @@ -497,13 +497,13 @@ def test_nuclear_heating_fw(nuclearheatingfwparam, monkeypatch, ccfe_hcpb): class NuclearHeatingBlanketParam(NamedTuple): whtblkt: Any = None - pnucblkt: Any = None + p_blkt_nuclear_heat_total_mw: Any = None fusion_power: Any = None exp_blanket: Any = None - expected_pnucblkt: Any = None + expected_p_blkt_nuclear_heat_total_mw: Any = None expected_exp_blanket: Any = None @@ -513,18 +513,18 @@ class NuclearHeatingBlanketParam(NamedTuple): ( NuclearHeatingBlanketParam( whtblkt=3501027.3252278985, - pnucblkt=0, + p_blkt_nuclear_heat_total_mw=0, fusion_power=1986.0623241661431, exp_blanket=0, - expected_pnucblkt=1517.0907688379014, + expected_p_blkt_nuclear_heat_total_mw=1517.0907688379014, expected_exp_blanket=0.99982809071915879, ), NuclearHeatingBlanketParam( whtblkt=3507503.3737008357, - pnucblkt=1504.9215740808861, + p_blkt_nuclear_heat_total_mw=1504.9215740808861, fusion_power=1985.4423932312809, exp_blanket=0.99982809071915879, - expected_pnucblkt=1516.6213709741428, + expected_p_blkt_nuclear_heat_total_mw=1516.6213709741428, expected_exp_blanket=0.99983082524994527, ), ), @@ -544,7 +544,11 @@ def test_nuclear_heating_blanket(nuclearheatingblanketparam, monkeypatch, ccfe_h monkeypatch.setattr(fwbs_variables, "whtblkt", nuclearheatingblanketparam.whtblkt) - monkeypatch.setattr(fwbs_variables, "pnucblkt", nuclearheatingblanketparam.pnucblkt) + monkeypatch.setattr( + fwbs_variables, + "p_blkt_nuclear_heat_total_mw", + nuclearheatingblanketparam.p_blkt_nuclear_heat_total_mw, + ) monkeypatch.setattr( physics_variables, "fusion_power", nuclearheatingblanketparam.fusion_power @@ -556,8 +560,8 @@ def test_nuclear_heating_blanket(nuclearheatingblanketparam, monkeypatch, ccfe_h ccfe_hcpb.nuclear_heating_blanket() - assert fwbs_variables.pnucblkt == pytest.approx( - nuclearheatingblanketparam.expected_pnucblkt + assert fwbs_variables.p_blkt_nuclear_heat_total_mw == pytest.approx( + nuclearheatingblanketparam.expected_p_blkt_nuclear_heat_total_mw ) assert ccfe_hcpb_module.exp_blanket == pytest.approx( @@ -808,7 +812,7 @@ class PowerflowCalcParam(NamedTuple): p_fw_nuclear_heat_total_mw: Any = None - pnucblkt: Any = None + p_blkt_nuclear_heat_total_mw: Any = None pnucdiv: Any = None @@ -894,7 +898,7 @@ class PowerflowCalcParam(NamedTuple): blpressure=15500000, primary_pumping=3, p_fw_nuclear_heat_total_mw=276.80690153753221, - pnucblkt=1504.9215740808861, + p_blkt_nuclear_heat_total_mw=1504.9215740808861, pnucdiv=182.71773382328519, pnucshld=1.3611259588044891, etaiso=0.90000000000000002, @@ -943,7 +947,7 @@ class PowerflowCalcParam(NamedTuple): blpressure=15500000, primary_pumping=3, p_fw_nuclear_heat_total_mw=230.98304919926957, - pnucblkt=1550.1447895848396, + p_blkt_nuclear_heat_total_mw=1550.1447895848396, pnucdiv=182.66070017727785, pnucshld=1.4038170956592293, etaiso=0.90000000000000002, @@ -1031,7 +1035,11 @@ def test_powerflow_calc(powerflowcalcparam, monkeypatch, ccfe_hcpb): powerflowcalcparam.p_fw_nuclear_heat_total_mw, ) - monkeypatch.setattr(fwbs_variables, "pnucblkt", powerflowcalcparam.pnucblkt) + monkeypatch.setattr( + fwbs_variables, + "p_blkt_nuclear_heat_total_mw", + powerflowcalcparam.p_blkt_nuclear_heat_total_mw, + ) monkeypatch.setattr(fwbs_variables, "pnucdiv", powerflowcalcparam.pnucdiv) diff --git a/tests/unit/test_costs_1990.py b/tests/unit/test_costs_1990.py index 830f288455..0710bf2741 100644 --- a/tests/unit/test_costs_1990.py +++ b/tests/unit/test_costs_1990.py @@ -104,7 +104,7 @@ def acc2261_fix(costs, request, monkeypatch): monkeypatch.setattr(cost_variables, "fkind", 1) monkeypatch.setattr(cost_variables, "lsa", 1) monkeypatch.setattr(htv, "pfwdiv", 0.0) - monkeypatch.setattr(fv, "pnucblkt", 1558.0) + monkeypatch.setattr(fv, "p_blkt_nuclear_heat_total_mw", 1558.0) monkeypatch.setattr(fv, "pnucshld", 1.478) monkeypatch.setattr(htv, "pthermmw", 2647.0) monkeypatch.setattr(htv, "nphx", 3) @@ -3813,7 +3813,7 @@ class Acc2261Param(NamedTuple): pnucshld: Any = None - pnucblkt: Any = None + p_blkt_nuclear_heat_total_mw: Any = None pthermmw: Any = None @@ -3850,7 +3850,7 @@ class Acc2261Param(NamedTuple): fkind=1, i_blkt_coolant_type=1, pnucshld=1.3609360176065353, - pnucblkt=1504.711566619962, + p_blkt_nuclear_heat_total_mw=1504.711566619962, pthermmw=2620.2218111502593, pfwdiv=0, nphx=3, @@ -3872,7 +3872,7 @@ class Acc2261Param(NamedTuple): fkind=1, i_blkt_coolant_type=1, pnucshld=1.4036212304705389, - pnucblkt=1549.9285082739402, + p_blkt_nuclear_heat_total_mw=1549.9285082739402, pthermmw=2619.4223856129224, pfwdiv=0, nphx=3, @@ -3912,7 +3912,11 @@ def test_acc2261_rut(acc2261param, monkeypatch, costs): monkeypatch.setattr(fwbs_variables, "pnucshld", acc2261param.pnucshld) - monkeypatch.setattr(fwbs_variables, "pnucblkt", acc2261param.pnucblkt) + monkeypatch.setattr( + fwbs_variables, + "p_blkt_nuclear_heat_total_mw", + acc2261param.p_blkt_nuclear_heat_total_mw, + ) monkeypatch.setattr(heat_transport_variables, "pthermmw", acc2261param.pthermmw) diff --git a/tests/unit/test_dcll.py b/tests/unit/test_dcll.py index c5cce13681..6748a22bc3 100644 --- a/tests/unit/test_dcll.py +++ b/tests/unit/test_dcll.py @@ -53,7 +53,7 @@ class DcllNeutronicsAndPowerParam(NamedTuple): psurffwo: Any = None - pnucblkt: Any = None + p_blkt_nuclear_heat_total_mw: Any = None pnuc_fw_ratio_dcll: Any = None @@ -81,7 +81,7 @@ class DcllNeutronicsAndPowerParam(NamedTuple): expected_p_fw_nuclear_heat_total_mw: Any = None - expected_pnucblkt: Any = None + expected_p_blkt_nuclear_heat_total_mw: Any = None expected_emultmw: Any = None @@ -104,7 +104,7 @@ class DcllNeutronicsAndPowerParam(NamedTuple): p_fw_nuclear_heat_total_mw=0, psurffwi=0, psurffwo=0, - pnucblkt=0, + p_blkt_nuclear_heat_total_mw=0, pnuc_fw_ratio_dcll=0.14000000000000001, pnuc_blkt_ratio_dcll=0.85999999999999999, emult=1.2689999999999999, @@ -118,7 +118,7 @@ class DcllNeutronicsAndPowerParam(NamedTuple): expected_pnucdiv=182.58994516305046, expected_pradfw=254.39207240222791, expected_p_fw_nuclear_heat_total_mw=196.72081918001697, - expected_pnucblkt=1533.4949914565693, + expected_p_blkt_nuclear_heat_total_mw=1533.4949914565693, expected_emultmw=325.06710220789364, ), DcllNeutronicsAndPowerParam( @@ -136,7 +136,7 @@ class DcllNeutronicsAndPowerParam(NamedTuple): p_fw_nuclear_heat_total_mw=196.72081918001697, psurffwi=97.271629070225231, psurffwo=176.95628839065773, - pnucblkt=1533.4949914565693, + p_blkt_nuclear_heat_total_mw=1533.4949914565693, pnuc_fw_ratio_dcll=0.14000000000000001, pnuc_blkt_ratio_dcll=0.85999999999999999, emult=1.2689999999999999, @@ -150,7 +150,7 @@ class DcllNeutronicsAndPowerParam(NamedTuple): expected_pnucdiv=182.53295140508826, expected_pradfw=254.39207240222791, expected_p_fw_nuclear_heat_total_mw=196.65941460078642, - expected_pnucblkt=1533.0163252173013, + expected_p_blkt_nuclear_heat_total_mw=1533.0163252173013, expected_emultmw=324.96563552675644, ), ), @@ -215,7 +215,9 @@ def test_dcll_neutronics_and_power(dcllneutronicsandpowerparam, monkeypatch, dcl ) monkeypatch.setattr( - fwbs_variables, "pnucblkt", dcllneutronicsandpowerparam.pnucblkt + fwbs_variables, + "p_blkt_nuclear_heat_total_mw", + dcllneutronicsandpowerparam.p_blkt_nuclear_heat_total_mw, ) monkeypatch.setattr( @@ -272,8 +274,8 @@ def test_dcll_neutronics_and_power(dcllneutronicsandpowerparam, monkeypatch, dcl dcllneutronicsandpowerparam.expected_p_fw_nuclear_heat_total_mw ) - assert fwbs_variables.pnucblkt == pytest.approx( - dcllneutronicsandpowerparam.expected_pnucblkt + assert fwbs_variables.p_blkt_nuclear_heat_total_mw == pytest.approx( + dcllneutronicsandpowerparam.expected_p_blkt_nuclear_heat_total_mw ) assert fwbs_variables.emultmw == pytest.approx( diff --git a/tests/unit/test_ife.py b/tests/unit/test_ife.py index 35c297be56..dabe746bfe 100644 --- a/tests/unit/test_ife.py +++ b/tests/unit/test_ife.py @@ -2026,7 +2026,7 @@ def test_genbld(genbldparam, monkeypatch, ife): class Ifepw1Param(NamedTuple): emult: Any = None fhole: Any = None - pnucblkt: Any = None + p_blkt_nuclear_heat_total_mw: Any = None pnucshld: Any = None pnucloss: Any = None priheat: Any = None @@ -2042,7 +2042,7 @@ class Ifepw1Param(NamedTuple): etadrv: Any = None pifecr: Any = None powfmw: Any = None - expected_pnucblkt: Any = None + expected_p_blkt_nuclear_heat_total_mw: Any = None expected_priheat: Any = None expected_pthermmw: Any = None expected_pfwdiv: Any = None @@ -2059,7 +2059,7 @@ class Ifepw1Param(NamedTuple): Ifepw1Param( emult=1.26, fhole=0, - pnucblkt=0, + p_blkt_nuclear_heat_total_mw=0, pnucshld=0, pnucloss=0, priheat=0, @@ -2075,7 +2075,7 @@ class Ifepw1Param(NamedTuple): etadrv=0.28199999999999997, pifecr=10, powfmw=2009.6999999999998, - expected_pnucblkt=1924.4887199999998, + expected_p_blkt_nuclear_heat_total_mw=1924.4887199999998, expected_priheat=2532.2219999999998, expected_pthermmw=2532.2219999999998, expected_pfwdiv=607.73327999999992, @@ -2101,7 +2101,11 @@ def test_ifepw1(ifepw1param, monkeypatch, ife): """ monkeypatch.setattr(fwbs_variables, "emult", ifepw1param.emult) monkeypatch.setattr(fwbs_variables, "fhole", ifepw1param.fhole) - monkeypatch.setattr(fwbs_variables, "pnucblkt", ifepw1param.pnucblkt) + monkeypatch.setattr( + fwbs_variables, + "p_blkt_nuclear_heat_total_mw", + ifepw1param.p_blkt_nuclear_heat_total_mw, + ) monkeypatch.setattr(fwbs_variables, "pnucshld", ifepw1param.pnucshld) monkeypatch.setattr(fwbs_variables, "pnucloss", ifepw1param.pnucloss) monkeypatch.setattr(heat_transport_variables, "priheat", ifepw1param.priheat) @@ -2120,7 +2124,9 @@ def test_ifepw1(ifepw1param, monkeypatch, ife): ife.ifepw1() - assert fwbs_variables.pnucblkt == pytest.approx(ifepw1param.expected_pnucblkt) + assert fwbs_variables.p_blkt_nuclear_heat_total_mw == pytest.approx( + ifepw1param.expected_p_blkt_nuclear_heat_total_mw + ) assert heat_transport_variables.priheat == pytest.approx( ifepw1param.expected_priheat ) @@ -2800,7 +2806,7 @@ class Ifepw2Param(NamedTuple): pnucloss: Any = None emult: Any = None tbr: Any = None - pnucblkt: Any = None + p_blkt_nuclear_heat_total_mw: Any = None fachtmw: Any = None fcsht: Any = None psechtmw: Any = None @@ -2839,7 +2845,7 @@ class Ifepw2Param(NamedTuple): pnucloss=0, emult=1.26, tbr=0, - pnucblkt=1924.4887199999998, + p_blkt_nuclear_heat_total_mw=1924.4887199999998, fachtmw=0, fcsht=24.322206046559071, psechtmw=0, @@ -2887,7 +2893,11 @@ def test_ifepw2(ifepw2param, monkeypatch, ife): monkeypatch.setattr(fwbs_variables, "pnucloss", ifepw2param.pnucloss) monkeypatch.setattr(fwbs_variables, "emult", ifepw2param.emult) monkeypatch.setattr(fwbs_variables, "tbr", ifepw2param.tbr) - monkeypatch.setattr(fwbs_variables, "pnucblkt", ifepw2param.pnucblkt) + monkeypatch.setattr( + fwbs_variables, + "p_blkt_nuclear_heat_total_mw", + ifepw2param.p_blkt_nuclear_heat_total_mw, + ) monkeypatch.setattr(heat_transport_variables, "fachtmw", ifepw2param.fachtmw) monkeypatch.setattr(heat_transport_variables, "fcsht", ifepw2param.fcsht) monkeypatch.setattr(heat_transport_variables, "psechtmw", ifepw2param.psechtmw) diff --git a/tests/unit/test_power.py b/tests/unit/test_power.py index b82625ecad..7671a76dda 100644 --- a/tests/unit/test_power.py +++ b/tests/unit/test_power.py @@ -2045,7 +2045,7 @@ class Power2Param(NamedTuple): inuclear: Any = None - pnucblkt: Any = None + p_blkt_nuclear_heat_total_mw: Any = None pradfw: Any = None @@ -2244,7 +2244,7 @@ class Power2Param(NamedTuple): pinjmw=51.978447720428512, emultmw=377.93233088402548, inuclear=1, - pnucblkt=1504.711566619962, + p_blkt_nuclear_heat_total_mw=1504.711566619962, pradfw=254.87601794907812, qnuc=12920, etahtp=0.87000000000000011, @@ -2346,7 +2346,7 @@ class Power2Param(NamedTuple): pinjmw=51.978447720428512, emultmw=377.8143718115644, inuclear=1, - pnucblkt=1549.9285082739402, + p_blkt_nuclear_heat_total_mw=1549.9285082739402, pradfw=254.87601794907812, qnuc=12920, etahtp=0.87000000000000011, @@ -2468,7 +2468,11 @@ def test_power2(power2param, monkeypatch, power): monkeypatch.setattr(fwbs_variables, "inuclear", power2param.inuclear) - monkeypatch.setattr(fwbs_variables, "pnucblkt", power2param.pnucblkt) + monkeypatch.setattr( + fwbs_variables, + "p_blkt_nuclear_heat_total_mw", + power2param.p_blkt_nuclear_heat_total_mw, + ) monkeypatch.setattr(fwbs_variables, "pradfw", power2param.pradfw) diff --git a/tracking/tracking_data.py b/tracking/tracking_data.py index 7bd1bfa86f..8fb2575518 100644 --- a/tracking/tracking_data.py +++ b/tracking/tracking_data.py @@ -113,7 +113,7 @@ class ProcessTracker: "dr_tf_inboard", "dr_shld_vv_gap_inboard", "pnucshld", - "pnucblkt", + "p_blkt_nuclear_heat_total_mw", "triang", "triang95", "p_plasma_inner_rad_mw", From 1c9e88903cf75288b598cd95462d0fc2b0fc2453 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 17 Feb 2025 15:47:54 +0000 Subject: [PATCH 12/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20whtblkt=20to=20m?= =?UTF-8?q?=5Fblkt=5Ftotal=20for=20clarity=20and=20consistency=20across=20?= =?UTF-8?q?the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++++----- process/dcll.py | 12 +++---- process/hcpb.py | 12 +++---- process/ife.py | 10 +++--- process/stellarator.py | 20 ++++++----- process/structure.py | 2 +- source/fortran/fwbs_variables.f90 | 4 +-- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 ++++++++-------- tests/integration/data/scan_MFILE.DAT | 18 +++++----- tests/integration/ref_dicts.json | 6 ++-- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_ccfe_hcpb.py | 36 +++++++++++-------- tests/unit/test_dcll.py | 18 +++++----- tests/unit/test_ife.py | 14 ++++---- 24 files changed, 117 insertions(+), 105 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 2c5760900b..f84f8fffb6 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -966,7 +966,7 @@ Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.0178E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+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_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 8.9696E+05 OP diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 96a33ff701..5904bedf47 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -961,7 +961,7 @@ Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.0178E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+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_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 8.9696E+05 OP diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 67f7e91495..b2450d0e47 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -961,7 +961,7 @@ Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.0178E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+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_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 8.9696E+05 OP diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 9a95de4fdb..0b5525a4a3 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -961,7 +961,7 @@ Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.0178E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+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_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 8.9696E+05 OP diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 533f4d15ec..6f46d18e65 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -961,7 +961,7 @@ Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.0178E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+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_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 8.9696E+05 OP diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index fca6161477..3ba91547cc 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -790,7 +790,7 @@ Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP - Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 3.7129E+06 OP + Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 1.1222E+06 OP @@ -1785,7 +1785,7 @@ Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP - Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 3.7129E+06 OP + Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 1.1222E+06 OP @@ -2780,7 +2780,7 @@ Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP - Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 3.7129E+06 OP + Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 1.1222E+06 OP @@ -3775,7 +3775,7 @@ Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP - Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 3.7129E+06 OP + Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 1.1222E+06 OP @@ -4770,7 +4770,7 @@ Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP - Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 3.7129E+06 OP + Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 1.1222E+06 OP @@ -5765,7 +5765,7 @@ Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP - Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 3.7129E+06 OP + Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 1.1222E+06 OP @@ -6760,7 +6760,7 @@ Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP - Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 3.7129E+06 OP + Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 1.1222E+06 OP @@ -7755,7 +7755,7 @@ Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP - Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 3.7129E+06 OP + Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 1.1222E+06 OP @@ -8750,7 +8750,7 @@ Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP - Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 3.7129E+06 OP + Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 1.1222E+06 OP diff --git a/process/dcll.py b/process/dcll.py index d7263ff195..90c99a502a 100644 --- a/process/dcll.py +++ b/process/dcll.py @@ -693,7 +693,7 @@ def dcll_masses(self, output: bool): ) # Total mass of blanket - fwbs_variables.whtblkt = ( + fwbs_variables.m_blkt_total = ( dcll_module.wht_stl_struct + dcll_module.wht_cool_struct + fwbs_variables.wht_liq @@ -709,13 +709,13 @@ def dcll_masses(self, output: bool): fwbs_variables.armour_fw_bl_mass = ( fwbs_variables.fw_armour_mass + fwbs_variables.m_fw_total - + fwbs_variables.whtblkt + + fwbs_variables.m_blkt_total ) # Total mass of IB/OB segment if fwbs_variables.i_blkt_inboard == 1: dcll_module.mass_segm_ib = ( - fwbs_variables.whtblkt + fwbs_variables.m_blkt_total * (fwbs_variables.vol_blkt_inboard / fwbs_variables.vol_blkt_total) + fwbs_variables.m_fw_total * ( @@ -735,7 +735,7 @@ def dcll_masses(self, output: bool): ) / fwbs_variables.nblktmodti dcll_module.mass_segm_ob = ( - fwbs_variables.whtblkt + fwbs_variables.m_blkt_total * (fwbs_variables.vol_blkt_outboard / fwbs_variables.vol_blkt_total) + fwbs_variables.m_fw_total * ( @@ -796,8 +796,8 @@ def dcll_masses(self, output: bool): po.ovarre( self.outfile, "Total Blanket Mass (kg)", - "(whtblkt)", - fwbs_variables.whtblkt, + "(m_blkt_total)", + fwbs_variables.m_blkt_total, "OP ", ) if fwbs_variables.ifci == 1: diff --git a/process/hcpb.py b/process/hcpb.py index 4a61cbfea5..b43cb567aa 100644 --- a/process/hcpb.py +++ b/process/hcpb.py @@ -369,7 +369,7 @@ def component_masses(self): ) # Total blanket mass (kg) - fwbs_variables.whtblkt = ( + fwbs_variables.m_blkt_total = ( fwbs_variables.whtbltibe12 + fwbs_variables.whtblli4sio4 + fwbs_variables.whtblss @@ -379,7 +379,7 @@ def component_masses(self): fwbs_variables.armour_fw_bl_mass = ( fwbs_variables.fw_armour_mass + fwbs_variables.m_fw_total - + fwbs_variables.whtblkt + + fwbs_variables.m_blkt_total ) def nuclear_heating_magnets(self, output: bool): @@ -416,7 +416,7 @@ def nuclear_heating_magnets(self, output: bool): ccfe_hcpb_module.armour_density = constants.den_tungsten * (1.0 - vffwm) ccfe_hcpb_module.fw_density = fwbs_variables.denstl * (1.0 - vffwm) ccfe_hcpb_module.blanket_density = ( - fwbs_variables.whtblkt / fwbs_variables.vol_blkt_total + fwbs_variables.m_blkt_total / fwbs_variables.vol_blkt_total ) ccfe_hcpb_module.shield_density = ( fwbs_variables.whtshld / fwbs_variables.volshld @@ -566,7 +566,7 @@ def nuclear_heating_blanket(self): b = 2.476e-3 # 1/tonne # Mass of the blanket in tonnes - mass = fwbs_variables.whtblkt / 1000 + mass = fwbs_variables.m_blkt_total / 1000 # Total blanket nuclear heating (MW) ccfe_hcpb_module.exp_blanket = 1 - np.exp(-b * mass) @@ -1319,8 +1319,8 @@ def write_output(self): po.ovarre( self.outfile, "Blanket Mass - Total(kg)", - "(whtblkt)", - fwbs_variables.whtblkt, + "(m_blkt_total)", + fwbs_variables.m_blkt_total, "OP ", ) po.ovarre( diff --git a/process/ife.py b/process/ife.py index bf953e34b8..21fce6e82e 100644 --- a/process/ife.py +++ b/process/ife.py @@ -1775,15 +1775,15 @@ def ifefbs(self, output: bool = False): # Total masses of components (excluding coolant) fwbs_variables.m_fw_total = 0.0 - fwbs_variables.whtblkt = 0.0 + fwbs_variables.m_blkt_total = 0.0 fwbs_variables.whtshld = 0.0 for i in range(5): for j in range(3): fwbs_variables.m_fw_total = ( fwbs_variables.m_fw_total + ife_variables.fwmatm[j, i] ) - fwbs_variables.whtblkt = ( - fwbs_variables.whtblkt + ife_variables.blmatm[j, i] + fwbs_variables.m_blkt_total = ( + fwbs_variables.m_blkt_total + ife_variables.blmatm[j, i] ) fwbs_variables.whtshld = ( fwbs_variables.whtshld + ife_variables.shmatm[j, i] @@ -1860,8 +1860,8 @@ def ifefbs(self, output: bool = False): process_output.ovarre( self.outfile, "Blanket mass (kg)", - "(whtblkt)", - fwbs_variables.whtblkt, + "(m_blkt_total)", + fwbs_variables.m_blkt_total, ) process_output.ovarre( self.outfile, diff --git a/process/stellarator.py b/process/stellarator.py index b052142bb3..9401ba23a1 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -1035,7 +1035,7 @@ def blanket_neutronics(self): ) fwbs_variables.densbreed = 2.12e3 - fwbs_variables.whtblkt = ( + fwbs_variables.m_blkt_total = ( fwbs_variables.vol_blkt_total * fwbs_variables.densbreed ) self.hcpb.nuclear_heating_blanket() @@ -1619,7 +1619,7 @@ def stfwbs(self, output: bool): fwbs_variables.whtblli = ( fwbs_variables.vol_blkt_total * fwbs_variables.fblli * 534.0e0 ) - fwbs_variables.whtblkt = ( + fwbs_variables.m_blkt_total = ( fwbs_variables.wtbllipb + fwbs_variables.whtblli ) else: # solid breeder (HCPB); always for ipowerflow=0 @@ -1629,7 +1629,7 @@ def stfwbs(self, output: bool): fwbs_variables.whtblbe = ( fwbs_variables.vol_blkt_total * fwbs_variables.fblbe * 1850.0e0 ) - fwbs_variables.whtblkt = ( + fwbs_variables.m_blkt_total = ( fwbs_variables.wtblli2o + fwbs_variables.whtblbe ) @@ -1642,8 +1642,10 @@ def stfwbs(self, output: bool): fwbs_variables.vol_blkt_total * 5870.0e0 * fwbs_variables.fblvd ) - fwbs_variables.whtblkt = ( - fwbs_variables.whtblkt + fwbs_variables.whtblss + fwbs_variables.whtblvd + fwbs_variables.m_blkt_total = ( + fwbs_variables.m_blkt_total + + fwbs_variables.whtblss + + fwbs_variables.whtblvd ) else: # volume fractions proportional to sub-assembly thicknesses @@ -1695,7 +1697,7 @@ def stfwbs(self, output: bool): ) ) ) - fwbs_variables.whtblkt = ( + fwbs_variables.m_blkt_total = ( fwbs_variables.whtblss + fwbs_variables.whtblbe + fwbs_variables.whtblbreed @@ -2211,12 +2213,12 @@ def stfwbs(self, output: bool): # if (fwbs_variables.blktmodel == 0) : # if ((fwbs_variables.blkttype == 1)or(fwbs_variables.blkttype == 2)) : - # po.write(self.outfile,601) vol_blkt_inboard, vol_blkt_outboard, vol_blkt_total, whtblkt, vfblkt, fbllipb, wtbllipb, fblli, whtblli, fblss, whtblss, fblvd, whtblvd, volshldi, volshldo, volshld, whtshld, vfshld, fwbs_variables.wpenshld + # po.write(self.outfile,601) vol_blkt_inboard, vol_blkt_outboard, vol_blkt_total, m_blkt_total, vfblkt, fbllipb, wtbllipb, fblli, whtblli, fblss, whtblss, fblvd, whtblvd, volshldi, volshldo, volshld, whtshld, vfshld, fwbs_variables.wpenshld # else: # (also if ipowerflow=0) - # po.write(self.outfile,600) vol_blkt_inboard, vol_blkt_outboard, vol_blkt_total, whtblkt, vfblkt, fblbe, whtblbe, fblli2o, wtblli2o, fblss, whtblss, fblvd, whtblvd, volshldi, volshldo, volshld, whtshld, vfshld, fwbs_variables.wpenshld + # po.write(self.outfile,600) vol_blkt_inboard, vol_blkt_outboard, vol_blkt_total, m_blkt_total, vfblkt, fblbe, whtblbe, fblli2o, wtblli2o, fblss, whtblss, fblvd, whtblvd, volshldi, volshldo, volshld, whtshld, vfshld, fwbs_variables.wpenshld # else: - # po.write(self.outfile,602) vol_blkt_inboard, vol_blkt_outboard, vol_blkt_total, whtblkt, vfblkt, (fwbs_variables.vol_blkt_inboard/fwbs_variables.vol_blkt_total * build_variables.blbuith/build_variables.dr_blkt_inboard + fwbs_variables.vol_blkt_outboard/fwbs_variables.vol_blkt_total * build_variables.blbuoth/build_variables.dr_blkt_outboard) * fblbe, whtblbe, (fwbs_variables.vol_blkt_inboard/fwbs_variables.vol_blkt_total * build_variables.blbuith/build_variables.dr_blkt_inboard + fwbs_variables.vol_blkt_outboard/fwbs_variables.vol_blkt_total * build_variables.blbuoth/build_variables.dr_blkt_outboard) * fblbreed, whtblbreed, fwbs_variables.vol_blkt_inboard/fwbs_variables.vol_blkt_total/build_variables.dr_blkt_inboard * (build_variables.blbuith * fwbs_variables.fblss + build_variables.blbmith * (1.0e0-fwbs_variables.fblhebmi) + build_variables.blbpith * (1.0e0-fwbs_variables.fblhebpi)) + fwbs_variables.vol_blkt_outboard/fwbs_variables.vol_blkt_total/build_variables.dr_blkt_outboard * (build_variables.blbuoth * fwbs_variables.fblss + build_variables.blbmoth * (1.0e0-fwbs_variables.fblhebmo) + build_variables.blbpoth * (1.0e0-fwbs_variables.fblhebpo)), whtblss, volshldi, volshldo, volshld, whtshld, vfshld, fwbs_variables.wpenshld + # po.write(self.outfile,602) vol_blkt_inboard, vol_blkt_outboard, vol_blkt_total, m_blkt_total, vfblkt, (fwbs_variables.vol_blkt_inboard/fwbs_variables.vol_blkt_total * build_variables.blbuith/build_variables.dr_blkt_inboard + fwbs_variables.vol_blkt_outboard/fwbs_variables.vol_blkt_total * build_variables.blbuoth/build_variables.dr_blkt_outboard) * fblbe, whtblbe, (fwbs_variables.vol_blkt_inboard/fwbs_variables.vol_blkt_total * build_variables.blbuith/build_variables.dr_blkt_inboard + fwbs_variables.vol_blkt_outboard/fwbs_variables.vol_blkt_total * build_variables.blbuoth/build_variables.dr_blkt_outboard) * fblbreed, whtblbreed, fwbs_variables.vol_blkt_inboard/fwbs_variables.vol_blkt_total/build_variables.dr_blkt_inboard * (build_variables.blbuith * fwbs_variables.fblss + build_variables.blbmith * (1.0e0-fwbs_variables.fblhebmi) + build_variables.blbpith * (1.0e0-fwbs_variables.fblhebpi)) + fwbs_variables.vol_blkt_outboard/fwbs_variables.vol_blkt_total/build_variables.dr_blkt_outboard * (build_variables.blbuoth * fwbs_variables.fblss + build_variables.blbmoth * (1.0e0-fwbs_variables.fblhebmo) + build_variables.blbpoth * (1.0e0-fwbs_variables.fblhebpo)), whtblss, volshldi, volshldo, volshld, whtshld, vfshld, fwbs_variables.wpenshld # 600 format( t32,'volume (m3)',t45,'vol fraction',t62,'weight (kg)'/ t32,'-----------',t45,'------------',t62,'-----------'/ ' Inboard blanket' ,t32,1pe10.3,/ ' Outboard blanket' ,t32,1pe10.3,/ ' Total blanket' ,t32,1pe10.3,t62,1pe10.3/ ' Void fraction' ,t45,1pe10.3,/ ' Blanket Be ',t45,1pe10.3,t62,1pe10.3/ ' Blanket Li2O ',t45,1pe10.3,t62,1pe10.3/ ' Blanket ss ',t45,1pe10.3,t62,1pe10.3/ ' Blanket Vd ',t45,1pe10.3,t62,1pe10.3/ ' Inboard shield' ,t32,1pe10.3,/ ' Outboard shield' ,t32,1pe10.3,/ ' Primary shield',t32,1pe10.3,t62,1pe10.3/ ' Void fraction' ,t45,1pe10.3,/ ' Penetration shield' ,t62,1pe10.3) diff --git a/process/structure.py b/process/structure.py index 24255c767f..1b41e8e2df 100644 --- a/process/structure.py +++ b/process/structure.py @@ -62,7 +62,7 @@ def run(self, output: bool = False) -> None: total_weight_pf, tfv.whttf, fwbsv.m_fw_total, - fwbsv.whtblkt, + fwbsv.m_blkt_total, fwbsv.m_fw_blkt_div_coolant_total, fwbsv.dewmkg, output=output, diff --git a/source/fortran/fwbs_variables.f90 b/source/fortran/fwbs_variables.f90 index 0f2da1c41e..3339a4fde4 100644 --- a/source/fortran/fwbs_variables.f90 +++ b/source/fortran/fwbs_variables.f90 @@ -136,7 +136,7 @@ module fwbs_variables real(dp) :: pnucshld !! nuclear heating in the shield [MW] - real(dp) :: whtblkt + real(dp) :: m_blkt_total !! mass of blanket [kg] real(dp) :: whtblss @@ -694,7 +694,7 @@ subroutine init_fwbs_variables pnucloss = 0.0D0 pnucvvplus = 0.0D0 pnucshld = 0.0D0 - whtblkt = 0.0D0 + m_blkt_total = 0.0D0 whtblss = 0.0D0 armour_fw_bl_mass = 0.0D0 breeder_f = 0.5D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 811c038611..eecca08cc7 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -960,7 +960,7 @@ Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.0178E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+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_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 8.9696E+05 OP diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index c85b7aed71..5739f9490f 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -961,7 +961,7 @@ Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.0178E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+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_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 8.9696E+05 OP diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 5a7e5cbc3f..14f7dab30f 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -961,7 +961,7 @@ Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.0178E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+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_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 8.9696E+05 OP diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 24b1776cb8..ad79c70062 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -961,7 +961,7 @@ Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.0178E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+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_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 8.9696E+05 OP diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 223e24da68..a274d171a3 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -964,7 +964,7 @@ Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.0178E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+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_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 8.9696E+05 OP diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 247ba989d1..43b55dd6c5 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -962,7 +962,7 @@ Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.0178E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+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_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 8.9696E+05 OP @@ -2125,7 +2125,7 @@ Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.0178E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+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_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 8.9696E+05 OP @@ -3288,7 +3288,7 @@ Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.0178E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+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_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 8.9696E+05 OP @@ -4451,7 +4451,7 @@ Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.0178E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+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_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 8.9696E+05 OP @@ -5614,7 +5614,7 @@ Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.0178E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+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_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 8.9696E+05 OP @@ -6777,7 +6777,7 @@ Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.0178E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+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_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 8.9696E+05 OP @@ -7940,7 +7940,7 @@ Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.0178E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+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_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 8.9696E+05 OP @@ -9103,7 +9103,7 @@ Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.0178E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+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_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 8.9696E+05 OP @@ -10266,7 +10266,7 @@ Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.0178E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+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_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 8.9696E+05 OP @@ -11429,7 +11429,7 @@ Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.0178E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+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_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 8.9696E+05 OP @@ -12592,7 +12592,7 @@ Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.0178E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+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_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 8.9696E+05 OP @@ -13755,7 +13755,7 @@ Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.0178E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+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_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 8.9696E+05 OP @@ -14918,7 +14918,7 @@ Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.0178E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+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_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 8.9696E+05 OP @@ -16081,7 +16081,7 @@ Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.0178E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+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_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 8.9696E+05 OP @@ -17244,7 +17244,7 @@ Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.0178E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+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_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 8.9696E+05 OP diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index f8e2d585dc..df055f9749 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -790,7 +790,7 @@ Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP - Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 3.7129E+06 OP + Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 1.1222E+06 OP @@ -1785,7 +1785,7 @@ Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP - Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 3.7129E+06 OP + Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 1.1222E+06 OP @@ -2780,7 +2780,7 @@ Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP - Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 3.7129E+06 OP + Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 1.1222E+06 OP @@ -3775,7 +3775,7 @@ Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP - Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 3.7129E+06 OP + Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 1.1222E+06 OP @@ -4770,7 +4770,7 @@ Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP - Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 3.7129E+06 OP + Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 1.1222E+06 OP @@ -5765,7 +5765,7 @@ Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP - Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 3.7129E+06 OP + Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 1.1222E+06 OP @@ -6760,7 +6760,7 @@ Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP - Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 3.7129E+06 OP + Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 1.1222E+06 OP @@ -7755,7 +7755,7 @@ Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP - Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 3.7129E+06 OP + Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 1.1222E+06 OP @@ -8750,7 +8750,7 @@ Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.2227E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP - Blanket_Mass_-_Total(kg)________________________________________________ (whtblkt)_____________________ 3.7129E+06 OP + Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 1.1222E+06 OP diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index b8b6f4182b..410ab71b35 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -8043,7 +8043,7 @@ "whole_site_area": 1000000.0, "whtblbe": 0.0, "whtblbreed": 0.0, - "whtblkt": 0.0, + "m_blkt_total": 0.0, "whtblli": 0.0, "whtblli4sio4": 0.0, "whtblss": 0.0, @@ -11152,7 +11152,7 @@ "whole_site_area": "area of entire plant site (m2); default 1.0E6 m2 (i.e. 1 km2)", "whtblbe": "mass of blanket - beryllium part (kg)", "whtblbreed": "mass of blanket - breeder part (kg) (`i_blanket_type=2` (KIT HCPB))", - "whtblkt": "mass of blanket (kg)", + "m_blkt_total": "mass of blanket (kg)", "whtblli": "mass of blanket - lithium part (kg)", "whtblli4sio4": "mass of lithium orthosilicate in blanket (kg) (`i_blanket_type=1,3` (CCFE HCPB))", "whtblss": "mass of blanket - steel part (kg)", @@ -18045,7 +18045,7 @@ "pnucloss", "pnucvvplus", "pnucshld", - "whtblkt", + "m_blkt_total", "whtblss", "armour_fw_bl_mass", "breeder_f", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 46b25b4cbb..8596ae4cd9 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -964,7 +964,7 @@ Vacuum_vessel_volume_(m3)_______________________________________________ (vol_vv)______________________ 1.0178E+03 First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+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_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 8.9696E+05 OP diff --git a/tests/unit/test_ccfe_hcpb.py b/tests/unit/test_ccfe_hcpb.py index d1403993c9..c3f5783aab 100644 --- a/tests/unit/test_ccfe_hcpb.py +++ b/tests/unit/test_ccfe_hcpb.py @@ -53,7 +53,7 @@ class NuclearHeatingMagnetsParam(NamedTuple): denstl: Any = None - whtblkt: Any = None + m_blkt_total: Any = None vol_blkt_total: Any = None @@ -141,7 +141,7 @@ class NuclearHeatingMagnetsParam(NamedTuple): radius_fw_channel=0.0060000000000000001, dx_fw_module=0.02, denstl=7800, - whtblkt=3501027.3252278985, + m_blkt_total=3501027.3252278985, vol_blkt_total=1397.9003011502937, whtshld=2294873.8131476045, volshld=735.53647857295027, @@ -190,7 +190,7 @@ class NuclearHeatingMagnetsParam(NamedTuple): radius_fw_channel=0.0060000000000000001, dx_fw_module=0.02, denstl=7800, - whtblkt=3507503.3737008357, + m_blkt_total=3507503.3737008357, vol_blkt_total=1400.4860764869636, whtshld=2297808.3935174854, volshld=736.47704920432227, @@ -286,7 +286,9 @@ def test_nuclear_heating_magnets(nuclearheatingmagnetsparam, monkeypatch, ccfe_h monkeypatch.setattr(fwbs_variables, "denstl", nuclearheatingmagnetsparam.denstl) - monkeypatch.setattr(fwbs_variables, "whtblkt", nuclearheatingmagnetsparam.whtblkt) + monkeypatch.setattr( + fwbs_variables, "m_blkt_total", nuclearheatingmagnetsparam.m_blkt_total + ) monkeypatch.setattr( fwbs_variables, "vol_blkt_total", nuclearheatingmagnetsparam.vol_blkt_total @@ -495,7 +497,7 @@ def test_nuclear_heating_fw(nuclearheatingfwparam, monkeypatch, ccfe_hcpb): class NuclearHeatingBlanketParam(NamedTuple): - whtblkt: Any = None + m_blkt_total: Any = None p_blkt_nuclear_heat_total_mw: Any = None @@ -512,7 +514,7 @@ class NuclearHeatingBlanketParam(NamedTuple): "nuclearheatingblanketparam", ( NuclearHeatingBlanketParam( - whtblkt=3501027.3252278985, + m_blkt_total=3501027.3252278985, p_blkt_nuclear_heat_total_mw=0, fusion_power=1986.0623241661431, exp_blanket=0, @@ -520,7 +522,7 @@ class NuclearHeatingBlanketParam(NamedTuple): expected_exp_blanket=0.99982809071915879, ), NuclearHeatingBlanketParam( - whtblkt=3507503.3737008357, + m_blkt_total=3507503.3737008357, p_blkt_nuclear_heat_total_mw=1504.9215740808861, fusion_power=1985.4423932312809, exp_blanket=0.99982809071915879, @@ -542,7 +544,9 @@ def test_nuclear_heating_blanket(nuclearheatingblanketparam, monkeypatch, ccfe_h :type monkeypatch: _pytest.monkeypatch.monkeypatch """ - monkeypatch.setattr(fwbs_variables, "whtblkt", nuclearheatingblanketparam.whtblkt) + monkeypatch.setattr( + fwbs_variables, "m_blkt_total", nuclearheatingblanketparam.m_blkt_total + ) monkeypatch.setattr( fwbs_variables, @@ -1446,7 +1450,7 @@ class ComponentMassesParam(NamedTuple): whtblbe: Any = None whtblss: Any = None denstl: Any = None - whtblkt: Any = None + m_blkt_total: Any = None volshld: Any = None vfshld: Any = None m_fw_blkt_div_coolant_total: Any = None @@ -1488,7 +1492,7 @@ class ComponentMassesParam(NamedTuple): expected_divmas: Any = None expected_whtblbe: Any = None expected_whtblss: Any = None - expected_whtblkt: Any = None + expected_m_blkt_total: Any = None expected_m_fw_blkt_div_coolant_total: Any = None expected_fwclfr: Any = None expected_whtbltibe12: Any = None @@ -1537,7 +1541,7 @@ class ComponentMassesParam(NamedTuple): whtblbe=0, whtblss=0, denstl=7800, - whtblkt=0, + m_blkt_total=0, volshld=783.69914576548854, vfshld=0.60000000000000009, m_fw_blkt_div_coolant_total=0, @@ -1579,7 +1583,7 @@ class ComponentMassesParam(NamedTuple): expected_divmas=36452.527878133093, expected_whtblbe=1002205.5121936026, expected_whtblss=895173.51112145756, - expected_whtblkt=2961668.0628126911, + expected_m_blkt_total=2961668.0628126911, expected_m_fw_blkt_div_coolant_total=1161.8025382862772, expected_fwclfr=0, expected_whtbltibe12=1002205.5121936026, @@ -1653,7 +1657,9 @@ def test_component_masses(componentmassesparam, monkeypatch, ccfe_hcpb): monkeypatch.setattr(fwbs_variables, "whtblbe", componentmassesparam.whtblbe) monkeypatch.setattr(fwbs_variables, "whtblss", componentmassesparam.whtblss) monkeypatch.setattr(fwbs_variables, "denstl", componentmassesparam.denstl) - monkeypatch.setattr(fwbs_variables, "whtblkt", componentmassesparam.whtblkt) + monkeypatch.setattr( + fwbs_variables, "m_blkt_total", componentmassesparam.m_blkt_total + ) monkeypatch.setattr(fwbs_variables, "volshld", componentmassesparam.volshld) monkeypatch.setattr(fwbs_variables, "vfshld", componentmassesparam.vfshld) monkeypatch.setattr( @@ -1740,8 +1746,8 @@ def test_component_masses(componentmassesparam, monkeypatch, ccfe_hcpb): assert fwbs_variables.whtblss == pytest.approx( componentmassesparam.expected_whtblss ) - assert fwbs_variables.whtblkt == pytest.approx( - componentmassesparam.expected_whtblkt + assert fwbs_variables.m_blkt_total == pytest.approx( + componentmassesparam.expected_m_blkt_total ) assert fwbs_variables.m_fw_blkt_div_coolant_total == pytest.approx( componentmassesparam.expected_m_fw_blkt_div_coolant_total diff --git a/tests/unit/test_dcll.py b/tests/unit/test_dcll.py index 6748a22bc3..6622edf001 100644 --- a/tests/unit/test_dcll.py +++ b/tests/unit/test_dcll.py @@ -316,7 +316,7 @@ class DcllMassesParam(NamedTuple): vol_blkt_outboard: Any = None - whtblkt: Any = None + m_blkt_total: Any = None m_fw_total: Any = None @@ -432,7 +432,7 @@ class DcllMassesParam(NamedTuple): expected_blbmoth: Any = None - expected_whtblkt: Any = None + expected_m_blkt_total: Any = None expected_m_fw_total: Any = None @@ -539,7 +539,7 @@ class DcllMassesParam(NamedTuple): vol_blkt_total=1397.9003011502937, vol_blkt_inboard=401.90579863726225, vol_blkt_outboard=995.99450251303142, - whtblkt=0, + m_blkt_total=0, m_fw_total=0, fw_armour_vol=0, fw_armour_thickness=0.0050000000000000001, @@ -597,7 +597,7 @@ class DcllMassesParam(NamedTuple): mass_segm_ob=0, expected_blbmith=0.37000000000000011, expected_blbmoth=0.49699999999999994, - expected_whtblkt=10654509.24412049, + expected_m_blkt_total=10654509.24412049, expected_m_fw_total=193353.16636179245, expected_fw_armour_vol=7.0163598878346534, expected_fw_armour_mass=135064.92784081708, @@ -658,7 +658,7 @@ class DcllMassesParam(NamedTuple): vol_blkt_total=1400.4860764869636, vol_blkt_inboard=402.02180553751157, vol_blkt_outboard=998.46427094945204, - whtblkt=10654509.24412049, + m_blkt_total=10654509.24412049, m_fw_total=193353.16636179245, fw_armour_vol=7.0163598878346534, fw_armour_thickness=0.0050000000000000001, @@ -716,7 +716,7 @@ class DcllMassesParam(NamedTuple): mass_segm_ob=162542.70811995145, expected_blbmith=0.37000000000000011, expected_blbmoth=0.49699999999999994, - expected_whtblkt=10673841.813263938, + expected_m_blkt_total=10673841.813263938, expected_m_fw_total=228388.37777659783, expected_fw_armour_vol=7.0163598878346534, expected_fw_armour_mass=135064.92784081708, @@ -827,7 +827,7 @@ def test_dcll_masses(dcllmassesparam, monkeypatch, dcll): fwbs_variables, "vol_blkt_outboard", dcllmassesparam.vol_blkt_outboard ) - monkeypatch.setattr(fwbs_variables, "whtblkt", dcllmassesparam.whtblkt) + monkeypatch.setattr(fwbs_variables, "m_blkt_total", dcllmassesparam.m_blkt_total) monkeypatch.setattr(fwbs_variables, "m_fw_total", dcllmassesparam.m_fw_total) @@ -969,7 +969,9 @@ def test_dcll_masses(dcllmassesparam, monkeypatch, dcll): assert build_variables.blbmoth == pytest.approx(dcllmassesparam.expected_blbmoth) - assert fwbs_variables.whtblkt == pytest.approx(dcllmassesparam.expected_whtblkt) + assert fwbs_variables.m_blkt_total == pytest.approx( + dcllmassesparam.expected_m_blkt_total + ) assert fwbs_variables.m_fw_total == pytest.approx( dcllmassesparam.expected_m_fw_total diff --git a/tests/unit/test_ife.py b/tests/unit/test_ife.py index dabe746bfe..d5a68975e0 100644 --- a/tests/unit/test_ife.py +++ b/tests/unit/test_ife.py @@ -1213,7 +1213,7 @@ class IfefbsParam(NamedTuple): cfactr: Any = None denstl: Any = None m_fw_total: Any = None - whtblkt: Any = None + m_blkt_total: Any = None whtshld: Any = None whtblbe: Any = None whtblvd: Any = None @@ -1241,7 +1241,7 @@ class IfefbsParam(NamedTuple): ifetyp: Any = None pflux_fw_neutron_mw: Any = None expected_m_fw_total: Any = None - expected_whtblkt: Any = None + expected_m_blkt_total: Any = None expected_whtshld: Any = None expected_life_blkt_fpy: Any = None expected_life_fw_fpy: Any = None @@ -1263,7 +1263,7 @@ class IfefbsParam(NamedTuple): cfactr=0.75000000000000011, denstl=7800, m_fw_total=0, - whtblkt=0, + m_blkt_total=0, whtshld=0, whtblbe=0, whtblvd=0, @@ -1452,7 +1452,7 @@ class IfefbsParam(NamedTuple): ifetyp=1, pflux_fw_neutron_mw=8.8876851857005388, expected_m_fw_total=20574.366184891722, - expected_whtblkt=347956.92928704334, + expected_m_blkt_total=347956.92928704334, expected_whtshld=1067310.9593707009, expected_life_blkt_fpy=3.000406304846492, expected_life_fw_fpy=3.000406304846492, @@ -1548,7 +1548,7 @@ def test_ifefbs(ifefbsparam, monkeypatch, ife): monkeypatch.setattr(cost_variables, "cfactr", ifefbsparam.cfactr) monkeypatch.setattr(fwbs_variables, "denstl", ifefbsparam.denstl) monkeypatch.setattr(fwbs_variables, "m_fw_total", ifefbsparam.m_fw_total) - monkeypatch.setattr(fwbs_variables, "whtblkt", ifefbsparam.whtblkt) + monkeypatch.setattr(fwbs_variables, "m_blkt_total", ifefbsparam.m_blkt_total) monkeypatch.setattr(fwbs_variables, "whtshld", ifefbsparam.whtshld) monkeypatch.setattr(fwbs_variables, "whtblbe", ifefbsparam.whtblbe) monkeypatch.setattr(fwbs_variables, "whtblvd", ifefbsparam.whtblvd) @@ -1581,7 +1581,9 @@ def test_ifefbs(ifefbsparam, monkeypatch, ife): ife.ifefbs(output=False) assert fwbs_variables.m_fw_total == pytest.approx(ifefbsparam.expected_m_fw_total) - assert fwbs_variables.whtblkt == pytest.approx(ifefbsparam.expected_whtblkt) + assert fwbs_variables.m_blkt_total == pytest.approx( + ifefbsparam.expected_m_blkt_total + ) assert fwbs_variables.whtshld == pytest.approx(ifefbsparam.expected_whtshld) assert fwbs_variables.life_blkt_fpy == pytest.approx( ifefbsparam.expected_life_blkt_fpy From e94fd39e97f15f61635d311a11021fa1b294f756 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 17 Feb 2025 16:04:21 +0000 Subject: [PATCH 13/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20whtblss=20to=20m?= =?UTF-8?q?=5Fblkt=5Fsteel=5Ftotal=20for=20clarity=20and=20consistency=20a?= =?UTF-8?q?cross=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++++------ process/costs.py | 8 +++-- process/costs_2015.py | 2 +- process/hcpb.py | 8 ++--- process/ife.py | 6 ++-- process/stellarator.py | 14 ++++----- source/fortran/fwbs_variables.f90 | 4 +-- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 18 +++++------ tests/integration/ref_dicts.json | 6 ++-- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_ccfe_hcpb.py | 16 +++++----- tests/unit/test_costs_1990.py | 10 ++++--- tests/unit/test_ife.py | 8 +++-- 24 files changed, 91 insertions(+), 79 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index f84f8fffb6..92759a98b4 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -969,7 +969,7 @@ Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP - ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 8.9696E+05 OP + ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 5904bedf47..29f0d4e60a 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -964,7 +964,7 @@ Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP - ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 8.9696E+05 OP + ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index b2450d0e47..c0c495650e 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -964,7 +964,7 @@ Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP - ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 8.9696E+05 OP + ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 0b5525a4a3..63c1e18689 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -964,7 +964,7 @@ Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP - ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 8.9696E+05 OP + ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 6f46d18e65..7e2959ea6d 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -964,7 +964,7 @@ Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP - ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 8.9696E+05 OP + ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 3ba91547cc..131f54017f 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -793,7 +793,7 @@ Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP - ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 1.1222E+06 OP + ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP @@ -1788,7 +1788,7 @@ Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP - ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 1.1222E+06 OP + ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP @@ -2783,7 +2783,7 @@ Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP - ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 1.1222E+06 OP + ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP @@ -3778,7 +3778,7 @@ Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP - ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 1.1222E+06 OP + ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP @@ -4773,7 +4773,7 @@ Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP - ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 1.1222E+06 OP + ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP @@ -5768,7 +5768,7 @@ Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP - ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 1.1222E+06 OP + ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP @@ -6763,7 +6763,7 @@ Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP - ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 1.1222E+06 OP + ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP @@ -7758,7 +7758,7 @@ Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP - ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 1.1222E+06 OP + ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP @@ -8753,7 +8753,7 @@ Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP - ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 1.1222E+06 OP + ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP diff --git a/process/costs.py b/process/costs.py index cb025a5c4e..78c76e39f4 100644 --- a/process/costs.py +++ b/process/costs.py @@ -1219,7 +1219,9 @@ def acc2212(self): 1.0e-6 * fwbs_variables.wtblli2o * cost_variables.ucblli2o ) - self.c22123 = 1.0e-6 * fwbs_variables.whtblss * cost_variables.ucblss + self.c22123 = ( + 1.0e-6 * fwbs_variables.m_blkt_steel_total * cost_variables.ucblss + ) self.c22124 = 1.0e-6 * fwbs_variables.whtblvd * cost_variables.ucblvd self.c22125 = 0.0e0 self.c22126 = 0.0e0 @@ -1231,7 +1233,9 @@ def acc2212(self): self.c22121 = 0.0e0 self.c22122 = 1.0e-6 * fwbs_variables.wtblli2o * cost_variables.ucblli2o - self.c22123 = 1.0e-6 * fwbs_variables.whtblss * cost_variables.ucblss + self.c22123 = ( + 1.0e-6 * fwbs_variables.m_blkt_steel_total * cost_variables.ucblss + ) self.c22124 = 0.0e0 self.c22125 = ( 1.0e-6 diff --git a/process/costs_2015.py b/process/costs_2015.py index 7521a85db1..93a0104b80 100644 --- a/process/costs_2015.py +++ b/process/costs_2015.py @@ -361,7 +361,7 @@ def calc_fwbs_costs(self): # It includes the first wall, blanket and shield, but excludes the breeder and multiplier materials. self.s_cref[25] = 317.0e6 # Scale with steel mass in blanket + shield mass - self.s_k[25] = fwbs_variables.whtblss + fwbs_variables.whtshld + self.s_k[25] = fwbs_variables.m_blkt_steel_total + fwbs_variables.whtshld self.s_kref[25] = 4.07e6 self.s_cost[25] = ( self.s_cost_factor[25] diff --git a/process/hcpb.py b/process/hcpb.py index b43cb567aa..2e7caa4956 100644 --- a/process/hcpb.py +++ b/process/hcpb.py @@ -362,7 +362,7 @@ def component_masses(self): ) # Steel mass (kg) - fwbs_variables.whtblss = ( + fwbs_variables.m_blkt_steel_total = ( fwbs_variables.vol_blkt_total * fwbs_variables.fblss_ccfe * fwbs_variables.denstl @@ -372,7 +372,7 @@ def component_masses(self): fwbs_variables.m_blkt_total = ( fwbs_variables.whtbltibe12 + fwbs_variables.whtblli4sio4 - + fwbs_variables.whtblss + + fwbs_variables.m_blkt_steel_total ) # Total mass of first wall and blanket @@ -1340,8 +1340,8 @@ def write_output(self): po.ovarre( self.outfile, " Blanket Mass - Steel (kg)", - "(whtblss)", - fwbs_variables.whtblss, + "(m_blkt_steel_total)", + fwbs_variables.m_blkt_steel_total, "OP ", ) po.ovarre( diff --git a/process/ife.py b/process/ife.py index 21fce6e82e..9d5c68f600 100644 --- a/process/ife.py +++ b/process/ife.py @@ -1792,12 +1792,14 @@ def ifefbs(self, output: bool = False): # Other masses fwbs_variables.whtblbe = 0.0 fwbs_variables.whtblvd = 0.0 - fwbs_variables.whtblss = 0.0 + fwbs_variables.m_blkt_steel_total = 0.0 fwbs_variables.wtblli2o = 0.0 fwbs_variables.whtblli = 0.0 for j in range(3): - fwbs_variables.whtblss = fwbs_variables.whtblss + ife_variables.blmatm[j, 1] + fwbs_variables.m_blkt_steel_total = ( + fwbs_variables.m_blkt_steel_total + ife_variables.blmatm[j, 1] + ) fwbs_variables.wtblli2o = ( fwbs_variables.wtblli2o + ife_variables.blmatm[j, 4] ) diff --git a/process/stellarator.py b/process/stellarator.py index 9401ba23a1..940715ca0e 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -1633,7 +1633,7 @@ def stfwbs(self, output: bool): fwbs_variables.wtblli2o + fwbs_variables.whtblbe ) - fwbs_variables.whtblss = ( + fwbs_variables.m_blkt_steel_total = ( fwbs_variables.vol_blkt_total * fwbs_variables.denstl * fwbs_variables.fblss @@ -1644,12 +1644,12 @@ def stfwbs(self, output: bool): fwbs_variables.m_blkt_total = ( fwbs_variables.m_blkt_total - + fwbs_variables.whtblss + + fwbs_variables.m_blkt_steel_total + fwbs_variables.whtblvd ) else: # volume fractions proportional to sub-assembly thicknesses - fwbs_variables.whtblss = fwbs_variables.denstl * ( + fwbs_variables.m_blkt_steel_total = fwbs_variables.denstl * ( fwbs_variables.vol_blkt_inboard / build_variables.dr_blkt_inboard * ( @@ -1698,7 +1698,7 @@ def stfwbs(self, output: bool): ) ) fwbs_variables.m_blkt_total = ( - fwbs_variables.whtblss + fwbs_variables.m_blkt_steel_total + fwbs_variables.whtblbe + fwbs_variables.whtblbreed ) @@ -2213,12 +2213,12 @@ def stfwbs(self, output: bool): # if (fwbs_variables.blktmodel == 0) : # if ((fwbs_variables.blkttype == 1)or(fwbs_variables.blkttype == 2)) : - # po.write(self.outfile,601) vol_blkt_inboard, vol_blkt_outboard, vol_blkt_total, m_blkt_total, vfblkt, fbllipb, wtbllipb, fblli, whtblli, fblss, whtblss, fblvd, whtblvd, volshldi, volshldo, volshld, whtshld, vfshld, fwbs_variables.wpenshld + # po.write(self.outfile,601) vol_blkt_inboard, vol_blkt_outboard, vol_blkt_total, m_blkt_total, vfblkt, fbllipb, wtbllipb, fblli, whtblli, fblss, m_blkt_steel_total, fblvd, whtblvd, volshldi, volshldo, volshld, whtshld, vfshld, fwbs_variables.wpenshld # else: # (also if ipowerflow=0) - # po.write(self.outfile,600) vol_blkt_inboard, vol_blkt_outboard, vol_blkt_total, m_blkt_total, vfblkt, fblbe, whtblbe, fblli2o, wtblli2o, fblss, whtblss, fblvd, whtblvd, volshldi, volshldo, volshld, whtshld, vfshld, fwbs_variables.wpenshld + # po.write(self.outfile,600) vol_blkt_inboard, vol_blkt_outboard, vol_blkt_total, m_blkt_total, vfblkt, fblbe, whtblbe, fblli2o, wtblli2o, fblss, m_blkt_steel_total, fblvd, whtblvd, volshldi, volshldo, volshld, whtshld, vfshld, fwbs_variables.wpenshld # else: - # po.write(self.outfile,602) vol_blkt_inboard, vol_blkt_outboard, vol_blkt_total, m_blkt_total, vfblkt, (fwbs_variables.vol_blkt_inboard/fwbs_variables.vol_blkt_total * build_variables.blbuith/build_variables.dr_blkt_inboard + fwbs_variables.vol_blkt_outboard/fwbs_variables.vol_blkt_total * build_variables.blbuoth/build_variables.dr_blkt_outboard) * fblbe, whtblbe, (fwbs_variables.vol_blkt_inboard/fwbs_variables.vol_blkt_total * build_variables.blbuith/build_variables.dr_blkt_inboard + fwbs_variables.vol_blkt_outboard/fwbs_variables.vol_blkt_total * build_variables.blbuoth/build_variables.dr_blkt_outboard) * fblbreed, whtblbreed, fwbs_variables.vol_blkt_inboard/fwbs_variables.vol_blkt_total/build_variables.dr_blkt_inboard * (build_variables.blbuith * fwbs_variables.fblss + build_variables.blbmith * (1.0e0-fwbs_variables.fblhebmi) + build_variables.blbpith * (1.0e0-fwbs_variables.fblhebpi)) + fwbs_variables.vol_blkt_outboard/fwbs_variables.vol_blkt_total/build_variables.dr_blkt_outboard * (build_variables.blbuoth * fwbs_variables.fblss + build_variables.blbmoth * (1.0e0-fwbs_variables.fblhebmo) + build_variables.blbpoth * (1.0e0-fwbs_variables.fblhebpo)), whtblss, volshldi, volshldo, volshld, whtshld, vfshld, fwbs_variables.wpenshld + # po.write(self.outfile,602) vol_blkt_inboard, vol_blkt_outboard, vol_blkt_total, m_blkt_total, vfblkt, (fwbs_variables.vol_blkt_inboard/fwbs_variables.vol_blkt_total * build_variables.blbuith/build_variables.dr_blkt_inboard + fwbs_variables.vol_blkt_outboard/fwbs_variables.vol_blkt_total * build_variables.blbuoth/build_variables.dr_blkt_outboard) * fblbe, whtblbe, (fwbs_variables.vol_blkt_inboard/fwbs_variables.vol_blkt_total * build_variables.blbuith/build_variables.dr_blkt_inboard + fwbs_variables.vol_blkt_outboard/fwbs_variables.vol_blkt_total * build_variables.blbuoth/build_variables.dr_blkt_outboard) * fblbreed, whtblbreed, fwbs_variables.vol_blkt_inboard/fwbs_variables.vol_blkt_total/build_variables.dr_blkt_inboard * (build_variables.blbuith * fwbs_variables.fblss + build_variables.blbmith * (1.0e0-fwbs_variables.fblhebmi) + build_variables.blbpith * (1.0e0-fwbs_variables.fblhebpi)) + fwbs_variables.vol_blkt_outboard/fwbs_variables.vol_blkt_total/build_variables.dr_blkt_outboard * (build_variables.blbuoth * fwbs_variables.fblss + build_variables.blbmoth * (1.0e0-fwbs_variables.fblhebmo) + build_variables.blbpoth * (1.0e0-fwbs_variables.fblhebpo)), m_blkt_steel_total, volshldi, volshldo, volshld, whtshld, vfshld, fwbs_variables.wpenshld # 600 format( t32,'volume (m3)',t45,'vol fraction',t62,'weight (kg)'/ t32,'-----------',t45,'------------',t62,'-----------'/ ' Inboard blanket' ,t32,1pe10.3,/ ' Outboard blanket' ,t32,1pe10.3,/ ' Total blanket' ,t32,1pe10.3,t62,1pe10.3/ ' Void fraction' ,t45,1pe10.3,/ ' Blanket Be ',t45,1pe10.3,t62,1pe10.3/ ' Blanket Li2O ',t45,1pe10.3,t62,1pe10.3/ ' Blanket ss ',t45,1pe10.3,t62,1pe10.3/ ' Blanket Vd ',t45,1pe10.3,t62,1pe10.3/ ' Inboard shield' ,t32,1pe10.3,/ ' Outboard shield' ,t32,1pe10.3,/ ' Primary shield',t32,1pe10.3,t62,1pe10.3/ ' Void fraction' ,t45,1pe10.3,/ ' Penetration shield' ,t62,1pe10.3) diff --git a/source/fortran/fwbs_variables.f90 b/source/fortran/fwbs_variables.f90 index 3339a4fde4..07aa22aca6 100644 --- a/source/fortran/fwbs_variables.f90 +++ b/source/fortran/fwbs_variables.f90 @@ -139,7 +139,7 @@ module fwbs_variables real(dp) :: m_blkt_total !! mass of blanket [kg] - real(dp) :: whtblss + real(dp) :: m_blkt_steel_total !! mass of blanket - steel part [kg] real(dp) :: armour_fw_bl_mass @@ -695,7 +695,7 @@ subroutine init_fwbs_variables pnucvvplus = 0.0D0 pnucshld = 0.0D0 m_blkt_total = 0.0D0 - whtblss = 0.0D0 + m_blkt_steel_total = 0.0D0 armour_fw_bl_mass = 0.0D0 breeder_f = 0.5D0 breeder_multiplier = 0.75D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index eecca08cc7..f606a2f961 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -963,7 +963,7 @@ Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP - ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 8.9696E+05 OP + ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 5739f9490f..2186b14d8b 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -964,7 +964,7 @@ Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP - ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 8.9696E+05 OP + ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 14f7dab30f..a3760c01ff 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -964,7 +964,7 @@ Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP - ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 8.9696E+05 OP + ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index ad79c70062..d287e32635 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -964,7 +964,7 @@ Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP - ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 8.9696E+05 OP + ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index a274d171a3..1b01b30f18 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -967,7 +967,7 @@ Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP - ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 8.9696E+05 OP + ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 43b55dd6c5..d473fe849a 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -965,7 +965,7 @@ Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP - ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 8.9696E+05 OP + ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 @@ -2128,7 +2128,7 @@ Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP - ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 8.9696E+05 OP + ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 @@ -3291,7 +3291,7 @@ Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP - ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 8.9696E+05 OP + ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 @@ -4454,7 +4454,7 @@ Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP - ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 8.9696E+05 OP + ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 @@ -5617,7 +5617,7 @@ Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP - ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 8.9696E+05 OP + ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 @@ -6780,7 +6780,7 @@ Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP - ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 8.9696E+05 OP + ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 @@ -7943,7 +7943,7 @@ Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP - ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 8.9696E+05 OP + ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 @@ -9106,7 +9106,7 @@ Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP - ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 8.9696E+05 OP + ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 @@ -10269,7 +10269,7 @@ Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP - ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 8.9696E+05 OP + ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 @@ -11432,7 +11432,7 @@ Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP - ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 8.9696E+05 OP + ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 @@ -12595,7 +12595,7 @@ Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP - ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 8.9696E+05 OP + ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 @@ -13758,7 +13758,7 @@ Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP - ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 8.9696E+05 OP + ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 @@ -14921,7 +14921,7 @@ Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP - ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 8.9696E+05 OP + ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 @@ -16084,7 +16084,7 @@ Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP - ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 8.9696E+05 OP + ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 @@ -17247,7 +17247,7 @@ Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP - ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 8.9696E+05 OP + ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index df055f9749..b831f238cd 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -793,7 +793,7 @@ Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP - ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 1.1222E+06 OP + ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP @@ -1788,7 +1788,7 @@ Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP - ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 1.1222E+06 OP + ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP @@ -2783,7 +2783,7 @@ Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP - ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 1.1222E+06 OP + ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP @@ -3778,7 +3778,7 @@ Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP - ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 1.1222E+06 OP + ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP @@ -4773,7 +4773,7 @@ Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP - ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 1.1222E+06 OP + ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP @@ -5768,7 +5768,7 @@ Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP - ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 1.1222E+06 OP + ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP @@ -6763,7 +6763,7 @@ Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP - ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 1.1222E+06 OP + ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP @@ -7758,7 +7758,7 @@ Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP - ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 1.1222E+06 OP + ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP @@ -8753,7 +8753,7 @@ Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP - ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 1.1222E+06 OP + ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 410ab71b35..5b74a6a72b 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -8046,7 +8046,7 @@ "m_blkt_total": 0.0, "whtblli": 0.0, "whtblli4sio4": 0.0, - "whtblss": 0.0, + "m_blkt_steel_total": 0.0, "whtbltibe12": 0.0, "whtblvd": 0.0, "whtcas": 0.0, @@ -11155,7 +11155,7 @@ "m_blkt_total": "mass of blanket (kg)", "whtblli": "mass of blanket - lithium part (kg)", "whtblli4sio4": "mass of lithium orthosilicate in blanket (kg) (`i_blanket_type=1,3` (CCFE HCPB))", - "whtblss": "mass of blanket - steel part (kg)", + "m_blkt_steel_total": "mass of blanket - steel part (kg)", "whtbltibe12": "mass of titanium beryllide in blanket (kg) (`i_blanket_type=1,3` (CCFE HCPB))", "whtblvd": "mass of blanket - vanadium part (kg)", "whtcas": "mass per coil of external case (kg)", @@ -18046,7 +18046,7 @@ "pnucvvplus", "pnucshld", "m_blkt_total", - "whtblss", + "m_blkt_steel_total", "armour_fw_bl_mass", "breeder_f", "breeder_multiplier", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 8596ae4cd9..c0f3a64436 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -967,7 +967,7 @@ Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP - ____Blanket_Mass_-_Steel_(kg)___________________________________________ (whtblss)_____________________ 8.9696E+05 OP + ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 diff --git a/tests/unit/test_ccfe_hcpb.py b/tests/unit/test_ccfe_hcpb.py index c3f5783aab..c074fd42a4 100644 --- a/tests/unit/test_ccfe_hcpb.py +++ b/tests/unit/test_ccfe_hcpb.py @@ -1448,7 +1448,7 @@ class ComponentMassesParam(NamedTuple): vol_blkt_total: Any = None vfblkt: Any = None whtblbe: Any = None - whtblss: Any = None + m_blkt_steel_total: Any = None denstl: Any = None m_blkt_total: Any = None volshld: Any = None @@ -1491,7 +1491,7 @@ class ComponentMassesParam(NamedTuple): expected_divsur: Any = None expected_divmas: Any = None expected_whtblbe: Any = None - expected_whtblss: Any = None + expected_m_blkt_steel_total: Any = None expected_m_blkt_total: Any = None expected_m_fw_blkt_div_coolant_total: Any = None expected_fwclfr: Any = None @@ -1539,7 +1539,7 @@ class ComponentMassesParam(NamedTuple): vol_blkt_total=1182.5433772195902, vfblkt=0.25, whtblbe=0, - whtblss=0, + m_blkt_steel_total=0, denstl=7800, m_blkt_total=0, volshld=783.69914576548854, @@ -1582,7 +1582,7 @@ class ComponentMassesParam(NamedTuple): expected_divsur=148.78582807401261, expected_divmas=36452.527878133093, expected_whtblbe=1002205.5121936026, - expected_whtblss=895173.51112145756, + expected_m_blkt_steel_total=895173.51112145756, expected_m_blkt_total=2961668.0628126911, expected_m_fw_blkt_div_coolant_total=1161.8025382862772, expected_fwclfr=0, @@ -1655,7 +1655,9 @@ def test_component_masses(componentmassesparam, monkeypatch, ccfe_hcpb): ) monkeypatch.setattr(fwbs_variables, "vfblkt", componentmassesparam.vfblkt) monkeypatch.setattr(fwbs_variables, "whtblbe", componentmassesparam.whtblbe) - monkeypatch.setattr(fwbs_variables, "whtblss", componentmassesparam.whtblss) + monkeypatch.setattr( + fwbs_variables, "m_blkt_steel_total", componentmassesparam.m_blkt_steel_total + ) monkeypatch.setattr(fwbs_variables, "denstl", componentmassesparam.denstl) monkeypatch.setattr( fwbs_variables, "m_blkt_total", componentmassesparam.m_blkt_total @@ -1743,8 +1745,8 @@ def test_component_masses(componentmassesparam, monkeypatch, ccfe_hcpb): assert fwbs_variables.whtblbe == pytest.approx( componentmassesparam.expected_whtblbe ) - assert fwbs_variables.whtblss == pytest.approx( - componentmassesparam.expected_whtblss + assert fwbs_variables.m_blkt_steel_total == pytest.approx( + componentmassesparam.expected_m_blkt_steel_total ) assert fwbs_variables.m_blkt_total == pytest.approx( componentmassesparam.expected_m_blkt_total diff --git a/tests/unit/test_costs_1990.py b/tests/unit/test_costs_1990.py index 0710bf2741..266d850516 100644 --- a/tests/unit/test_costs_1990.py +++ b/tests/unit/test_costs_1990.py @@ -1151,7 +1151,7 @@ class Acc2212Param(NamedTuple): whtblbe: Any = None - whtblss: Any = None + m_blkt_steel_total: Any = None wtbllipb: Any = None @@ -1217,7 +1217,7 @@ class Acc2212Param(NamedTuple): whtblbreed=0, whtblvd=0, whtblbe=1184720.5052248738, - whtblss=1058196.5489677608, + m_blkt_steel_total=1058196.5489677608, wtbllipb=0, ucflib=84, blmatm=np.array( @@ -1271,7 +1271,7 @@ class Acc2212Param(NamedTuple): whtblbreed=0, whtblvd=0, whtblbe=1186911.9498227015, - whtblss=1060153.955039866, + m_blkt_steel_total=1060153.955039866, wtbllipb=0, ucflib=84, blmatm=np.array( @@ -1356,7 +1356,9 @@ def test_acc2212(acc2212param, monkeypatch, costs): monkeypatch.setattr(fwbs_variables, "whtblbe", acc2212param.whtblbe) - monkeypatch.setattr(fwbs_variables, "whtblss", acc2212param.whtblss) + monkeypatch.setattr( + fwbs_variables, "m_blkt_steel_total", acc2212param.m_blkt_steel_total + ) monkeypatch.setattr(fwbs_variables, "wtbllipb", acc2212param.wtbllipb) diff --git a/tests/unit/test_ife.py b/tests/unit/test_ife.py index d5a68975e0..ad54eef5a0 100644 --- a/tests/unit/test_ife.py +++ b/tests/unit/test_ife.py @@ -1217,7 +1217,7 @@ class IfefbsParam(NamedTuple): whtshld: Any = None whtblbe: Any = None whtblvd: Any = None - whtblss: Any = None + m_blkt_steel_total: Any = None wtblli2o: Any = None whtblli: Any = None life_blkt_fpy: Any = None @@ -1267,7 +1267,7 @@ class IfefbsParam(NamedTuple): whtshld=0, whtblbe=0, whtblvd=0, - whtblss=0, + m_blkt_steel_total=0, wtblli2o=0, whtblli=0, life_blkt_fpy=0, @@ -1552,7 +1552,9 @@ def test_ifefbs(ifefbsparam, monkeypatch, ife): monkeypatch.setattr(fwbs_variables, "whtshld", ifefbsparam.whtshld) monkeypatch.setattr(fwbs_variables, "whtblbe", ifefbsparam.whtblbe) monkeypatch.setattr(fwbs_variables, "whtblvd", ifefbsparam.whtblvd) - monkeypatch.setattr(fwbs_variables, "whtblss", ifefbsparam.whtblss) + monkeypatch.setattr( + fwbs_variables, "m_blkt_steel_total", ifefbsparam.m_blkt_steel_total + ) monkeypatch.setattr(fwbs_variables, "wtblli2o", ifefbsparam.wtblli2o) monkeypatch.setattr(fwbs_variables, "whtblli", ifefbsparam.whtblli) monkeypatch.setattr(fwbs_variables, "life_blkt_fpy", ifefbsparam.life_blkt_fpy) From f85eab5d7160edf8633b9e99947abe60cebd6de4 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 17 Feb 2025 16:15:38 +0000 Subject: [PATCH 14/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20blpressure=20to?= =?UTF-8?q?=20pres=5Fblkt=5Fcoolant=20for=20clarity=20and=20consistency=20?= =?UTF-8?q?across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proc-pages/eng-models/fw-blanket.md | 2 +- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++++------ process/blanket_library.py | 10 +++---- process/dcll.py | 4 +-- process/hcpb.py | 8 +++-- source/fortran/fwbs_variables.f90 | 4 +-- source/fortran/input.f90 | 6 ++-- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 18 +++++------ tests/integration/ref_dicts.json | 10 +++---- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_blanket_library.py | 10 ++++--- tests/unit/test_ccfe_hcpb.py | 10 ++++--- 24 files changed, 80 insertions(+), 74 deletions(-) diff --git a/documentation/proc-pages/eng-models/fw-blanket.md b/documentation/proc-pages/eng-models/fw-blanket.md index c97568f987..3c3e0390ce 100644 --- a/documentation/proc-pages/eng-models/fw-blanket.md +++ b/documentation/proc-pages/eng-models/fw-blanket.md @@ -88,7 +88,7 @@ Summary of key variables and switches: | secondary coolant switch | --- | --- | `i_bb_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` | +| pressure (Pa) | `pres_fw_coolant` | `pres_blkt_coolant` | `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. diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 92759a98b4..edb2ed6f94 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -984,7 +984,7 @@ Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (secondary_cycle)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 - Blanket_coolant_pressure_(Pa)___________________________________________ (blpressure)__________________ 1.5500E+07 + Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 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 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 29f0d4e60a..63e601912d 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -979,7 +979,7 @@ Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (secondary_cycle)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 - Blanket_coolant_pressure_(Pa)___________________________________________ (blpressure)__________________ 1.5500E+07 + Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 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 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index c0c495650e..f7e2507b1a 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -979,7 +979,7 @@ Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (secondary_cycle)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 - Blanket_coolant_pressure_(Pa)___________________________________________ (blpressure)__________________ 1.5500E+07 + Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 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 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 63c1e18689..b4b73a234f 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -979,7 +979,7 @@ Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (secondary_cycle)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 - Blanket_coolant_pressure_(Pa)___________________________________________ (blpressure)__________________ 1.5500E+07 + Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 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 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 7e2959ea6d..44e9cb76f6 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -979,7 +979,7 @@ Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (secondary_cycle)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 - Blanket_coolant_pressure_(Pa)___________________________________________ (blpressure)__________________ 1.5500E+07 + Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 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 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 131f54017f..5c3f003aa8 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -808,7 +808,7 @@ Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (secondary_cycle)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 - Blanket_coolant_pressure_(Pa)___________________________________________ (blpressure)__________________ 1.5500E+07 + Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 No_of_inboard_blanket_modules_poloidally________________________________ (nblktmodpi)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 @@ -1803,7 +1803,7 @@ Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (secondary_cycle)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 - Blanket_coolant_pressure_(Pa)___________________________________________ (blpressure)__________________ 1.5500E+07 + Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 No_of_inboard_blanket_modules_poloidally________________________________ (nblktmodpi)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 @@ -2798,7 +2798,7 @@ Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (secondary_cycle)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 - Blanket_coolant_pressure_(Pa)___________________________________________ (blpressure)__________________ 1.5500E+07 + Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 No_of_inboard_blanket_modules_poloidally________________________________ (nblktmodpi)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 @@ -3793,7 +3793,7 @@ Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (secondary_cycle)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 - Blanket_coolant_pressure_(Pa)___________________________________________ (blpressure)__________________ 1.5500E+07 + Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 No_of_inboard_blanket_modules_poloidally________________________________ (nblktmodpi)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 @@ -4788,7 +4788,7 @@ Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (secondary_cycle)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 - Blanket_coolant_pressure_(Pa)___________________________________________ (blpressure)__________________ 1.5500E+07 + Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 No_of_inboard_blanket_modules_poloidally________________________________ (nblktmodpi)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 @@ -5783,7 +5783,7 @@ Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (secondary_cycle)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 - Blanket_coolant_pressure_(Pa)___________________________________________ (blpressure)__________________ 1.5500E+07 + Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 No_of_inboard_blanket_modules_poloidally________________________________ (nblktmodpi)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 @@ -6778,7 +6778,7 @@ Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (secondary_cycle)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 - Blanket_coolant_pressure_(Pa)___________________________________________ (blpressure)__________________ 1.5500E+07 + Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 No_of_inboard_blanket_modules_poloidally________________________________ (nblktmodpi)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 @@ -7773,7 +7773,7 @@ Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (secondary_cycle)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 - Blanket_coolant_pressure_(Pa)___________________________________________ (blpressure)__________________ 1.5500E+07 + Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 No_of_inboard_blanket_modules_poloidally________________________________ (nblktmodpi)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 @@ -8768,7 +8768,7 @@ Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (secondary_cycle)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 - Blanket_coolant_pressure_(Pa)___________________________________________ (blpressure)__________________ 1.5500E+07 + Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 No_of_inboard_blanket_modules_poloidally________________________________ (nblktmodpi)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 diff --git a/process/blanket_library.py b/process/blanket_library.py index 74f0f3dff6..3ba60456b1 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -500,7 +500,7 @@ def primary_coolant_properties(self, output: bool): bb_fluid_properties = FluidProperties.of( "Helium" if fwbs_variables.i_blkt_coolant_type == 1 else "Water", temperature=mid_temp_bl, - pressure=fwbs_variables.blpressure, + pressure=fwbs_variables.pres_blkt_coolant, ) fwbs_variables.rhof_bl = bb_fluid_properties.density fwbs_variables.cp_bl = bb_fluid_properties.specific_heat_const_p @@ -1545,7 +1545,7 @@ def thermo_hydraulic_model(self, output: bool): secondary coolant switch --- --- i_bb_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 + pressure (Pa) pres_fw_coolant pres_blkt_coolant blpressure_liq """ ###################################################### # Pre calculations needed for thermo-hydraulic model # @@ -1916,7 +1916,7 @@ def thermo_hydraulic_model(self, output: bool): icoolpump=1, temp_in=fwbs_variables.inlet_temp.item(), temp_out=fwbs_variables.outlet_temp.item(), - pressure=fwbs_variables.blpressure.item(), + pressure=fwbs_variables.pres_blkt_coolant.item(), pdrop=deltap_blkt.item(), mf=blanket_library.mfblkt, primary_coolant_switch=( @@ -2063,8 +2063,8 @@ def thermo_hydraulic_model(self, output: bool): po.ovarre( self.outfile, "Blanket (primary) coolant pressure (Pa)", - "(blpressure)", - fwbs_variables.blpressure, + "(pres_blkt_coolant)", + fwbs_variables.pres_blkt_coolant, ) if fwbs_variables.ipump == 1: po.ovarre( diff --git a/process/dcll.py b/process/dcll.py index 90c99a502a..18036ad06f 100644 --- a/process/dcll.py +++ b/process/dcll.py @@ -404,8 +404,8 @@ def dcll_power_and_heating(self, output: bool): po.ovarre( self.outfile, "Blanket coolant pressure (Pa)", - "(blpressure)", - fwbs_variables.blpressure, + "(pres_blkt_coolant)", + fwbs_variables.pres_blkt_coolant, ) if fwbs_variables.icooldual > 0: po.ovarre( diff --git a/process/hcpb.py b/process/hcpb.py index 2e7caa4956..1b744ec201 100644 --- a/process/hcpb.py +++ b/process/hcpb.py @@ -681,7 +681,9 @@ def powerflow_calc(self, output: bool): # coolant outlet temperature as 20 deg C below the boiling point if fwbs_variables.i_blkt_coolant_type == 2: outlet_saturated_fluid_properties = FluidProperties.of( - "Water", pressure=fwbs_variables.blpressure * 1.0e6, vapor_quality=0 + "Water", + pressure=fwbs_variables.pres_blkt_coolant * 1.0e6, + vapor_quality=0, ) fwbs_variables.outlet_temp = ( outlet_saturated_fluid_properties.temperature - 20.0 @@ -1483,8 +1485,8 @@ def write_output(self): po.ovarre( self.outfile, "Blanket coolant pressure (Pa)", - "(blpressure)", - fwbs_variables.blpressure, + "(pres_blkt_coolant)", + fwbs_variables.pres_blkt_coolant, ) if fwbs_variables.primary_pumping != 3: diff --git a/source/fortran/fwbs_variables.f90 b/source/fortran/fwbs_variables.f90 index 07aa22aca6..a8f9597a89 100644 --- a/source/fortran/fwbs_variables.f90 +++ b/source/fortran/fwbs_variables.f90 @@ -347,7 +347,7 @@ module fwbs_variables !! Applies to both neutron and surface loads. Only used to calculate peak temperature - not !! the coolant flow rate.) - real(dp) :: blpressure + real(dp) :: pres_blkt_coolant !! blanket coolant pressure [Pa] (`secondary_cycle>1`) real(dp) :: inlet_temp @@ -749,7 +749,7 @@ subroutine init_fwbs_variables roughness = 1.0D-6 len_fw_channel = 4.0D0 f_fw_peak = 1.0D0 - blpressure = 15.50D6 + pres_blkt_coolant = 15.50D6 inlet_temp = 573.0D0 outlet_temp = 823.0D0 coolp = 15.5D6 diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index 9a4ee8b683..54bf54d5f9 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -211,7 +211,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) iblanket_thickness, vfcblkt, breeder_f, fbllipb, fhcd, vfshld, fblhebmi, & f_neut_shield, fw_th_conductivity, nblktmodti, dr_fw_wall, afwo, & fvolsi, etahtp, nblktmodpo, pres_fw_coolant, emult, temp_fw_coolant_out, nblktmodpi, & - fblhebpi, fblss, inlet_temp, outlet_temp, fblbreed, qnuc, blpressure, & + fblhebpi, fblss, inlet_temp, outlet_temp, fblbreed, qnuc, pres_blkt_coolant, & blpressure_liq, n_liq_recirc, pnuc_fw_ratio_dcll, f_nuc_pow_bz_struct, & declblkt, fblhebmo, blkttype, radius_fw_channel, inuclear, declshld, hcdportsize, & npdiv, f_fw_peak, primary_pumping, dr_pf_cryostat, secondary_cycle, secondary_cycle_liq, & @@ -1889,8 +1889,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('bctmp') call parse_real_variable('bctmp', bctmp, 1.0D0, 800.0D0, & 'First wall bulk coolant temperature (C)') - case ('blpressure') - call parse_real_variable('blpressure', blpressure, 1.0D5, 1.0D8, & + case ('pres_blkt_coolant') + call parse_real_variable('pres_blkt_coolant', pres_blkt_coolant, 1.0D5, 1.0D8, & 'Blanket coolant pressure (Pa)') case ('blpressure_liq') call parse_real_variable('blpressure_liq', blpressure_liq, 1.0D5, 1.0D8, & diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index f606a2f961..e5a77a7ed8 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -978,7 +978,7 @@ Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (secondary_cycle)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 - Blanket_coolant_pressure_(Pa)___________________________________________ (blpressure)__________________ 1.5500E+07 + Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 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 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 2186b14d8b..f55f2db96d 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -979,7 +979,7 @@ Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (secondary_cycle)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 - Blanket_coolant_pressure_(Pa)___________________________________________ (blpressure)__________________ 1.5500E+07 + Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 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 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index a3760c01ff..041318f62d 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -979,7 +979,7 @@ Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (secondary_cycle)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 - Blanket_coolant_pressure_(Pa)___________________________________________ (blpressure)__________________ 1.5500E+07 + Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 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 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index d287e32635..71778e8dcf 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -979,7 +979,7 @@ Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (secondary_cycle)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 - Blanket_coolant_pressure_(Pa)___________________________________________ (blpressure)__________________ 1.5500E+07 + Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 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 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 1b01b30f18..ac65eac228 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -982,7 +982,7 @@ Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (secondary_cycle)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 - Blanket_coolant_pressure_(Pa)___________________________________________ (blpressure)__________________ 1.5500E+07 + Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 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 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index d473fe849a..620786e003 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -980,7 +980,7 @@ Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (secondary_cycle)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 - Blanket_coolant_pressure_(Pa)___________________________________________ (blpressure)__________________ 1.5500E+07 + Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 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 @@ -2143,7 +2143,7 @@ Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (secondary_cycle)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 - Blanket_coolant_pressure_(Pa)___________________________________________ (blpressure)__________________ 1.5500E+07 + Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 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 @@ -3306,7 +3306,7 @@ Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (secondary_cycle)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 - Blanket_coolant_pressure_(Pa)___________________________________________ (blpressure)__________________ 1.5500E+07 + Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 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 @@ -4469,7 +4469,7 @@ Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (secondary_cycle)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 - Blanket_coolant_pressure_(Pa)___________________________________________ (blpressure)__________________ 1.5500E+07 + Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 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 @@ -5632,7 +5632,7 @@ Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (secondary_cycle)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 - Blanket_coolant_pressure_(Pa)___________________________________________ (blpressure)__________________ 1.5500E+07 + Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 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 @@ -6795,7 +6795,7 @@ Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (secondary_cycle)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 - Blanket_coolant_pressure_(Pa)___________________________________________ (blpressure)__________________ 1.5500E+07 + Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 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 @@ -7958,7 +7958,7 @@ Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (secondary_cycle)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 - Blanket_coolant_pressure_(Pa)___________________________________________ (blpressure)__________________ 1.5500E+07 + Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 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 @@ -9121,7 +9121,7 @@ Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (secondary_cycle)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 - Blanket_coolant_pressure_(Pa)___________________________________________ (blpressure)__________________ 1.5500E+07 + Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 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 @@ -10284,7 +10284,7 @@ Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (secondary_cycle)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 - Blanket_coolant_pressure_(Pa)___________________________________________ (blpressure)__________________ 1.5500E+07 + Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 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 @@ -11447,7 +11447,7 @@ Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (secondary_cycle)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 - Blanket_coolant_pressure_(Pa)___________________________________________ (blpressure)__________________ 1.5500E+07 + Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 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 @@ -12610,7 +12610,7 @@ Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (secondary_cycle)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 - Blanket_coolant_pressure_(Pa)___________________________________________ (blpressure)__________________ 1.5500E+07 + Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 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 @@ -13773,7 +13773,7 @@ Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (secondary_cycle)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 - Blanket_coolant_pressure_(Pa)___________________________________________ (blpressure)__________________ 1.5500E+07 + Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 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 @@ -14936,7 +14936,7 @@ Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (secondary_cycle)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 - Blanket_coolant_pressure_(Pa)___________________________________________ (blpressure)__________________ 1.5500E+07 + Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 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 @@ -16099,7 +16099,7 @@ Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (secondary_cycle)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 - Blanket_coolant_pressure_(Pa)___________________________________________ (blpressure)__________________ 1.5500E+07 + Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 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 @@ -17262,7 +17262,7 @@ Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (secondary_cycle)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 - Blanket_coolant_pressure_(Pa)___________________________________________ (blpressure)__________________ 1.5500E+07 + Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 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 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index b831f238cd..fa2ecf0904 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -808,7 +808,7 @@ Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (secondary_cycle)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 - Blanket_coolant_pressure_(Pa)___________________________________________ (blpressure)__________________ 1.5500E+07 + Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 No_of_inboard_blanket_modules_poloidally________________________________ (nblktmodpi)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 @@ -1803,7 +1803,7 @@ Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (secondary_cycle)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 - Blanket_coolant_pressure_(Pa)___________________________________________ (blpressure)__________________ 1.5500E+07 + Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 No_of_inboard_blanket_modules_poloidally________________________________ (nblktmodpi)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 @@ -2798,7 +2798,7 @@ Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (secondary_cycle)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 - Blanket_coolant_pressure_(Pa)___________________________________________ (blpressure)__________________ 1.5500E+07 + Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 No_of_inboard_blanket_modules_poloidally________________________________ (nblktmodpi)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 @@ -3793,7 +3793,7 @@ Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (secondary_cycle)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 - Blanket_coolant_pressure_(Pa)___________________________________________ (blpressure)__________________ 1.5500E+07 + Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 No_of_inboard_blanket_modules_poloidally________________________________ (nblktmodpi)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 @@ -4788,7 +4788,7 @@ Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (secondary_cycle)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 - Blanket_coolant_pressure_(Pa)___________________________________________ (blpressure)__________________ 1.5500E+07 + Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 No_of_inboard_blanket_modules_poloidally________________________________ (nblktmodpi)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 @@ -5783,7 +5783,7 @@ Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (secondary_cycle)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 - Blanket_coolant_pressure_(Pa)___________________________________________ (blpressure)__________________ 1.5500E+07 + Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 No_of_inboard_blanket_modules_poloidally________________________________ (nblktmodpi)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 @@ -6778,7 +6778,7 @@ Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (secondary_cycle)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 - Blanket_coolant_pressure_(Pa)___________________________________________ (blpressure)__________________ 1.5500E+07 + Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 No_of_inboard_blanket_modules_poloidally________________________________ (nblktmodpi)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 @@ -7773,7 +7773,7 @@ Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (secondary_cycle)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 - Blanket_coolant_pressure_(Pa)___________________________________________ (blpressure)__________________ 1.5500E+07 + Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 No_of_inboard_blanket_modules_poloidally________________________________ (nblktmodpi)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 @@ -8768,7 +8768,7 @@ Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (secondary_cycle)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 - Blanket_coolant_pressure_(Pa)___________________________________________ (blpressure)__________________ 1.5500E+07 + Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 No_of_inboard_blanket_modules_poloidally________________________________ (nblktmodpi)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 5b74a6a72b..171aec989d 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -399,7 +399,7 @@ ], "bloizp": 0.0, "blomzp": 0.0, - "blpressure": 15500000.0, + "pres_blkt_coolant": 15500000.0, "blvol": [ 0.0, 0.0, @@ -8917,7 +8917,7 @@ "blohkw": "outboard blanket total heat output (kW)", "bloizp": "outboard blanket integrated zone power / neutron", "blomzp": "outboard blanket mean zone power density / neutron", - "blpressure": "blanket coolant pressure (Pa) (`secondary_cycle>1`)", + "pres_blkt_coolant": "blanket coolant pressure (Pa) (`secondary_cycle>1`)", "blvol": "IFE blanket volume (m3)", "blwidti": "Inboard/outboard blanket mid-plan toroidal circumference for segment (m)", "blwidto": "Inboard/outboard blanket mid-plan toroidal circumference for segment (m)", @@ -11757,7 +11757,7 @@ "lb": 0.0, "ub": 10.0 }, - "blpressure": { + "pres_blkt_coolant": { "lb": 100000.0, "ub": 100000000.0 }, @@ -18093,7 +18093,7 @@ "roughness", "len_fw_channel", "f_fw_peak", - "blpressure", + "pres_blkt_coolant", "inlet_temp", "outlet_temp", "coolp", @@ -20038,7 +20038,7 @@ "blmatf": "real_array", "dr_blkt_inboard": "real_variable", "dr_blkt_outboard": "real_variable", - "blpressure": "real_variable", + "pres_blkt_coolant": "real_variable", "b_cs_limit_max": "real_variable", "bmn": "real_variable", "bmxlim": "real_variable", diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 4f59315951..ffc0f46dff 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2423,7 +2423,7 @@ i_blkt_inboard = 0 * calculated if `i_blkt_coolant_type=2` (water) * JUSTIFICATION: Not set as not used -*blpressure = +*pres_blkt_coolant = * DESCRIPTION: Blanket coolant pressure [Pa] (`secondary_cycle>1`) (default = 15.5D6) * JUSTIFICATION: Not yet set diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index c0f3a64436..4964076aef 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -982,7 +982,7 @@ Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (secondary_cycle)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 - Blanket_coolant_pressure_(Pa)___________________________________________ (blpressure)__________________ 1.5500E+07 + Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 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 diff --git a/tests/unit/test_blanket_library.py b/tests/unit/test_blanket_library.py index 94cb1dd89e..f5e9fdf3d5 100644 --- a/tests/unit/test_blanket_library.py +++ b/tests/unit/test_blanket_library.py @@ -47,7 +47,7 @@ class PrimaryCoolantPropertiesParam(NamedTuple): outlet_temp: Any = None - blpressure: Any = None + pres_blkt_coolant: Any = None rhof_bl: Any = None @@ -94,7 +94,7 @@ class PrimaryCoolantPropertiesParam(NamedTuple): i_blkt_coolant_type=1, inlet_temp=573, outlet_temp=773, - blpressure=8000000, + pres_blkt_coolant=8000000, rhof_bl=0, icooldual=2, visc_bl=0, @@ -122,7 +122,7 @@ class PrimaryCoolantPropertiesParam(NamedTuple): i_blkt_coolant_type=1, inlet_temp=573, outlet_temp=773, - blpressure=8000000, + pres_blkt_coolant=8000000, rhof_bl=5.6389735407435868, icooldual=2, visc_bl=3.5036293160410249e-05, @@ -201,7 +201,9 @@ def test_primary_coolant_properties( ) monkeypatch.setattr( - fwbs_variables, "blpressure", primarycoolantpropertiesparam.blpressure + fwbs_variables, + "pres_blkt_coolant", + primarycoolantpropertiesparam.pres_blkt_coolant, ) monkeypatch.setattr( diff --git a/tests/unit/test_ccfe_hcpb.py b/tests/unit/test_ccfe_hcpb.py index c074fd42a4..691974c58e 100644 --- a/tests/unit/test_ccfe_hcpb.py +++ b/tests/unit/test_ccfe_hcpb.py @@ -810,7 +810,7 @@ class PowerflowCalcParam(NamedTuple): outlet_temp: Any = None - blpressure: Any = None + pres_blkt_coolant: Any = None primary_pumping: Any = None @@ -899,7 +899,7 @@ class PowerflowCalcParam(NamedTuple): pradfw=0, i_blkt_coolant_type=1, outlet_temp=823, - blpressure=15500000, + pres_blkt_coolant=15500000, primary_pumping=3, p_fw_nuclear_heat_total_mw=276.80690153753221, p_blkt_nuclear_heat_total_mw=1504.9215740808861, @@ -948,7 +948,7 @@ class PowerflowCalcParam(NamedTuple): pradfw=254.39207240222791, i_blkt_coolant_type=1, outlet_temp=823, - blpressure=15500000, + pres_blkt_coolant=15500000, primary_pumping=3, p_fw_nuclear_heat_total_mw=230.98304919926957, p_blkt_nuclear_heat_total_mw=1550.1447895848396, @@ -1027,7 +1027,9 @@ def test_powerflow_calc(powerflowcalcparam, monkeypatch, ccfe_hcpb): monkeypatch.setattr(fwbs_variables, "outlet_temp", powerflowcalcparam.outlet_temp) - monkeypatch.setattr(fwbs_variables, "blpressure", powerflowcalcparam.blpressure) + monkeypatch.setattr( + fwbs_variables, "pres_blkt_coolant", powerflowcalcparam.pres_blkt_coolant + ) monkeypatch.setattr( fwbs_variables, "primary_pumping", powerflowcalcparam.primary_pumping From 851e118fc551708cd9d736d6b5f1bc77aebc199f Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 17 Feb 2025 16:21:02 +0000 Subject: [PATCH 15/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20inlet=5Ftemp=20to?= =?UTF-8?q?=20temp=5Fblkt=5Fcoolant=5Fin=20for=20clarity=20and=20consisten?= =?UTF-8?q?cy=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proc-pages/eng-models/fw-blanket.md | 2 +- process/blanket_library.py | 20 ++++++++++--------- source/fortran/fwbs_variables.f90 | 4 ++-- source/fortran/input.f90 | 6 +++--- tests/integration/ref_dicts.json | 10 +++++----- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/test_blanket_library.py | 10 ++++++---- 7 files changed, 29 insertions(+), 25 deletions(-) diff --git a/documentation/proc-pages/eng-models/fw-blanket.md b/documentation/proc-pages/eng-models/fw-blanket.md index 3c3e0390ce..9918db3cca 100644 --- a/documentation/proc-pages/eng-models/fw-blanket.md +++ b/documentation/proc-pages/eng-models/fw-blanket.md @@ -86,7 +86,7 @@ Summary of key variables and switches: | Coolant | :-----------: | ------------------------ | -------------------------- | | primary coolant switch | `i_fw_coolant_type` | `i_blkt_coolant_type` | --- | | secondary coolant switch | --- | --- | `i_bb_liq` | -| inlet temp (K) | `temp_fw_coolant_in` | `inlet_temp` | `inlet_temp_liq` | +| inlet temp (K) | `temp_fw_coolant_in` | `temp_blkt_coolant_in` | `inlet_temp_liq` | | outlet temp (K) | `temp_fw_coolant_out` | `outlet_temp` | `outlet_temp_liq` | | pressure (Pa) | `pres_fw_coolant` | `pres_blkt_coolant` | `blpressure_liq` | diff --git a/process/blanket_library.py b/process/blanket_library.py index 3ba60456b1..52aa4b0cd3 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -496,7 +496,9 @@ def primary_coolant_properties(self, output: bool): fwbs_variables.visc_fw_coolant = fw_fluid_properties.viscosity # BB - mid_temp_bl = (fwbs_variables.inlet_temp + fwbs_variables.outlet_temp) * 0.5 + mid_temp_bl = ( + fwbs_variables.temp_blkt_coolant_in + fwbs_variables.outlet_temp + ) * 0.5 bb_fluid_properties = FluidProperties.of( "Helium" if fwbs_variables.i_blkt_coolant_type == 1 else "Water", temperature=mid_temp_bl, @@ -613,8 +615,8 @@ def primary_coolant_properties(self, output: bool): po.ovarre( self.outfile, "Inlet Temperature (Celcius)", - "(inlet_temp)", - fwbs_variables.inlet_temp, + "(temp_blkt_coolant_in)", + fwbs_variables.temp_blkt_coolant_in, "OP ", ) po.ovarre( @@ -1543,7 +1545,7 @@ def thermo_hydraulic_model(self, output: bool): primary coolant switch i_fw_coolant_type i_blkt_coolant_type --- secondary coolant switch --- --- i_bb_liq - inlet temp (K) temp_fw_coolant_in inlet_temp inlet_temp_liq + inlet temp (K) temp_fw_coolant_in temp_blkt_coolant_in inlet_temp_liq outlet temp (K) temp_fw_coolant_out outlet_temp outlet_temp_liq pressure (Pa) pres_fw_coolant pres_blkt_coolant blpressure_liq """ @@ -1658,9 +1660,9 @@ def thermo_hydraulic_model(self, output: bool): elif fwbs_variables.ipump == 1: fwoutleti = fwbs_variables.temp_fw_coolant_out - inlet_tempi = fwbs_variables.inlet_temp + inlet_tempi = fwbs_variables.temp_blkt_coolant_in fwoutleto = fwbs_variables.temp_fw_coolant_out - inlet_tempo = fwbs_variables.inlet_temp + inlet_tempo = fwbs_variables.temp_blkt_coolant_in # Maximum FW temperature. (27/11/2015) Issue #348 # First wall flow is just along the first wall, with no allowance for radial @@ -1914,7 +1916,7 @@ def thermo_hydraulic_model(self, output: bool): heat_transport_variables.htpmw_blkt = self.pumppower( output=output, icoolpump=1, - temp_in=fwbs_variables.inlet_temp.item(), + temp_in=fwbs_variables.temp_blkt_coolant_in.item(), temp_out=fwbs_variables.outlet_temp.item(), pressure=fwbs_variables.pres_blkt_coolant.item(), pdrop=deltap_blkt.item(), @@ -2051,8 +2053,8 @@ def thermo_hydraulic_model(self, output: bool): po.ovarrf( self.outfile, "Inlet temperature of blanket coolant (K)", - "(inlet_temp)", - fwbs_variables.inlet_temp, + "(temp_blkt_coolant_in)", + fwbs_variables.temp_blkt_coolant_in, ) po.ovarrf( self.outfile, diff --git a/source/fortran/fwbs_variables.f90 b/source/fortran/fwbs_variables.f90 index a8f9597a89..f43983bb3c 100644 --- a/source/fortran/fwbs_variables.f90 +++ b/source/fortran/fwbs_variables.f90 @@ -350,7 +350,7 @@ module fwbs_variables real(dp) :: pres_blkt_coolant !! blanket coolant pressure [Pa] (`secondary_cycle>1`) - real(dp) :: inlet_temp + real(dp) :: temp_blkt_coolant_in !! inlet temperature of blanket coolant [K] (`secondary_cycle>1`) real(dp) :: outlet_temp @@ -750,7 +750,7 @@ subroutine init_fwbs_variables len_fw_channel = 4.0D0 f_fw_peak = 1.0D0 pres_blkt_coolant = 15.50D6 - inlet_temp = 573.0D0 + temp_blkt_coolant_in = 573.0D0 outlet_temp = 823.0D0 coolp = 15.5D6 nblktmodpo = 8 diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index 54bf54d5f9..fcf7a932bf 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -211,7 +211,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) iblanket_thickness, vfcblkt, breeder_f, fbllipb, fhcd, vfshld, fblhebmi, & f_neut_shield, fw_th_conductivity, nblktmodti, dr_fw_wall, afwo, & fvolsi, etahtp, nblktmodpo, pres_fw_coolant, emult, temp_fw_coolant_out, nblktmodpi, & - fblhebpi, fblss, inlet_temp, outlet_temp, fblbreed, qnuc, pres_blkt_coolant, & + fblhebpi, fblss, temp_blkt_coolant_in, outlet_temp, fblbreed, qnuc, pres_blkt_coolant, & blpressure_liq, n_liq_recirc, pnuc_fw_ratio_dcll, f_nuc_pow_bz_struct, & declblkt, fblhebmo, blkttype, radius_fw_channel, inuclear, declshld, hcdportsize, & npdiv, f_fw_peak, primary_pumping, dr_pf_cryostat, secondary_cycle, secondary_cycle_liq, & @@ -1993,8 +1993,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('afwo') call parse_real_variable('afwo', afwo, 1.0D-3, 0.05D0, & 'O/B fw/blkt coolant channel inner radius (m)') - case ('inlet_temp') - call parse_real_variable('inlet_temp', inlet_temp, 200.0D0, 600.0D0, & + case ('temp_blkt_coolant_in') + call parse_real_variable('temp_blkt_coolant_in', temp_blkt_coolant_in, 200.0D0, 600.0D0, & 'Coolant inlet temperature (K)') case ('irefprop') call parse_int_variable('irefprop', irefprop, 0, 1, & diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 171aec989d..fd4b91c581 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -2606,7 +2606,7 @@ "infile": 0.0, "info": null, "initialpressure": 1.0, - "inlet_temp": 573.0, + "temp_blkt_coolant_in": 573.0, "inp0": null, "insstrain": 0.0, "insulation_area": 0.0, @@ -9861,7 +9861,7 @@ "infile": "", "info": "", "initialpressure": "initial neutral pressure at the beginning of the dwell phase (Pa)", - "inlet_temp": "inlet temperature of blanket coolant (K) (`secondary_cycle>1`)", + "temp_blkt_coolant_in": "inlet temperature of blanket coolant (K) (`secondary_cycle>1`)", "insstrain": "Radial strain in insulator", "insulation_area": "single turn insulation area (m2)", "int_def": "", @@ -13413,7 +13413,7 @@ "lb": 1e-06, "ub": 10000.0 }, - "inlet_temp": { + "temp_blkt_coolant_in": { "lb": 200.0, "ub": 600.0 }, @@ -18094,7 +18094,7 @@ "len_fw_channel", "f_fw_peak", "pres_blkt_coolant", - "inlet_temp", + "temp_blkt_coolant_in", "outlet_temp", "coolp", "nblktmodpo", @@ -20465,7 +20465,7 @@ "impurity_enrichment": "real_array", "impvardiv": "int_variable", "initialpressure": "real_variable", - "inlet_temp": "real_variable", + "temp_blkt_coolant_in": "real_variable", "inuclear": "int_variable", "iohcl": "int_variable", "ioptimz": "int_variable", diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index ffc0f46dff..6b43382fa3 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2413,7 +2413,7 @@ i_blkt_inboard = 0 * DESCRIPTION: Number of inboard blanket modules in toroidal direction (`secondary_cycle>1`)(default = 32) * JUSTIFICATION: Not set as not used -*inlet_temp = +*temp_blkt_coolant_in = * DESCRIPTION: Inlet temperature of blanket coolant [K] (`secondary_cycle>1`) * JUSTIFICATION: Not set as not used diff --git a/tests/unit/test_blanket_library.py b/tests/unit/test_blanket_library.py index f5e9fdf3d5..57860b34f5 100644 --- a/tests/unit/test_blanket_library.py +++ b/tests/unit/test_blanket_library.py @@ -43,7 +43,7 @@ class PrimaryCoolantPropertiesParam(NamedTuple): i_blkt_coolant_type: Any = None - inlet_temp: Any = None + temp_blkt_coolant_in: Any = None outlet_temp: Any = None @@ -92,7 +92,7 @@ class PrimaryCoolantPropertiesParam(NamedTuple): cp_fw=0, cv_fw=0, i_blkt_coolant_type=1, - inlet_temp=573, + temp_blkt_coolant_in=573, outlet_temp=773, pres_blkt_coolant=8000000, rhof_bl=0, @@ -120,7 +120,7 @@ class PrimaryCoolantPropertiesParam(NamedTuple): cp_fw=5188.5588430173211, cv_fw=3123.5687263525392, i_blkt_coolant_type=1, - inlet_temp=573, + temp_blkt_coolant_in=573, outlet_temp=773, pres_blkt_coolant=8000000, rhof_bl=5.6389735407435868, @@ -193,7 +193,9 @@ def test_primary_coolant_properties( ) monkeypatch.setattr( - fwbs_variables, "inlet_temp", primarycoolantpropertiesparam.inlet_temp + fwbs_variables, + "temp_blkt_coolant_in", + primarycoolantpropertiesparam.temp_blkt_coolant_in, ) monkeypatch.setattr( From cc98aa0e3294d369ab6fcba28df51b1a438974b8 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 17 Feb 2025 16:22:03 +0000 Subject: [PATCH 16/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20outlet=5Ftemp=20t?= =?UTF-8?q?o=20temp=5Fblkt=5Fcoolant=5Fout=20for=20clarity=20and=20consist?= =?UTF-8?q?ency=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proc-pages/eng-models/fw-blanket.md | 2 +- process/blanket_library.py | 48 +++++++++++-------- process/hcpb.py | 2 +- process/power.py | 14 ++++-- process/stellarator.py | 4 +- source/fortran/fwbs_variables.f90 | 4 +- source/fortran/input.f90 | 6 +-- tests/integration/ref_dicts.json | 10 ++-- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/test_blanket_library.py | 10 ++-- tests/unit/test_ccfe_hcpb.py | 12 +++-- 11 files changed, 68 insertions(+), 46 deletions(-) diff --git a/documentation/proc-pages/eng-models/fw-blanket.md b/documentation/proc-pages/eng-models/fw-blanket.md index 9918db3cca..1c0a65269a 100644 --- a/documentation/proc-pages/eng-models/fw-blanket.md +++ b/documentation/proc-pages/eng-models/fw-blanket.md @@ -87,7 +87,7 @@ Summary of key variables and switches: | primary coolant switch | `i_fw_coolant_type` | `i_blkt_coolant_type` | --- | | secondary coolant switch | --- | --- | `i_bb_liq` | | inlet temp (K) | `temp_fw_coolant_in` | `temp_blkt_coolant_in` | `inlet_temp_liq` | -| outlet temp (K) | `temp_fw_coolant_out` | `outlet_temp` | `outlet_temp_liq` | +| outlet temp (K) | `temp_fw_coolant_out` | `temp_blkt_coolant_out` | `outlet_temp_liq` | | pressure (Pa) | `pres_fw_coolant` | `pres_blkt_coolant` | `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. diff --git a/process/blanket_library.py b/process/blanket_library.py index 52aa4b0cd3..dec541db56 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -461,7 +461,7 @@ def primary_coolant_properties(self, output: bool): if fwbs_variables.ipump == 0: # Use FW inlet temp and BB outlet temp mid_temp = ( - fwbs_variables.temp_fw_coolant_in + fwbs_variables.outlet_temp + fwbs_variables.temp_fw_coolant_in + fwbs_variables.temp_blkt_coolant_out ) * 0.5 # FW/BB fw_bb_fluid_properties = FluidProperties.of( @@ -497,7 +497,8 @@ def primary_coolant_properties(self, output: bool): # BB mid_temp_bl = ( - fwbs_variables.temp_blkt_coolant_in + fwbs_variables.outlet_temp + fwbs_variables.temp_blkt_coolant_in + + fwbs_variables.temp_blkt_coolant_out ) * 0.5 bb_fluid_properties = FluidProperties.of( "Helium" if fwbs_variables.i_blkt_coolant_type == 1 else "Water", @@ -572,8 +573,8 @@ def primary_coolant_properties(self, output: bool): po.ovarre( self.outfile, "Outlet Temperature (Celcius)", - "(outlet_temp)", - fwbs_variables.outlet_temp, + "(temp_blkt_coolant_out)", + fwbs_variables.temp_blkt_coolant_out, "OP ", ) else: @@ -622,8 +623,8 @@ def primary_coolant_properties(self, output: bool): po.ovarre( self.outfile, "Outlet Temperature (Celcius)", - "(outlet_temp)", - fwbs_variables.outlet_temp, + "(temp_blkt_coolant_out)", + fwbs_variables.temp_blkt_coolant_out, "OP ", ) @@ -1546,7 +1547,7 @@ def thermo_hydraulic_model(self, output: bool): primary coolant switch i_fw_coolant_type i_blkt_coolant_type --- secondary coolant switch --- --- i_bb_liq inlet temp (K) temp_fw_coolant_in temp_blkt_coolant_in inlet_temp_liq - outlet temp (K) temp_fw_coolant_out outlet_temp outlet_temp_liq + outlet temp (K) temp_fw_coolant_out temp_blkt_coolant_out outlet_temp_liq pressure (Pa) pres_fw_coolant pres_blkt_coolant blpressure_liq """ ###################################################### @@ -1646,14 +1647,14 @@ def thermo_hydraulic_model(self, output: bool): # Outlet FW/inlet BB temp (mass flow FW = mass flow BB) if fwbs_variables.i_blkt_inboard == 1: - fwoutleti = (f_nuc_fwi * fwbs_variables.outlet_temp) + ( + fwoutleti = (f_nuc_fwi * fwbs_variables.temp_blkt_coolant_out) + ( 1 - f_nuc_fwi ) * fwbs_variables.temp_fw_coolant_in inlet_tempi = fwoutleti else: fwoutleti = fwbs_variables.temp_fw_coolant_out - fwoutleto = (f_nuc_fwo * fwbs_variables.outlet_temp) + ( + fwoutleto = (f_nuc_fwo * fwbs_variables.temp_blkt_coolant_out) + ( 1 - f_nuc_fwo ) * fwbs_variables.temp_fw_coolant_in inlet_tempo = fwoutleto @@ -1736,7 +1737,10 @@ def thermo_hydraulic_model(self, output: bool): blanket_library.mfblkto = ( 1.0e6 * (pnucblkto_struct) - / (fwbs_variables.cp_bl * (fwbs_variables.outlet_temp - inlet_tempo)) + / ( + fwbs_variables.cp_bl + * (fwbs_variables.temp_blkt_coolant_out - inlet_tempo) + ) ) blanket_library.mfblkto_liq = ( 1.0e6 @@ -1755,7 +1759,7 @@ def thermo_hydraulic_model(self, output: bool): * (pnucblkti_struct) / ( fwbs_variables.cp_bl - * (fwbs_variables.outlet_temp - inlet_tempi) + * (fwbs_variables.temp_blkt_coolant_out - inlet_tempi) ) ) blanket_library.mfblkti_liq = ( @@ -1776,7 +1780,10 @@ def thermo_hydraulic_model(self, output: bool): blanket_library.mfblkto = ( 1.0e6 * (blanket_library.pnucblkto) - / (fwbs_variables.cp_bl * (fwbs_variables.outlet_temp - inlet_tempo)) + / ( + fwbs_variables.cp_bl + * (fwbs_variables.temp_blkt_coolant_out - inlet_tempo) + ) ) # Get mass flow rate etc. for inboard blanket breeder flow for tritium extraction @@ -1794,7 +1801,7 @@ def thermo_hydraulic_model(self, output: bool): * (blanket_library.pnucblkti) / ( fwbs_variables.cp_bl - * (fwbs_variables.outlet_temp - inlet_tempi) + * (fwbs_variables.temp_blkt_coolant_out - inlet_tempi) ) ) # Mass flow rate for inboard breeder flow (kg/s) @@ -1808,7 +1815,10 @@ def thermo_hydraulic_model(self, output: bool): blanket_library.mfblkto = ( 1.0e6 * (blanket_library.pnucblkto) - / (fwbs_variables.cp_bl * (fwbs_variables.outlet_temp - inlet_tempo)) + / ( + fwbs_variables.cp_bl + * (fwbs_variables.temp_blkt_coolant_out - inlet_tempo) + ) ) # If there is an IB blanket... @@ -1819,7 +1829,7 @@ def thermo_hydraulic_model(self, output: bool): * (blanket_library.pnucblkti) / ( fwbs_variables.cp_bl - * (fwbs_variables.outlet_temp - inlet_tempi) + * (fwbs_variables.temp_blkt_coolant_out - inlet_tempi) ) ) @@ -1865,7 +1875,7 @@ def thermo_hydraulic_model(self, output: bool): output=output, icoolpump=1, temp_in=fwbs_variables.temp_fw_coolant_in.item(), - temp_out=fwbs_variables.outlet_temp.item(), + temp_out=fwbs_variables.temp_blkt_coolant_out.item(), pressure=fwbs_variables.pres_fw_coolant.item(), pdrop=deltap_fw_blkt, mf=blanket_library.mftotal, @@ -1917,7 +1927,7 @@ def thermo_hydraulic_model(self, output: bool): output=output, icoolpump=1, temp_in=fwbs_variables.temp_blkt_coolant_in.item(), - temp_out=fwbs_variables.outlet_temp.item(), + temp_out=fwbs_variables.temp_blkt_coolant_out.item(), pressure=fwbs_variables.pres_blkt_coolant.item(), pdrop=deltap_blkt.item(), mf=blanket_library.mfblkt, @@ -2059,8 +2069,8 @@ def thermo_hydraulic_model(self, output: bool): po.ovarrf( self.outfile, "Outlet temperature of blanket coolant (K)", - "(outlet_temp)", - fwbs_variables.outlet_temp, + "(temp_blkt_coolant_out)", + fwbs_variables.temp_blkt_coolant_out, ) po.ovarre( self.outfile, diff --git a/process/hcpb.py b/process/hcpb.py index 1b744ec201..2eea8f6a67 100644 --- a/process/hcpb.py +++ b/process/hcpb.py @@ -685,7 +685,7 @@ def powerflow_calc(self, output: bool): pressure=fwbs_variables.pres_blkt_coolant * 1.0e6, vapor_quality=0, ) - fwbs_variables.outlet_temp = ( + fwbs_variables.temp_blkt_coolant_out = ( outlet_saturated_fluid_properties.temperature - 20.0 ) # in K diff --git a/process/power.py b/process/power.py index e1216eb69f..1cc3cb319c 100644 --- a/process/power.py +++ b/process/power.py @@ -2356,7 +2356,7 @@ def plant_thermal_efficiency(self, etath): taken from cycle modelling studies.

If secondary_cycle > 1, the outlet temperature from the first wall and breeder zone is used to calculate an efficiency, using a simple relationship - between etath and outlet_temp again obtained from previous studies. + between etath and temp_blkt_coolant_out again obtained from previous studies. C. Harrington, K:Power Plant Physics and Technology PROCESS blanket_model New Power Module Harrington Cycle correlations Cycle correlations.xls """ @@ -2414,7 +2414,9 @@ def plant_thermal_efficiency(self, etath): # Superheated steam Rankine cycle correlation (C. Harrington) # Range of validity: 657 K < heat_transport_variables.tturb < 915 K - heat_transport_variables.tturb = fwbs_variables.outlet_temp - 20.0e0 + heat_transport_variables.tturb = ( + fwbs_variables.temp_blkt_coolant_out - 20.0e0 + ) if (heat_transport_variables.tturb < 657.0e0) or ( heat_transport_variables.tturb > 915.0e0 ): @@ -2431,7 +2433,9 @@ def plant_thermal_efficiency(self, etath): # KIT HCPB Model elif fwbs_variables.i_blanket_type == 2: # Same as fwbs_variables.i_blanket_type = 1 - heat_transport_variables.tturb = fwbs_variables.outlet_temp - 20.0e0 + heat_transport_variables.tturb = ( + fwbs_variables.temp_blkt_coolant_out - 20.0e0 + ) if (heat_transport_variables.tturb < 657.0e0) or ( heat_transport_variables.tturb > 915.0e0 ): @@ -2458,7 +2462,9 @@ def plant_thermal_efficiency(self, etath): # Supercritical CO2 cycle correlation (C. Harrington) # Range of validity: 408 K < heat_transport_variables.tturb < 1023 K - heat_transport_variables.tturb = fwbs_variables.outlet_temp - 20.0e0 + heat_transport_variables.tturb = ( + fwbs_variables.temp_blkt_coolant_out - 20.0e0 + ) if (heat_transport_variables.tturb < 408.0e0) or ( heat_transport_variables.tturb > 1023.0e0 ): diff --git a/process/stellarator.py b/process/stellarator.py index 940715ca0e..d432e5e3fe 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -1377,7 +1377,7 @@ def stfwbs(self, output: bool): if fwbs_variables.i_blkt_coolant_type == 2: if fwbs_variables.irefprop: - fwbs_variables.outlet_temp = ( + fwbs_variables.temp_blkt_coolant_out = ( FluidProperties.of( "Water", pressure=fwbs_variables.coolp, @@ -1386,7 +1386,7 @@ def stfwbs(self, output: bool): - 20 ) else: - fwbs_variables.outlet_temp = ( + fwbs_variables.temp_blkt_coolant_out = ( 273.15 + 168.396 + 0.314653 / fwbs_variables.coolp diff --git a/source/fortran/fwbs_variables.f90 b/source/fortran/fwbs_variables.f90 index f43983bb3c..aff7a6ee34 100644 --- a/source/fortran/fwbs_variables.f90 +++ b/source/fortran/fwbs_variables.f90 @@ -353,7 +353,7 @@ module fwbs_variables real(dp) :: temp_blkt_coolant_in !! inlet temperature of blanket coolant [K] (`secondary_cycle>1`) - real(dp) :: outlet_temp + real(dp) :: temp_blkt_coolant_out !! Outlet temperature of blanket coolant [K] (`secondary_cycle>1`) !! !! - input if `i_blkt_coolant_type=1` (helium) @@ -751,7 +751,7 @@ subroutine init_fwbs_variables f_fw_peak = 1.0D0 pres_blkt_coolant = 15.50D6 temp_blkt_coolant_in = 573.0D0 - outlet_temp = 823.0D0 + temp_blkt_coolant_out = 823.0D0 coolp = 15.5D6 nblktmodpo = 8 nblktmodpi = 7 diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index fcf7a932bf..f118236101 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -211,7 +211,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) iblanket_thickness, vfcblkt, breeder_f, fbllipb, fhcd, vfshld, fblhebmi, & f_neut_shield, fw_th_conductivity, nblktmodti, dr_fw_wall, afwo, & fvolsi, etahtp, nblktmodpo, pres_fw_coolant, emult, temp_fw_coolant_out, nblktmodpi, & - fblhebpi, fblss, temp_blkt_coolant_in, outlet_temp, fblbreed, qnuc, pres_blkt_coolant, & + fblhebpi, fblss, temp_blkt_coolant_in, temp_blkt_coolant_out, fblbreed, qnuc, pres_blkt_coolant, & blpressure_liq, n_liq_recirc, pnuc_fw_ratio_dcll, f_nuc_pow_bz_struct, & declblkt, fblhebmo, blkttype, radius_fw_channel, inuclear, declshld, hcdportsize, & npdiv, f_fw_peak, primary_pumping, dr_pf_cryostat, secondary_cycle, secondary_cycle_liq, & @@ -1999,8 +1999,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('irefprop') call parse_int_variable('irefprop', irefprop, 0, 1, & 'Switch to use REFPROP routines') - case ('outlet_temp') - call parse_real_variable('outlet_temp', outlet_temp, 450.0D0, 900.0D0, & + case ('temp_blkt_coolant_out') + call parse_real_variable('temp_blkt_coolant_out', temp_blkt_coolant_out, 450.0D0, 900.0D0, & 'Coolant outlet temperature (K)') case ('nblktmodpo') call parse_int_variable('nblktmodpo', nblktmodpo, 1, 16, & diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index fd4b91c581..0a7ffc211a 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3458,7 +3458,7 @@ "outfile": 0.0, "outgasfactor": 0.0235, "outgasindex": 1.0, - "outlet_temp": 823.0, + "temp_blkt_coolant_out": 823.0, "output_costs": 1.0, "output_huge": 1e+66, "output_prefix": "", @@ -10217,7 +10217,7 @@ "outfile": "", "outgasfactor": "outgassing prefactor kw: outgassing rate at 1 s per unit area (Pa m s-1)", "outgasindex": "outgassing decay index", - "outlet_temp": "Outlet temperature of blanket coolant (K) (`secondary_cycle>1`)\n

    \n
  • input if `i_blkt_coolant_type=1` (helium)
    • \n
  • calculated if `i_blkt_coolant_type=2` (water)
    • \n
", + "temp_blkt_coolant_out": "Outlet temperature of blanket coolant (K) (`secondary_cycle>1`)\n
    \n
  • input if `i_blkt_coolant_type=1` (helium)
    • \n
  • calculated if `i_blkt_coolant_type=2` (water)
    • \n
", "output_costs": "Switch for costs output:\n
    \n
  • =0 do not write cost-related outputs to file
    • \n
  • =1 write cost-related outputs to file
    • \n
", "output_huge": "", "output_prefix": "output file prefix", @@ -13841,7 +13841,7 @@ "lb": 1e-06, "ub": 1000.0 }, - "outlet_temp": { + "temp_blkt_coolant_out": { "lb": 450.0, "ub": 900.0 }, @@ -18095,7 +18095,7 @@ "f_fw_peak", "pres_blkt_coolant", "temp_blkt_coolant_in", - "outlet_temp", + "temp_blkt_coolant_out", "coolp", "nblktmodpo", "nblktmodpi", @@ -20586,7 +20586,7 @@ "omegan": "real_variable", "outgasfactor": "real_variable", "outgasindex": "real_variable", - "outlet_temp": "real_variable", + "temp_blkt_coolant_out": "real_variable", "output_costs": "int_variable", "p_he": "real_variable", "pbase": "real_variable", diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 6b43382fa3..87fb3d7b05 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2417,7 +2417,7 @@ i_blkt_inboard = 0 * DESCRIPTION: Inlet temperature of blanket coolant [K] (`secondary_cycle>1`) * JUSTIFICATION: Not set as not used -*outlet_temp = +*temp_blkt_coolant_out = * DESCRIPTION: Outlet temperature of blanket coolant [K] (`secondary_cycle>1`) * input if `i_blkt_coolant_type=1` (helium) * calculated if `i_blkt_coolant_type=2` (water) diff --git a/tests/unit/test_blanket_library.py b/tests/unit/test_blanket_library.py index 57860b34f5..380ac2102f 100644 --- a/tests/unit/test_blanket_library.py +++ b/tests/unit/test_blanket_library.py @@ -45,7 +45,7 @@ class PrimaryCoolantPropertiesParam(NamedTuple): temp_blkt_coolant_in: Any = None - outlet_temp: Any = None + temp_blkt_coolant_out: Any = None pres_blkt_coolant: Any = None @@ -93,7 +93,7 @@ class PrimaryCoolantPropertiesParam(NamedTuple): cv_fw=0, i_blkt_coolant_type=1, temp_blkt_coolant_in=573, - outlet_temp=773, + temp_blkt_coolant_out=773, pres_blkt_coolant=8000000, rhof_bl=0, icooldual=2, @@ -121,7 +121,7 @@ class PrimaryCoolantPropertiesParam(NamedTuple): cv_fw=3123.5687263525392, i_blkt_coolant_type=1, temp_blkt_coolant_in=573, - outlet_temp=773, + temp_blkt_coolant_out=773, pres_blkt_coolant=8000000, rhof_bl=5.6389735407435868, icooldual=2, @@ -199,7 +199,9 @@ def test_primary_coolant_properties( ) monkeypatch.setattr( - fwbs_variables, "outlet_temp", primarycoolantpropertiesparam.outlet_temp + fwbs_variables, + "temp_blkt_coolant_out", + primarycoolantpropertiesparam.temp_blkt_coolant_out, ) monkeypatch.setattr( diff --git a/tests/unit/test_ccfe_hcpb.py b/tests/unit/test_ccfe_hcpb.py index 691974c58e..82b111e0fe 100644 --- a/tests/unit/test_ccfe_hcpb.py +++ b/tests/unit/test_ccfe_hcpb.py @@ -808,7 +808,7 @@ class PowerflowCalcParam(NamedTuple): i_blkt_coolant_type: Any = None - outlet_temp: Any = None + temp_blkt_coolant_out: Any = None pres_blkt_coolant: Any = None @@ -898,7 +898,7 @@ class PowerflowCalcParam(NamedTuple): fhcd=0, pradfw=0, i_blkt_coolant_type=1, - outlet_temp=823, + temp_blkt_coolant_out=823, pres_blkt_coolant=15500000, primary_pumping=3, p_fw_nuclear_heat_total_mw=276.80690153753221, @@ -947,7 +947,7 @@ class PowerflowCalcParam(NamedTuple): fhcd=0, pradfw=254.39207240222791, i_blkt_coolant_type=1, - outlet_temp=823, + temp_blkt_coolant_out=823, pres_blkt_coolant=15500000, primary_pumping=3, p_fw_nuclear_heat_total_mw=230.98304919926957, @@ -1025,7 +1025,11 @@ def test_powerflow_calc(powerflowcalcparam, monkeypatch, ccfe_hcpb): fwbs_variables, "i_blkt_coolant_type", powerflowcalcparam.i_blkt_coolant_type ) - monkeypatch.setattr(fwbs_variables, "outlet_temp", powerflowcalcparam.outlet_temp) + monkeypatch.setattr( + fwbs_variables, + "temp_blkt_coolant_out", + powerflowcalcparam.temp_blkt_coolant_out, + ) monkeypatch.setattr( fwbs_variables, "pres_blkt_coolant", powerflowcalcparam.pres_blkt_coolant From c4d5eee62ce0edfb3af5833de6d8bfe5c5a29964 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 17 Feb 2025 16:23:25 +0000 Subject: [PATCH 17/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20nblktmodpo=20to?= =?UTF-8?q?=20n=5Fblkt=5Foutboard=5Fmodules=5Fpoloidal=20for=20clarity=20a?= =?UTF-8?q?nd=20consistency=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proc-pages/eng-models/fw-blanket.md | 2 +- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++++------ process/blanket_library.py | 14 ++++----- process/hcpb.py | 4 +-- source/fortran/fwbs_variables.f90 | 4 +-- source/fortran/input.f90 | 6 ++-- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 18 +++++------ tests/integration/ref_dicts.json | 10 +++---- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_blanket_library.py | 8 ++--- 22 files changed, 69 insertions(+), 69 deletions(-) diff --git a/documentation/proc-pages/eng-models/fw-blanket.md b/documentation/proc-pages/eng-models/fw-blanket.md index 1c0a65269a..bb0573827f 100644 --- a/documentation/proc-pages/eng-models/fw-blanket.md +++ b/documentation/proc-pages/eng-models/fw-blanket.md @@ -172,7 +172,7 @@ The user can select the number poloidal and toroidal modules for the IB and OB B | Variable | Units | Itvar. | Default | Description | | :----------: | :---: | ------ | ------- | -------------------------------------------------------- | | `nblktmodpi` | --- | | 7 | Number of inboard blanket modules in poloidal direction | -| `nblktmodpo` | --- | | 8 | Number of outboard blanket modules in poloidal direction | +| `n_blkt_outboard_modules_poloidal` | --- | | 8 | Number of outboard blanket modules in poloidal direction | | `nblktmodti` | --- | | 32 | Number of inboard blanket modules in toroidal direction | | `nblktmodto` | --- | | 48 | Number of outboard blanket modules in toroidal direction | diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index edb2ed6f94..9aa7141817 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -988,7 +988,7 @@ 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_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 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)____________________________________________________ (a_fw_total)______________________ 1.6044E+03 OP diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 63e601912d..40ca0679f6 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -983,7 +983,7 @@ 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_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 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)____________________________________________________ (a_fw_total)______________________ 1.6044E+03 OP diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index f7e2507b1a..e3a9e610c3 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -983,7 +983,7 @@ 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_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 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)____________________________________________________ (a_fw_total)______________________ 1.6044E+03 OP diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index b4b73a234f..424228abd6 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -983,7 +983,7 @@ 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_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 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)____________________________________________________ (a_fw_total)______________________ 1.6044E+03 OP diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 44e9cb76f6..bfbf9fcbdc 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -983,7 +983,7 @@ 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_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 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)____________________________________________________ (a_fw_total)______________________ 1.6044E+03 OP diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 5c3f003aa8..b1b9a64442 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -812,7 +812,7 @@ Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 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_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 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)____________________________________________________ (a_fw_total)______________________ 2.0043E+03 OP @@ -1807,7 +1807,7 @@ Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 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_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 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)____________________________________________________ (a_fw_total)______________________ 2.0043E+03 OP @@ -2802,7 +2802,7 @@ Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 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_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 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)____________________________________________________ (a_fw_total)______________________ 2.0043E+03 OP @@ -3797,7 +3797,7 @@ Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 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_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 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)____________________________________________________ (a_fw_total)______________________ 2.0043E+03 OP @@ -4792,7 +4792,7 @@ Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 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_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 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)____________________________________________________ (a_fw_total)______________________ 2.0043E+03 OP @@ -5787,7 +5787,7 @@ Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 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_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 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)____________________________________________________ (a_fw_total)______________________ 2.0043E+03 OP @@ -6782,7 +6782,7 @@ Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 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_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 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)____________________________________________________ (a_fw_total)______________________ 2.0043E+03 OP @@ -7777,7 +7777,7 @@ Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 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_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 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)____________________________________________________ (a_fw_total)______________________ 2.0043E+03 OP @@ -8772,7 +8772,7 @@ Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 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_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 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)____________________________________________________ (a_fw_total)______________________ 2.0043E+03 OP diff --git a/process/blanket_library.py b/process/blanket_library.py index dec541db56..b9aed5ecba 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -660,7 +660,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): # Should not need this as nblktmodpi is input but make sure here. if fwbs_variables.ims == 1: fwbs_variables.nblktmodpi = 1 - fwbs_variables.nblktmodpo = 1 + fwbs_variables.n_blkt_outboard_modules_poloidal = 1 # Calculate mid-plane toroidal circumference and segment blanket_library.blwidti = ( @@ -807,7 +807,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): npblkto_liq = ( fwbs_variables.nopipes * fwbs_variables.nblktmodto - * fwbs_variables.nblktmodpo + * fwbs_variables.n_blkt_outboard_modules_poloidal ) # Mass flow rate per coolant pipe @@ -880,7 +880,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): npblkto_liq = ( fwbs_variables.nopipes * fwbs_variables.nblktmodto - * fwbs_variables.nblktmodpo + * fwbs_variables.n_blkt_outboard_modules_poloidal ) # Mass flow rate per coolant pipe @@ -1155,12 +1155,12 @@ def blanket_mod_pol_height(self): 0.5 * ptor * (1.0 - 2.0 * fwbs_variables.fdiv) - / fwbs_variables.nblktmodpo + / fwbs_variables.n_blkt_outboard_modules_poloidal ) else: # single null configuration blanket_library.bllengo = ( - 0.5 * ptor * (1.0 - fwbs_variables.fdiv) / fwbs_variables.nblktmodpo + 0.5 * ptor * (1.0 - fwbs_variables.fdiv) / fwbs_variables.n_blkt_outboard_modules_poloidal ) # shape defined by two half-ellipses @@ -1221,12 +1221,12 @@ def blanket_mod_pol_height(self): 0.5 * ptor * (1.0 - 2.0 * fwbs_variables.fdiv) - / fwbs_variables.nblktmodpo + / fwbs_variables.n_blkt_outboard_modules_poloidal ) else: # single null configuration blanket_library.bllengo = ( - 0.5 * ptor * (1.0 - fwbs_variables.fdiv) / fwbs_variables.nblktmodpo + 0.5 * ptor * (1.0 - fwbs_variables.fdiv) / fwbs_variables.n_blkt_outboard_modules_poloidal ) def liquid_breeder_properties(self, output: bool = False): diff --git a/process/hcpb.py b/process/hcpb.py index 2eea8f6a67..ef23bd6728 100644 --- a/process/hcpb.py +++ b/process/hcpb.py @@ -1547,8 +1547,8 @@ def write_output(self): po.ovarin( self.outfile, "No of outboard blanket modules poloidally", - "(nblktmodpo)", - fwbs_variables.nblktmodpo, + "(n_blkt_outboard_modules_poloidal)", + fwbs_variables.n_blkt_outboard_modules_poloidal, ) po.ovarin( self.outfile, diff --git a/source/fortran/fwbs_variables.f90 b/source/fortran/fwbs_variables.f90 index aff7a6ee34..2233614d14 100644 --- a/source/fortran/fwbs_variables.f90 +++ b/source/fortran/fwbs_variables.f90 @@ -362,7 +362,7 @@ module fwbs_variables real(dp) :: coolp !! blanket coolant pressure [Pa] (stellarator only) - integer :: nblktmodpo + integer :: n_blkt_outboard_modules_poloidal !! number of outboard blanket modules in poloidal direction (`secondary_cycle>1`) integer :: nblktmodpi @@ -753,7 +753,7 @@ subroutine init_fwbs_variables temp_blkt_coolant_in = 573.0D0 temp_blkt_coolant_out = 823.0D0 coolp = 15.5D6 - nblktmodpo = 8 + n_blkt_outboard_modules_poloidal = 8 nblktmodpi = 7 nblktmodto = 48 nblktmodti = 32 diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index f118236101..228f2c782a 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -210,7 +210,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) fw_armour_thickness, roughness, fwclfr, breedmat, fblli, fblvd, & iblanket_thickness, vfcblkt, breeder_f, fbllipb, fhcd, vfshld, fblhebmi, & f_neut_shield, fw_th_conductivity, nblktmodti, dr_fw_wall, afwo, & - fvolsi, etahtp, nblktmodpo, pres_fw_coolant, emult, temp_fw_coolant_out, nblktmodpi, & + fvolsi, etahtp, n_blkt_outboard_modules_poloidal, pres_fw_coolant, emult, temp_fw_coolant_out, nblktmodpi, & fblhebpi, fblss, temp_blkt_coolant_in, temp_blkt_coolant_out, fblbreed, qnuc, pres_blkt_coolant, & blpressure_liq, n_liq_recirc, pnuc_fw_ratio_dcll, f_nuc_pow_bz_struct, & declblkt, fblhebmo, blkttype, radius_fw_channel, inuclear, declshld, hcdportsize, & @@ -2002,8 +2002,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('temp_blkt_coolant_out') call parse_real_variable('temp_blkt_coolant_out', temp_blkt_coolant_out, 450.0D0, 900.0D0, & 'Coolant outlet temperature (K)') - case ('nblktmodpo') - call parse_int_variable('nblktmodpo', nblktmodpo, 1, 16, & + case ('n_blkt_outboard_modules_poloidal') + call parse_int_variable('n_blkt_outboard_modules_poloidal', n_blkt_outboard_modules_poloidal, 1, 16, & 'No of o/b blanket modules in poloidal direction') case ('nblktmodpi') call parse_int_variable('nblktmodpi', nblktmodpi, 1, 16, & diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index e5a77a7ed8..16e6c83137 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -982,7 +982,7 @@ 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_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 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)____________________________________________________ (a_fw_total)______________________ 1.6044E+03 OP diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index f55f2db96d..7537546cec 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -983,7 +983,7 @@ 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_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 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)____________________________________________________ (a_fw_total)______________________ 1.6044E+03 OP diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 041318f62d..c656d80597 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -983,7 +983,7 @@ 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_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 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)____________________________________________________ (a_fw_total)______________________ 1.6044E+03 OP diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 71778e8dcf..80b01d08c5 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -983,7 +983,7 @@ 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_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 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)____________________________________________________ (a_fw_total)______________________ 1.6044E+03 OP diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index ac65eac228..4640f9e5d2 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -986,7 +986,7 @@ 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_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 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)____________________________________________________ (a_fw_total)______________________ 1.6044E+03 OP diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 620786e003..5d4ca820de 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -984,7 +984,7 @@ 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_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 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)____________________________________________________ (a_fw_total)______________________ 1.6044E+03 OP @@ -2147,7 +2147,7 @@ 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_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 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)____________________________________________________ (a_fw_total)______________________ 1.6044E+03 OP @@ -3310,7 +3310,7 @@ 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_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 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)____________________________________________________ (a_fw_total)______________________ 1.6044E+03 OP @@ -4473,7 +4473,7 @@ 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_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 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)____________________________________________________ (a_fw_total)______________________ 1.6044E+03 OP @@ -5636,7 +5636,7 @@ 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_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 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)____________________________________________________ (a_fw_total)______________________ 1.6044E+03 OP @@ -6799,7 +6799,7 @@ 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_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 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)____________________________________________________ (a_fw_total)______________________ 1.6044E+03 OP @@ -7962,7 +7962,7 @@ 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_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 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)____________________________________________________ (a_fw_total)______________________ 1.6044E+03 OP @@ -9125,7 +9125,7 @@ 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_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 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)____________________________________________________ (a_fw_total)______________________ 1.6044E+03 OP @@ -10288,7 +10288,7 @@ 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_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 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)____________________________________________________ (a_fw_total)______________________ 1.6044E+03 OP @@ -11451,7 +11451,7 @@ 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_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 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)____________________________________________________ (a_fw_total)______________________ 1.6044E+03 OP @@ -12614,7 +12614,7 @@ 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_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 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)____________________________________________________ (a_fw_total)______________________ 1.6044E+03 OP @@ -13777,7 +13777,7 @@ 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_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 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)____________________________________________________ (a_fw_total)______________________ 1.6044E+03 OP @@ -14940,7 +14940,7 @@ 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_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 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)____________________________________________________ (a_fw_total)______________________ 1.6044E+03 OP @@ -16103,7 +16103,7 @@ 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_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 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)____________________________________________________ (a_fw_total)______________________ 1.6044E+03 OP @@ -17266,7 +17266,7 @@ 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_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 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)____________________________________________________ (a_fw_total)______________________ 1.6044E+03 OP diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index fa2ecf0904..0a355255aa 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -812,7 +812,7 @@ Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 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_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 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)____________________________________________________ (a_fw_total)______________________ 2.0043E+03 OP @@ -1807,7 +1807,7 @@ Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 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_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 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)____________________________________________________ (a_fw_total)______________________ 2.0043E+03 OP @@ -2802,7 +2802,7 @@ Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 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_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 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)____________________________________________________ (a_fw_total)______________________ 2.0043E+03 OP @@ -3797,7 +3797,7 @@ Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 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_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 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)____________________________________________________ (a_fw_total)______________________ 2.0043E+03 OP @@ -4792,7 +4792,7 @@ Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 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_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 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)____________________________________________________ (a_fw_total)______________________ 2.0043E+03 OP @@ -5787,7 +5787,7 @@ Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 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_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 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)____________________________________________________ (a_fw_total)______________________ 2.0043E+03 OP @@ -6782,7 +6782,7 @@ Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 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_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 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)____________________________________________________ (a_fw_total)______________________ 2.0043E+03 OP @@ -7777,7 +7777,7 @@ Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 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_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 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)____________________________________________________ (a_fw_total)______________________ 2.0043E+03 OP @@ -8772,7 +8772,7 @@ Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 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_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 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)____________________________________________________ (a_fw_total)______________________ 2.0043E+03 OP diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 0a7ffc211a..990ca574b3 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3351,7 +3351,7 @@ "nbi_sys_l": 225.0, "nbi_sys_w": 185.0, "nblktmodpi": 7.0, - "nblktmodpo": 8.0, + "n_blkt_outboard_modules_poloidal": 8.0, "nblktmodti": 32.0, "nblktmodto": 48.0, "nbshield": 0.5, @@ -10124,7 +10124,7 @@ "nbi_sys_l": "NBI system length, width (m)", "nbi_sys_w": "NBI system length, width (m)", "nblktmodpi": "number of inboard blanket modules in poloidal direction (`secondary_cycle>1`)", - "nblktmodpo": "number of outboard blanket modules in poloidal direction (`secondary_cycle>1`)", + "n_blkt_outboard_modules_poloidal": "number of outboard blanket modules in poloidal direction (`secondary_cycle>1`)", "nblktmodti": "number of inboard blanket modules in toroidal direction (`secondary_cycle>1`)", "nblktmodto": "number of outboard blanket modules in toroidal direction (`secondary_cycle>1`)", "nbshield": "neutral beam duct shielding thickness (m)", @@ -13753,7 +13753,7 @@ "lb": 1, "ub": 16 }, - "nblktmodpo": { + "n_blkt_outboard_modules_poloidal": { "lb": 1, "ub": 16 }, @@ -18097,7 +18097,7 @@ "temp_blkt_coolant_in", "temp_blkt_coolant_out", "coolp", - "nblktmodpo", + "n_blkt_outboard_modules_poloidal", "nblktmodpi", "nblktmodto", "nblktmodti", @@ -20556,7 +20556,7 @@ "nbi_sys_l": "real_variable", "nbi_sys_w": "real_variable", "nblktmodpi": "int_variable", - "nblktmodpo": "int_variable", + "n_blkt_outboard_modules_poloidal": "int_variable", "nblktmodti": "int_variable", "nblktmodto": "int_variable", "nbshield": "real_variable", diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 87fb3d7b05..a3656f2d2d 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2397,7 +2397,7 @@ i_blkt_inboard = 0 * =1 SMS * JUSTIFICATION: Not yet set. -*nblktmodpo = +*n_blkt_outboard_modules_poloidal = * DESCRIPTION: Number of outboard blanket modules in poloidal direction (`secondary_cycle>1`)(default = 8) * JUSTIFICATION: Not set as not used diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 4964076aef..8d08033083 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -986,7 +986,7 @@ 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_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 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)____________________________________________________ (a_fw_total)______________________ 1.6044E+03 OP diff --git a/tests/unit/test_blanket_library.py b/tests/unit/test_blanket_library.py index 380ac2102f..1b25476386 100644 --- a/tests/unit/test_blanket_library.py +++ b/tests/unit/test_blanket_library.py @@ -1486,7 +1486,7 @@ class BlanketModPolHeightParam(NamedTuple): i_fw_blkt_vv_shape: Any = None nblktmodpi: Any = None fdiv: Any = None - nblktmodpo: Any = None + n_blkt_outboard_modules_poloidal: Any = None itart: Any = None rminor: Any = None idivrt: Any = None @@ -1508,7 +1508,7 @@ class BlanketModPolHeightParam(NamedTuple): i_fw_blkt_vv_shape=2, nblktmodpi=7, fdiv=0.115, - nblktmodpo=8, + n_blkt_outboard_modules_poloidal=8, itart=0, rminor=2.6666666666666665, idivrt=1, @@ -1526,7 +1526,7 @@ class BlanketModPolHeightParam(NamedTuple): i_fw_blkt_vv_shape=1, nblktmodpi=7, fdiv=0.115, - nblktmodpo=8, + n_blkt_outboard_modules_poloidal=8, itart=1, rminor=2.5, idivrt=2, @@ -1576,7 +1576,7 @@ def test_blanket_mod_pol_height( ) monkeypatch.setattr(fwbs_variables, "fdiv", blanketmodpolheightparam.fdiv) monkeypatch.setattr( - fwbs_variables, "nblktmodpo", blanketmodpolheightparam.nblktmodpo + fwbs_variables, "n_blkt_outboard_modules_poloidal", blanketmodpolheightparam.n_blkt_outboard_modules_poloidal ) monkeypatch.setattr(physics_variables, "itart", blanketmodpolheightparam.itart) monkeypatch.setattr(physics_variables, "rminor", blanketmodpolheightparam.rminor) From 6a6def994ac0b3caacfd13e62a28bb9f114340fe Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 17 Feb 2025 16:24:12 +0000 Subject: [PATCH 18/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20nblktmodpi=20to?= =?UTF-8?q?=20n=5Fblkt=5Finboard=5Fmodules=5Fpoloidal=20for=20clarity=20an?= =?UTF-8?q?d=20consistency=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proc-pages/eng-models/fw-blanket.md | 2 +- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++++------ process/blanket_library.py | 14 ++++----- process/hcpb.py | 4 +-- source/fortran/fwbs_variables.f90 | 4 +-- source/fortran/input.f90 | 6 ++-- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 18 +++++------ tests/integration/ref_dicts.json | 10 +++---- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_blanket_library.py | 8 ++--- 22 files changed, 69 insertions(+), 69 deletions(-) diff --git a/documentation/proc-pages/eng-models/fw-blanket.md b/documentation/proc-pages/eng-models/fw-blanket.md index bb0573827f..d3edbbde0f 100644 --- a/documentation/proc-pages/eng-models/fw-blanket.md +++ b/documentation/proc-pages/eng-models/fw-blanket.md @@ -171,7 +171,7 @@ The user can select the number poloidal and toroidal modules for the IB and OB B | Variable | Units | Itvar. | Default | Description | | :----------: | :---: | ------ | ------- | -------------------------------------------------------- | -| `nblktmodpi` | --- | | 7 | Number of inboard blanket modules in poloidal direction | +| `n_blkt_inboard_modules_poloidal` | --- | | 7 | Number of inboard blanket modules in poloidal direction | | `n_blkt_outboard_modules_poloidal` | --- | | 8 | Number of outboard blanket modules in poloidal direction | | `nblktmodti` | --- | | 32 | Number of inboard blanket modules in toroidal direction | | `nblktmodto` | --- | | 48 | Number of outboard blanket modules in toroidal direction | diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 9aa7141817..8da6918649 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -986,7 +986,7 @@ First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 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_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 40ca0679f6..9073fd883d 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -981,7 +981,7 @@ First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 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_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index e3a9e610c3..14b4e891ca 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -981,7 +981,7 @@ First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 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_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 424228abd6..4cca4ae416 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -981,7 +981,7 @@ First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 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_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index bfbf9fcbdc..696139f57b 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -981,7 +981,7 @@ First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 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_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index b1b9a64442..81b817a7d7 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -810,7 +810,7 @@ First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 - No_of_inboard_blanket_modules_poloidally________________________________ (nblktmodpi)__________________ 7 + No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 @@ -1805,7 +1805,7 @@ First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 - No_of_inboard_blanket_modules_poloidally________________________________ (nblktmodpi)__________________ 7 + No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 @@ -2800,7 +2800,7 @@ First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 - No_of_inboard_blanket_modules_poloidally________________________________ (nblktmodpi)__________________ 7 + No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 @@ -3795,7 +3795,7 @@ First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 - No_of_inboard_blanket_modules_poloidally________________________________ (nblktmodpi)__________________ 7 + No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 @@ -4790,7 +4790,7 @@ First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 - No_of_inboard_blanket_modules_poloidally________________________________ (nblktmodpi)__________________ 7 + No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 @@ -5785,7 +5785,7 @@ First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 - No_of_inboard_blanket_modules_poloidally________________________________ (nblktmodpi)__________________ 7 + No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 @@ -6780,7 +6780,7 @@ First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 - No_of_inboard_blanket_modules_poloidally________________________________ (nblktmodpi)__________________ 7 + No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 @@ -7775,7 +7775,7 @@ First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 - No_of_inboard_blanket_modules_poloidally________________________________ (nblktmodpi)__________________ 7 + No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 @@ -8770,7 +8770,7 @@ First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 - No_of_inboard_blanket_modules_poloidally________________________________ (nblktmodpi)__________________ 7 + No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 diff --git a/process/blanket_library.py b/process/blanket_library.py index b9aed5ecba..234a1f6780 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -657,9 +657,9 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): # blanket into nblktmodp*nblktmodt modules, all assumed to be the same size # If SMS blanket then do not have seperate poloidal modules.... - # Should not need this as nblktmodpi is input but make sure here. + # Should not need this as n_blkt_inboard_modules_poloidal is input but make sure here. if fwbs_variables.ims == 1: - fwbs_variables.nblktmodpi = 1 + fwbs_variables.n_blkt_inboard_modules_poloidal = 1 fwbs_variables.n_blkt_outboard_modules_poloidal = 1 # Calculate mid-plane toroidal circumference and segment @@ -842,7 +842,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): npblkti_liq = ( fwbs_variables.nopipes * fwbs_variables.nblktmodti - * fwbs_variables.nblktmodpi + * fwbs_variables.n_blkt_inboard_modules_poloidal ) # Mass flow rate per coolant pipe @@ -923,7 +923,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): npblkti_liq = ( fwbs_variables.nopipes * fwbs_variables.nblktmodti - * fwbs_variables.nblktmodpi + * fwbs_variables.n_blkt_inboard_modules_poloidal ) # Mass flow rate per coolant pipe @@ -1129,7 +1129,7 @@ def blanket_mod_pol_height(self): # Segment vertical inboard surface (m) blanket_library.bllengi = ( 2.0 * blanket_library.hblnkt - ) / fwbs_variables.nblktmodpi + ) / fwbs_variables.n_blkt_inboard_modules_poloidal # Calculate perimeter of ellipse that defines the internal # surface of the outboard first wall / blanket @@ -1194,12 +1194,12 @@ def blanket_mod_pol_height(self): 0.5 * ptor * (1.0 - 2.0 * fwbs_variables.fdiv) - / fwbs_variables.nblktmodpi + / fwbs_variables.n_blkt_inboard_modules_poloidal ) else: # single null configuration blanket_library.bllengi = ( - 0.5 * ptor * (1.0 - fwbs_variables.fdiv) / fwbs_variables.nblktmodpi + 0.5 * ptor * (1.0 - fwbs_variables.fdiv) / fwbs_variables.n_blkt_inboard_modules_poloidal ) # Distance between r1 and inner edge of outboard first wall / blanket (m) diff --git a/process/hcpb.py b/process/hcpb.py index ef23bd6728..8bcca7e86a 100644 --- a/process/hcpb.py +++ b/process/hcpb.py @@ -1535,8 +1535,8 @@ def write_output(self): po.ovarin( self.outfile, "No of inboard blanket modules poloidally", - "(nblktmodpi)", - fwbs_variables.nblktmodpi, + "(n_blkt_inboard_modules_poloidal)", + fwbs_variables.n_blkt_inboard_modules_poloidal, ) po.ovarin( self.outfile, diff --git a/source/fortran/fwbs_variables.f90 b/source/fortran/fwbs_variables.f90 index 2233614d14..8d2602f67f 100644 --- a/source/fortran/fwbs_variables.f90 +++ b/source/fortran/fwbs_variables.f90 @@ -365,7 +365,7 @@ module fwbs_variables integer :: n_blkt_outboard_modules_poloidal !! number of outboard blanket modules in poloidal direction (`secondary_cycle>1`) - integer :: nblktmodpi + integer :: n_blkt_inboard_modules_poloidal !! number of inboard blanket modules in poloidal direction (`secondary_cycle>1`) integer :: nblktmodto @@ -754,7 +754,7 @@ subroutine init_fwbs_variables temp_blkt_coolant_out = 823.0D0 coolp = 15.5D6 n_blkt_outboard_modules_poloidal = 8 - nblktmodpi = 7 + n_blkt_inboard_modules_poloidal = 7 nblktmodto = 48 nblktmodti = 32 temp_fw_max = 823.0D0 diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index 228f2c782a..7951e8b767 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -210,7 +210,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) fw_armour_thickness, roughness, fwclfr, breedmat, fblli, fblvd, & iblanket_thickness, vfcblkt, breeder_f, fbllipb, fhcd, vfshld, fblhebmi, & f_neut_shield, fw_th_conductivity, nblktmodti, dr_fw_wall, afwo, & - fvolsi, etahtp, n_blkt_outboard_modules_poloidal, pres_fw_coolant, emult, temp_fw_coolant_out, nblktmodpi, & + fvolsi, etahtp, n_blkt_outboard_modules_poloidal, pres_fw_coolant, emult, temp_fw_coolant_out, n_blkt_inboard_modules_poloidal, & fblhebpi, fblss, temp_blkt_coolant_in, temp_blkt_coolant_out, fblbreed, qnuc, pres_blkt_coolant, & blpressure_liq, n_liq_recirc, pnuc_fw_ratio_dcll, f_nuc_pow_bz_struct, & declblkt, fblhebmo, blkttype, radius_fw_channel, inuclear, declshld, hcdportsize, & @@ -2005,8 +2005,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('n_blkt_outboard_modules_poloidal') call parse_int_variable('n_blkt_outboard_modules_poloidal', n_blkt_outboard_modules_poloidal, 1, 16, & 'No of o/b blanket modules in poloidal direction') - case ('nblktmodpi') - call parse_int_variable('nblktmodpi', nblktmodpi, 1, 16, & + case ('n_blkt_inboard_modules_poloidal') + call parse_int_variable('n_blkt_inboard_modules_poloidal', n_blkt_inboard_modules_poloidal, 1, 16, & 'No of i/b blanket modules in poloidal direction') case ('nblktmodto') call parse_int_variable('nblktmodto', nblktmodto, 8, 96, & diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 16e6c83137..67f4e0d82e 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -980,7 +980,7 @@ First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 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_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 7537546cec..636eb79ca9 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -981,7 +981,7 @@ First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 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_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index c656d80597..ef40118781 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -981,7 +981,7 @@ First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 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_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 80b01d08c5..7b8d9cdded 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -981,7 +981,7 @@ First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 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_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 4640f9e5d2..9a2c6f76ca 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -984,7 +984,7 @@ First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 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_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 5d4ca820de..ec62065de1 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -982,7 +982,7 @@ First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 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_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 @@ -2145,7 +2145,7 @@ First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 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_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 @@ -3308,7 +3308,7 @@ First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 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_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 @@ -4471,7 +4471,7 @@ First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 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_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 @@ -5634,7 +5634,7 @@ First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 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_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 @@ -6797,7 +6797,7 @@ First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 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_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 @@ -7960,7 +7960,7 @@ First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 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_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 @@ -9123,7 +9123,7 @@ First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 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_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 @@ -10286,7 +10286,7 @@ First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 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_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 @@ -11449,7 +11449,7 @@ First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 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_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 @@ -12612,7 +12612,7 @@ First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 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_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 @@ -13775,7 +13775,7 @@ First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 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_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 @@ -14938,7 +14938,7 @@ First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 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_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 @@ -16101,7 +16101,7 @@ First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 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_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 @@ -17264,7 +17264,7 @@ First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 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_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 0a355255aa..12e59ca6fe 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -810,7 +810,7 @@ First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 - No_of_inboard_blanket_modules_poloidally________________________________ (nblktmodpi)__________________ 7 + No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 @@ -1805,7 +1805,7 @@ First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 - No_of_inboard_blanket_modules_poloidally________________________________ (nblktmodpi)__________________ 7 + No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 @@ -2800,7 +2800,7 @@ First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 - No_of_inboard_blanket_modules_poloidally________________________________ (nblktmodpi)__________________ 7 + No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 @@ -3795,7 +3795,7 @@ First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 - No_of_inboard_blanket_modules_poloidally________________________________ (nblktmodpi)__________________ 7 + No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 @@ -4790,7 +4790,7 @@ First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 - No_of_inboard_blanket_modules_poloidally________________________________ (nblktmodpi)__________________ 7 + No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 @@ -5785,7 +5785,7 @@ First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 - No_of_inboard_blanket_modules_poloidally________________________________ (nblktmodpi)__________________ 7 + No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 @@ -6780,7 +6780,7 @@ First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 - No_of_inboard_blanket_modules_poloidally________________________________ (nblktmodpi)__________________ 7 + No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 @@ -7775,7 +7775,7 @@ First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 - No_of_inboard_blanket_modules_poloidally________________________________ (nblktmodpi)__________________ 7 + No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 @@ -8770,7 +8770,7 @@ First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 - No_of_inboard_blanket_modules_poloidally________________________________ (nblktmodpi)__________________ 7 + No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 990ca574b3..61c02703cd 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3350,7 +3350,7 @@ "nb_tor_ob": 0.0, "nbi_sys_l": 225.0, "nbi_sys_w": 185.0, - "nblktmodpi": 7.0, + "n_blkt_inboard_modules_poloidal": 7.0, "n_blkt_outboard_modules_poloidal": 8.0, "nblktmodti": 32.0, "nblktmodto": 48.0, @@ -10123,7 +10123,7 @@ "nb_tor_ob": "", "nbi_sys_l": "NBI system length, width (m)", "nbi_sys_w": "NBI system length, width (m)", - "nblktmodpi": "number of inboard blanket modules in poloidal direction (`secondary_cycle>1`)", + "n_blkt_inboard_modules_poloidal": "number of inboard blanket modules in poloidal direction (`secondary_cycle>1`)", "n_blkt_outboard_modules_poloidal": "number of outboard blanket modules in poloidal direction (`secondary_cycle>1`)", "nblktmodti": "number of inboard blanket modules in toroidal direction (`secondary_cycle>1`)", "nblktmodto": "number of outboard blanket modules in toroidal direction (`secondary_cycle>1`)", @@ -13749,7 +13749,7 @@ "lb": 10.0, "ub": 1000.0 }, - "nblktmodpi": { + "n_blkt_inboard_modules_poloidal": { "lb": 1, "ub": 16 }, @@ -18098,7 +18098,7 @@ "temp_blkt_coolant_out", "coolp", "n_blkt_outboard_modules_poloidal", - "nblktmodpi", + "n_blkt_inboard_modules_poloidal", "nblktmodto", "nblktmodti", "temp_fw_max", @@ -20555,7 +20555,7 @@ "n_tf_turn": "real_variable", "nbi_sys_l": "real_variable", "nbi_sys_w": "real_variable", - "nblktmodpi": "int_variable", + "n_blkt_inboard_modules_poloidal": "int_variable", "n_blkt_outboard_modules_poloidal": "int_variable", "nblktmodti": "int_variable", "nblktmodto": "int_variable", diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index a3656f2d2d..d6e89868f9 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2405,7 +2405,7 @@ i_blkt_inboard = 0 * DESCRIPTION: Number of outboard blanket modules in toroidal direction (`secondary_cycle>1`)(default =48) * JUSTIFICATION: Not set as not used -*nblktmodpi = +*n_blkt_inboard_modules_poloidal = * DESCRIPTION: Number of inboard blanket modules in poloidal direction (`secondary_cycle>1`)(default = 7) * JUSTIFICATION: Not set as not used diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 8d08033083..9ba621d4ed 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -984,7 +984,7 @@ First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 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_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 diff --git a/tests/unit/test_blanket_library.py b/tests/unit/test_blanket_library.py index 1b25476386..d02562dbae 100644 --- a/tests/unit/test_blanket_library.py +++ b/tests/unit/test_blanket_library.py @@ -1484,7 +1484,7 @@ class BlanketModPolHeightParam(NamedTuple): dr_fw_plasma_gap_inboard: Any = None dr_fw_plasma_gap_outboard: Any = None i_fw_blkt_vv_shape: Any = None - nblktmodpi: Any = None + n_blkt_inboard_modules_poloidal: Any = None fdiv: Any = None n_blkt_outboard_modules_poloidal: Any = None itart: Any = None @@ -1506,7 +1506,7 @@ class BlanketModPolHeightParam(NamedTuple): dr_fw_plasma_gap_inboard=0.25, dr_fw_plasma_gap_outboard=0.25, i_fw_blkt_vv_shape=2, - nblktmodpi=7, + n_blkt_inboard_modules_poloidal=7, fdiv=0.115, n_blkt_outboard_modules_poloidal=8, itart=0, @@ -1524,7 +1524,7 @@ class BlanketModPolHeightParam(NamedTuple): dr_fw_plasma_gap_inboard=0.10000000000000001, dr_fw_plasma_gap_outboard=0.10000000000000001, i_fw_blkt_vv_shape=1, - nblktmodpi=7, + n_blkt_inboard_modules_poloidal=7, fdiv=0.115, n_blkt_outboard_modules_poloidal=8, itart=1, @@ -1572,7 +1572,7 @@ def test_blanket_mod_pol_height( blanketmodpolheightparam.i_fw_blkt_vv_shape, ) monkeypatch.setattr( - fwbs_variables, "nblktmodpi", blanketmodpolheightparam.nblktmodpi + fwbs_variables, "n_blkt_inboard_modules_poloidal", blanketmodpolheightparam.n_blkt_inboard_modules_poloidal ) monkeypatch.setattr(fwbs_variables, "fdiv", blanketmodpolheightparam.fdiv) monkeypatch.setattr( From 000344427e4519c242bb05f989389aca4bb4509a Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 17 Feb 2025 16:25:14 +0000 Subject: [PATCH 19/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20nblktmodti=20to?= =?UTF-8?q?=20n=5Fblkt=5Finboard=5Fmodules=5Ftoroidal=20for=20clarity=20an?= =?UTF-8?q?d=20consistency=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proc-pages/eng-models/fw-blanket.md | 2 +- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++++------ process/blanket_library.py | 6 ++-- process/dcll.py | 2 +- process/hcpb.py | 4 +-- source/fortran/fwbs_variables.f90 | 4 +-- source/fortran/input.f90 | 6 ++-- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 18 +++++------ tests/integration/ref_dicts.json | 10 +++---- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_dcll.py | 8 ++--- 23 files changed, 66 insertions(+), 66 deletions(-) diff --git a/documentation/proc-pages/eng-models/fw-blanket.md b/documentation/proc-pages/eng-models/fw-blanket.md index d3edbbde0f..9fefb19f72 100644 --- a/documentation/proc-pages/eng-models/fw-blanket.md +++ b/documentation/proc-pages/eng-models/fw-blanket.md @@ -173,7 +173,7 @@ The user can select the number poloidal and toroidal modules for the IB and OB B | :----------: | :---: | ------ | ------- | -------------------------------------------------------- | | `n_blkt_inboard_modules_poloidal` | --- | | 7 | Number of inboard blanket modules in poloidal direction | | `n_blkt_outboard_modules_poloidal` | --- | | 8 | Number of outboard blanket modules in poloidal direction | -| `nblktmodti` | --- | | 32 | Number of inboard blanket modules in toroidal direction | +| `n_blkt_inboard_modules_toroidal` | --- | | 32 | Number of inboard blanket modules in toroidal direction | | `nblktmodto` | --- | | 48 | Number of outboard blanket modules in toroidal direction | #### Liquid Breeder or Dual Coolant diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 8da6918649..b62c737878 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -987,7 +987,7 @@ Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 5.0000E+00 No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 - No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 + No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 9073fd883d..7f640f24e0 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -982,7 +982,7 @@ Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 5.0000E+00 No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 - No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 + No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 14b4e891ca..a7d3f39deb 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -982,7 +982,7 @@ Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 5.0000E+00 No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 - No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 + No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 4cca4ae416..fab24edc9d 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -982,7 +982,7 @@ Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 5.0000E+00 No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 - No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 + No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 696139f57b..74f1a3653d 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -982,7 +982,7 @@ Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 5.0000E+00 No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 - No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 + No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 81b817a7d7..e22840fc86 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -811,7 +811,7 @@ Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 - No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 + No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 @@ -1806,7 +1806,7 @@ Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 - No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 + No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 @@ -2801,7 +2801,7 @@ Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 - No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 + No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 @@ -3796,7 +3796,7 @@ Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 - No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 + No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 @@ -4791,7 +4791,7 @@ Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 - No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 + No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 @@ -5786,7 +5786,7 @@ Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 - No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 + No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 @@ -6781,7 +6781,7 @@ Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 - No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 + No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 @@ -7776,7 +7776,7 @@ Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 - No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 + No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 @@ -8771,7 +8771,7 @@ Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 - No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 + No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 diff --git a/process/blanket_library.py b/process/blanket_library.py index 234a1f6780..877d9d71ab 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -671,7 +671,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): - physics_variables.rminor - build_variables.dr_fw_plasma_gap_inboard ) - ) / fwbs_variables.nblktmodti + ) / fwbs_variables.n_blkt_inboard_modules_toroidal blanket_library.blwidto = ( 2.0e0 * np.pi @@ -841,7 +841,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): # Have DEMO DCLL set here for now npblkti_liq = ( fwbs_variables.nopipes - * fwbs_variables.nblktmodti + * fwbs_variables.n_blkt_inboard_modules_toroidal * fwbs_variables.n_blkt_inboard_modules_poloidal ) @@ -922,7 +922,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): # Have DEMO DCLL set here for now npblkti_liq = ( fwbs_variables.nopipes - * fwbs_variables.nblktmodti + * fwbs_variables.n_blkt_inboard_modules_toroidal * fwbs_variables.n_blkt_inboard_modules_poloidal ) diff --git a/process/dcll.py b/process/dcll.py index 18036ad06f..614cc96fd1 100644 --- a/process/dcll.py +++ b/process/dcll.py @@ -732,7 +732,7 @@ def dcll_masses(self, output: bool): * fwbs_variables.fw_armour_thickness / fwbs_variables.fw_armour_vol ) - ) / fwbs_variables.nblktmodti + ) / fwbs_variables.n_blkt_inboard_modules_toroidal dcll_module.mass_segm_ob = ( fwbs_variables.m_blkt_total diff --git a/process/hcpb.py b/process/hcpb.py index 8bcca7e86a..98922e831f 100644 --- a/process/hcpb.py +++ b/process/hcpb.py @@ -1541,8 +1541,8 @@ def write_output(self): po.ovarin( self.outfile, "No of inboard blanket modules toroidally", - "(nblktmodti)", - fwbs_variables.nblktmodti, + "(n_blkt_inboard_modules_toroidal)", + fwbs_variables.n_blkt_inboard_modules_toroidal, ) po.ovarin( self.outfile, diff --git a/source/fortran/fwbs_variables.f90 b/source/fortran/fwbs_variables.f90 index 8d2602f67f..a5fb1fe0c2 100644 --- a/source/fortran/fwbs_variables.f90 +++ b/source/fortran/fwbs_variables.f90 @@ -371,7 +371,7 @@ module fwbs_variables integer :: nblktmodto !! number of outboard blanket modules in toroidal direction (`secondary_cycle>1`) - integer :: nblktmodti + integer :: n_blkt_inboard_modules_toroidal !! number of inboard blanket modules in toroidal direction (`secondary_cycle>1`) real(dp) :: temp_fw_max @@ -756,7 +756,7 @@ subroutine init_fwbs_variables n_blkt_outboard_modules_poloidal = 8 n_blkt_inboard_modules_poloidal = 7 nblktmodto = 48 - nblktmodti = 32 + n_blkt_inboard_modules_toroidal = 32 temp_fw_max = 823.0D0 fw_th_conductivity = 28.34D0 fvoldw = 1.74D0 diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index 7951e8b767..4943b7345f 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -209,7 +209,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) dx_fw_module, i_blanket_type, blktmodel, afwi, fblli2o, nphcdin, breeder_multiplier, & fw_armour_thickness, roughness, fwclfr, breedmat, fblli, fblvd, & iblanket_thickness, vfcblkt, breeder_f, fbllipb, fhcd, vfshld, fblhebmi, & - f_neut_shield, fw_th_conductivity, nblktmodti, dr_fw_wall, afwo, & + f_neut_shield, fw_th_conductivity, n_blkt_inboard_modules_toroidal, dr_fw_wall, afwo, & fvolsi, etahtp, n_blkt_outboard_modules_poloidal, pres_fw_coolant, emult, temp_fw_coolant_out, n_blkt_inboard_modules_poloidal, & fblhebpi, fblss, temp_blkt_coolant_in, temp_blkt_coolant_out, fblbreed, qnuc, pres_blkt_coolant, & blpressure_liq, n_liq_recirc, pnuc_fw_ratio_dcll, f_nuc_pow_bz_struct, & @@ -2011,8 +2011,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('nblktmodto') call parse_int_variable('nblktmodto', nblktmodto, 8, 96, & 'No of o/b blanket modules in toroidal direction') - case ('nblktmodti') - call parse_int_variable('nblktmodti', nblktmodti, 8, 96, & + case ('n_blkt_inboard_modules_toroidal') + call parse_int_variable('n_blkt_inboard_modules_toroidal', n_blkt_inboard_modules_toroidal, 8, 96, & 'No of i/b blanket modules in toroidal direction') case ('temp_fw_max') call parse_real_variable('temp_fw_max', temp_fw_max, 500.0D0, 2000.0D0, & diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 67f4e0d82e..9d1bc4e876 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -981,7 +981,7 @@ Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 5.0000E+00 No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 - No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 + No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 636eb79ca9..ae0cc857ed 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -982,7 +982,7 @@ Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 5.0000E+00 No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 - No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 + No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index ef40118781..a2e1e5f5ce 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -982,7 +982,7 @@ Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 5.0000E+00 No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 - No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 + No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 7b8d9cdded..6755cca306 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -982,7 +982,7 @@ Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 5.0000E+00 No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 - No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 + No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 9a2c6f76ca..2e6e8df5b9 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -985,7 +985,7 @@ Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 5.0000E+00 No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 - No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 + No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index ec62065de1..2c3faaf63f 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -983,7 +983,7 @@ Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 5.0000E+00 No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 - No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 + No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 @@ -2146,7 +2146,7 @@ Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 5.0000E+00 No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 - No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 + No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 @@ -3309,7 +3309,7 @@ Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 5.0000E+00 No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 - No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 + No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 @@ -4472,7 +4472,7 @@ Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 5.0000E+00 No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 - No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 + No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 @@ -5635,7 +5635,7 @@ Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 5.0000E+00 No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 - No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 + No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 @@ -6798,7 +6798,7 @@ Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 5.0000E+00 No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 - No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 + No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 @@ -7961,7 +7961,7 @@ Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 5.0000E+00 No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 - No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 + No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 @@ -9124,7 +9124,7 @@ Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 5.0000E+00 No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 - No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 + No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 @@ -10287,7 +10287,7 @@ Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 5.0000E+00 No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 - No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 + No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 @@ -11450,7 +11450,7 @@ Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 5.0000E+00 No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 - No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 + No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 @@ -12613,7 +12613,7 @@ Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 5.0000E+00 No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 - No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 + No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 @@ -13776,7 +13776,7 @@ Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 5.0000E+00 No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 - No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 + No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 @@ -14939,7 +14939,7 @@ Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 5.0000E+00 No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 - No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 + No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 @@ -16102,7 +16102,7 @@ Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 5.0000E+00 No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 - No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 + No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 @@ -17265,7 +17265,7 @@ Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 5.0000E+00 No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 - No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 + No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 12e59ca6fe..3fac61b072 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -811,7 +811,7 @@ Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 - No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 + No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 @@ -1806,7 +1806,7 @@ Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 - No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 + No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 @@ -2801,7 +2801,7 @@ Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 - No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 + No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 @@ -3796,7 +3796,7 @@ Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 - No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 + No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 @@ -4791,7 +4791,7 @@ Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 - No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 + No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 @@ -5786,7 +5786,7 @@ Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 - No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 + No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 @@ -6781,7 +6781,7 @@ Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 - No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 + No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 @@ -7776,7 +7776,7 @@ Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 - No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 + No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 @@ -8771,7 +8771,7 @@ Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 - No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 + No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 61c02703cd..2e59765701 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3352,7 +3352,7 @@ "nbi_sys_w": 185.0, "n_blkt_inboard_modules_poloidal": 7.0, "n_blkt_outboard_modules_poloidal": 8.0, - "nblktmodti": 32.0, + "n_blkt_inboard_modules_toroidal": 32.0, "nblktmodto": 48.0, "nbshield": 0.5, "nbshinef": 0.0, @@ -10125,7 +10125,7 @@ "nbi_sys_w": "NBI system length, width (m)", "n_blkt_inboard_modules_poloidal": "number of inboard blanket modules in poloidal direction (`secondary_cycle>1`)", "n_blkt_outboard_modules_poloidal": "number of outboard blanket modules in poloidal direction (`secondary_cycle>1`)", - "nblktmodti": "number of inboard blanket modules in toroidal direction (`secondary_cycle>1`)", + "n_blkt_inboard_modules_toroidal": "number of inboard blanket modules in toroidal direction (`secondary_cycle>1`)", "nblktmodto": "number of outboard blanket modules in toroidal direction (`secondary_cycle>1`)", "nbshield": "neutral beam duct shielding thickness (m)", "nbshinef": "neutral beam shine-through fraction", @@ -13757,7 +13757,7 @@ "lb": 1, "ub": 16 }, - "nblktmodti": { + "n_blkt_inboard_modules_toroidal": { "lb": 8, "ub": 96 }, @@ -18100,7 +18100,7 @@ "n_blkt_outboard_modules_poloidal", "n_blkt_inboard_modules_poloidal", "nblktmodto", - "nblktmodti", + "n_blkt_inboard_modules_toroidal", "temp_fw_max", "fw_th_conductivity", "fvoldw", @@ -20557,7 +20557,7 @@ "nbi_sys_w": "real_variable", "n_blkt_inboard_modules_poloidal": "int_variable", "n_blkt_outboard_modules_poloidal": "int_variable", - "nblktmodti": "int_variable", + "n_blkt_inboard_modules_toroidal": "int_variable", "nblktmodto": "int_variable", "nbshield": "real_variable", "nbshinefmax": "real_variable", diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index d6e89868f9..cd05071f2f 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2409,7 +2409,7 @@ i_blkt_inboard = 0 * DESCRIPTION: Number of inboard blanket modules in poloidal direction (`secondary_cycle>1`)(default = 7) * JUSTIFICATION: Not set as not used -*nblktmodti = +*n_blkt_inboard_modules_toroidal = * DESCRIPTION: Number of inboard blanket modules in toroidal direction (`secondary_cycle>1`)(default = 32) * JUSTIFICATION: Not set as not used diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 9ba621d4ed..a9d8cdcf0d 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -985,7 +985,7 @@ Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 5.0000E+00 No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 - No_of_inboard_blanket_modules_toroidally________________________________ (nblktmodti)__________________ 32 + No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 diff --git a/tests/unit/test_dcll.py b/tests/unit/test_dcll.py index 6622edf001..1c6e1da4ba 100644 --- a/tests/unit/test_dcll.py +++ b/tests/unit/test_dcll.py @@ -358,7 +358,7 @@ class DcllMassesParam(NamedTuple): rhof_bl: Any = None - nblktmodti: Any = None + n_blkt_inboard_modules_toroidal: Any = None nblktmodto: Any = None @@ -560,7 +560,7 @@ class DcllMassesParam(NamedTuple): icooldual=2, den_fw_coolant=5.6389735407435868, rhof_bl=5.6389735407435868, - nblktmodti=32, + n_blkt_inboard_modules_toroidal=32, nblktmodto=48, r_fci=0, r_backwall=0, @@ -679,7 +679,7 @@ class DcllMassesParam(NamedTuple): icooldual=2, den_fw_coolant=5.6389735407435868, rhof_bl=5.6389735407435868, - nblktmodti=32, + n_blkt_inboard_modules_toroidal=32, nblktmodto=48, r_fci=0.050000000000000003, r_backwall=0.02, @@ -879,7 +879,7 @@ def test_dcll_masses(dcllmassesparam, monkeypatch, dcll): monkeypatch.setattr(fwbs_variables, "rhof_bl", dcllmassesparam.rhof_bl) - monkeypatch.setattr(fwbs_variables, "nblktmodti", dcllmassesparam.nblktmodti) + monkeypatch.setattr(fwbs_variables, "n_blkt_inboard_modules_toroidal", dcllmassesparam.n_blkt_inboard_modules_toroidal) monkeypatch.setattr(fwbs_variables, "nblktmodto", dcllmassesparam.nblktmodto) From c4f0a0f3be684434e6f80d0174e87df2b901e64d Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 17 Feb 2025 16:26:11 +0000 Subject: [PATCH 20/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20nblktmodto=20to?= =?UTF-8?q?=20n=5Fblkt=5Foutboard=5Fmodules=5Ftoroidal=20for=20clarity=20a?= =?UTF-8?q?nd=20consistency=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proc-pages/eng-models/fw-blanket.md | 2 +- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++++------ process/blanket_library.py | 21 +++++++++---- process/dcll.py | 2 +- process/hcpb.py | 4 +-- source/fortran/fwbs_variables.f90 | 4 +-- source/fortran/input.f90 | 6 ++-- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 18 +++++------ tests/integration/ref_dicts.json | 10 +++---- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_blanket_library.py | 8 +++-- tests/unit/test_dcll.py | 18 +++++++---- 24 files changed, 93 insertions(+), 72 deletions(-) diff --git a/documentation/proc-pages/eng-models/fw-blanket.md b/documentation/proc-pages/eng-models/fw-blanket.md index 9fefb19f72..4e6e482855 100644 --- a/documentation/proc-pages/eng-models/fw-blanket.md +++ b/documentation/proc-pages/eng-models/fw-blanket.md @@ -174,7 +174,7 @@ The user can select the number poloidal and toroidal modules for the IB and OB B | `n_blkt_inboard_modules_poloidal` | --- | | 7 | Number of inboard blanket modules in poloidal direction | | `n_blkt_outboard_modules_poloidal` | --- | | 8 | Number of outboard blanket modules in poloidal direction | | `n_blkt_inboard_modules_toroidal` | --- | | 32 | Number of inboard blanket modules in toroidal direction | -| `nblktmodto` | --- | | 48 | Number of outboard blanket modules in toroidal direction | +| `n_blkt_outboard_modules_toroidal` | --- | | 48 | Number of outboard blanket modules in toroidal direction | #### Liquid Breeder or Dual Coolant diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index b62c737878..9b0648d536 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -989,7 +989,7 @@ No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 - No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 + No_of_outboard_blanket_modules_toroidally_______________________________ (n_blkt_outboard_modules_toroidal)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (a_fw_total)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7769E+01 OP diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 7f640f24e0..f9cf1d6eaf 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -984,7 +984,7 @@ No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 - No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 + No_of_outboard_blanket_modules_toroidally_______________________________ (n_blkt_outboard_modules_toroidal)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (a_fw_total)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7798E+01 OP diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index a7d3f39deb..7fde556306 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -984,7 +984,7 @@ No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 - No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 + No_of_outboard_blanket_modules_toroidally_______________________________ (n_blkt_outboard_modules_toroidal)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (a_fw_total)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7798E+01 OP diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index fab24edc9d..05bf22c08b 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -984,7 +984,7 @@ No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 - No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 + No_of_outboard_blanket_modules_toroidally_______________________________ (n_blkt_outboard_modules_toroidal)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (a_fw_total)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7798E+01 OP diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 74f1a3653d..ebdd87b942 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -984,7 +984,7 @@ No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 - No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 + No_of_outboard_blanket_modules_toroidally_______________________________ (n_blkt_outboard_modules_toroidal)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (a_fw_total)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7798E+01 OP diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index e22840fc86..e26c7eb287 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -813,7 +813,7 @@ No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 - No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 + No_of_outboard_blanket_modules_toroidally_______________________________ (n_blkt_outboard_modules_toroidal)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (a_fw_total)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP @@ -1808,7 +1808,7 @@ No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 - No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 + No_of_outboard_blanket_modules_toroidally_______________________________ (n_blkt_outboard_modules_toroidal)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (a_fw_total)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP @@ -2803,7 +2803,7 @@ No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 - No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 + No_of_outboard_blanket_modules_toroidally_______________________________ (n_blkt_outboard_modules_toroidal)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (a_fw_total)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP @@ -3798,7 +3798,7 @@ No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 - No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 + No_of_outboard_blanket_modules_toroidally_______________________________ (n_blkt_outboard_modules_toroidal)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (a_fw_total)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP @@ -4793,7 +4793,7 @@ No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 - No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 + No_of_outboard_blanket_modules_toroidally_______________________________ (n_blkt_outboard_modules_toroidal)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (a_fw_total)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP @@ -5788,7 +5788,7 @@ No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 - No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 + No_of_outboard_blanket_modules_toroidally_______________________________ (n_blkt_outboard_modules_toroidal)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (a_fw_total)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP @@ -6783,7 +6783,7 @@ No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 - No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 + No_of_outboard_blanket_modules_toroidally_______________________________ (n_blkt_outboard_modules_toroidal)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (a_fw_total)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP @@ -7778,7 +7778,7 @@ No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 - No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 + No_of_outboard_blanket_modules_toroidally_______________________________ (n_blkt_outboard_modules_toroidal)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (a_fw_total)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP @@ -8773,7 +8773,7 @@ No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 - No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 + No_of_outboard_blanket_modules_toroidally_______________________________ (n_blkt_outboard_modules_toroidal)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (a_fw_total)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP diff --git a/process/blanket_library.py b/process/blanket_library.py index 877d9d71ab..fe14658412 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -680,7 +680,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): + physics_variables.rminor + build_variables.dr_fw_plasma_gap_outboard ) - ) / fwbs_variables.nblktmodto + ) / fwbs_variables.n_blkt_outboard_modules_toroidal # Calculate poloidal height of blanket modules self.blanket_mod_pol_height() @@ -806,7 +806,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): ) npblkto_liq = ( fwbs_variables.nopipes - * fwbs_variables.nblktmodto + * fwbs_variables.n_blkt_outboard_modules_toroidal * fwbs_variables.n_blkt_outboard_modules_poloidal ) @@ -879,7 +879,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): ) npblkto_liq = ( fwbs_variables.nopipes - * fwbs_variables.nblktmodto + * fwbs_variables.n_blkt_outboard_modules_toroidal * fwbs_variables.n_blkt_outboard_modules_poloidal ) @@ -1160,7 +1160,10 @@ def blanket_mod_pol_height(self): else: # single null configuration blanket_library.bllengo = ( - 0.5 * ptor * (1.0 - fwbs_variables.fdiv) / fwbs_variables.n_blkt_outboard_modules_poloidal + 0.5 + * ptor + * (1.0 - fwbs_variables.fdiv) + / fwbs_variables.n_blkt_outboard_modules_poloidal ) # shape defined by two half-ellipses @@ -1199,7 +1202,10 @@ def blanket_mod_pol_height(self): else: # single null configuration blanket_library.bllengi = ( - 0.5 * ptor * (1.0 - fwbs_variables.fdiv) / fwbs_variables.n_blkt_inboard_modules_poloidal + 0.5 + * ptor + * (1.0 - fwbs_variables.fdiv) + / fwbs_variables.n_blkt_inboard_modules_poloidal ) # Distance between r1 and inner edge of outboard first wall / blanket (m) @@ -1226,7 +1232,10 @@ def blanket_mod_pol_height(self): else: # single null configuration blanket_library.bllengo = ( - 0.5 * ptor * (1.0 - fwbs_variables.fdiv) / fwbs_variables.n_blkt_outboard_modules_poloidal + 0.5 + * ptor + * (1.0 - fwbs_variables.fdiv) + / fwbs_variables.n_blkt_outboard_modules_poloidal ) def liquid_breeder_properties(self, output: bool = False): diff --git a/process/dcll.py b/process/dcll.py index 614cc96fd1..1d96197076 100644 --- a/process/dcll.py +++ b/process/dcll.py @@ -749,7 +749,7 @@ def dcll_masses(self, output: bool): * fwbs_variables.fw_armour_thickness / fwbs_variables.fw_armour_vol ) - ) / fwbs_variables.nblktmodto + ) / fwbs_variables.n_blkt_outboard_modules_toroidal # Total FW/Structure Coolant Mass dcll_module.mass_cool_blanket = ( diff --git a/process/hcpb.py b/process/hcpb.py index 98922e831f..aa858b59b0 100644 --- a/process/hcpb.py +++ b/process/hcpb.py @@ -1553,8 +1553,8 @@ def write_output(self): po.ovarin( self.outfile, "No of outboard blanket modules toroidally", - "(nblktmodto)", - fwbs_variables.nblktmodto, + "(n_blkt_outboard_modules_toroidal)", + fwbs_variables.n_blkt_outboard_modules_toroidal, ) po.ovarre( self.outfile, diff --git a/source/fortran/fwbs_variables.f90 b/source/fortran/fwbs_variables.f90 index a5fb1fe0c2..899fce71d8 100644 --- a/source/fortran/fwbs_variables.f90 +++ b/source/fortran/fwbs_variables.f90 @@ -368,7 +368,7 @@ module fwbs_variables integer :: n_blkt_inboard_modules_poloidal !! number of inboard blanket modules in poloidal direction (`secondary_cycle>1`) - integer :: nblktmodto + integer :: n_blkt_outboard_modules_toroidal !! number of outboard blanket modules in toroidal direction (`secondary_cycle>1`) integer :: n_blkt_inboard_modules_toroidal @@ -755,7 +755,7 @@ subroutine init_fwbs_variables coolp = 15.5D6 n_blkt_outboard_modules_poloidal = 8 n_blkt_inboard_modules_poloidal = 7 - nblktmodto = 48 + n_blkt_outboard_modules_toroidal = 48 n_blkt_inboard_modules_toroidal = 32 temp_fw_max = 823.0D0 fw_th_conductivity = 28.34D0 diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index 4943b7345f..84817cacb0 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -217,7 +217,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) npdiv, f_fw_peak, primary_pumping, dr_pf_cryostat, secondary_cycle, secondary_cycle_liq, & denstl, declfw, nphcdout, i_blkt_inboard, vfpblkt, temp_fw_coolant_in, wallpf, fblbe, & fhole, i_fw_blkt_vv_shape, coolp, temp_fw_max, irefprop, len_fw_channel, & - li6enrich, etaiso, nblktmodto, fvoldw, i_shield_mat, i_bb_liq, & + li6enrich, etaiso, n_blkt_outboard_modules_toroidal, fvoldw, i_shield_mat, i_bb_liq, & icooldual, ifci, inlet_temp_liq, outlet_temp_liq, bz_channel_conduct_liq, ipump, ims, & i_blkt_coolant_type, emult use heat_transport_variables, only: htpmw_fw, baseel, fmgdmw, htpmw_div, & @@ -2008,8 +2008,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('n_blkt_inboard_modules_poloidal') call parse_int_variable('n_blkt_inboard_modules_poloidal', n_blkt_inboard_modules_poloidal, 1, 16, & 'No of i/b blanket modules in poloidal direction') - case ('nblktmodto') - call parse_int_variable('nblktmodto', nblktmodto, 8, 96, & + case ('n_blkt_outboard_modules_toroidal') + call parse_int_variable('n_blkt_outboard_modules_toroidal', n_blkt_outboard_modules_toroidal, 8, 96, & 'No of o/b blanket modules in toroidal direction') case ('n_blkt_inboard_modules_toroidal') call parse_int_variable('n_blkt_inboard_modules_toroidal', n_blkt_inboard_modules_toroidal, 8, 96, & diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 9d1bc4e876..29e87420c2 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -983,7 +983,7 @@ No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 - No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 + No_of_outboard_blanket_modules_toroidally_______________________________ (n_blkt_outboard_modules_toroidal)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (a_fw_total)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7798E+01 OP diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index ae0cc857ed..10441df5a4 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -984,7 +984,7 @@ No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 - No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 + No_of_outboard_blanket_modules_toroidally_______________________________ (n_blkt_outboard_modules_toroidal)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (a_fw_total)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7798E+01 OP diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index a2e1e5f5ce..16d213c12a 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -984,7 +984,7 @@ No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 - No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 + No_of_outboard_blanket_modules_toroidally_______________________________ (n_blkt_outboard_modules_toroidal)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (a_fw_total)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7798E+01 OP diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 6755cca306..dac3904172 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -984,7 +984,7 @@ No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 - No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 + No_of_outboard_blanket_modules_toroidally_______________________________ (n_blkt_outboard_modules_toroidal)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (a_fw_total)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7798E+01 OP diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 2e6e8df5b9..2be77c29ef 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -987,7 +987,7 @@ No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 - No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 + No_of_outboard_blanket_modules_toroidally_______________________________ (n_blkt_outboard_modules_toroidal)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (a_fw_total)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7805E+01 OP diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 2c3faaf63f..cdf4b18cdd 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -985,7 +985,7 @@ No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 - No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 + No_of_outboard_blanket_modules_toroidally_______________________________ (n_blkt_outboard_modules_toroidal)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (a_fw_total)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7774E+01 OP @@ -2148,7 +2148,7 @@ No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 - No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 + No_of_outboard_blanket_modules_toroidally_______________________________ (n_blkt_outboard_modules_toroidal)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (a_fw_total)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7765E+01 OP @@ -3311,7 +3311,7 @@ No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 - No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 + No_of_outboard_blanket_modules_toroidally_______________________________ (n_blkt_outboard_modules_toroidal)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (a_fw_total)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7758E+01 OP @@ -4474,7 +4474,7 @@ No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 - No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 + No_of_outboard_blanket_modules_toroidally_______________________________ (n_blkt_outboard_modules_toroidal)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (a_fw_total)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7759E+01 OP @@ -5637,7 +5637,7 @@ No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 - No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 + No_of_outboard_blanket_modules_toroidally_______________________________ (n_blkt_outboard_modules_toroidal)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (a_fw_total)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7766E+01 OP @@ -6800,7 +6800,7 @@ No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 - No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 + No_of_outboard_blanket_modules_toroidally_______________________________ (n_blkt_outboard_modules_toroidal)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (a_fw_total)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7775E+01 OP @@ -7963,7 +7963,7 @@ No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 - No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 + No_of_outboard_blanket_modules_toroidally_______________________________ (n_blkt_outboard_modules_toroidal)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (a_fw_total)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7776E+01 OP @@ -9126,7 +9126,7 @@ No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 - No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 + No_of_outboard_blanket_modules_toroidally_______________________________ (n_blkt_outboard_modules_toroidal)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (a_fw_total)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7768E+01 OP @@ -10289,7 +10289,7 @@ No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 - No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 + No_of_outboard_blanket_modules_toroidally_______________________________ (n_blkt_outboard_modules_toroidal)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (a_fw_total)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7760E+01 OP @@ -11452,7 +11452,7 @@ No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 - No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 + No_of_outboard_blanket_modules_toroidally_______________________________ (n_blkt_outboard_modules_toroidal)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (a_fw_total)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7761E+01 OP @@ -12615,7 +12615,7 @@ No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 - No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 + No_of_outboard_blanket_modules_toroidally_______________________________ (n_blkt_outboard_modules_toroidal)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (a_fw_total)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7769E+01 OP @@ -13778,7 +13778,7 @@ No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 - No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 + No_of_outboard_blanket_modules_toroidally_______________________________ (n_blkt_outboard_modules_toroidal)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (a_fw_total)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7777E+01 OP @@ -14941,7 +14941,7 @@ No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 - No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 + No_of_outboard_blanket_modules_toroidally_______________________________ (n_blkt_outboard_modules_toroidal)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (a_fw_total)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7778E+01 OP @@ -16104,7 +16104,7 @@ No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 - No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 + No_of_outboard_blanket_modules_toroidally_______________________________ (n_blkt_outboard_modules_toroidal)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (a_fw_total)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7770E+01 OP @@ -17267,7 +17267,7 @@ No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 - No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 + No_of_outboard_blanket_modules_toroidally_______________________________ (n_blkt_outboard_modules_toroidal)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (a_fw_total)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7762E+01 OP diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 3fac61b072..4dbd734c69 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -813,7 +813,7 @@ No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 - No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 + No_of_outboard_blanket_modules_toroidally_______________________________ (n_blkt_outboard_modules_toroidal)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (a_fw_total)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP @@ -1808,7 +1808,7 @@ No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 - No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 + No_of_outboard_blanket_modules_toroidally_______________________________ (n_blkt_outboard_modules_toroidal)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (a_fw_total)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP @@ -2803,7 +2803,7 @@ No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 - No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 + No_of_outboard_blanket_modules_toroidally_______________________________ (n_blkt_outboard_modules_toroidal)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (a_fw_total)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP @@ -3798,7 +3798,7 @@ No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 - No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 + No_of_outboard_blanket_modules_toroidally_______________________________ (n_blkt_outboard_modules_toroidal)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (a_fw_total)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP @@ -4793,7 +4793,7 @@ No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 - No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 + No_of_outboard_blanket_modules_toroidally_______________________________ (n_blkt_outboard_modules_toroidal)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (a_fw_total)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP @@ -5788,7 +5788,7 @@ No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 - No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 + No_of_outboard_blanket_modules_toroidally_______________________________ (n_blkt_outboard_modules_toroidal)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (a_fw_total)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP @@ -6783,7 +6783,7 @@ No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 - No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 + No_of_outboard_blanket_modules_toroidally_______________________________ (n_blkt_outboard_modules_toroidal)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (a_fw_total)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP @@ -7778,7 +7778,7 @@ No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 - No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 + No_of_outboard_blanket_modules_toroidally_______________________________ (n_blkt_outboard_modules_toroidal)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (a_fw_total)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP @@ -8773,7 +8773,7 @@ No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 - No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 + No_of_outboard_blanket_modules_toroidally_______________________________ (n_blkt_outboard_modules_toroidal)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (a_fw_total)______________________ 2.0043E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 2.0115E+01 OP diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 2e59765701..bb9958fb81 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3353,7 +3353,7 @@ "n_blkt_inboard_modules_poloidal": 7.0, "n_blkt_outboard_modules_poloidal": 8.0, "n_blkt_inboard_modules_toroidal": 32.0, - "nblktmodto": 48.0, + "n_blkt_outboard_modules_toroidal": 48.0, "nbshield": 0.5, "nbshinef": 0.0, "nbshinefmax": 0.001, @@ -10126,7 +10126,7 @@ "n_blkt_inboard_modules_poloidal": "number of inboard blanket modules in poloidal direction (`secondary_cycle>1`)", "n_blkt_outboard_modules_poloidal": "number of outboard blanket modules in poloidal direction (`secondary_cycle>1`)", "n_blkt_inboard_modules_toroidal": "number of inboard blanket modules in toroidal direction (`secondary_cycle>1`)", - "nblktmodto": "number of outboard blanket modules in toroidal direction (`secondary_cycle>1`)", + "n_blkt_outboard_modules_toroidal": "number of outboard blanket modules in toroidal direction (`secondary_cycle>1`)", "nbshield": "neutral beam duct shielding thickness (m)", "nbshinef": "neutral beam shine-through fraction", "nbshinefmax": "maximum neutral beam shine-through fraction (`constraint equation 59`)", @@ -13761,7 +13761,7 @@ "lb": 8, "ub": 96 }, - "nblktmodto": { + "n_blkt_outboard_modules_toroidal": { "lb": 8, "ub": 96 }, @@ -18099,7 +18099,7 @@ "coolp", "n_blkt_outboard_modules_poloidal", "n_blkt_inboard_modules_poloidal", - "nblktmodto", + "n_blkt_outboard_modules_toroidal", "n_blkt_inboard_modules_toroidal", "temp_fw_max", "fw_th_conductivity", @@ -20558,7 +20558,7 @@ "n_blkt_inboard_modules_poloidal": "int_variable", "n_blkt_outboard_modules_poloidal": "int_variable", "n_blkt_inboard_modules_toroidal": "int_variable", - "nblktmodto": "int_variable", + "n_blkt_outboard_modules_toroidal": "int_variable", "nbshield": "real_variable", "nbshinefmax": "real_variable", "n_pf_coils_in_group": "int_array", diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index cd05071f2f..4be7076c1b 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2401,7 +2401,7 @@ i_blkt_inboard = 0 * DESCRIPTION: Number of outboard blanket modules in poloidal direction (`secondary_cycle>1`)(default = 8) * JUSTIFICATION: Not set as not used -*nblktmodto = +*n_blkt_outboard_modules_toroidal = * DESCRIPTION: Number of outboard blanket modules in toroidal direction (`secondary_cycle>1`)(default =48) * JUSTIFICATION: Not set as not used diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index a9d8cdcf0d..7e24270d04 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -987,7 +987,7 @@ No_of_inboard_blanket_modules_poloidally________________________________ (n_blkt_inboard_modules_poloidal)__________________ 7 No_of_inboard_blanket_modules_toroidally________________________________ (n_blkt_inboard_modules_toroidal)__________________ 32 No_of_outboard_blanket_modules_poloidally_______________________________ (n_blkt_outboard_modules_poloidal)__________________ 8 - No_of_outboard_blanket_modules_toroidally_______________________________ (nblktmodto)__________________ 48 + No_of_outboard_blanket_modules_toroidally_______________________________ (n_blkt_outboard_modules_toroidal)__________________ 48 Isentropic_efficiency_of_first_wall_/_blanket_coolant_pumps_____________ (etaiso)______________________ 9.0000E-01 First_wall_area_(m2)____________________________________________________ (a_fw_total)______________________ 1.6044E+03 OP Cryostat_internal_radius_(m)____________________________________________ (r_cryostat_inboard)______________________ 1.7805E+01 OP diff --git a/tests/unit/test_blanket_library.py b/tests/unit/test_blanket_library.py index d02562dbae..702c35e682 100644 --- a/tests/unit/test_blanket_library.py +++ b/tests/unit/test_blanket_library.py @@ -1572,11 +1572,15 @@ def test_blanket_mod_pol_height( blanketmodpolheightparam.i_fw_blkt_vv_shape, ) monkeypatch.setattr( - fwbs_variables, "n_blkt_inboard_modules_poloidal", blanketmodpolheightparam.n_blkt_inboard_modules_poloidal + fwbs_variables, + "n_blkt_inboard_modules_poloidal", + blanketmodpolheightparam.n_blkt_inboard_modules_poloidal, ) monkeypatch.setattr(fwbs_variables, "fdiv", blanketmodpolheightparam.fdiv) monkeypatch.setattr( - fwbs_variables, "n_blkt_outboard_modules_poloidal", blanketmodpolheightparam.n_blkt_outboard_modules_poloidal + fwbs_variables, + "n_blkt_outboard_modules_poloidal", + blanketmodpolheightparam.n_blkt_outboard_modules_poloidal, ) monkeypatch.setattr(physics_variables, "itart", blanketmodpolheightparam.itart) monkeypatch.setattr(physics_variables, "rminor", blanketmodpolheightparam.rminor) diff --git a/tests/unit/test_dcll.py b/tests/unit/test_dcll.py index 1c6e1da4ba..30fefdcf8f 100644 --- a/tests/unit/test_dcll.py +++ b/tests/unit/test_dcll.py @@ -360,7 +360,7 @@ class DcllMassesParam(NamedTuple): n_blkt_inboard_modules_toroidal: Any = None - nblktmodto: Any = None + n_blkt_outboard_modules_toroidal: Any = None r_fci: Any = None @@ -561,7 +561,7 @@ class DcllMassesParam(NamedTuple): den_fw_coolant=5.6389735407435868, rhof_bl=5.6389735407435868, n_blkt_inboard_modules_toroidal=32, - nblktmodto=48, + n_blkt_outboard_modules_toroidal=48, r_fci=0, r_backwall=0, bz_r_ib=0, @@ -680,7 +680,7 @@ class DcllMassesParam(NamedTuple): den_fw_coolant=5.6389735407435868, rhof_bl=5.6389735407435868, n_blkt_inboard_modules_toroidal=32, - nblktmodto=48, + n_blkt_outboard_modules_toroidal=48, r_fci=0.050000000000000003, r_backwall=0.02, bz_r_ib=0.315, @@ -879,9 +879,17 @@ def test_dcll_masses(dcllmassesparam, monkeypatch, dcll): monkeypatch.setattr(fwbs_variables, "rhof_bl", dcllmassesparam.rhof_bl) - monkeypatch.setattr(fwbs_variables, "n_blkt_inboard_modules_toroidal", dcllmassesparam.n_blkt_inboard_modules_toroidal) + monkeypatch.setattr( + fwbs_variables, + "n_blkt_inboard_modules_toroidal", + dcllmassesparam.n_blkt_inboard_modules_toroidal, + ) - monkeypatch.setattr(fwbs_variables, "nblktmodto", dcllmassesparam.nblktmodto) + monkeypatch.setattr( + fwbs_variables, + "n_blkt_outboard_modules_toroidal", + dcllmassesparam.n_blkt_outboard_modules_toroidal, + ) monkeypatch.setattr(dcll_module, "r_fci", dcllmassesparam.r_fci) From 94101f9161ed83805bdd1bd23427b58843be7923 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 17 Feb 2025 16:27:56 +0000 Subject: [PATCH 21/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20ipump=20to=20i=5F?= =?UTF-8?q?fw=5Fblkt=5Fshared=5Fcoolant=20for=20clarity=20and=20consistenc?= =?UTF-8?q?y=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proc-pages/eng-models/fw-blanket.md | 4 +-- process/blanket_library.py | 36 +++++++++---------- process/dcll.py | 2 +- process/vacuum.py | 4 +-- source/fortran/dcll.f90 | 2 +- source/fortran/fwbs_variables.f90 | 4 +-- source/fortran/input.f90 | 6 ++-- .../spherical_tokamak_once_through.IN.DAT | 2 +- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/test_blanket_library.py | 8 ++--- 10 files changed, 35 insertions(+), 35 deletions(-) diff --git a/documentation/proc-pages/eng-models/fw-blanket.md b/documentation/proc-pages/eng-models/fw-blanket.md index 4e6e482855..b5bbc66cff 100644 --- a/documentation/proc-pages/eng-models/fw-blanket.md +++ b/documentation/proc-pages/eng-models/fw-blanket.md @@ -158,12 +158,12 @@ 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): +The model has three mechanical pumping power options, chosen by the user to match their selected blanket design using the switch 'i_fw_blkt_shared_coolant' (default=0): 0. Same coolant for FW and BB ('i_fw_coolant_type`=`i_blkt_coolant_type`) 1. Different coolant for FW and BB ('i_fw_coolant_type`/=`i_blkt_coolant_type`) !!! 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. + For the dual-coolant blanket the 'i_fw_blkt_shared_coolant' switch is relavent for the blanket structure coolant and not the liquid metal breeder/coolant choice. The user can select the number poloidal and toroidal modules for the IB and OB BB. The 'ims' switch can be set to 1 for a single-module-segment blanket (default=0): 0. Multi-module segment diff --git a/process/blanket_library.py b/process/blanket_library.py index fe14658412..87ab8c9ce7 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -443,22 +443,22 @@ def primary_coolant_properties(self, output: bool): """ # Make sure that, if the inputs for the FW and blanket inputs are different, - # the ipump variable is appropriately set for seperate coolants + # the i_fw_blkt_shared_coolant variable is appropriately set for seperate coolants if ( f2py_compatible_to_string(fwbs_variables.i_fw_coolant_type).title() == "Helium" and fwbs_variables.i_blkt_coolant_type == 2 ): - fwbs_variables.ipump = 1 + fwbs_variables.i_fw_blkt_shared_coolant = 1 if ( f2py_compatible_to_string(fwbs_variables.i_fw_coolant_type).title() == "Water" and fwbs_variables.i_blkt_coolant_type == 1 ): - fwbs_variables.ipump = 1 + fwbs_variables.i_fw_blkt_shared_coolant = 1 # If FW and BB have same coolant... - if fwbs_variables.ipump == 0: + if fwbs_variables.i_fw_blkt_shared_coolant == 0: # Use FW inlet temp and BB outlet temp mid_temp = ( fwbs_variables.temp_fw_coolant_in + fwbs_variables.temp_blkt_coolant_out @@ -537,7 +537,7 @@ def primary_coolant_properties(self, output: bool): ) # FW (or FW/BB) - if fwbs_variables.ipump == 1: + if fwbs_variables.i_fw_blkt_shared_coolant == 1: po.osubhd(self.outfile, "First Wall :") po.ovarst( @@ -569,7 +569,7 @@ def primary_coolant_properties(self, output: bool): "OP ", ) - if fwbs_variables.ipump == 0: + if fwbs_variables.i_fw_blkt_shared_coolant == 0: po.ovarre( self.outfile, "Outlet Temperature (Celcius)", @@ -587,7 +587,7 @@ def primary_coolant_properties(self, output: bool): ) # BB - if fwbs_variables.ipump == 1: + if fwbs_variables.i_fw_blkt_shared_coolant == 1: po.osubhd(self.outfile, "Breeding Blanket :") if fwbs_variables.i_blkt_coolant_type == 1: @@ -1618,22 +1618,22 @@ def thermo_hydraulic_model(self, output: bool): # FW and BB Mass Flow ########### # Make sure that, if the inputs for the FW and blanket inputs are different, - # the ipump variable is appropriately set for seperate coolants + # the i_fw_blkt_shared_coolant variable is appropriately set for seperate coolants if ( f2py_compatible_to_string(fwbs_variables.i_fw_coolant_type).title() == "Helium" and fwbs_variables.i_blkt_coolant_type == 2 ): - fwbs_variables.ipump = 1 + fwbs_variables.i_fw_blkt_shared_coolant = 1 if ( f2py_compatible_to_string(fwbs_variables.i_fw_coolant_type).title() == "Water" and fwbs_variables.i_blkt_coolant_type == 1 ): - fwbs_variables.ipump = 1 + fwbs_variables.i_fw_blkt_shared_coolant = 1 # If FW and BB have the same coolant... - if fwbs_variables.ipump == 0: + if fwbs_variables.i_fw_blkt_shared_coolant == 0: # Fraction of heat to be removed by IB/OB FW if fwbs_variables.icooldual == 2: f_nuc_fwi = (blanket_library.pnucfwi + fwbs_variables.psurffwi) / ( @@ -1668,7 +1668,7 @@ def thermo_hydraulic_model(self, output: bool): ) * fwbs_variables.temp_fw_coolant_in inlet_tempo = fwoutleto - elif fwbs_variables.ipump == 1: + elif fwbs_variables.i_fw_blkt_shared_coolant == 1: fwoutleti = fwbs_variables.temp_fw_coolant_out inlet_tempi = fwbs_variables.temp_blkt_coolant_in fwoutleto = fwbs_variables.temp_fw_coolant_out @@ -1867,7 +1867,7 @@ def thermo_hydraulic_model(self, output: bool): # Pumping Power # If FW and BB have the same coolant... - if fwbs_variables.ipump == 0: + if fwbs_variables.i_fw_blkt_shared_coolant == 0: # Total pressure drop in the first wall/blanket (Pa) if fwbs_variables.primary_pumping == 2: if fwbs_variables.i_blkt_inboard == 1: @@ -1896,7 +1896,7 @@ def thermo_hydraulic_model(self, output: bool): ) # If FW and BB have different coolants... - elif fwbs_variables.ipump == 1: + elif fwbs_variables.i_fw_blkt_shared_coolant == 1: if fwbs_variables.primary_pumping == 2: # Total pressure drop in the first wall (Pa) deltap_fw = deltap_fwi + deltap_fwo @@ -2038,7 +2038,7 @@ def thermo_hydraulic_model(self, output: bool): "(pres_fw_coolant)", fwbs_variables.pres_fw_coolant, ) - if fwbs_variables.ipump == 1: + if fwbs_variables.i_fw_blkt_shared_coolant == 1: po.ovarre( self.outfile, "First wall coolant mass flow rate (kg/s)", @@ -2087,7 +2087,7 @@ def thermo_hydraulic_model(self, output: bool): "(pres_blkt_coolant)", fwbs_variables.pres_blkt_coolant, ) - if fwbs_variables.ipump == 1: + if fwbs_variables.i_fw_blkt_shared_coolant == 1: po.ovarre( self.outfile, "Blanket coolant mass flow rate (kg/s)", @@ -2097,7 +2097,7 @@ def thermo_hydraulic_model(self, output: bool): ) # Total primary coolant mass flow rate (if they are the same coolant) - if fwbs_variables.ipump == 0: + if fwbs_variables.i_fw_blkt_shared_coolant == 0: po.ovarre( self.outfile, "Total (FW+BB) primary coolant mass flow rate(kg/s)", @@ -2155,7 +2155,7 @@ def thermo_hydraulic_model(self, output: bool): # Pumping Power po.osubhd(self.outfile, "Mechanical pumping power: ") - if fwbs_variables.ipump == 1: + if fwbs_variables.i_fw_blkt_shared_coolant == 1: po.ovarre( self.outfile, "Mechanical pumping power for FW (MW)", diff --git a/process/dcll.py b/process/dcll.py index 1d96197076..90503813bf 100644 --- a/process/dcll.py +++ b/process/dcll.py @@ -51,7 +51,7 @@ class DCLL: (bz_channel_conduct_liq) Choose if FW and BB structure are on the same pumping system (unless have diffent coolants), default is same coolant with flow IN->FW->BB->OUT - (ipump) + (i_fw_blkt_shared_coolant) Can set inlet and oulet temperature for liquid metal breeder (inlet_temp_liq) diff --git a/process/vacuum.py b/process/vacuum.py index 60c3cd0215..2e7cb9576f 100644 --- a/process/vacuum.py +++ b/process/vacuum.py @@ -625,7 +625,7 @@ def vacuum( po.ocmmnt(self.outfile, "Conductance is inadequate.") po.oblnkl(self.outfile) - ipump = "cryo " if vacv.ntype == 1 else "turbo" + i_fw_blkt_shared_coolant = "cryo " if vacv.ntype == 1 else "turbo" po.oblnkl(self.outfile) po.ocmmnt(self.outfile, "The vacuum pumping system size is governed by the") @@ -659,6 +659,6 @@ def vacuum( po.ovarre(self.outfile, "Duct length, elbow to pumps (m)", "(l3)", l3) po.ovarre(self.outfile, "Number of pumps", "(pumpn)", pumpn, "OP ") po.oblnkl(self.outfile) - po.ocmmnt(self.outfile, f"The vacuum system uses {ipump} pumps.") + po.ocmmnt(self.outfile, f"The vacuum system uses {i_fw_blkt_shared_coolant} pumps.") return pumpn, nduct, dlscalc, mvdsh, dimax diff --git a/source/fortran/dcll.f90 b/source/fortran/dcll.f90 index 6245005681..894dd94f1a 100644 --- a/source/fortran/dcll.f90 +++ b/source/fortran/dcll.f90 @@ -37,7 +37,7 @@ module dcll_module !! (bz_channel_conduct_liq) !! !! Choose if FW and BB structure are on the same pumping system (unless have diffent coolants), default is same coolant with flow IN->FW->BB->OUT - !! (ipump) + !! (i_fw_blkt_shared_coolant) !! !! Can set inlet and oulet temperature for liquid metal breeder !! (inlet_temp_liq) diff --git a/source/fortran/fwbs_variables.f90 b/source/fortran/fwbs_variables.f90 index 899fce71d8..3ec6a7e6b1 100644 --- a/source/fortran/fwbs_variables.f90 +++ b/source/fortran/fwbs_variables.f90 @@ -532,7 +532,7 @@ module fwbs_variables !! Thermodynamic Model for primary_pumping == 2 !! ----------------------------------------------------- - integer :: ipump + integer :: i_fw_blkt_shared_coolant !! Switch for whether the FW and BB are on the same pump system !! i.e. do they have the same primary coolant or not !! - =0 FW and BB have the same primary coolant, flow = FWin->FWout->BBin->BBout @@ -805,7 +805,7 @@ subroutine init_fwbs_variables pnuc_cp_sh = 0.0D0 pnuc_cp_tf = 0.0D0 neut_flux_cp = 0.0D0 - ipump = 0 + i_fw_blkt_shared_coolant = 0 i_bb_liq = 0 icooldual = 0 ifci = 0 diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index 84817cacb0..a891823de5 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -218,7 +218,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) denstl, declfw, nphcdout, i_blkt_inboard, vfpblkt, temp_fw_coolant_in, wallpf, fblbe, & fhole, i_fw_blkt_vv_shape, coolp, temp_fw_max, irefprop, len_fw_channel, & li6enrich, etaiso, n_blkt_outboard_modules_toroidal, fvoldw, i_shield_mat, i_bb_liq, & - icooldual, ifci, inlet_temp_liq, outlet_temp_liq, bz_channel_conduct_liq, ipump, ims, & + icooldual, ifci, inlet_temp_liq, outlet_temp_liq, bz_channel_conduct_liq, i_fw_blkt_shared_coolant, ims, & i_blkt_coolant_type, emult use heat_transport_variables, only: htpmw_fw, baseel, fmgdmw, htpmw_div, & pwpm2, etath, vachtmw, iprimshld, fpumpdiv, pinjmax, htpmw_blkt, etatf, & @@ -1969,8 +1969,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('outlet_temp_liq') call parse_real_variable('outlet_temp_liq', outlet_temp_liq, 508.D0, 1.5D3, & 'Outlet temperature for blanket liquid metal') - case ('ipump') - call parse_int_variable('ipump', ipump, 0, 2, & + case ('i_fw_blkt_shared_coolant') + call parse_int_variable('i_fw_blkt_shared_coolant', i_fw_blkt_shared_coolant, 0, 2, & 'Switch for same or different pumping system for FW/BB') case ('ims') call parse_int_variable('ims', ims, 0, 1, & diff --git a/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT b/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT index acbf5bc072..44f5994289 100644 --- a/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT @@ -237,7 +237,7 @@ secondary_cycle = 2 * Switch for power conversion cycle; i_fw_coolant_type = helium * switch for first wall coolant (can be different from blanket coolant); etaiso = 0.9 * isentropic efficiency of FW and blanket coolant pumps etahtp = 0.87 * electrical efficiency of primary coolant pumps -ipump = 0 * Switch for whether the FW and BB are on the same pump system +i_fw_blkt_shared_coolant = 0 * Switch for whether the FW and BB are on the same pump system outlet_temp_liq = 873.0 * Inlet (scan var 68) and Outlet (scan var 69) temperature of the liquid breeder/coolant [K] *-----------------Global Variables-----------------* diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 4be7076c1b..495bb89fbe 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2245,7 +2245,7 @@ primary_pumping = 3 * =3 Mechanical pumping power is calculated using specified pressure drop * JUSTIFICATION: Used for He cooling. Pressure drop is default value and may be wrong -ipump = 0 +i_fw_blkt_shared_coolant = 0 * DESCRIPTION: Switch for whether the FW and BB are on the same pump system * i.e. do they have the same primary coolant or not * =0 FW and BB have the same primary coolant, flow = FWin->FWout->BBin->BBout diff --git a/tests/unit/test_blanket_library.py b/tests/unit/test_blanket_library.py index 702c35e682..93fb2c9fb6 100644 --- a/tests/unit/test_blanket_library.py +++ b/tests/unit/test_blanket_library.py @@ -61,7 +61,7 @@ class PrimaryCoolantPropertiesParam(NamedTuple): visc_fw_coolant: Any = None - ipump: Any = None + i_fw_blkt_shared_coolant: Any = None expected_den_fw_coolant: Any = None @@ -101,7 +101,7 @@ class PrimaryCoolantPropertiesParam(NamedTuple): cp_bl=0, cv_bl=0, visc_fw_coolant=0, - ipump=0, + i_fw_blkt_shared_coolant=0, expected_den_fw_coolant=5.6389735407435868, expected_cp_fw=5188.5588430173211, expected_cv_fw=3123.5687263525392, @@ -129,7 +129,7 @@ class PrimaryCoolantPropertiesParam(NamedTuple): cp_bl=5188.5588430173211, cv_bl=3123.5687263525392, visc_fw_coolant=3.5036293160410249e-05, - ipump=0, + i_fw_blkt_shared_coolant=0, expected_den_fw_coolant=5.6389735407435868, expected_cp_fw=5188.5588430173211, expected_cv_fw=3123.5687263525392, @@ -230,7 +230,7 @@ def test_primary_coolant_properties( fwbs_variables, "visc_fw_coolant", primarycoolantpropertiesparam.visc_fw_coolant ) - monkeypatch.setattr(fwbs_variables, "ipump", primarycoolantpropertiesparam.ipump) + monkeypatch.setattr(fwbs_variables, "i_fw_blkt_shared_coolant", primarycoolantpropertiesparam.i_fw_blkt_shared_coolant) blanket_library_fixture.primary_coolant_properties(output=False) From 8867d1d1c26aa6467d6794a8abb81d7688f93551 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 17 Feb 2025 16:30:10 +0000 Subject: [PATCH 22/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20rhof=5Fbl=20to=20?= =?UTF-8?q?den=5Fblkt=5Fcoolant=20for=20clarity=20and=20consistency=20acro?= =?UTF-8?q?ss=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/blanket_library.py | 34 +++++++++++++++--------------- process/dcll.py | 8 ++++--- process/vacuum.py | 5 ++++- source/fortran/fwbs_variables.f90 | 4 ++-- tests/unit/test_blanket_library.py | 26 ++++++++++++++--------- tests/unit/test_dcll.py | 10 +++++---- 6 files changed, 50 insertions(+), 37 deletions(-) diff --git a/process/blanket_library.py b/process/blanket_library.py index 87ab8c9ce7..3a07d58efd 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -474,7 +474,7 @@ def primary_coolant_properties(self, output: bool): fwbs_variables.cv_fw = fw_bb_fluid_properties.specific_heat_const_v fwbs_variables.visc_fw_coolant = fw_bb_fluid_properties.viscosity - fwbs_variables.rhof_bl = fwbs_variables.den_fw_coolant + fwbs_variables.den_blkt_coolant = fwbs_variables.den_fw_coolant fwbs_variables.visc_bl = fwbs_variables.visc_fw_coolant fwbs_variables.cp_bl = fwbs_variables.cp_fw fwbs_variables.cv_bl = fwbs_variables.cv_fw @@ -505,7 +505,7 @@ def primary_coolant_properties(self, output: bool): temperature=mid_temp_bl, pressure=fwbs_variables.pres_blkt_coolant, ) - fwbs_variables.rhof_bl = bb_fluid_properties.density + fwbs_variables.den_blkt_coolant = bb_fluid_properties.density fwbs_variables.cp_bl = bb_fluid_properties.specific_heat_const_p fwbs_variables.cv_bl = bb_fluid_properties.specific_heat_const_v fwbs_variables.visc_bl = bb_fluid_properties.viscosity @@ -519,12 +519,12 @@ def primary_coolant_properties(self, output: bool): f"Error in primary_coolant_properties. {fwbs_variables.den_fw_coolant = }" ) if ( - fwbs_variables.rhof_bl > 1e9 - or fwbs_variables.rhof_bl <= 0 - or np.isnan(fwbs_variables.rhof_bl) + fwbs_variables.den_blkt_coolant > 1e9 + or fwbs_variables.den_blkt_coolant <= 0 + or np.isnan(fwbs_variables.den_blkt_coolant) ): raise RuntimeError( - f"Error in primary_coolant_properties. {fwbs_variables.rhof_bl = }" + f"Error in primary_coolant_properties. {fwbs_variables.den_blkt_coolant = }" ) if output: @@ -601,8 +601,8 @@ def primary_coolant_properties(self, output: bool): po.ovarrf( self.outfile, "Density (kg m-3)", - "(rhof_bl)", - fwbs_variables.rhof_bl, + "(den_blkt_coolant)", + fwbs_variables.den_blkt_coolant, "OP ", ) po.ovarrf( @@ -818,7 +818,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): blanket_library.velblkto = self.flow_velocity( i_channel_shape=1, mass_flow_rate=blanket_library.mfblktpo, - flow_density=fwbs_variables.rhof_bl, + flow_density=fwbs_variables.den_blkt_coolant, ) velblkto_liq = self.flow_velocity( i_channel_shape=2, @@ -856,7 +856,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): blanket_library.velblkti = self.flow_velocity( i_channel_shape=1, mass_flow_rate=blanket_library.mfblktpi, - flow_density=fwbs_variables.rhof_bl, + flow_density=fwbs_variables.den_blkt_coolant, ) velblkti_liq = self.flow_velocity( i_channel_shape=2, @@ -891,7 +891,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): blanket_library.velblkto = self.flow_velocity( i_channel_shape=1, mass_flow_rate=blanket_library.mfblktpo, - flow_density=fwbs_variables.rhof_bl, + flow_density=fwbs_variables.den_blkt_coolant, ) # Get mass flow rate etc. for inboard blanket breeder flow for tritium extraction @@ -936,7 +936,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): blanket_library.velblkti = self.flow_velocity( i_channel_shape=1, mass_flow_rate=blanket_library.mfblktpi, - flow_density=fwbs_variables.rhof_bl, + flow_density=fwbs_variables.den_blkt_coolant, ) # Get mass flow rate etc. for inboard blanket breeder flow for tritium extraction @@ -973,7 +973,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): blanket_library.velblkto = self.flow_velocity( i_channel_shape=1, mass_flow_rate=blanket_library.mfblktpo, - flow_density=fwbs_variables.rhof_bl, + flow_density=fwbs_variables.den_blkt_coolant, ) if fwbs_variables.i_blkt_inboard == 1: @@ -999,7 +999,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): blanket_library.velblkti = self.flow_velocity( i_channel_shape=1, mass_flow_rate=blanket_library.mfblktpi, - flow_density=fwbs_variables.rhof_bl, + flow_density=fwbs_variables.den_blkt_coolant, ) # FW Presure Drops ############### @@ -1048,7 +1048,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): flleng=blanket_library.bzfllengo, no90=no90bz, no180=no180bz, - coolant_density=fwbs_variables.rhof_bl, + coolant_density=fwbs_variables.den_blkt_coolant, coolant_dynamic_viscosity=fwbs_variables.visc_bl, coolant_electrical_conductivity=0.0e0, pol_channel_length=pollengo, @@ -1064,7 +1064,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): flleng=blanket_library.bzfllengi, no90=no90bz, no180=no180bz, - coolant_density=fwbs_variables.rhof_bl, + coolant_density=fwbs_variables.den_blkt_coolant, coolant_dynamic_viscosity=fwbs_variables.visc_bl, coolant_electrical_conductivity=0.0e0, pol_channel_length=pollengi, @@ -1943,7 +1943,7 @@ def thermo_hydraulic_model(self, output: bool): primary_coolant_switch=( "Helium" if fwbs_variables.i_blkt_coolant_type == 1 else "Water" ), - coolant_density=blanket_library.rhof_bl, + coolant_density=blanket_library.den_blkt_coolant, label="Blanket", ) diff --git a/process/dcll.py b/process/dcll.py index 90503813bf..cf8dc0eeae 100644 --- a/process/dcll.py +++ b/process/dcll.py @@ -636,7 +636,7 @@ def dcll_masses(self, output: bool): * dcll_module.vol_bz_struct ) dcll_module.wht_cool_struct = ( - fwbs_variables.rhof_bl + fwbs_variables.den_blkt_coolant * (1 - dcll_module.f_vol_stl_bz_struct) * dcll_module.vol_bz_struct ) @@ -649,7 +649,7 @@ def dcll_masses(self, output: bool): fwbs_variables.denstl * dcll_module.f_vol_stl_back_wall * dcll_module.vol_bw ) dcll_module.wht_bw_cool = ( - fwbs_variables.rhof_bl + fwbs_variables.den_blkt_coolant * (1 - dcll_module.f_vol_stl_back_wall) * dcll_module.vol_bw ) @@ -659,7 +659,9 @@ def dcll_masses(self, output: bool): fwbs_variables.denstl * dcll_module.f_vol_mfbss_stl * dcll_module.vol_bss ) dcll_module.wht_mfbss_cool = ( - fwbs_variables.rhof_bl * dcll_module.f_vol_mfbss_he * dcll_module.vol_bss + fwbs_variables.den_blkt_coolant + * dcll_module.f_vol_mfbss_he + * dcll_module.vol_bss ) dcll_module.wht_mfbss_pbli = ( fwbs_variables.den_liq * dcll_module.f_vol_mfbss_pbli * dcll_module.vol_bss diff --git a/process/vacuum.py b/process/vacuum.py index 2e7cb9576f..8b5ce426c5 100644 --- a/process/vacuum.py +++ b/process/vacuum.py @@ -659,6 +659,9 @@ def vacuum( po.ovarre(self.outfile, "Duct length, elbow to pumps (m)", "(l3)", l3) po.ovarre(self.outfile, "Number of pumps", "(pumpn)", pumpn, "OP ") po.oblnkl(self.outfile) - po.ocmmnt(self.outfile, f"The vacuum system uses {i_fw_blkt_shared_coolant} pumps.") + po.ocmmnt( + self.outfile, + f"The vacuum system uses {i_fw_blkt_shared_coolant} pumps.", + ) return pumpn, nduct, dlscalc, mvdsh, dimax diff --git a/source/fortran/fwbs_variables.f90 b/source/fortran/fwbs_variables.f90 index 3ec6a7e6b1..c473851324 100644 --- a/source/fortran/fwbs_variables.f90 +++ b/source/fortran/fwbs_variables.f90 @@ -631,7 +631,7 @@ module fwbs_variables real(dp) :: visc_fw_coolant !! Viscosity of the FW primary coolant - real(dp) :: rhof_bl + real(dp) :: den_blkt_coolant !! Density of the blanket primary coolant real(dp) :: visc_bl @@ -838,7 +838,7 @@ subroutine init_fwbs_variables outlet_temp_liq = 720.0D0 den_fw_coolant = 0.0D0 visc_fw_coolant = 0.0D0 - rhof_bl = 0.0D0 + den_blkt_coolant = 0.0D0 visc_bl = 0.0D0 cp_fw = 0.0D0 cv_fw = 0.0D0 diff --git a/tests/unit/test_blanket_library.py b/tests/unit/test_blanket_library.py index 93fb2c9fb6..247f1e4189 100644 --- a/tests/unit/test_blanket_library.py +++ b/tests/unit/test_blanket_library.py @@ -49,7 +49,7 @@ class PrimaryCoolantPropertiesParam(NamedTuple): pres_blkt_coolant: Any = None - rhof_bl: Any = None + den_blkt_coolant: Any = None icooldual: Any = None @@ -69,7 +69,7 @@ class PrimaryCoolantPropertiesParam(NamedTuple): expected_cv_fw: Any = None - expected_rhof_bl: Any = None + expected_den_blkt_coolant: Any = None expected_visc_bl: Any = None @@ -95,7 +95,7 @@ class PrimaryCoolantPropertiesParam(NamedTuple): temp_blkt_coolant_in=573, temp_blkt_coolant_out=773, pres_blkt_coolant=8000000, - rhof_bl=0, + den_blkt_coolant=0, icooldual=2, visc_bl=0, cp_bl=0, @@ -105,7 +105,7 @@ class PrimaryCoolantPropertiesParam(NamedTuple): expected_den_fw_coolant=5.6389735407435868, expected_cp_fw=5188.5588430173211, expected_cv_fw=3123.5687263525392, - expected_rhof_bl=5.6389735407435868, + expected_den_blkt_coolant=5.6389735407435868, expected_visc_bl=3.5036293160410249e-05, expected_cp_bl=5188.5588430173211, expected_cv_bl=3123.5687263525392, @@ -123,7 +123,7 @@ class PrimaryCoolantPropertiesParam(NamedTuple): temp_blkt_coolant_in=573, temp_blkt_coolant_out=773, pres_blkt_coolant=8000000, - rhof_bl=5.6389735407435868, + den_blkt_coolant=5.6389735407435868, icooldual=2, visc_bl=3.5036293160410249e-05, cp_bl=5188.5588430173211, @@ -133,7 +133,7 @@ class PrimaryCoolantPropertiesParam(NamedTuple): expected_den_fw_coolant=5.6389735407435868, expected_cp_fw=5188.5588430173211, expected_cv_fw=3123.5687263525392, - expected_rhof_bl=5.6389735407435868, + expected_den_blkt_coolant=5.6389735407435868, expected_visc_bl=3.5036293160410249e-05, expected_cp_bl=5188.5588430173211, expected_cv_bl=3123.5687263525392, @@ -211,7 +211,9 @@ def test_primary_coolant_properties( ) monkeypatch.setattr( - fwbs_variables, "rhof_bl", primarycoolantpropertiesparam.rhof_bl + fwbs_variables, + "den_blkt_coolant", + primarycoolantpropertiesparam.den_blkt_coolant, ) monkeypatch.setattr( @@ -230,7 +232,11 @@ def test_primary_coolant_properties( fwbs_variables, "visc_fw_coolant", primarycoolantpropertiesparam.visc_fw_coolant ) - monkeypatch.setattr(fwbs_variables, "i_fw_blkt_shared_coolant", primarycoolantpropertiesparam.i_fw_blkt_shared_coolant) + monkeypatch.setattr( + fwbs_variables, + "i_fw_blkt_shared_coolant", + primarycoolantpropertiesparam.i_fw_blkt_shared_coolant, + ) blanket_library_fixture.primary_coolant_properties(output=False) @@ -246,8 +252,8 @@ def test_primary_coolant_properties( primarycoolantpropertiesparam.expected_cv_fw, rel=1e-4 ) - assert fwbs_variables.rhof_bl == pytest.approx( - primarycoolantpropertiesparam.expected_rhof_bl, rel=1e-4 + assert fwbs_variables.den_blkt_coolant == pytest.approx( + primarycoolantpropertiesparam.expected_den_blkt_coolant, rel=1e-4 ) assert fwbs_variables.visc_bl == pytest.approx( diff --git a/tests/unit/test_dcll.py b/tests/unit/test_dcll.py index 30fefdcf8f..58430a6a21 100644 --- a/tests/unit/test_dcll.py +++ b/tests/unit/test_dcll.py @@ -356,7 +356,7 @@ class DcllMassesParam(NamedTuple): den_fw_coolant: Any = None - rhof_bl: Any = None + den_blkt_coolant: Any = None n_blkt_inboard_modules_toroidal: Any = None @@ -559,7 +559,7 @@ class DcllMassesParam(NamedTuple): vfblkt=0.25, icooldual=2, den_fw_coolant=5.6389735407435868, - rhof_bl=5.6389735407435868, + den_blkt_coolant=5.6389735407435868, n_blkt_inboard_modules_toroidal=32, n_blkt_outboard_modules_toroidal=48, r_fci=0, @@ -678,7 +678,7 @@ class DcllMassesParam(NamedTuple): vfblkt=0.082598954955828252, icooldual=2, den_fw_coolant=5.6389735407435868, - rhof_bl=5.6389735407435868, + den_blkt_coolant=5.6389735407435868, n_blkt_inboard_modules_toroidal=32, n_blkt_outboard_modules_toroidal=48, r_fci=0.050000000000000003, @@ -877,7 +877,9 @@ def test_dcll_masses(dcllmassesparam, monkeypatch, dcll): fwbs_variables, "den_fw_coolant", dcllmassesparam.den_fw_coolant ) - monkeypatch.setattr(fwbs_variables, "rhof_bl", dcllmassesparam.rhof_bl) + monkeypatch.setattr( + fwbs_variables, "den_blkt_coolant", dcllmassesparam.den_blkt_coolant + ) monkeypatch.setattr( fwbs_variables, From 85cb9022b6cfa2daed7152c39df6d12a413a8697 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 17 Feb 2025 16:35:29 +0000 Subject: [PATCH 23/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20visc=5Fbl=20to=20?= =?UTF-8?q?visc=5Fblkt=5Fcoolant=20for=20clarity=20and=20consistency=20acr?= =?UTF-8?q?oss=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/blanket_library.py | 12 ++++++------ source/fortran/fwbs_variables.f90 | 4 ++-- tests/unit/test_blanket_library.py | 20 +++++++++++--------- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/process/blanket_library.py b/process/blanket_library.py index 3a07d58efd..5fb774c720 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -475,7 +475,7 @@ def primary_coolant_properties(self, output: bool): fwbs_variables.visc_fw_coolant = fw_bb_fluid_properties.viscosity fwbs_variables.den_blkt_coolant = fwbs_variables.den_fw_coolant - fwbs_variables.visc_bl = fwbs_variables.visc_fw_coolant + fwbs_variables.visc_blkt_coolant = fwbs_variables.visc_fw_coolant fwbs_variables.cp_bl = fwbs_variables.cp_fw fwbs_variables.cv_bl = fwbs_variables.cv_fw @@ -508,7 +508,7 @@ def primary_coolant_properties(self, output: bool): fwbs_variables.den_blkt_coolant = bb_fluid_properties.density fwbs_variables.cp_bl = bb_fluid_properties.specific_heat_const_p fwbs_variables.cv_bl = bb_fluid_properties.specific_heat_const_v - fwbs_variables.visc_bl = bb_fluid_properties.viscosity + fwbs_variables.visc_blkt_coolant = bb_fluid_properties.viscosity if ( fwbs_variables.den_fw_coolant > 1e9 @@ -608,8 +608,8 @@ def primary_coolant_properties(self, output: bool): po.ovarrf( self.outfile, "Viscosity (Pa s)", - "(visc_bl)", - fwbs_variables.visc_bl, + "(visc_blkt_coolant)", + fwbs_variables.visc_blkt_coolant, "OP ", ) @@ -1049,7 +1049,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): no90=no90bz, no180=no180bz, coolant_density=fwbs_variables.den_blkt_coolant, - coolant_dynamic_viscosity=fwbs_variables.visc_bl, + coolant_dynamic_viscosity=fwbs_variables.visc_blkt_coolant, coolant_electrical_conductivity=0.0e0, pol_channel_length=pollengo, nopolchan=npoltoto, @@ -1065,7 +1065,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): no90=no90bz, no180=no180bz, coolant_density=fwbs_variables.den_blkt_coolant, - coolant_dynamic_viscosity=fwbs_variables.visc_bl, + coolant_dynamic_viscosity=fwbs_variables.visc_blkt_coolant, coolant_electrical_conductivity=0.0e0, pol_channel_length=pollengi, nopolchan=npoltoti, diff --git a/source/fortran/fwbs_variables.f90 b/source/fortran/fwbs_variables.f90 index c473851324..2a089dba67 100644 --- a/source/fortran/fwbs_variables.f90 +++ b/source/fortran/fwbs_variables.f90 @@ -634,7 +634,7 @@ module fwbs_variables real(dp) :: den_blkt_coolant !! Density of the blanket primary coolant - real(dp) :: visc_bl + real(dp) :: visc_blkt_coolant !! Viscosity of the blanket primary coolant real(dp) :: cp_fw, cv_fw, cp_bl, cv_bl @@ -839,7 +839,7 @@ subroutine init_fwbs_variables den_fw_coolant = 0.0D0 visc_fw_coolant = 0.0D0 den_blkt_coolant = 0.0D0 - visc_bl = 0.0D0 + visc_blkt_coolant = 0.0D0 cp_fw = 0.0D0 cv_fw = 0.0D0 cp_bl = 0.0D0 diff --git a/tests/unit/test_blanket_library.py b/tests/unit/test_blanket_library.py index 247f1e4189..83ad295756 100644 --- a/tests/unit/test_blanket_library.py +++ b/tests/unit/test_blanket_library.py @@ -53,7 +53,7 @@ class PrimaryCoolantPropertiesParam(NamedTuple): icooldual: Any = None - visc_bl: Any = None + visc_blkt_coolant: Any = None cp_bl: Any = None @@ -71,7 +71,7 @@ class PrimaryCoolantPropertiesParam(NamedTuple): expected_den_blkt_coolant: Any = None - expected_visc_bl: Any = None + expected_visc_blkt_coolant: Any = None expected_cp_bl: Any = None @@ -97,7 +97,7 @@ class PrimaryCoolantPropertiesParam(NamedTuple): pres_blkt_coolant=8000000, den_blkt_coolant=0, icooldual=2, - visc_bl=0, + visc_blkt_coolant=0, cp_bl=0, cv_bl=0, visc_fw_coolant=0, @@ -106,7 +106,7 @@ class PrimaryCoolantPropertiesParam(NamedTuple): expected_cp_fw=5188.5588430173211, expected_cv_fw=3123.5687263525392, expected_den_blkt_coolant=5.6389735407435868, - expected_visc_bl=3.5036293160410249e-05, + expected_visc_blkt_coolant=3.5036293160410249e-05, expected_cp_bl=5188.5588430173211, expected_cv_bl=3123.5687263525392, expected_visc_fw_coolant=3.5036293160410249e-05, @@ -125,7 +125,7 @@ class PrimaryCoolantPropertiesParam(NamedTuple): pres_blkt_coolant=8000000, den_blkt_coolant=5.6389735407435868, icooldual=2, - visc_bl=3.5036293160410249e-05, + visc_blkt_coolant=3.5036293160410249e-05, cp_bl=5188.5588430173211, cv_bl=3123.5687263525392, visc_fw_coolant=3.5036293160410249e-05, @@ -134,7 +134,7 @@ class PrimaryCoolantPropertiesParam(NamedTuple): expected_cp_fw=5188.5588430173211, expected_cv_fw=3123.5687263525392, expected_den_blkt_coolant=5.6389735407435868, - expected_visc_bl=3.5036293160410249e-05, + expected_visc_blkt_coolant=3.5036293160410249e-05, expected_cp_bl=5188.5588430173211, expected_cv_bl=3123.5687263525392, expected_visc_fw_coolant=3.5036293160410249e-05, @@ -221,7 +221,9 @@ def test_primary_coolant_properties( ) monkeypatch.setattr( - fwbs_variables, "visc_bl", primarycoolantpropertiesparam.visc_bl + fwbs_variables, + "visc_blkt_coolant", + primarycoolantpropertiesparam.visc_blkt_coolant, ) monkeypatch.setattr(fwbs_variables, "cp_bl", primarycoolantpropertiesparam.cp_bl) @@ -256,8 +258,8 @@ def test_primary_coolant_properties( primarycoolantpropertiesparam.expected_den_blkt_coolant, rel=1e-4 ) - assert fwbs_variables.visc_bl == pytest.approx( - primarycoolantpropertiesparam.expected_visc_bl, rel=1e-4 + assert fwbs_variables.visc_blkt_coolant == pytest.approx( + primarycoolantpropertiesparam.expected_visc_blkt_coolant, rel=1e-4 ) assert fwbs_variables.cp_bl == pytest.approx( From 1c863fd12f84ae20b663ab098ad31800a921fe03 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 17 Feb 2025 16:48:23 +0000 Subject: [PATCH 24/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20primary=5Fpumping?= =?UTF-8?q?=20to=20i=5Fcoolant=5Fpumping=20for=20clarity=20and=20consisten?= =?UTF-8?q?cy=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proc-pages/eng-models/fw-blanket.md | 4 +-- ...conversion-and-heat-dissipation-systems.md | 10 +++--- .../proc-pages/fusion-devices/stellarator.md | 2 +- .../data/csv_output_large_tokamak_MFILE.DAT | 4 +-- examples/data/large_tokamak_1_MFILE.DAT | 4 +-- examples/data/large_tokamak_2_MFILE.DAT | 4 +-- examples/data/large_tokamak_3_MFILE.DAT | 4 +-- examples/data/large_tokamak_4_MFILE.DAT | 4 +-- examples/data/large_tokamak_IN.DAT | 2 +- examples/data/scan_MFILE.DAT | 20 +++++------ examples/data/scan_example_file_IN.DAT | 2 +- process/blanket_library.py | 18 +++++----- process/dcll.py | 10 +++--- process/hcpb.py | 16 ++++----- process/power.py | 34 +++++++++---------- process/stellarator.py | 10 +++--- process/utilities/errorlist.json | 2 +- source/fortran/fwbs_variables.f90 | 10 +++--- source/fortran/input.f90 | 6 ++-- source/fortran/primary_pumping_variables.f90 | 24 ++++++------- .../data/large_tokamak_1_MFILE.DAT | 4 +-- .../data/large_tokamak_2_MFILE.DAT | 4 +-- .../data/large_tokamak_3_MFILE.DAT | 4 +-- .../data/large_tokamak_4_MFILE.DAT | 4 +-- tests/integration/data/large_tokamak_IN.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 4 +-- .../data/large_tokamak_once_through.IN.DAT | 2 +- tests/integration/data/ref_IN.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 32 ++++++++--------- tests/integration/data/scan_MFILE.DAT | 20 +++++------ .../data/uncertainties_nonopt_ref_IN.DAT | 2 +- .../integration/data/uncertainties_ref_IN.DAT | 2 +- tests/integration/ref_dicts.json | 22 ++++++------ tests/regression/input_files/helias_5b.IN.DAT | 2 +- .../input_files/large_tokamak.IN.DAT | 2 +- .../input_files/large_tokamak_nof.IN.DAT | 2 +- .../large_tokamak_once_through.IN.DAT | 2 +- .../spherical_tokamak_once_through.IN.DAT | 2 +- .../input_files/st_regression.IN.DAT | 28 +++++++-------- .../stellarator_helias_once_through.IN.DAT | 2 +- tests/unit/data/large_tokamak_IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 4 +-- tests/unit/test_ccfe_hcpb.py | 8 ++--- tests/unit/test_power.py | 8 ++--- 44 files changed, 178 insertions(+), 178 deletions(-) diff --git a/documentation/proc-pages/eng-models/fw-blanket.md b/documentation/proc-pages/eng-models/fw-blanket.md index b5bbc66cff..71f4902ae1 100644 --- a/documentation/proc-pages/eng-models/fw-blanket.md +++ b/documentation/proc-pages/eng-models/fw-blanket.md @@ -68,7 +68,7 @@ efficiency) proceeds. ## Thermo-hydraulic model for first wall and blanket !!! Note "Note" - This is called for primary_pumping = 2 and 3 + This is called for i_coolant_pumping = 2 and 3 Summary of key variables and switches: @@ -143,7 +143,7 @@ where $\texttt{tkfw}$ is the thermal conductivity of the first wall material and The temperature difference between the channel inner wall (film temperature) and the bulk coolant is calculated using the heat transfer coefficient, which is derived using the [Gnielinski correlation](https://en.wikipedia.org/wiki/Nusselt_number#Gnielinski_correlation). The pressure drop is based on the Darcy fraction factor, using the [Haaland equation](https://en.wikipedia.org/wiki/Darcy_friction_factor_formulae#Haaland_equation), an approximation to the implicit Colebrook–White equation. The thermal conductivity of Eurofer is used, from "Fusion Demo Interim Structural Design Criteria - Appendix A Material Design Limit Data", F. Tavassoli, TW4-TTMS-005-D01, 2004" !!! Note "Note" - The pressure drop calculation is only performed for primary_pumping = 2, as for 3 it is used as an input, as explained in the heat transport section. + The pressure drop calculation is only performed for i_coolant_pumping = 2, as for 3 it is used as an input, as explained in the heat transport section. ### Model Switches diff --git a/documentation/proc-pages/eng-models/power-conversion-and-heat-dissipation-systems.md b/documentation/proc-pages/eng-models/power-conversion-and-heat-dissipation-systems.md index 8e5aaac324..19a5ff9b8e 100644 --- a/documentation/proc-pages/eng-models/power-conversion-and-heat-dissipation-systems.md +++ b/documentation/proc-pages/eng-models/power-conversion-and-heat-dissipation-systems.md @@ -39,12 +39,12 @@ The primary coolant (less any thermal power required to produce hydrogen in a hy plant) is used to heat the secondary coolant to turn the turbines, which power the generator. The remainder is dumped to the environment. All of the low-grade heat is dumped to the environment. -`primary_pumping` : This switch controls the calculation of the mechanical pumping power required +`i_coolant_pumping` : This switch controls the calculation of the mechanical pumping power required for the primary coolant. - - If `primary_pumping` = 0, the user sets mechanical pumping directly - - If `primary_pumping` = 1, the user sets mechanical pumping power as a fraction of thermal power removed by coolant. - - If `primary_pumping` = 2, the mechanical pumping power is calculated, as follows: + - If `i_coolant_pumping` = 0, the user sets mechanical pumping directly + - If `i_coolant_pumping` = 1, the user sets mechanical pumping power as a fraction of thermal power removed by coolant. + - If `i_coolant_pumping` = 2, the mechanical pumping power is calculated, as follows: - User inputs for the coolant outlets temperature (which may be used as an iteration variable), the coolant channel diameter, and the segmentation of the blanket are used. The peak temperature in the first wall material (underneath the armour) is derived. The user can apply an upper limit @@ -62,7 +62,7 @@ for the primary coolant. mechanical power used) is specified by the parameter `etaiso`. Note that the mechanical pumping power for the shield and divertor are still calculated using the simplified method (a fixed fraction of the heat transported). - - If `primary_pumping` = 3, the mechanical pumping power is calculated using specified pressure drop. + - If `i_coolant_pumping` = 3, the mechanical pumping power is calculated using specified pressure drop. The pressures and temperatures are set by the user. - When used with the DCLL model a different set of pressure drop variables are used, which are outlined below: diff --git a/documentation/proc-pages/fusion-devices/stellarator.md b/documentation/proc-pages/fusion-devices/stellarator.md index 83db25bd7d..15f971b734 100644 --- a/documentation/proc-pages/fusion-devices/stellarator.md +++ b/documentation/proc-pages/fusion-devices/stellarator.md @@ -265,7 +265,7 @@ fblss = 0.13 *Stainless steel fraction of blanket by volume (only relevant for m fblvd = 0. *Vanadium fraction of blanket by volume (only relevant for mass calculations) fhole = 0. *Area fraction taken up by other holes (in addition to fdiv and fhcd when ipowerflow=1) fwclfr = 0.1 *First wall coolant fraction (only relevant for mass calculations) -primary_pumping = 1 *Switch for pumping power (0: User sets pump power directly) +i_coolant_pumping = 1 *Switch for pumping power (0: User sets pump power directly) htpmw_blkt = 120. *Blanket coolant mechanical pumping power (MW) htpmw_fw = 56. *First wall coolant mechanical pumping power (MW) htpmw_div = 24. *Divertor coolant mechanical pumping power (MW) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 9b0648d536..721fb223e6 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -1110,7 +1110,7 @@ Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 - Switch_for_pumping_of_primary_coolant___________________________________ (primary_pumping)_____________ 3 + Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP Mechanical_pumping_power_for_FW_and_blanket_cooling_loop_including_heat_ (htpmw_fw_blkt)_______________ 1.6141E+02 OP @@ -1692,7 +1692,7 @@ fimp(14) = 0.000005 ipowerflow = 0 * Switch for pumping power for primary coolant -primary_pumping = 3 +i_coolant_pumping = 3 * Electrical efficiency of FW and blanket coolant pumps etahtp = 0.87 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index f9cf1d6eaf..1e31dbf67f 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -1105,7 +1105,7 @@ Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 - Switch_for_pumping_of_primary_coolant___________________________________ (primary_pumping)_____________ 3 + Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP Mechanical_pumping_power_for_FW_and_blanket_cooling_loop_including_heat_ (htpmw_fw_blkt)_______________ 1.6407E+02 OP @@ -1686,7 +1686,7 @@ fimp(14) = 0.000005 ipowerflow = 0 * Switch for pumping power for primary coolant -primary_pumping = 3 +i_coolant_pumping = 3 * Electrical efficiency of FW and blanket coolant pumps etahtp = 0.87 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 7fde556306..552a538de7 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -1105,7 +1105,7 @@ Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 - Switch_for_pumping_of_primary_coolant___________________________________ (primary_pumping)_____________ 3 + Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP Mechanical_pumping_power_for_FW_and_blanket_cooling_loop_including_heat_ (htpmw_fw_blkt)_______________ 1.6407E+02 OP @@ -1686,7 +1686,7 @@ fimp(14) = 0.000005 ipowerflow = 0 * Switch for pumping power for primary coolant -primary_pumping = 3 +i_coolant_pumping = 3 * Electrical efficiency of FW and blanket coolant pumps etahtp = 0.87 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 05bf22c08b..142693f709 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -1105,7 +1105,7 @@ Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 - Switch_for_pumping_of_primary_coolant___________________________________ (primary_pumping)_____________ 3 + Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP Mechanical_pumping_power_for_FW_and_blanket_cooling_loop_including_heat_ (htpmw_fw_blkt)_______________ 1.6407E+02 OP @@ -1687,7 +1687,7 @@ fimp(14) = 0.000005 ipowerflow = 0 * Switch for pumping power for primary coolant -primary_pumping = 3 +i_coolant_pumping = 3 * Electrical efficiency of FW and blanket coolant pumps etahtp = 0.87 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index ebdd87b942..a8be6d5f52 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -1105,7 +1105,7 @@ Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 - Switch_for_pumping_of_primary_coolant___________________________________ (primary_pumping)_____________ 3 + Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP Mechanical_pumping_power_for_FW_and_blanket_cooling_loop_including_heat_ (htpmw_fw_blkt)_______________ 1.6407E+02 OP @@ -1687,7 +1687,7 @@ fimp(14) = 0.000005 ipowerflow = 0 * Switch for pumping power for primary coolant -primary_pumping = 3 +i_coolant_pumping = 3 * Electrical efficiency of FW and blanket coolant pumps etahtp = 0.87 diff --git a/examples/data/large_tokamak_IN.DAT b/examples/data/large_tokamak_IN.DAT index 9c4e378909..8dcf0f9eb1 100644 --- a/examples/data/large_tokamak_IN.DAT +++ b/examples/data/large_tokamak_IN.DAT @@ -497,7 +497,7 @@ fimp(14) = 0.000005 ipowerflow = 0 * Switch for pumping power for primary coolant -primary_pumping = 3 +i_coolant_pumping = 3 * Electrical efficiency of FW and blanket coolant pumps etahtp = 0.87 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index e26c7eb287..645b5a251e 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -932,7 +932,7 @@ Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 - Switch_for_pumping_of_primary_coolant___________________________________ (primary_pumping)_____________ 3 + Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP Mechanical_pumping_power_for_FW_and_blanket_cooling_loop_including_heat_ (htpmw_fw_blkt)_______________ 2.0197E+02 OP @@ -1927,7 +1927,7 @@ Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 - Switch_for_pumping_of_primary_coolant___________________________________ (primary_pumping)_____________ 3 + Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP Mechanical_pumping_power_for_FW_and_blanket_cooling_loop_including_heat_ (htpmw_fw_blkt)_______________ 2.0197E+02 OP @@ -2922,7 +2922,7 @@ Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 - Switch_for_pumping_of_primary_coolant___________________________________ (primary_pumping)_____________ 3 + Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP Mechanical_pumping_power_for_FW_and_blanket_cooling_loop_including_heat_ (htpmw_fw_blkt)_______________ 2.0197E+02 OP @@ -3917,7 +3917,7 @@ Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 - Switch_for_pumping_of_primary_coolant___________________________________ (primary_pumping)_____________ 3 + Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP Mechanical_pumping_power_for_FW_and_blanket_cooling_loop_including_heat_ (htpmw_fw_blkt)_______________ 2.0197E+02 OP @@ -4912,7 +4912,7 @@ Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 - Switch_for_pumping_of_primary_coolant___________________________________ (primary_pumping)_____________ 3 + Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP Mechanical_pumping_power_for_FW_and_blanket_cooling_loop_including_heat_ (htpmw_fw_blkt)_______________ 2.0197E+02 OP @@ -5907,7 +5907,7 @@ Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 - Switch_for_pumping_of_primary_coolant___________________________________ (primary_pumping)_____________ 3 + Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP Mechanical_pumping_power_for_FW_and_blanket_cooling_loop_including_heat_ (htpmw_fw_blkt)_______________ 2.0197E+02 OP @@ -6902,7 +6902,7 @@ Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 - Switch_for_pumping_of_primary_coolant___________________________________ (primary_pumping)_____________ 3 + Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP Mechanical_pumping_power_for_FW_and_blanket_cooling_loop_including_heat_ (htpmw_fw_blkt)_______________ 2.0197E+02 OP @@ -7897,7 +7897,7 @@ Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 - Switch_for_pumping_of_primary_coolant___________________________________ (primary_pumping)_____________ 3 + Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP Mechanical_pumping_power_for_FW_and_blanket_cooling_loop_including_heat_ (htpmw_fw_blkt)_______________ 2.0197E+02 OP @@ -8892,7 +8892,7 @@ Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 - Switch_for_pumping_of_primary_coolant___________________________________ (primary_pumping)_____________ 3 + Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP Mechanical_pumping_power_for_FW_and_blanket_cooling_loop_including_heat_ (htpmw_fw_blkt)_______________ 2.0197E+02 OP @@ -9167,7 +9167,7 @@ vfshld = 0.60 * Coolant void fraction in shield *-------------Heat Transport Variables-------------* ipowerflow = 0 * Switch for power flow model; HAS NO EFFECT? -primary_pumping = 3 * Switch for pumping power for primary coolant +i_coolant_pumping = 3 * Switch for pumping power for primary coolant etahtp = 0.87 * electrical efficiency of FW and blanket coolant pumps etaiso = 0.9 * isentropic efficiency of FW and blanket coolant pumps secondary_cycle = 2 * user input thermal-electric efficiency (etath) diff --git a/examples/data/scan_example_file_IN.DAT b/examples/data/scan_example_file_IN.DAT index ba3418008a..a7e46de70e 100644 --- a/examples/data/scan_example_file_IN.DAT +++ b/examples/data/scan_example_file_IN.DAT @@ -497,7 +497,7 @@ fimp(14) = 0.000005 ipowerflow = 0 * Switch for pumping power for primary coolant -primary_pumping = 3 +i_coolant_pumping = 3 * Electrical efficiency of FW and blanket coolant pumps etahtp = 0.87 diff --git a/process/blanket_library.py b/process/blanket_library.py index 5fb774c720..16f93cdc4e 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -631,7 +631,7 @@ def primary_coolant_properties(self, output: bool): def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): """ Function that calculates the pressure drops for the thermo-hydraulic model - when primary_pumping = 2. + when i_coolant_pumping = 2. Within are calculations necessary for the deltap_tot function but not required for other calculations within the thermo-hydraulic model as then they are just @@ -1519,7 +1519,7 @@ def flow_velocity(self, i_channel_shape, mass_flow_rate, flow_density): def thermo_hydraulic_model(self, output: bool): """ Thermo-hydraulic model for first wall and blanket - ONLY CALLED if primary_pumping = 2 or 3 + ONLY CALLED if i_coolant_pumping = 2 or 3 Calculations for detailed powerflow model secondary_cycle > 1 @@ -1847,7 +1847,7 @@ def thermo_hydraulic_model(self, output: bool): ######################################################## # load in pressures if primary pumping == 2 - if fwbs_variables.primary_pumping == 2: + if fwbs_variables.i_coolant_pumping == 2: deltap = self.thermo_hydraulic_model_pressure_drop_calculations( output=output ) @@ -1869,12 +1869,12 @@ def thermo_hydraulic_model(self, output: bool): # If FW and BB have the same coolant... if fwbs_variables.i_fw_blkt_shared_coolant == 0: # Total pressure drop in the first wall/blanket (Pa) - if fwbs_variables.primary_pumping == 2: + if fwbs_variables.i_coolant_pumping == 2: if fwbs_variables.i_blkt_inboard == 1: deltap_fw_blkt = deltap_fwi + deltap_bli + deltap_fwo + deltap_blo if fwbs_variables.i_blkt_inboard == 0: deltap_fw_blkt = deltap_fwi + deltap_fwo + deltap_blo - elif fwbs_variables.primary_pumping == 3: + elif fwbs_variables.i_coolant_pumping == 3: deltap_fw_blkt = primary_pumping_variables.dp_fw_blkt # Total coolant mass flow rate in the first wall/blanket (kg/s) blanket_library.mftotal = blanket_library.mffwi + blanket_library.mffwo @@ -1897,7 +1897,7 @@ def thermo_hydraulic_model(self, output: bool): # If FW and BB have different coolants... elif fwbs_variables.i_fw_blkt_shared_coolant == 1: - if fwbs_variables.primary_pumping == 2: + if fwbs_variables.i_coolant_pumping == 2: # Total pressure drop in the first wall (Pa) deltap_fw = deltap_fwi + deltap_fwo @@ -1906,7 +1906,7 @@ def thermo_hydraulic_model(self, output: bool): deltap_blkt = deltap_bli + deltap_blo if fwbs_variables.i_blkt_inboard == 0: deltap_blkt = deltap_blo - elif fwbs_variables.primary_pumping == 3: + elif fwbs_variables.i_coolant_pumping == 3: deltap_fw = primary_pumping_variables.dp_fw deltap_blkt = primary_pumping_variables.dp_blkt @@ -1955,12 +1955,12 @@ def thermo_hydraulic_model(self, output: bool): # If the blanket has a liquid metal breeder... if fwbs_variables.icooldual > 0: # Total pressure drop in the blanket (Pa) - if fwbs_variables.primary_pumping == 2: + if fwbs_variables.i_coolant_pumping == 2: if fwbs_variables.i_blkt_inboard == 1: deltap_bl_liq = deltap_bli_liq + deltap_blo_liq if fwbs_variables.i_blkt_inboard == 0: deltap_bl_liq = deltap_blo_liq - elif fwbs_variables.primary_pumping == 3: + elif fwbs_variables.i_coolant_pumping == 3: deltap_bl_liq = primary_pumping_variables.dp_liq # Total liquid metal breeder/coolant mass flow rate in the blanket (kg/s) fwbs_variables.mfblkt_liq = ( diff --git a/process/dcll.py b/process/dcll.py index cf8dc0eeae..ad8a667d18 100644 --- a/process/dcll.py +++ b/process/dcll.py @@ -289,11 +289,11 @@ def dcll_neutronics_and_power(self, output: bool): def dcll_power_and_heating(self, output: bool): # Mechanical Pumping - # For primary_pumping == 0: + # For i_coolant_pumping == 0: # User sets mechanical pumping power directly (primary_pumping_power) # Values of htpmw_blkt, htpmw_div, htpmw_fw, htpmw_shld set in input file - if fwbs_variables.primary_pumping == 1: + if fwbs_variables.i_coolant_pumping == 1: # User sets mechanical pumping power as a fraction of thermal power # removed by coolant heat_transport_variables.htpmw_fw = heat_transport_variables.fpumpfw * ( @@ -317,7 +317,7 @@ def dcll_power_and_heating(self, output: bool): + fwbs_variables.praddiv ) - elif fwbs_variables.primary_pumping in [2, 3]: + elif fwbs_variables.i_coolant_pumping in [2, 3]: # Mechanical pumping power is calculated for first wall and blanket self.blanket_library.thermo_hydraulic_model(output=output) # For divertor,mechanical pumping power is a fraction of thermal power removed by coolant @@ -333,8 +333,8 @@ def dcll_power_and_heating(self, output: bool): if output: po.osubhd(self.outfile, "DCLL model: Thermal-hydraulics Component Totals") - if (fwbs_variables.primary_pumping != 2) and ( - fwbs_variables.primary_pumping != 3 + if (fwbs_variables.i_coolant_pumping != 2) and ( + fwbs_variables.i_coolant_pumping != 3 ): po.ovarre( self.outfile, diff --git a/process/hcpb.py b/process/hcpb.py index aa858b59b0..7b06905e59 100644 --- a/process/hcpb.py +++ b/process/hcpb.py @@ -702,10 +702,10 @@ def powerflow_calc(self, output: bool): 1 - build_variables.a_fw_outboard / build_variables.a_fw_total ) - # primary_pumping == 0 + # i_coolant_pumping == 0 # User sets mechanical pumping power directly (primary_pumping_power) # Values of htpmw_blkt, htpmw_div, htpmw_fw, htpmw_shld set in input file - if fwbs_variables.primary_pumping == 1: + if fwbs_variables.i_coolant_pumping == 1: # User sets mechanical pumping power as a fraction of thermal power # removed by coolant heat_transport_variables.htpmw_fw = heat_transport_variables.fpumpfw * ( @@ -726,7 +726,7 @@ def powerflow_calc(self, output: bool): + fwbs_variables.praddiv ) - elif fwbs_variables.primary_pumping == 2: + elif fwbs_variables.i_coolant_pumping == 2: # Calculate the required material properties of the FW and BB coolant. self.blanket_library.primary_coolant_properties(output=output) # Mechanical pumping power is calculated for first wall and blanket @@ -743,7 +743,7 @@ def powerflow_calc(self, output: bool): + fwbs_variables.praddiv ) - elif fwbs_variables.primary_pumping == 3: + elif fwbs_variables.i_coolant_pumping == 3: # Issue #503 # Mechanical pumping power is calculated using specified pressure drop for # first wall and blanket circuit, including heat exchanger and pipes @@ -754,13 +754,13 @@ def powerflow_calc(self, output: bool): (primary_pumping_variables.gamma_he - 1) / primary_pumping_variables.gamma_he ) - # N.B. Currenlty primary_pumping==3 uses seperate variables found in + # N.B. Currenlty i_coolant_pumping==3 uses seperate variables found in # primary_pumping_variables rather than fwbs_variables. # The pressure (p_he) is assumed to be the pressure at the # blanket inlet/pump oulet. # The pressures (found in fwbs_variables) for coolants using - # primary_pumping==2 are assumed to be the pressure at the - # blanket oulet/pump inlet. The equation below is used for primary_pumping==2: + # i_coolant_pumping==2 are assumed to be the pressure at the + # blanket oulet/pump inlet. The equation below is used for i_coolant_pumping==2: # pfactor = ((pressure+deltap)/pressure)**((gamma-1.0d0)/gamma) t_in_compressor = primary_pumping_variables.t_in_bb / pfactor dt_he = ( @@ -1489,7 +1489,7 @@ def write_output(self): fwbs_variables.pres_blkt_coolant, ) - if fwbs_variables.primary_pumping != 3: + if fwbs_variables.i_coolant_pumping != 3: po.ovarre( self.outfile, "Mechanical pumping power for first wall (MW)", diff --git a/process/power.py b/process/power.py index 1cc3cb319c..4026becbb5 100644 --- a/process/power.py +++ b/process/power.py @@ -563,7 +563,7 @@ def power1(self): and plant power balance constituents. None """ - if fwbs_variables.primary_pumping != 2 and fwbs_variables.primary_pumping != 3: + if fwbs_variables.i_coolant_pumping != 2 and fwbs_variables.i_coolant_pumping != 3: primary_pumping_variables.htpmw_fw_blkt = ( heat_transport_variables.htpmw_fw + heat_transport_variables.htpmw_blkt ) @@ -576,12 +576,12 @@ def power1(self): ) self.htpmwe_shld = heat_transport_variables.htpmw_shld / fwbs_variables.etahtp self.htpmwe_div = heat_transport_variables.htpmw_div / fwbs_variables.etahtp - if fwbs_variables.icooldual > 0 and fwbs_variables.primary_pumping == 2: + if fwbs_variables.icooldual > 0 and fwbs_variables.i_coolant_pumping == 2: self.htpmwe_blkt_liq = ( heat_transport_variables.htpmw_blkt_liq / fwbs_variables.etahtp ) - if fwbs_variables.icooldual > 0 and fwbs_variables.primary_pumping == 2: + if fwbs_variables.icooldual > 0 and fwbs_variables.i_coolant_pumping == 2: # Total mechanical pump power (deposited in coolant) self.htpmw_mech = ( primary_pumping_variables.htpmw_fw_blkt @@ -622,7 +622,7 @@ def power1(self): # Calculate total deposited power (MW), n.b. energy multiplication in p_blkt_nuclear_heat_total_mw already - if fwbs_variables.primary_pumping == 2: + if fwbs_variables.i_coolant_pumping == 2: # Liquid metal breeder/coolant if fwbs_variables.icooldual == 2: self.pthermblkt_liq = ( @@ -669,7 +669,7 @@ def power1(self): + current_drive_variables.nbshinemw ) - elif fwbs_variables.primary_pumping == 3: + elif fwbs_variables.i_coolant_pumping == 3: # First wall and blanket coolant combined self.pthermfw_blkt = ( fwbs_variables.p_fw_nuclear_heat_total_mw @@ -715,7 +715,7 @@ def power1(self): ) # Heat removal from first wall and divertor (MW) (only used in costs.f90) - if fwbs_variables.primary_pumping != 3: + if fwbs_variables.i_coolant_pumping != 3: heat_transport_variables.pfwdiv = self.pthermfw + self.pthermdiv # Thermal to electric efficiency @@ -912,7 +912,7 @@ def power2(self, output: bool): if cost_variables.ireactor == 1: # Gross electric power # pgrossmw = (heat_transport_variables.pthermmw-hthermmw) * heat_transport_variables.etath - if fwbs_variables.icooldual > 0 and fwbs_variables.primary_pumping == 2: + if fwbs_variables.icooldual > 0 and fwbs_variables.i_coolant_pumping == 2: heat_transport_variables.pgrossmw = ( (heat_transport_variables.pthermmw - self.pthermblkt_liq) * heat_transport_variables.etath @@ -1093,22 +1093,22 @@ def power2(self, output: bool): po.ovarin( self.outfile, "Switch for pumping of primary coolant", - "(primary_pumping)", - fwbs_variables.primary_pumping, + "(i_coolant_pumping)", + fwbs_variables.i_coolant_pumping, ) - if fwbs_variables.primary_pumping == 0: + if fwbs_variables.i_coolant_pumping == 0: po.ocmmnt(self.outfile, "User sets mechanical pumping power directly") - elif fwbs_variables.primary_pumping == 1: + elif fwbs_variables.i_coolant_pumping == 1: po.ocmmnt( self.outfile, "User sets mechanical pumping power as a fraction of thermal power removed by coolant", ) - elif fwbs_variables.primary_pumping == 2: + elif fwbs_variables.i_coolant_pumping == 2: po.ocmmnt( self.outfile, "Mechanical pumping power is calculated for FW and blanket", ) - elif fwbs_variables.primary_pumping == 3: + elif fwbs_variables.i_coolant_pumping == 3: po.ocmmnt( self.outfile, "Mechanical pumping power for FW and blanket cooling loop" ) @@ -1138,7 +1138,7 @@ def power2(self, output: bool): "OP ", ) - if fwbs_variables.primary_pumping != 3: + if fwbs_variables.i_coolant_pumping != 3: po.ovarre( self.outfile, "Mechanical pumping power for FW (MW)", @@ -1198,7 +1198,7 @@ def power2(self, output: bool): "OP ", ) - if fwbs_variables.primary_pumping == 1: + if fwbs_variables.i_coolant_pumping == 1: po.ovarre( self.outfile, "Coolant pump power / non-pumping thermal power in first wall", @@ -1212,7 +1212,7 @@ def power2(self, output: bool): heat_transport_variables.fpumpblkt, ) - if fwbs_variables.primary_pumping != 0: + if fwbs_variables.i_coolant_pumping != 0: po.ovarre( self.outfile, "Coolant pump power / non-pumping thermal power in shield", @@ -1840,7 +1840,7 @@ def power2(self, output: bool): ) # Heat rejected by main power conversion circuit - if fwbs_variables.icooldual > 0 and fwbs_variables.primary_pumping == 2: + if fwbs_variables.icooldual > 0 and fwbs_variables.i_coolant_pumping == 2: self.rejected_main = ( heat_transport_variables.pthermmw - self.pthermblkt_liq ) * (1 - heat_transport_variables.etath) + self.pthermblkt_liq * ( diff --git a/process/stellarator.py b/process/stellarator.py index d432e5e3fe..771b92406f 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -1425,7 +1425,7 @@ def stfwbs(self, output: bool): / build_variables.a_fw_total ) - # Simple blanket model (fwbs_variables.primary_pumping = 0 or 1) is assumed for stellarators + # Simple blanket model (fwbs_variables.i_coolant_pumping = 0 or 1) is assumed for stellarators # The power deposited in the first wall, breeder zone and shield is # calculated according to their dimensions and materials assuming @@ -1464,10 +1464,10 @@ def stfwbs(self, output: bool): # First wall and Blanket pumping power (MW) - if fwbs_variables.primary_pumping == 0: + if fwbs_variables.i_coolant_pumping == 0: # Use input pass - elif fwbs_variables.primary_pumping == 1: + elif fwbs_variables.i_coolant_pumping == 1: heat_transport_variables.htpmw_fw = ( heat_transport_variables.fpumpfw * ( @@ -1510,7 +1510,7 @@ def stfwbs(self, output: bool): # Calculation of shield and divertor powers # Shield and divertor powers and pumping powers are calculated using the same - # simplified method as the first wall and breeder zone when fwbs_variables.primary_pumping = 1. + # simplified method as the first wall and breeder zone when fwbs_variables.i_coolant_pumping = 1. # i.e. the pumping power is a fraction of the total thermal power deposited in the # coolant. @@ -1554,7 +1554,7 @@ def stfwbs(self, output: bool): # htpmw_i = fpump_i*C # where C is the non-pumping thermal power deposited in the coolant - if fwbs_variables.primary_pumping == 1: + if fwbs_variables.i_coolant_pumping == 1: # Shield pumping power (MW) heat_transport_variables.htpmw_shld = ( heat_transport_variables.fpumpshld * (pnucshldi + pnucshldo) diff --git a/process/utilities/errorlist.json b/process/utilities/errorlist.json index 7efcc5c46d..c731ca4f70 100644 --- a/process/utilities/errorlist.json +++ b/process/utilities/errorlist.json @@ -1083,7 +1083,7 @@ { "no": 215, "level": 3, - "message": "STELLARATOR: primary_pumping = 0 or 1 only" + "message": "STELLARATOR: i_coolant_pumping = 0 or 1 only" }, { "no": 216, diff --git a/source/fortran/fwbs_variables.f90 b/source/fortran/fwbs_variables.f90 index 2a089dba67..21815cb64c 100644 --- a/source/fortran/fwbs_variables.f90 +++ b/source/fortran/fwbs_variables.f90 @@ -86,7 +86,7 @@ module fwbs_variables !! - =4 KIT HCLL model # REMOVED, no longer usable !! - =5 DCLL model - no nutronics model included (in development) please check/choose values for !! 'dual-coolant blanket' fractions (provided in this file). - !! - please use primary_pumping = 0 or 1. + !! - please use i_coolant_pumping = 0 or 1. integer :: i_blkt_inboard !! switch for inboard blanket: @@ -263,9 +263,9 @@ module fwbs_variables !! - =2 medium 0.64 m inboard, 1.11 m outboard !! - =3 thick 0.75 m inboard, 1.30 m outboard - integer :: primary_pumping + integer :: i_coolant_pumping !! Switch for pumping power for primary coolant (mechanical power only and peak first wall - !! temperature is only calculated if `primary_pumping=2`): + !! temperature is only calculated if `i_coolant_pumping=2`): !! !! - =0 User sets pump power directly (htpmw_blkt, htpmw_fw, htpmw_div, htpmw_shld) !! - =1 User sets pump power as a fraction of thermal power (fpumpblkt, fpumpfw, fpumpdiv, fpumpshld) @@ -529,7 +529,7 @@ module fwbs_variables !! ----------------------------------------------------- !! BLANKET REFACTOR !! For DCLL, but to be used by all mods that share blanket library after testing. - !! Thermodynamic Model for primary_pumping == 2 + !! Thermodynamic Model for i_coolant_pumping == 2 !! ----------------------------------------------------- integer :: i_fw_blkt_shared_coolant @@ -731,7 +731,7 @@ subroutine init_fwbs_variables whtblbreed = 0.0D0 whtblbe = 0.0D0 iblanket_thickness = 2 - primary_pumping = 2 + i_coolant_pumping = 2 i_shield_mat = 0 secondary_cycle = 0 secondary_cycle_liq = 4 diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index a891823de5..89900bfb60 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -214,7 +214,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) fblhebpi, fblss, temp_blkt_coolant_in, temp_blkt_coolant_out, fblbreed, qnuc, pres_blkt_coolant, & blpressure_liq, n_liq_recirc, pnuc_fw_ratio_dcll, f_nuc_pow_bz_struct, & declblkt, fblhebmo, blkttype, radius_fw_channel, inuclear, declshld, hcdportsize, & - npdiv, f_fw_peak, primary_pumping, dr_pf_cryostat, secondary_cycle, secondary_cycle_liq, & + npdiv, f_fw_peak, i_coolant_pumping, dr_pf_cryostat, secondary_cycle, secondary_cycle_liq, & denstl, declfw, nphcdout, i_blkt_inboard, vfpblkt, temp_fw_coolant_in, wallpf, fblbe, & fhole, i_fw_blkt_vv_shape, coolp, temp_fw_max, irefprop, len_fw_channel, & li6enrich, etaiso, n_blkt_outboard_modules_toroidal, fvoldw, i_shield_mat, i_bb_liq, & @@ -1936,8 +1936,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) ! First wall, blanket, shield settings - case ('primary_pumping') - call parse_int_variable('primary_pumping', primary_pumping, 0, 3, & + case ('i_coolant_pumping') + call parse_int_variable('i_coolant_pumping', i_coolant_pumping, 0, 3, & 'Switch for pumping of primary coolant') case ('htpmw_blkt') call parse_real_variable('htpmw_blkt', htpmw_blkt, 0.0D0, 1.0D3, & diff --git a/source/fortran/primary_pumping_variables.f90 b/source/fortran/primary_pumping_variables.f90 index 9ca8823d0c..07b4d5f16c 100644 --- a/source/fortran/primary_pumping_variables.f90 +++ b/source/fortran/primary_pumping_variables.f90 @@ -1,7 +1,7 @@ module primary_pumping_variables !! author: J. Morris, M. Kovari (UKAEA) !! - !! Module containing global variables relating to `the primary_pumping=3` option. + !! Module containing global variables relating to `the i_coolant_pumping=3` option. !! (Mechanical pumping power is calculated using specified pressure drop) !! !!### References @@ -17,38 +17,38 @@ module primary_pumping_variables public real(dp) :: gamma_he - !! ratio of specific heats for helium (`primary_pumping=3`) + !! ratio of specific heats for helium (`i_coolant_pumping=3`) - ! if cp_he is required place here specific heat capacity at constant pressure: helium (`primary_pumping=3`) [J/(kg.K)] + ! if cp_he is required place here specific heat capacity at constant pressure: helium (`i_coolant_pumping=3`) [J/(kg.K)] ! cp_he is only used in private routine hcll.f90 at the moment real(dp) :: t_in_bb - !! temperature in FW and blanket coolant at blanket entrance (`primary_pumping=3`) [K] + !! temperature in FW and blanket coolant at blanket entrance (`i_coolant_pumping=3`) [K] real(dp) :: t_out_bb - !! temperature in FW and blanket coolant at blanket exit (`primary_pumping=3`) [K] + !! temperature in FW and blanket coolant at blanket exit (`i_coolant_pumping=3`) [K] real(dp) :: p_he - !! pressure in FW and blanket coolant at pump exit (`primary_pumping=3`) [Pa] + !! pressure in FW and blanket coolant at pump exit (`i_coolant_pumping=3`) [Pa] real(dp) :: dp_he - !! pressure drop in FW and blanket coolant including heat exchanger and pipes (`primary_pumping=3`) [Pa] + !! pressure drop in FW and blanket coolant including heat exchanger and pipes (`i_coolant_pumping=3`) [Pa] real(dp) :: dp_fw_blkt - !! pressure drop in FW and blanket coolant including heat exchanger and pipes (`primary_pumping=3`) [Pa] + !! pressure drop in FW and blanket coolant including heat exchanger and pipes (`i_coolant_pumping=3`) [Pa] real(dp) :: dp_fw - !! pressure drop in FW coolant including heat exchanger and pipes (`primary_pumping=3`) [Pa] + !! pressure drop in FW coolant including heat exchanger and pipes (`i_coolant_pumping=3`) [Pa] real(dp) :: dp_blkt - !! pressure drop in blanket coolant including heat exchanger and pipes (`primary_pumping=3`) [Pa] + !! pressure drop in blanket coolant including heat exchanger and pipes (`i_coolant_pumping=3`) [Pa] real(dp) :: dp_liq - !! pressure drop in liquid metal blanket coolant including heat exchanger and pipes (`primary_pumping=3`) [Pa] + !! pressure drop in liquid metal blanket coolant including heat exchanger and pipes (`i_coolant_pumping=3`) [Pa] real(dp) :: htpmw_fw_blkt !! mechanical pumping power for FW and blanket including heat exchanger and - !! pipes (`primary_pumping=3`) [MW] + !! pipes (`i_coolant_pumping=3`) [MW] contains diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 29e87420c2..1e539ea6cd 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -1104,7 +1104,7 @@ Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 - Switch_for_pumping_of_primary_coolant___________________________________ (primary_pumping)_____________ 3 + Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP Mechanical_pumping_power_for_FW_and_blanket_cooling_loop_including_heat_ (htpmw_fw_blkt)_______________ 1.6407E+02 OP @@ -1685,7 +1685,7 @@ fimp(14) = 0.000005 ipowerflow = 0 * Switch for pumping power for primary coolant -primary_pumping = 3 +i_coolant_pumping = 3 * Electrical efficiency of FW and blanket coolant pumps etahtp = 0.87 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 10441df5a4..240cc68075 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -1105,7 +1105,7 @@ Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 - Switch_for_pumping_of_primary_coolant___________________________________ (primary_pumping)_____________ 3 + Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP Mechanical_pumping_power_for_FW_and_blanket_cooling_loop_including_heat_ (htpmw_fw_blkt)_______________ 1.6407E+02 OP @@ -1686,7 +1686,7 @@ fimp(14) = 0.000005 ipowerflow = 0 * Switch for pumping power for primary coolant -primary_pumping = 3 +i_coolant_pumping = 3 * Electrical efficiency of FW and blanket coolant pumps etahtp = 0.87 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 16d213c12a..7559b8ef9a 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -1105,7 +1105,7 @@ Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 - Switch_for_pumping_of_primary_coolant___________________________________ (primary_pumping)_____________ 3 + Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP Mechanical_pumping_power_for_FW_and_blanket_cooling_loop_including_heat_ (htpmw_fw_blkt)_______________ 1.6407E+02 OP @@ -1686,7 +1686,7 @@ fimp(14) = 0.000005 ipowerflow = 0 * Switch for pumping power for primary coolant -primary_pumping = 3 +i_coolant_pumping = 3 * Electrical efficiency of FW and blanket coolant pumps etahtp = 0.87 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index dac3904172..b36be33162 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -1105,7 +1105,7 @@ Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 - Switch_for_pumping_of_primary_coolant___________________________________ (primary_pumping)_____________ 3 + Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP Mechanical_pumping_power_for_FW_and_blanket_cooling_loop_including_heat_ (htpmw_fw_blkt)_______________ 1.6407E+02 OP @@ -1686,7 +1686,7 @@ fimp(14) = 0.000005 ipowerflow = 0 * Switch for pumping power for primary coolant -primary_pumping = 3 +i_coolant_pumping = 3 * Electrical efficiency of FW and blanket coolant pumps etahtp = 0.87 diff --git a/tests/integration/data/large_tokamak_IN.DAT b/tests/integration/data/large_tokamak_IN.DAT index f190c6d13c..e9e1b96d9d 100644 --- a/tests/integration/data/large_tokamak_IN.DAT +++ b/tests/integration/data/large_tokamak_IN.DAT @@ -496,7 +496,7 @@ fimp(14) = 0.000005 ipowerflow = 0 * Switch for pumping power for primary coolant -primary_pumping = 3 +i_coolant_pumping = 3 * Electrical efficiency of FW and blanket coolant pumps etahtp = 0.87 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 2be77c29ef..b1b2400ca9 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -1108,7 +1108,7 @@ Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 - Switch_for_pumping_of_primary_coolant___________________________________ (primary_pumping)_____________ 3 + Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP Mechanical_pumping_power_for_FW_and_blanket_cooling_loop_including_heat_ (htpmw_fw_blkt)_______________ 1.6366E+02 OP @@ -1687,7 +1687,7 @@ fimp(14) = 0.000005 ipowerflow = 0 * Switch for pumping power for primary coolant -primary_pumping = 3 +i_coolant_pumping = 3 * Electrical efficiency of FW and blanket coolant pumps etahtp = 0.87 diff --git a/tests/integration/data/large_tokamak_once_through.IN.DAT b/tests/integration/data/large_tokamak_once_through.IN.DAT index b8cacf9f8f..21aa38fd9e 100644 --- a/tests/integration/data/large_tokamak_once_through.IN.DAT +++ b/tests/integration/data/large_tokamak_once_through.IN.DAT @@ -208,7 +208,7 @@ dz_divertor = 0.62 * divertor structure vertical thickness (m) inuclear = 1 * switch for nuclear heating in the coils; qnuc = 1.3e4 * nuclear heating in the coils (W) (`inuclear=1`) -primary_pumping = 3 * Switch for pumping power for primary coolant (mechanical power only and peak first wall +i_coolant_pumping = 3 * Switch for pumping power for primary coolant (mechanical power only and peak first wall secondary_cycle = 2 * Switch for power conversion cycle; vfshld = 0.60 * coolant void fraction in shield etaiso = 0.9 * isentropic efficiency of FW and blanket coolant pumps diff --git a/tests/integration/data/ref_IN.DAT b/tests/integration/data/ref_IN.DAT index 3b3863221d..908fa582b7 100644 --- a/tests/integration/data/ref_IN.DAT +++ b/tests/integration/data/ref_IN.DAT @@ -188,7 +188,7 @@ vfshld = 0.60 * Coolant void fraction in shield *-------------Heat Transport Variables-------------* ipowerflow = 0 * Switch for power flow model; HAS NO EFFECT? -primary_pumping = 3 * Switch for pumping power for primary coolant +i_coolant_pumping = 3 * Switch for pumping power for primary coolant etahtp = 0.87 * electrical efficiency of FW and blanket coolant pumps etaiso = 0.9 * isentropic efficiency of FW and blanket coolant pumps secondary_cycle = 2 * user input thermal-electric efficiency (etath) diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index cdf4b18cdd..ae6fd02397 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -1106,7 +1106,7 @@ Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 - Switch_for_pumping_of_primary_coolant___________________________________ (primary_pumping)_____________ 3 + Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP Mechanical_pumping_power_for_FW_and_blanket_cooling_loop_including_heat_ (htpmw_fw_blkt)_______________ 1.6156E+02 OP @@ -2269,7 +2269,7 @@ Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 - Switch_for_pumping_of_primary_coolant___________________________________ (primary_pumping)_____________ 3 + Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP Mechanical_pumping_power_for_FW_and_blanket_cooling_loop_including_heat_ (htpmw_fw_blkt)_______________ 1.6305E+02 OP @@ -3432,7 +3432,7 @@ Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 - Switch_for_pumping_of_primary_coolant___________________________________ (primary_pumping)_____________ 3 + Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP Mechanical_pumping_power_for_FW_and_blanket_cooling_loop_including_heat_ (htpmw_fw_blkt)_______________ 1.6403E+02 OP @@ -4595,7 +4595,7 @@ Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 - Switch_for_pumping_of_primary_coolant___________________________________ (primary_pumping)_____________ 3 + Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP Mechanical_pumping_power_for_FW_and_blanket_cooling_loop_including_heat_ (htpmw_fw_blkt)_______________ 1.6424E+02 OP @@ -5758,7 +5758,7 @@ Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 - Switch_for_pumping_of_primary_coolant___________________________________ (primary_pumping)_____________ 3 + Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP Mechanical_pumping_power_for_FW_and_blanket_cooling_loop_including_heat_ (htpmw_fw_blkt)_______________ 1.6438E+02 OP @@ -6921,7 +6921,7 @@ Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 - Switch_for_pumping_of_primary_coolant___________________________________ (primary_pumping)_____________ 3 + Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP Mechanical_pumping_power_for_FW_and_blanket_cooling_loop_including_heat_ (htpmw_fw_blkt)_______________ 1.6374E+02 OP @@ -8084,7 +8084,7 @@ Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 - Switch_for_pumping_of_primary_coolant___________________________________ (primary_pumping)_____________ 3 + Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP Mechanical_pumping_power_for_FW_and_blanket_cooling_loop_including_heat_ (htpmw_fw_blkt)_______________ 1.6404E+02 OP @@ -9247,7 +9247,7 @@ Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 - Switch_for_pumping_of_primary_coolant___________________________________ (primary_pumping)_____________ 3 + Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP Mechanical_pumping_power_for_FW_and_blanket_cooling_loop_including_heat_ (htpmw_fw_blkt)_______________ 1.6439E+02 OP @@ -10410,7 +10410,7 @@ Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 - Switch_for_pumping_of_primary_coolant___________________________________ (primary_pumping)_____________ 3 + Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP Mechanical_pumping_power_for_FW_and_blanket_cooling_loop_including_heat_ (htpmw_fw_blkt)_______________ 1.6385E+02 OP @@ -11573,7 +11573,7 @@ Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 - Switch_for_pumping_of_primary_coolant___________________________________ (primary_pumping)_____________ 3 + Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP Mechanical_pumping_power_for_FW_and_blanket_cooling_loop_including_heat_ (htpmw_fw_blkt)_______________ 1.6490E+02 OP @@ -12736,7 +12736,7 @@ Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 - Switch_for_pumping_of_primary_coolant___________________________________ (primary_pumping)_____________ 3 + Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP Mechanical_pumping_power_for_FW_and_blanket_cooling_loop_including_heat_ (htpmw_fw_blkt)_______________ 1.6587E+02 OP @@ -13899,7 +13899,7 @@ Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 - Switch_for_pumping_of_primary_coolant___________________________________ (primary_pumping)_____________ 3 + Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP Mechanical_pumping_power_for_FW_and_blanket_cooling_loop_including_heat_ (htpmw_fw_blkt)_______________ 1.6570E+02 OP @@ -15062,7 +15062,7 @@ Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 - Switch_for_pumping_of_primary_coolant___________________________________ (primary_pumping)_____________ 3 + Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP Mechanical_pumping_power_for_FW_and_blanket_cooling_loop_including_heat_ (htpmw_fw_blkt)_______________ 1.6658E+02 OP @@ -16225,7 +16225,7 @@ Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 - Switch_for_pumping_of_primary_coolant___________________________________ (primary_pumping)_____________ 3 + Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP Mechanical_pumping_power_for_FW_and_blanket_cooling_loop_including_heat_ (htpmw_fw_blkt)_______________ 1.6756E+02 OP @@ -17388,7 +17388,7 @@ Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 - Switch_for_pumping_of_primary_coolant___________________________________ (primary_pumping)_____________ 3 + Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP Mechanical_pumping_power_for_FW_and_blanket_cooling_loop_including_heat_ (htpmw_fw_blkt)_______________ 1.6860E+02 OP @@ -17973,7 +17973,7 @@ fimp(14) = 0.000005 ipowerflow = 0 * Switch for pumping power for primary coolant -primary_pumping = 3 +i_coolant_pumping = 3 * Electrical efficiency of FW and blanket coolant pumps etahtp = 0.87 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 4dbd734c69..58c135f601 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -932,7 +932,7 @@ Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 - Switch_for_pumping_of_primary_coolant___________________________________ (primary_pumping)_____________ 3 + Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP Mechanical_pumping_power_for_FW_and_blanket_cooling_loop_including_heat_ (htpmw_fw_blkt)_______________ 2.0197E+02 OP @@ -1927,7 +1927,7 @@ Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 - Switch_for_pumping_of_primary_coolant___________________________________ (primary_pumping)_____________ 3 + Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP Mechanical_pumping_power_for_FW_and_blanket_cooling_loop_including_heat_ (htpmw_fw_blkt)_______________ 2.0197E+02 OP @@ -2922,7 +2922,7 @@ Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 - Switch_for_pumping_of_primary_coolant___________________________________ (primary_pumping)_____________ 3 + Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP Mechanical_pumping_power_for_FW_and_blanket_cooling_loop_including_heat_ (htpmw_fw_blkt)_______________ 2.0197E+02 OP @@ -3917,7 +3917,7 @@ Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 - Switch_for_pumping_of_primary_coolant___________________________________ (primary_pumping)_____________ 3 + Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP Mechanical_pumping_power_for_FW_and_blanket_cooling_loop_including_heat_ (htpmw_fw_blkt)_______________ 2.0197E+02 OP @@ -4912,7 +4912,7 @@ Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 - Switch_for_pumping_of_primary_coolant___________________________________ (primary_pumping)_____________ 3 + Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP Mechanical_pumping_power_for_FW_and_blanket_cooling_loop_including_heat_ (htpmw_fw_blkt)_______________ 2.0197E+02 OP @@ -5907,7 +5907,7 @@ Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 - Switch_for_pumping_of_primary_coolant___________________________________ (primary_pumping)_____________ 3 + Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP Mechanical_pumping_power_for_FW_and_blanket_cooling_loop_including_heat_ (htpmw_fw_blkt)_______________ 2.0197E+02 OP @@ -6902,7 +6902,7 @@ Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 - Switch_for_pumping_of_primary_coolant___________________________________ (primary_pumping)_____________ 3 + Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP Mechanical_pumping_power_for_FW_and_blanket_cooling_loop_including_heat_ (htpmw_fw_blkt)_______________ 2.0197E+02 OP @@ -7897,7 +7897,7 @@ Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 - Switch_for_pumping_of_primary_coolant___________________________________ (primary_pumping)_____________ 3 + Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP Mechanical_pumping_power_for_FW_and_blanket_cooling_loop_including_heat_ (htpmw_fw_blkt)_______________ 2.0197E+02 OP @@ -8892,7 +8892,7 @@ Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 - Switch_for_pumping_of_primary_coolant___________________________________ (primary_pumping)_____________ 3 + Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP Mechanical_pumping_power_for_FW_and_blanket_cooling_loop_including_heat_ (htpmw_fw_blkt)_______________ 2.0197E+02 OP @@ -9167,7 +9167,7 @@ vfshld = 0.60 * Coolant void fraction in shield *-------------Heat Transport Variables-------------* ipowerflow = 0 * Switch for power flow model; HAS NO EFFECT? -primary_pumping = 3 * Switch for pumping power for primary coolant +i_coolant_pumping = 3 * Switch for pumping power for primary coolant etahtp = 0.87 * electrical efficiency of FW and blanket coolant pumps etaiso = 0.9 * isentropic efficiency of FW and blanket coolant pumps secondary_cycle = 2 * user input thermal-electric efficiency (etath) diff --git a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT index 2c4cd8923a..5a2fdcc890 100644 --- a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT +++ b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT @@ -188,7 +188,7 @@ vfshld = 0.60 * Coolant void fraction in shield *-------------Heat Transport Variables-------------* ipowerflow = 0 * Switch for power flow model; HAS NO EFFECT? -primary_pumping = 3 * Switch for pumping power for primary coolant +i_coolant_pumping = 3 * Switch for pumping power for primary coolant etahtp = 0.87 * electrical efficiency of FW and blanket coolant pumps etaiso = 0.9 * isentropic efficiency of FW and blanket coolant pumps secondary_cycle = 2 * user input thermal-electric efficiency (etath) diff --git a/tests/integration/data/uncertainties_ref_IN.DAT b/tests/integration/data/uncertainties_ref_IN.DAT index 728d1a8d41..d42179292a 100644 --- a/tests/integration/data/uncertainties_ref_IN.DAT +++ b/tests/integration/data/uncertainties_ref_IN.DAT @@ -188,7 +188,7 @@ vfshld = 0.60 * Coolant void fraction in shield *-------------Heat Transport Variables-------------* ipowerflow = 0 * Switch for power flow model; HAS NO EFFECT? -primary_pumping = 3 * Switch for pumping power for primary coolant +i_coolant_pumping = 3 * Switch for pumping power for primary coolant etahtp = 0.87 * electrical efficiency of FW and blanket coolant pumps etaiso = 0.9 * isentropic efficiency of FW and blanket coolant pumps secondary_cycle = 2 * user input thermal-electric efficiency (etath) diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index bb9958fb81..7bf7c3f4a0 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3619,7 +3619,7 @@ "p_tf_leg_resistive": 0.0, "pressure0": 0.0, "priheat": 0.0, - "primary_pumping": 2.0, + "i_coolant_pumping": 2.0, "prn1": 0.285, "profcalc": null, "f_nd_protium_electrons": 0.0, @@ -9332,7 +9332,7 @@ "dp_bu_ob": "", "dp_bz_ib": "", "dp_bz_ob": "", - "dp_he": "pressure drop in FW and blanket coolant including heat exchanger and pipes (`primary_pumping=3`) [Pa]", + "dp_he": "pressure drop in FW and blanket coolant including heat exchanger and pipes (`i_coolant_pumping=3`) [Pa]", "dp_mf_ib": "", "dp_mf_ob": "", "dr_bb_ib": "", @@ -9707,7 +9707,7 @@ "gamcd": "normalised current drive efficiency (1.0e20 A/(W m^2))", "ejima_coeff": "Ejima coefficient for resistive startup V-s formula", "gamma_ecrh": "User input ECRH gamma (1.0e20 A/(W m^2))", - "gamma_he": "ratio of specific heats for helium (`primary_pumping=3`)", + "gamma_he": "ratio of specific heats for helium (`i_coolant_pumping=3`)", "f_beta_alpha_beam_thermal": "ratio of (fast alpha + neutral beam beta) to thermal beta", "gammax": "maximum current drive gamma (`constraint equation 37`)", "dr_shld_vv_gap_inboard": "gap between inboard vacuum vessel and thermal shield (m) (`iteration variable 61`)", @@ -9767,7 +9767,7 @@ "htpmw_blkto": "Inboard/outboard blanket pumping power (MW)", "htpmw_div": "divertor coolant mechanical pumping power (MW)", "htpmw_fw": "first wall coolant mechanical pumping power (MW)", - "htpmw_fw_blkt": "mechanical pumping power for FW and blanket including heat exchanger and\n pipes (`primary_pumping=3`) [MW]", + "htpmw_fw_blkt": "mechanical pumping power for FW and blanket including heat exchanger and\n pipes (`i_coolant_pumping=3`) [MW]", "htpmw_fwi": "Inboard/outboard first wall pumping power (MW)", "htpmw_fwo": "Inboard/outboard first wall pumping power (MW)", "htpmw_ife": "IFE heat transport system electrical pump power (MW)", @@ -10228,7 +10228,7 @@ "pUImw": "", "pUOmw": "", "p_": "", - "p_he": "pressure in FW and blanket coolant at pump exit (`primary_pumping=3`) [Pa]", + "p_he": "pressure in FW and blanket coolant at pump exit (`i_coolant_pumping=3`) [Pa]", "pacpmw": "total pulsed power system load (MW)", "alpha_power_electron_density": "alpha power per volume to electrons (MW/m3)", "p_fw_alpha_mw": "alpha power escaping plasma and reaching first wall (MW)", @@ -10371,7 +10371,7 @@ "p_tf_leg_resistive": "Summed resistive power in the TF coil legs [W]. Remain 0 if `itart=0`.", "pressure0": "Total plasma pressure near target (thermal+dynamic) [Pa]", "priheat": "total thermal power removed from fusion core (MW)", - "primary_pumping": "Switch for pumping power for primary coolant (mechanical power only and peak first wall\n temperature is only calculated if `primary_pumping=2`):\n
    \n
  • =0 User sets pump power directly (htpmw_blkt, htpmw_fw, htpmw_div, htpmw_shld)
    • \n
  • =1 User sets pump power as a fraction of thermal power (fpumpblkt, fpumpfw, fpumpdiv, fpumpshld)
    • \n
  • =2 Mechanical pumping power is calculated
    • \n
  • =3 Mechanical pumping power is calculated using specified pressure drop
    • \n
", + "i_coolant_pumping": "Switch for pumping power for primary coolant (mechanical power only and peak first wall\n temperature is only calculated if `i_coolant_pumping=2`):\n
    \n
  • =0 User sets pump power directly (htpmw_blkt, htpmw_fw, htpmw_div, htpmw_shld)
    • \n
  • =1 User sets pump power as a fraction of thermal power (fpumpblkt, fpumpfw, fpumpdiv, fpumpshld)
    • \n
  • =2 Mechanical pumping power is calculated
    • \n
  • =3 Mechanical pumping power is calculated using specified pressure drop
    • \n
", "prn1": "n-scrape-off / n-average plasma; (input for `ipedestal=0`, = nesep/dene if `ipedestal>=1`)", "profcalc": "", "f_nd_protium_electrons": "Seeded f_nd_protium_electrons density / electron density.", @@ -10702,10 +10702,10 @@ "t_crack_radial": "Initial depth of crack in thickness of conduit (m)", "t_crack_vertical": "Inital vertical crack size (m)", "t_crit_nbti": "critical temperature of GL_nbti", - "t_in_bb": "temperature in FW and blanket coolant at blanket entrance (`primary_pumping=3`) [K]", + "t_in_bb": "temperature in FW and blanket coolant at blanket entrance (`i_coolant_pumping=3`) [K]", "t_lat_case_av": "Average lateral casing thickness [m]", "t_operation": "Operational time (yrs)", - "t_out_bb": "temperature in FW and blanket coolant at blanket exit (`primary_pumping=3`) [K]", + "t_out_bb": "temperature in FW and blanket coolant at blanket exit (`i_coolant_pumping=3`) [K]", "t_plant": "Plant lifetime [FPY]", "t_structural_radial": "Thickness of CS conductor conduit (m)", "t_structural_vertical": "Vertical thickness of CS conductor conduit (m)", @@ -13961,7 +13961,7 @@ "lb": 0.0, "ub": 10.0 }, - "primary_pumping": { + "i_coolant_pumping": { "lb": 0, "ub": 3 }, @@ -18076,7 +18076,7 @@ "whtblbreed", "whtblbe", "iblanket_thickness", - "primary_pumping", + "i_coolant_pumping", "i_shield_mat", "secondary_cycle", "i_blkt_coolant_type", @@ -20616,7 +20616,7 @@ "poisson_steel": "real_variable", "powfmax": "real_variable", "prdiv": "real_variable", - "primary_pumping": "int_variable", + "i_coolant_pumping": "int_variable", "prn1": "real_variable", "f_nd_protium_electrons": "real_variable", "psepbqarmax": "real_variable", diff --git a/tests/regression/input_files/helias_5b.IN.DAT b/tests/regression/input_files/helias_5b.IN.DAT index 9f81a1c3a1..9262c7a8e3 100644 --- a/tests/regression/input_files/helias_5b.IN.DAT +++ b/tests/regression/input_files/helias_5b.IN.DAT @@ -130,7 +130,7 @@ fwclfr = 0.1 *First wall coolant fraction htpmw_blkt = 120.0 *Blanket coolant mechanical pumping power (MW) htpmw_fw = 56.0 *First wall coolant mechanical pumping power (MW) htpmw_div = 24.0 *Divertor coolant mechanical pumping power (MW) -primary_pumping = 0 *Switch for pumping power (0: User sets pump power directly) +i_coolant_pumping = 0 *Switch for pumping power (0: User sets pump power directly) secondary_cycle = 2 *Switch for power conversion cycle (2: user input thermal-electric efficiency) vfblkt = 0.10 *Coolant void fraction in blanket (blktmodel=0) vfshld = 0.60 *Coolant void fraction in shield diff --git a/tests/regression/input_files/large_tokamak.IN.DAT b/tests/regression/input_files/large_tokamak.IN.DAT index cb8a527d7b..651df996d6 100644 --- a/tests/regression/input_files/large_tokamak.IN.DAT +++ b/tests/regression/input_files/large_tokamak.IN.DAT @@ -496,7 +496,7 @@ fimp(14) = 0.000005 ipowerflow = 0 * Switch for pumping power for primary coolant -primary_pumping = 3 +i_coolant_pumping = 3 * Electrical efficiency of FW and blanket coolant pumps etahtp = 0.87 diff --git a/tests/regression/input_files/large_tokamak_nof.IN.DAT b/tests/regression/input_files/large_tokamak_nof.IN.DAT index e180f79865..91c2ed441b 100644 --- a/tests/regression/input_files/large_tokamak_nof.IN.DAT +++ b/tests/regression/input_files/large_tokamak_nof.IN.DAT @@ -478,7 +478,7 @@ fimp(14) = 0.000005 ipowerflow = 0 * Switch for pumping power for primary coolant -primary_pumping = 3 +i_coolant_pumping = 3 * Electrical efficiency of FW and blanket coolant pumps etahtp = 0.87 diff --git a/tests/regression/input_files/large_tokamak_once_through.IN.DAT b/tests/regression/input_files/large_tokamak_once_through.IN.DAT index 2f911da8a3..0c896c74d1 100644 --- a/tests/regression/input_files/large_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/large_tokamak_once_through.IN.DAT @@ -208,7 +208,7 @@ dz_divertor = 0.62 * divertor structure vertical thickness (m) inuclear = 1 * switch for nuclear heating in the coils; qnuc = 1.3e4 * nuclear heating in the coils (W) (`inuclear=1`) -primary_pumping = 3 * Switch for pumping power for primary coolant (mechanical power only and peak first wall +i_coolant_pumping = 3 * Switch for pumping power for primary coolant (mechanical power only and peak first wall secondary_cycle = 2 * Switch for power conversion cycle; vfshld = 0.60 * coolant void fraction in shield etaiso = 0.9 * isentropic efficiency of FW and blanket coolant pumps diff --git a/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT b/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT index 44f5994289..dacd4232b9 100644 --- a/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT @@ -232,7 +232,7 @@ fw_armour_thickness = 0.003 * first wall armour thickness [m] i_blanket_type = 1 * switch for blanket model; i_blkt_inboard = 0 * switch for inboard blanket; inuclear = 0 * switch for nuclear heating in the coils; -primary_pumping = 3 * Switch for pumping power for primary coolant (mechanical power only and peak first wall +i_coolant_pumping = 3 * Switch for pumping power for primary coolant (mechanical power only and peak first wall secondary_cycle = 2 * Switch for power conversion cycle; i_fw_coolant_type = helium * switch for first wall coolant (can be different from blanket coolant); etaiso = 0.9 * isentropic efficiency of FW and blanket coolant pumps diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 495bb89fbe..8813ed1c40 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2236,9 +2236,9 @@ i_fw_blkt_vv_shape = 1 * DESCRIPTION: FW, Blanket, Shield & VV Shape (1: D-shaped (Cylinder Inboard & Ellipse Outboard)) * JUSTIFICATION: Unknown, tapered centrepost may justify ellises (option 2) -primary_pumping = 3 +i_coolant_pumping = 3 * DESCRIPTION: Switch for Pumping Power for Primary Coolant (mechanical power only and peak first wall -* temperature is only calculated if primary_pumping=2): +* temperature is only calculated if i_coolant_pumping=2): * =0 User sets pump power directly (htpmw_blkt, htpmw_fw, htpmw_div, htpmw_shld) * =1 User sets pump power as a fraction of thermal power (fpumpblkt, fpumpfw, fpumpdiv, fpumpshld) * =2 Mechanical pumping power is calculated @@ -2256,37 +2256,37 @@ i_fw_blkt_shared_coolant = 0 *htpmw_blkt = * DESCRIPTION: Blanket coolant mechanical pumping power (MW) -* JUSTIFICATION: Not used as, primary_pumping is not = 0 +* JUSTIFICATION: Not used as, i_coolant_pumping is not = 0 *htpmw_div = * DESCRIPTION: Divertor coolant mechanical pumping power (MW) -* JUSTIFICATION: Not used as, primary_pumping is not = 0 +* JUSTIFICATION: Not used as, i_coolant_pumping is not = 0 *htpmw_fw = * DESCRIPTION: First wall coolant mechanical pumping power (MW) -* JUSTIFICATION: Not used as, primary_pumping is not = 0 +* JUSTIFICATION: Not used as, i_coolant_pumping is not = 0 *htpmw_shld = * DESCRIPTION: Shield and vacuum vessel coolant mechanical pumping power (MW) -* JUSTIFICATION: Not used as, primary_pumping is not = 0 +* JUSTIFICATION: Not used as, i_coolant_pumping is not = 0 *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *fpumpfw = 0.025 * 0.01 * 0.005 * DESCRIPTION: fraction of total first wall thermal power required to drive the FW coolant -* JUSTIFICATION: Liquid metal pumping power (if primary_pumping == 1) +* JUSTIFICATION: Liquid metal pumping power (if i_coolant_pumping == 1) *fpumpshld = 0.025 * 0.01 * 0.005 * DESCRIPTION: fraction of total shield thermal power required to drive the shield coolant -* JUSTIFICATION: Liquid metal pumping power (if primary_pumping == 1) +* JUSTIFICATION: Liquid metal pumping power (if i_coolant_pumping == 1) *fpumpblkt = 0.025 * 0.01 * 0.005 * DESCRIPTION: fraction of total blanket thermal power required to drive the blanket -* JUSTIFICATION: Liquid metal pumping power (if primary_pumping == 1) +* JUSTIFICATION: Liquid metal pumping power (if i_coolant_pumping == 1) *fpumpdiv = 0.025 * 0.01 * 0.005 * DESCRIPTION: fraction of total divertor thermal power required to drive the divertor -* JUSTIFICATION: Liquid metal pumping power (if primary_pumping == 1) +* JUSTIFICATION: Liquid metal pumping power (if i_coolant_pumping == 1) *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -2374,7 +2374,7 @@ i_blanket_type = 1 * =4 KIT HCLL model * =5 DCLL model - no nutronics model included (in development) please check/choose values for * 'dual-coolant blanket' fractions (provided in this file). -* please use primary_pumping = 0 or 1. +* please use i_coolant_pumping = 0 or 1. * JUSTIFICATION: Assuming DCLL blanket *iblanket_thickness = @@ -2496,15 +2496,15 @@ inuclear = 0 * JUSTIFICATION: Not yet set *t_in_bb = -* DESCRIPTION: Temperature in FW and blanket coolant at blanket entrance (`primary_pumping=3`) [K] (Default value in code 573.13D0) +* DESCRIPTION: Temperature in FW and blanket coolant at blanket entrance (`i_coolant_pumping=3`) [K] (Default value in code 573.13D0) * JUSTIFICATION: Design Spec *t_out_bb = -* DESCRIPTION: Temperature in FW and blanket coolant at blanket exit (`primary_pumping=3`) [K] (Default value in code 773.13D0) +* DESCRIPTION: Temperature in FW and blanket coolant at blanket exit (`i_coolant_pumping=3`) [K] (Default value in code 773.13D0) * JUSTIFICATION: Design Spec *dp_he = -* DESCRIPTION: Pressure drop in FW and blanket coolant including heat exchanger and pipes (`primary_pumping=3`) [Pa] (Default value in code 5.5D5) +* DESCRIPTION: Pressure drop in FW and blanket coolant including heat exchanger and pipes (`i_coolant_pumping=3`) [Pa] (Default value in code 5.5D5) * JUSTIFICATION: Design Spec *p_he = diff --git a/tests/regression/input_files/stellarator_helias_once_through.IN.DAT b/tests/regression/input_files/stellarator_helias_once_through.IN.DAT index c0dd7a25de..1af548c3f6 100644 --- a/tests/regression/input_files/stellarator_helias_once_through.IN.DAT +++ b/tests/regression/input_files/stellarator_helias_once_through.IN.DAT @@ -193,7 +193,7 @@ emult = 1.3 * energy multiplication in blanket and shield fblss = 0.13 * KIT blanket model; steel fraction of breeding zone fhole = 0. * area fraction taken up by other holes (IFE) fblbe = 0.47 * beryllium fraction of blanket by volume (if `iblanket=2`; is Be fraction of breeding zone) -primary_pumping = 0 * Switch for pumping power for primary coolant (mechanical power only and peak first wall +i_coolant_pumping = 0 * Switch for pumping power for primary coolant (mechanical power only and peak first wall secondary_cycle = 2 * Switch for power conversion cycle; fwclfr = 0.1 * first wall coolant fraction (calculated if `lpulse=1` or `ipowerflow=1`) vfshld = 0.6 * coolant void fraction in shield diff --git a/tests/unit/data/large_tokamak_IN.DAT b/tests/unit/data/large_tokamak_IN.DAT index cba5b8c396..412c7ad90d 100644 --- a/tests/unit/data/large_tokamak_IN.DAT +++ b/tests/unit/data/large_tokamak_IN.DAT @@ -497,7 +497,7 @@ fimp(14) = 0.000005 ipowerflow = 0 * Switch for pumping power for primary coolant -primary_pumping = 3 +i_coolant_pumping = 3 * Electrical efficiency of FW and blanket coolant pumps etahtp = 0.87 diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 7e24270d04..c154e17261 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -1108,7 +1108,7 @@ Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 - Switch_for_pumping_of_primary_coolant___________________________________ (primary_pumping)_____________ 3 + Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP Mechanical_pumping_power_for_FW_and_blanket_cooling_loop_including_heat_ (htpmw_fw_blkt)_______________ 1.6366E+02 OP @@ -1688,7 +1688,7 @@ fimp(14) = 0.000005 ipowerflow = 0 * Switch for pumping power for primary coolant -primary_pumping = 3 +i_coolant_pumping = 3 * Electrical efficiency of FW and blanket coolant pumps etahtp = 0.87 diff --git a/tests/unit/test_ccfe_hcpb.py b/tests/unit/test_ccfe_hcpb.py index 82b111e0fe..5d4dade37f 100644 --- a/tests/unit/test_ccfe_hcpb.py +++ b/tests/unit/test_ccfe_hcpb.py @@ -812,7 +812,7 @@ class PowerflowCalcParam(NamedTuple): pres_blkt_coolant: Any = None - primary_pumping: Any = None + i_coolant_pumping: Any = None p_fw_nuclear_heat_total_mw: Any = None @@ -900,7 +900,7 @@ class PowerflowCalcParam(NamedTuple): i_blkt_coolant_type=1, temp_blkt_coolant_out=823, pres_blkt_coolant=15500000, - primary_pumping=3, + i_coolant_pumping=3, p_fw_nuclear_heat_total_mw=276.80690153753221, p_blkt_nuclear_heat_total_mw=1504.9215740808861, pnucdiv=182.71773382328519, @@ -949,7 +949,7 @@ class PowerflowCalcParam(NamedTuple): i_blkt_coolant_type=1, temp_blkt_coolant_out=823, pres_blkt_coolant=15500000, - primary_pumping=3, + i_coolant_pumping=3, p_fw_nuclear_heat_total_mw=230.98304919926957, p_blkt_nuclear_heat_total_mw=1550.1447895848396, pnucdiv=182.66070017727785, @@ -1036,7 +1036,7 @@ def test_powerflow_calc(powerflowcalcparam, monkeypatch, ccfe_hcpb): ) monkeypatch.setattr( - fwbs_variables, "primary_pumping", powerflowcalcparam.primary_pumping + fwbs_variables, "i_coolant_pumping", powerflowcalcparam.i_coolant_pumping ) monkeypatch.setattr( diff --git a/tests/unit/test_power.py b/tests/unit/test_power.py index 7671a76dda..c89fc9506d 100644 --- a/tests/unit/test_power.py +++ b/tests/unit/test_power.py @@ -2067,7 +2067,7 @@ class Power2Param(NamedTuple): pnucdiv: Any = None - primary_pumping: Any = None + i_coolant_pumping: Any = None ptfnuc: Any = None @@ -2255,7 +2255,7 @@ class Power2Param(NamedTuple): secondary_cycle=2, pnuc_cp=0, pnucdiv=182.69222981118057, - primary_pumping=3, + i_coolant_pumping=3, ptfnuc=0.044178296011112193, pnuchcd=0, pnucshld=1.3609360176065353, @@ -2357,7 +2357,7 @@ class Power2Param(NamedTuple): secondary_cycle=2, pnuc_cp=0, pnucdiv=182.6352084763719, - primary_pumping=3, + i_coolant_pumping=3, ptfnuc=0.045535131445547841, pnuchcd=0, pnucshld=1.4036212304705389, @@ -2494,7 +2494,7 @@ def test_power2(power2param, monkeypatch, power): monkeypatch.setattr(fwbs_variables, "pnucdiv", power2param.pnucdiv) - monkeypatch.setattr(fwbs_variables, "primary_pumping", power2param.primary_pumping) + monkeypatch.setattr(fwbs_variables, "i_coolant_pumping", power2param.i_coolant_pumping) monkeypatch.setattr(fwbs_variables, "ptfnuc", power2param.ptfnuc) From da1b58a8dd61cfa56db3d456709abe57734a6287 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Mon, 17 Feb 2025 16:50:26 +0000 Subject: [PATCH 25/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20secondary=5Fcycle?= =?UTF-8?q?=20to=20i=5Fthermal=5Felectric=5Fconversion=20for=20clarity=20a?= =?UTF-8?q?nd=20consistency=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proc-pages/eng-models/fw-blanket.md | 2 +- ...conversion-and-heat-dissipation-systems.md | 12 +++---- .../proc-pages/fusion-devices/stellarator.md | 2 +- .../data/csv_output_large_tokamak_MFILE.DAT | 4 +-- examples/data/large_tokamak_1_MFILE.DAT | 4 +-- examples/data/large_tokamak_2_MFILE.DAT | 4 +-- examples/data/large_tokamak_3_MFILE.DAT | 4 +-- examples/data/large_tokamak_4_MFILE.DAT | 4 +-- examples/data/large_tokamak_IN.DAT | 2 +- examples/data/scan_MFILE.DAT | 20 +++++------ examples/data/scan_example_file_IN.DAT | 2 +- process/blanket_library.py | 2 +- process/dcll.py | 4 +-- process/hcpb.py | 4 +-- process/power.py | 28 +++++++-------- process/stellarator.py | 6 ++-- source/fortran/constraint_equations.f90 | 2 +- source/fortran/fwbs_variables.f90 | 22 ++++++------ source/fortran/heat_transport_variables.f90 | 8 ++--- source/fortran/input.f90 | 6 ++-- .../data/large_tokamak_1_MFILE.DAT | 4 +-- .../data/large_tokamak_2_MFILE.DAT | 4 +-- .../data/large_tokamak_3_MFILE.DAT | 4 +-- .../data/large_tokamak_4_MFILE.DAT | 4 +-- tests/integration/data/large_tokamak_IN.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 4 +-- .../data/large_tokamak_once_through.IN.DAT | 4 +-- tests/integration/data/ref_IN.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 32 ++++++++--------- tests/integration/data/scan_MFILE.DAT | 20 +++++------ .../data/uncertainties_nonopt_ref_IN.DAT | 2 +- .../integration/data/uncertainties_ref_IN.DAT | 2 +- tests/integration/ref_dicts.json | 36 +++++++++---------- tests/regression/input_files/helias_5b.IN.DAT | 2 +- .../input_files/large_tokamak.IN.DAT | 2 +- .../input_files/large_tokamak_nof.IN.DAT | 2 +- .../large_tokamak_once_through.IN.DAT | 4 +-- .../spherical_tokamak_once_through.IN.DAT | 4 +-- .../input_files/st_regression.IN.DAT | 20 +++++------ .../stellarator_helias_once_through.IN.DAT | 4 +-- tests/unit/data/large_tokamak_IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 4 +-- tests/unit/test_power.py | 8 ++--- 43 files changed, 157 insertions(+), 157 deletions(-) diff --git a/documentation/proc-pages/eng-models/fw-blanket.md b/documentation/proc-pages/eng-models/fw-blanket.md index 71f4902ae1..6fe4c8930f 100644 --- a/documentation/proc-pages/eng-models/fw-blanket.md +++ b/documentation/proc-pages/eng-models/fw-blanket.md @@ -60,7 +60,7 @@ electricity have been revised extensively. - `MEDIUM` -- 1.261 - `THICK` -- 1.264. -`secondary_cycle` -- This switch controls how the coolant pumping power in the +`i_thermal_electric_conversion` -- This switch controls how the coolant pumping power in the first wall and blanket is determined, and also how the calculation of the plant's thermal to electric conversion efficiency (the secondary cycle thermal efficiency) proceeds. diff --git a/documentation/proc-pages/eng-models/power-conversion-and-heat-dissipation-systems.md b/documentation/proc-pages/eng-models/power-conversion-and-heat-dissipation-systems.md index 19a5ff9b8e..0c72ee5331 100644 --- a/documentation/proc-pages/eng-models/power-conversion-and-heat-dissipation-systems.md +++ b/documentation/proc-pages/eng-models/power-conversion-and-heat-dissipation-systems.md @@ -75,19 +75,19 @@ for the primary coolant. - The defaults for these variables are geared towards a WCLL concept, so different values should be used with Helium cooling. -`secondary_cycle` : This switch controls the calculation of the thermal to electric conversion +`i_thermal_electric_conversion` : This switch controls the calculation of the thermal to electric conversion efficiency in the secondary cycle. - - If `secondary_cycle` = 0, the efficiency of the power generation cycle is set to a single value + - If `i_thermal_electric_conversion` = 0, the efficiency of the power generation cycle is set to a single value obtained from previous cycle modelling studies. The heat deposited in the Toroidal Field coils divertor coolant is assumed to be at such low temperature that it cannot be used for power generation and is dumped to the environment. - - In the remaining options (`secondary_cycle` = 1, 2 or 3), the heat deposited in the divertor + - In the remaining options (`i_thermal_electric_conversion` = 1, 2 or 3), the heat deposited in the divertor coolant is used for power generation - If `secondary cycle` = 1, the efficiency of the power generation cycle is set as above, but the divertor heat is used for electricity generation. - - If `secondary_cycle` = 2, the efficiency of the power generation cycle is input by the user. - - If `secondary_cycle` = 3, a steam Rankine cycle is assumed. The secondary cycle thermal + - If `i_thermal_electric_conversion` = 2, the efficiency of the power generation cycle is input by the user. + - If `i_thermal_electric_conversion` = 3, a steam Rankine cycle is assumed. The secondary cycle thermal efficiency (`etath`) is calculated from the coolant outlet temperature using simple relations between temperature and efficiency[^1]: @@ -96,7 +96,7 @@ efficiency in the secondary cycle. \eta & = & -0.8002 + 0.1802 \, \mathrm{ln}(T) \,\, \mathrm{(helium \, coolant; superheated \, steam \, Rankine \, cycle)} \end{eqnarray*}$ - - If `secondary_cycle` = 4, a supercritical CO$_2$ Brayton cycle is assumed. The secondary cycle + - If `i_thermal_electric_conversion` = 4, a supercritical CO$_2$ Brayton cycle is assumed. The secondary cycle efficiency (`etath`) is calculated from the coolant outlet temperature using simple relations between temperature and efficiency from [^1]: diff --git a/documentation/proc-pages/fusion-devices/stellarator.md b/documentation/proc-pages/fusion-devices/stellarator.md index 15f971b734..3715d0dcc2 100644 --- a/documentation/proc-pages/fusion-devices/stellarator.md +++ b/documentation/proc-pages/fusion-devices/stellarator.md @@ -269,7 +269,7 @@ i_coolant_pumping = 1 *Switch for pumping power (0: User sets pump power directl htpmw_blkt = 120. *Blanket coolant mechanical pumping power (MW) htpmw_fw = 56. *First wall coolant mechanical pumping power (MW) htpmw_div = 24. *Divertor coolant mechanical pumping power (MW) -secondary_cycle = 2 *Switch for power conversion cycle (2: user input thermal-electric efficiency) +i_thermal_electric_conversion = 2 *Switch for power conversion cycle (2: user input thermal-electric efficiency) vfblkt = 0.1 *Coolant void fraction in blanket (blktmodel=0) (only relevant for mass calculations) vfshld = 0.6 *Coolant void fraction in shield declblkt = 0.075 *Neutron decay length in blanket area (m) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 721fb223e6..fd285d14ec 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -982,7 +982,7 @@ Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP 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 + Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 5.0000E+00 @@ -1701,7 +1701,7 @@ etahtp = 0.87 etaiso = 0.9 * Switch for secondary cycle - User input thermal-electric efficiency -secondary_cycle = 2 +i_thermal_electric_conversion = 2 * Thermal to electric conversion efficiency etath = 0.4 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 1e31dbf67f..b573ca34e6 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -977,7 +977,7 @@ Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP 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 + Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 5.0000E+00 @@ -1695,7 +1695,7 @@ etahtp = 0.87 etaiso = 0.9 * Switch for secondary cycle - User input thermal-electric efficiency -secondary_cycle = 2 +i_thermal_electric_conversion = 2 * Thermal to electric conversion efficiency etath = 0.4 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 552a538de7..ff881a5996 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -977,7 +977,7 @@ Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP 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 + Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 5.0000E+00 @@ -1695,7 +1695,7 @@ etahtp = 0.87 etaiso = 0.9 * Switch for secondary cycle - User input thermal-electric efficiency -secondary_cycle = 2 +i_thermal_electric_conversion = 2 * Thermal to electric conversion efficiency etath = 0.4 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 142693f709..547619c784 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -977,7 +977,7 @@ Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP 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 + Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 5.0000E+00 @@ -1696,7 +1696,7 @@ etahtp = 0.87 etaiso = 0.9 * Switch for secondary cycle - User input thermal-electric efficiency -secondary_cycle = 2 +i_thermal_electric_conversion = 2 * Thermal to electric conversion efficiency etath = 0.4 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index a8be6d5f52..a9921941ad 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -977,7 +977,7 @@ Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP 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 + Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 5.0000E+00 @@ -1696,7 +1696,7 @@ etahtp = 0.87 etaiso = 0.9 * Switch for secondary cycle - User input thermal-electric efficiency -secondary_cycle = 2 +i_thermal_electric_conversion = 2 * Thermal to electric conversion efficiency etath = 0.4 diff --git a/examples/data/large_tokamak_IN.DAT b/examples/data/large_tokamak_IN.DAT index 8dcf0f9eb1..5a8e12fc6d 100644 --- a/examples/data/large_tokamak_IN.DAT +++ b/examples/data/large_tokamak_IN.DAT @@ -506,7 +506,7 @@ etahtp = 0.87 etaiso = 0.9 * Switch for secondary cycle - User input thermal-electric efficiency -secondary_cycle = 2 +i_thermal_electric_conversion = 2 * Thermal to electric conversion efficiency etath = 0.4 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 645b5a251e..10fd6f80a7 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -806,7 +806,7 @@ Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP 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 + Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 @@ -1801,7 +1801,7 @@ Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP 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 + Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 @@ -2796,7 +2796,7 @@ Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP 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 + Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 @@ -3791,7 +3791,7 @@ Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP 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 + Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 @@ -4786,7 +4786,7 @@ Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP 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 + Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 @@ -5781,7 +5781,7 @@ Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP 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 + Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 @@ -6776,7 +6776,7 @@ Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP 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 + Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 @@ -7771,7 +7771,7 @@ Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP 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 + Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 @@ -8766,7 +8766,7 @@ Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP 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 + Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 @@ -9170,7 +9170,7 @@ ipowerflow = 0 * Switch for power flow model; HAS NO EFFECT? i_coolant_pumping = 3 * Switch for pumping power for primary coolant etahtp = 0.87 * electrical efficiency of FW and blanket coolant pumps etaiso = 0.9 * isentropic efficiency of FW and blanket coolant pumps -secondary_cycle = 2 * user input thermal-electric efficiency (etath) +i_thermal_electric_conversion = 2 * user input thermal-electric efficiency (etath) iprimshld = 1 * switch for shield thermal power destiny: = 1 contributes to energy generation cycle etath = 0.375D0 * thermal to electric conversion efficiency diff --git a/examples/data/scan_example_file_IN.DAT b/examples/data/scan_example_file_IN.DAT index a7e46de70e..e415f46bed 100644 --- a/examples/data/scan_example_file_IN.DAT +++ b/examples/data/scan_example_file_IN.DAT @@ -506,7 +506,7 @@ etahtp = 0.87 etaiso = 0.9 * Switch for secondary cycle - User input thermal-electric efficiency -secondary_cycle = 2 +i_thermal_electric_conversion = 2 * Thermal to electric conversion efficiency etath = 0.4 diff --git a/process/blanket_library.py b/process/blanket_library.py index 16f93cdc4e..c23a51f82d 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -1521,7 +1521,7 @@ def thermo_hydraulic_model(self, output: bool): Thermo-hydraulic model for first wall and blanket ONLY CALLED if i_coolant_pumping = 2 or 3 - Calculations for detailed powerflow model secondary_cycle > 1 + Calculations for detailed powerflow model i_thermal_electric_conversion > 1 original author: J. Morris, CCFE, Culham Science Centre Dual-coolant modifications and generalisation refactor: G. Graham, CCFE diff --git a/process/dcll.py b/process/dcll.py index ad8a667d18..47abe19d0a 100644 --- a/process/dcll.py +++ b/process/dcll.py @@ -386,8 +386,8 @@ def dcll_power_and_heating(self, output: bool): po.ovarin( self.outfile, "Switch for plant secondary cycle ", - "(secondary_cycle)", - fwbs_variables.secondary_cycle, + "(i_thermal_electric_conversion)", + fwbs_variables.i_thermal_electric_conversion, ) po.ovarin( self.outfile, diff --git a/process/hcpb.py b/process/hcpb.py index 7b06905e59..181f77a63e 100644 --- a/process/hcpb.py +++ b/process/hcpb.py @@ -1473,8 +1473,8 @@ def write_output(self): po.ovarin( self.outfile, "Switch for plant secondary cycle ", - "(secondary_cycle)", - fwbs_variables.secondary_cycle, + "(i_thermal_electric_conversion)", + fwbs_variables.i_thermal_electric_conversion, ) po.ovarre( self.outfile, diff --git a/process/power.py b/process/power.py index 4026becbb5..6fc8140966 100644 --- a/process/power.py +++ b/process/power.py @@ -728,7 +728,7 @@ def power1(self): # Primary (high-grade) thermal power, available for electricity generation. Switch heat_transport_variables.iprimshld # is 1 or 0, is user choice on whether the shield thermal power goes to primary or secondary heat - if fwbs_variables.secondary_cycle == 0: + if fwbs_variables.i_thermal_electric_conversion == 0: # Primary thermal power (MW) heat_transport_variables.pthermmw = ( self.pthermfw_blkt @@ -1257,13 +1257,13 @@ def power2(self, output: bool): ) if cost_variables.ireactor == 1: - if fwbs_variables.secondary_cycle == 0: + if fwbs_variables.i_thermal_electric_conversion == 0: po.ocmmnt( self.outfile, "Power conversion cycle efficiency model: " "efficiency set according to blanket type (div power to secondary)", ) - elif fwbs_variables.secondary_cycle == 1: + elif fwbs_variables.i_thermal_electric_conversion == 1: po.ocmmnt( self.outfile, "Power conversion cycle efficiency model: " @@ -1275,7 +1275,7 @@ def power2(self, output: bool): "(etath)", heat_transport_variables.etath, ) - elif fwbs_variables.secondary_cycle == 2: + elif fwbs_variables.i_thermal_electric_conversion == 2: po.ocmmnt( self.outfile, "Power conversion cycle efficiency model: user-defined efficiency", @@ -1286,7 +1286,7 @@ def power2(self, output: bool): "(etath)", heat_transport_variables.etath, ) - elif fwbs_variables.secondary_cycle == 3: + elif fwbs_variables.i_thermal_electric_conversion == 3: po.ocmmnt( self.outfile, "Power conversion cycle efficiency model: steam Rankine cycle", @@ -1297,7 +1297,7 @@ def power2(self, output: bool): "Power conversion cycle efficiency model: supercritical CO2 cycle", ) - if fwbs_variables.secondary_cycle > 2: + if fwbs_variables.i_thermal_electric_conversion > 2: po.ovarrf( self.outfile, "Coolant temperature at turbine inlet (K)", @@ -2352,15 +2352,15 @@ def plant_thermal_efficiency(self, etath): This gives the gross power of the plant, i.e. the primary coolant pumping power is not subtracted at this point; however, the pumping of the secondary coolant is accounted for. -

If secondary_cycle = 0, 1, a set efficiency for the chosen blanket design is used, +

If i_thermal_electric_conversion = 0, 1, a set efficiency for the chosen blanket design is used, taken from cycle modelling studies. -

If secondary_cycle > 1, the outlet temperature from the first wall +

If i_thermal_electric_conversion > 1, the outlet temperature from the first wall and breeder zone is used to calculate an efficiency, using a simple relationship between etath and temp_blkt_coolant_out again obtained from previous studies. C. Harrington, K:Power Plant Physics and Technology PROCESS blanket_model New Power Module Harrington Cycle correlations Cycle correlations.xls """ - if fwbs_variables.secondary_cycle == 0: + if fwbs_variables.i_thermal_electric_conversion == 0: # CCFE HCPB Model (with or without TBR) if ( (fwbs_variables.i_blanket_type == 1) @@ -2376,7 +2376,7 @@ def plant_thermal_efficiency(self, etath): logger.log(f"{'i_blanket_type does not have a value in range 1-3.'}") # Etath from reference. Div power to primary - elif fwbs_variables.secondary_cycle == 1: + elif fwbs_variables.i_thermal_electric_conversion == 1: # CCFE HCPB Model (with or without TBR) if (fwbs_variables.i_blanket_type == 1) or ( fwbs_variables.i_blanket_type == 3 @@ -2394,12 +2394,12 @@ def plant_thermal_efficiency(self, etath): logger.log(f"{'i_blanket_type does not have a value in range 1-3.'}") # User input used, etath not changed - elif fwbs_variables.secondary_cycle == 2: + elif fwbs_variables.i_thermal_electric_conversion == 2: return etath # Do nothing # Steam Rankine cycle to be used - elif fwbs_variables.secondary_cycle == 3: + elif fwbs_variables.i_thermal_electric_conversion == 3: # CCFE HCPB Model (with or without TBR) if (fwbs_variables.i_blanket_type == 1) or ( fwbs_variables.i_blanket_type == 3 @@ -2452,7 +2452,7 @@ def plant_thermal_efficiency(self, etath): logger.log(f"{'i_blanket_type does not have a value in range 1-3.'}") # Supercritical CO2 cycle to be used - elif fwbs_variables.secondary_cycle == 4: + elif fwbs_variables.i_thermal_electric_conversion == 4: # The same temperature/efficiency correlation is used regardless of # primary coolant choice. The turbine inlet temperature is assumed to # be 20 degrees below the primary coolant outlet temperature. @@ -2476,7 +2476,7 @@ def plant_thermal_efficiency(self, etath): else: logger.log( - f"{'secondary_cycle does not appear to have a value within its range (0-4)'}" + f"{'i_thermal_electric_conversion does not appear to have a value within its range (0-4)'}" ) return etath diff --git a/process/stellarator.py b/process/stellarator.py index 771b92406f..923135e7f2 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -2203,10 +2203,10 @@ def stfwbs(self, output: bool): po.ovarin( self.outfile, "First wall / blanket thermodynamic model", - "(secondary_cycle)", - fwbs_variables.secondary_cycle, + "(i_thermal_electric_conversion)", + fwbs_variables.i_thermal_electric_conversion, ) - if fwbs_variables.secondary_cycle == 0: + if fwbs_variables.i_thermal_electric_conversion == 0: po.ocmmnt(self.outfile, " (Simple calculation)") po.osubhd(self.outfile, "Blanket / shield volumes and weights :") diff --git a/source/fortran/constraint_equations.f90 b/source/fortran/constraint_equations.f90 index 257128f845..0e7ab26ac6 100755 --- a/source/fortran/constraint_equations.f90 +++ b/source/fortran/constraint_equations.f90 @@ -1758,7 +1758,7 @@ subroutine constraint_eqn_039(tmp_cc, tmp_con, tmp_err, tmp_symbol, tmp_units) !! and hence also optional here. !! Logic change during pre-factoring: err, symbol, units will be assigned only if present. !! ftpeak : input real : f-value for first wall peak temperature - !! temp_fw_max : input real : maximum temperature of first wall material (K) (secondary_cycle>1) + !! temp_fw_max : input real : maximum temperature of first wall material (K) (i_thermal_electric_conversion>1) !! temp_fw_peak : input real : peak first wall temperature (K) use constraint_variables, only: ftpeak use fwbs_variables, only: temp_fw_max, temp_fw_peak diff --git a/source/fortran/fwbs_variables.f90 b/source/fortran/fwbs_variables.f90 index 21815cb64c..e32caf782d 100644 --- a/source/fortran/fwbs_variables.f90 +++ b/source/fortran/fwbs_variables.f90 @@ -278,7 +278,7 @@ module fwbs_variables !! - =0 Tungsten (default) !! - =1 Tungsten carbide - integer :: secondary_cycle + integer :: i_thermal_electric_conversion !! Switch for power conversion cycle: !! !! - =0 Set efficiency for chosen blanket, from detailed models (divertor heat not used) @@ -330,7 +330,7 @@ module fwbs_variables !! outlet temperature of first wall coolant [K] real(dp) :: pres_fw_coolant - !! first wall coolant pressure [Pa] (`secondary_cycle>1`) + !! first wall coolant pressure [Pa] (`i_thermal_electric_conversion>1`) real(dp) :: temp_fw_peak !! peak first wall temperature [K] @@ -348,13 +348,13 @@ module fwbs_variables !! the coolant flow rate.) real(dp) :: pres_blkt_coolant - !! blanket coolant pressure [Pa] (`secondary_cycle>1`) + !! blanket coolant pressure [Pa] (`i_thermal_electric_conversion>1`) real(dp) :: temp_blkt_coolant_in - !! inlet temperature of blanket coolant [K] (`secondary_cycle>1`) + !! inlet temperature of blanket coolant [K] (`i_thermal_electric_conversion>1`) real(dp) :: temp_blkt_coolant_out - !! Outlet temperature of blanket coolant [K] (`secondary_cycle>1`) + !! Outlet temperature of blanket coolant [K] (`i_thermal_electric_conversion>1`) !! !! - input if `i_blkt_coolant_type=1` (helium) !! - calculated if `i_blkt_coolant_type=2` (water) @@ -363,19 +363,19 @@ module fwbs_variables !! blanket coolant pressure [Pa] (stellarator only) integer :: n_blkt_outboard_modules_poloidal - !! number of outboard blanket modules in poloidal direction (`secondary_cycle>1`) + !! number of outboard blanket modules in poloidal direction (`i_thermal_electric_conversion>1`) integer :: n_blkt_inboard_modules_poloidal - !! number of inboard blanket modules in poloidal direction (`secondary_cycle>1`) + !! number of inboard blanket modules in poloidal direction (`i_thermal_electric_conversion>1`) integer :: n_blkt_outboard_modules_toroidal - !! number of outboard blanket modules in toroidal direction (`secondary_cycle>1`) + !! number of outboard blanket modules in toroidal direction (`i_thermal_electric_conversion>1`) integer :: n_blkt_inboard_modules_toroidal - !! number of inboard blanket modules in toroidal direction (`secondary_cycle>1`) + !! number of inboard blanket modules in toroidal direction (`i_thermal_electric_conversion>1`) real(dp) :: temp_fw_max - !! maximum temperature of first wall material [K] (`secondary_cycle>1`) + !! maximum temperature of first wall material [K] (`i_thermal_electric_conversion>1`) real(dp) :: fw_th_conductivity !! thermal conductivity of first wall material at 293 K (W/m/K) (Temperature dependence @@ -733,7 +733,7 @@ subroutine init_fwbs_variables iblanket_thickness = 2 i_coolant_pumping = 2 i_shield_mat = 0 - secondary_cycle = 0 + i_thermal_electric_conversion = 0 secondary_cycle_liq = 4 i_blkt_coolant_type = 1 afwi = 0.008D0 diff --git a/source/fortran/heat_transport_variables.f90 b/source/fortran/heat_transport_variables.f90 index 074f1e8c54..d054a5bb56 100644 --- a/source/fortran/heat_transport_variables.f90 +++ b/source/fortran/heat_transport_variables.f90 @@ -35,7 +35,7 @@ module heat_transport_variables !! AC to resistive power conversion for TF coils real(dp) :: etath - !! thermal to electric conversion efficiency if `secondary_cycle=2`; otherwise calculated. + !! thermal to electric conversion efficiency if `i_thermal_electric_conversion=2`; otherwise calculated. real(dp) :: etath_liq @@ -53,7 +53,7 @@ module heat_transport_variables real(dp) :: fpumpblkt !! fraction of total blanket thermal power required to drive the blanket - !! coolant pumps (default assumes water coolant) (`secondary_cycle=0`) + !! coolant pumps (default assumes water coolant) (`i_thermal_electric_conversion=0`) real(dp) :: fpumpdiv !! fraction of total divertor thermal power required to drive the divertor @@ -61,7 +61,7 @@ module heat_transport_variables real(dp) :: fpumpfw !! fraction of total first wall thermal power required to drive the FW coolant - !! pumps (default assumes water coolant) (`secondary_cycle=0`) + !! pumps (default assumes water coolant) (`i_thermal_electric_conversion=0`) real(dp) :: fpumpshld !! fraction of total shield thermal power required to drive the shield coolant @@ -179,7 +179,7 @@ module heat_transport_variables !! power required for tritium processing (MW) real(dp) :: tturb - !! coolant temperature at turbine inlet (K) (`secondary_cycle = 3,4`) + !! coolant temperature at turbine inlet (K) (`i_thermal_electric_conversion = 3,4`) real(dp) :: vachtmw !! vacuum pump power (MW) diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index 89900bfb60..dc858ac1ae 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -214,7 +214,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) fblhebpi, fblss, temp_blkt_coolant_in, temp_blkt_coolant_out, fblbreed, qnuc, pres_blkt_coolant, & blpressure_liq, n_liq_recirc, pnuc_fw_ratio_dcll, f_nuc_pow_bz_struct, & declblkt, fblhebmo, blkttype, radius_fw_channel, inuclear, declshld, hcdportsize, & - npdiv, f_fw_peak, i_coolant_pumping, dr_pf_cryostat, secondary_cycle, secondary_cycle_liq, & + npdiv, f_fw_peak, i_coolant_pumping, dr_pf_cryostat, i_thermal_electric_conversion, secondary_cycle_liq, & denstl, declfw, nphcdout, i_blkt_inboard, vfpblkt, temp_fw_coolant_in, wallpf, fblbe, & fhole, i_fw_blkt_vv_shape, coolp, temp_fw_max, irefprop, len_fw_channel, & li6enrich, etaiso, n_blkt_outboard_modules_toroidal, fvoldw, i_shield_mat, i_bb_liq, & @@ -1979,8 +1979,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) call parse_int_variable('i_blkt_coolant_type', i_blkt_coolant_type, 1, 2, & ' Blanket coolant type (1=He, 2=H20)') - case ('secondary_cycle') - call parse_int_variable('secondary_cycle', secondary_cycle, 0, 4, & + case ('i_thermal_electric_conversion') + call parse_int_variable('i_thermal_electric_conversion', i_thermal_electric_conversion, 0, 4, & 'Switch for blanket thermodynamic model') case ('secondary_cycle_liq') diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 1e539ea6cd..a6972060d1 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -976,7 +976,7 @@ Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP 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 + Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 5.0000E+00 @@ -1694,7 +1694,7 @@ etahtp = 0.87 etaiso = 0.9 * Switch for secondary cycle - User input thermal-electric efficiency -secondary_cycle = 2 +i_thermal_electric_conversion = 2 * Thermal to electric conversion efficiency etath = 0.4 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 240cc68075..1a002cc657 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -977,7 +977,7 @@ Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP 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 + Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 5.0000E+00 @@ -1695,7 +1695,7 @@ etahtp = 0.87 etaiso = 0.9 * Switch for secondary cycle - User input thermal-electric efficiency -secondary_cycle = 2 +i_thermal_electric_conversion = 2 * Thermal to electric conversion efficiency etath = 0.4 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 7559b8ef9a..71735a856b 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -977,7 +977,7 @@ Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP 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 + Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 5.0000E+00 @@ -1695,7 +1695,7 @@ etahtp = 0.87 etaiso = 0.9 * Switch for secondary cycle - User input thermal-electric efficiency -secondary_cycle = 2 +i_thermal_electric_conversion = 2 * Thermal to electric conversion efficiency etath = 0.4 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index b36be33162..ee4ac865d7 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -977,7 +977,7 @@ Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP 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 + Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 5.0000E+00 @@ -1695,7 +1695,7 @@ etahtp = 0.87 etaiso = 0.9 * Switch for secondary cycle - User input thermal-electric efficiency -secondary_cycle = 2 +i_thermal_electric_conversion = 2 * Thermal to electric conversion efficiency etath = 0.4 diff --git a/tests/integration/data/large_tokamak_IN.DAT b/tests/integration/data/large_tokamak_IN.DAT index e9e1b96d9d..ff04ea734f 100644 --- a/tests/integration/data/large_tokamak_IN.DAT +++ b/tests/integration/data/large_tokamak_IN.DAT @@ -505,7 +505,7 @@ etahtp = 0.87 etaiso = 0.9 * Switch for secondary cycle - User input thermal-electric efficiency -secondary_cycle = 2 +i_thermal_electric_conversion = 2 * Thermal to electric conversion efficiency etath = 0.4 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index b1b2400ca9..d07a2934fe 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -980,7 +980,7 @@ Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP 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 + Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 5.0000E+00 @@ -1696,7 +1696,7 @@ etahtp = 0.87 etaiso = 0.9 * Switch for secondary cycle - User input thermal-electric efficiency -secondary_cycle = 2 +i_thermal_electric_conversion = 2 * Thermal to electric conversion efficiency etath = 0.4 diff --git a/tests/integration/data/large_tokamak_once_through.IN.DAT b/tests/integration/data/large_tokamak_once_through.IN.DAT index 21aa38fd9e..10c6508b65 100644 --- a/tests/integration/data/large_tokamak_once_through.IN.DAT +++ b/tests/integration/data/large_tokamak_once_through.IN.DAT @@ -209,7 +209,7 @@ dz_divertor = 0.62 * divertor structure vertical thickness (m) inuclear = 1 * switch for nuclear heating in the coils; qnuc = 1.3e4 * nuclear heating in the coils (W) (`inuclear=1`) i_coolant_pumping = 3 * Switch for pumping power for primary coolant (mechanical power only and peak first wall -secondary_cycle = 2 * Switch for power conversion cycle; +i_thermal_electric_conversion = 2 * Switch for power conversion cycle; vfshld = 0.60 * coolant void fraction in shield etaiso = 0.9 * isentropic efficiency of FW and blanket coolant pumps etahtp = 0.87 * electrical efficiency of primary coolant pumps @@ -220,7 +220,7 @@ runtitle = generic large tokamak * short descriptive title for the run *-------------Heat Transport Variables-------------* -etath = 0.4 * thermal to electric conversion efficiency if `secondary_cycle=2`; otherwise calculated; +etath = 0.4 * thermal to electric conversion efficiency if `i_thermal_electric_conversion=2`; otherwise calculated; ipowerflow = 0 * switch for power flow model; iprimshld = 1 * Switch for shield thermal power destiny; diff --git a/tests/integration/data/ref_IN.DAT b/tests/integration/data/ref_IN.DAT index 908fa582b7..ea70bb398b 100644 --- a/tests/integration/data/ref_IN.DAT +++ b/tests/integration/data/ref_IN.DAT @@ -191,7 +191,7 @@ ipowerflow = 0 * Switch for power flow model; HAS NO EFFECT? i_coolant_pumping = 3 * Switch for pumping power for primary coolant etahtp = 0.87 * electrical efficiency of FW and blanket coolant pumps etaiso = 0.9 * isentropic efficiency of FW and blanket coolant pumps -secondary_cycle = 2 * user input thermal-electric efficiency (etath) +i_thermal_electric_conversion = 2 * user input thermal-electric efficiency (etath) iprimshld = 1 * switch for shield thermal power destiny: = 1 contributes to energy generation cycle etath = 0.375D0 * thermal to electric conversion efficiency diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index ae6fd02397..8dafd66938 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -978,7 +978,7 @@ Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP 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 + Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 5.0000E+00 @@ -2141,7 +2141,7 @@ Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP 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 + Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 5.0000E+00 @@ -3304,7 +3304,7 @@ Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP 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 + Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 5.0000E+00 @@ -4467,7 +4467,7 @@ Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP 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 + Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 5.0000E+00 @@ -5630,7 +5630,7 @@ Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP 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 + Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 5.0000E+00 @@ -6793,7 +6793,7 @@ Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP 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 + Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 5.0000E+00 @@ -7956,7 +7956,7 @@ Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP 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 + Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 5.0000E+00 @@ -9119,7 +9119,7 @@ Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP 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 + Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 5.0000E+00 @@ -10282,7 +10282,7 @@ Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP 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 + Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 5.0000E+00 @@ -11445,7 +11445,7 @@ Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP 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 + Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 5.0000E+00 @@ -12608,7 +12608,7 @@ Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP 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 + Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 5.0000E+00 @@ -13771,7 +13771,7 @@ Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP 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 + Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 5.0000E+00 @@ -14934,7 +14934,7 @@ Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP 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 + Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 5.0000E+00 @@ -16097,7 +16097,7 @@ Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP 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 + Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 5.0000E+00 @@ -17260,7 +17260,7 @@ Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP 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 + Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 5.0000E+00 @@ -17982,7 +17982,7 @@ etahtp = 0.87 etaiso = 0.9 * Switch for secondary cycle - User input thermal-electric efficiency -secondary_cycle = 2 +i_thermal_electric_conversion = 2 * Thermal to electric conversion efficiency etath = 0.4 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 58c135f601..d9642b8ea8 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -806,7 +806,7 @@ Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP 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 + Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 @@ -1801,7 +1801,7 @@ Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP 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 + Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 @@ -2796,7 +2796,7 @@ Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP 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 + Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 @@ -3791,7 +3791,7 @@ Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP 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 + Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 @@ -4786,7 +4786,7 @@ Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP 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 + Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 @@ -5781,7 +5781,7 @@ Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP 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 + Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 @@ -6776,7 +6776,7 @@ Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP 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 + Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 @@ -7771,7 +7771,7 @@ Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP 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 + Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 @@ -8766,7 +8766,7 @@ Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP 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 + Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 1.5000E+01 @@ -9170,7 +9170,7 @@ ipowerflow = 0 * Switch for power flow model; HAS NO EFFECT? i_coolant_pumping = 3 * Switch for pumping power for primary coolant etahtp = 0.87 * electrical efficiency of FW and blanket coolant pumps etaiso = 0.9 * isentropic efficiency of FW and blanket coolant pumps -secondary_cycle = 2 * user input thermal-electric efficiency (etath) +i_thermal_electric_conversion = 2 * user input thermal-electric efficiency (etath) iprimshld = 1 * switch for shield thermal power destiny: = 1 contributes to energy generation cycle etath = 0.375D0 * thermal to electric conversion efficiency diff --git a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT index 5a2fdcc890..d0f7a92d4d 100644 --- a/tests/integration/data/uncertainties_nonopt_ref_IN.DAT +++ b/tests/integration/data/uncertainties_nonopt_ref_IN.DAT @@ -191,7 +191,7 @@ ipowerflow = 0 * Switch for power flow model; HAS NO EFFECT? i_coolant_pumping = 3 * Switch for pumping power for primary coolant etahtp = 0.87 * electrical efficiency of FW and blanket coolant pumps etaiso = 0.9 * isentropic efficiency of FW and blanket coolant pumps -secondary_cycle = 2 * user input thermal-electric efficiency (etath) +i_thermal_electric_conversion = 2 * user input thermal-electric efficiency (etath) iprimshld = 1 * switch for shield thermal power destiny: = 1 contributes to energy generation cycle etath = 0.375D0 * thermal to electric conversion efficiency diff --git a/tests/integration/data/uncertainties_ref_IN.DAT b/tests/integration/data/uncertainties_ref_IN.DAT index d42179292a..9d022ffb48 100644 --- a/tests/integration/data/uncertainties_ref_IN.DAT +++ b/tests/integration/data/uncertainties_ref_IN.DAT @@ -191,7 +191,7 @@ ipowerflow = 0 * Switch for power flow model; HAS NO EFFECT? i_coolant_pumping = 3 * Switch for pumping power for primary coolant etahtp = 0.87 * electrical efficiency of FW and blanket coolant pumps etaiso = 0.9 * isentropic efficiency of FW and blanket coolant pumps -secondary_cycle = 2 * user input thermal-electric efficiency (etath) +i_thermal_electric_conversion = 2 * user input thermal-electric efficiency (etath) iprimshld = 1 * switch for shield thermal power destiny: = 1 contributes to energy generation cycle etath = 0.375D0 * thermal to electric conversion efficiency diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 7bf7c3f4a0..3306464d29 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -5260,7 +5260,7 @@ "sec_buildings_h": 6.0, "sec_buildings_l": 30.0, "sec_buildings_w": 25.0, - "secondary_cycle": 0.0, + "i_thermal_electric_conversion": 0.0, "seppowerratio": 2.3, "sfd": null, "sfn": null, @@ -8917,7 +8917,7 @@ "blohkw": "outboard blanket total heat output (kW)", "bloizp": "outboard blanket integrated zone power / neutron", "blomzp": "outboard blanket mean zone power density / neutron", - "pres_blkt_coolant": "blanket coolant pressure (Pa) (`secondary_cycle>1`)", + "pres_blkt_coolant": "blanket coolant pressure (Pa) (`i_thermal_electric_conversion>1`)", "blvol": "IFE blanket volume (m3)", "blwidti": "Inboard/outboard blanket mid-plan toroidal circumference for segment (m)", "blwidto": "Inboard/outboard blanket mid-plan toroidal circumference for segment (m)", @@ -9429,7 +9429,7 @@ "etapsu": "Efficiency of transfer of PF stored energy into or out of storage.", "etapump": "centrepost coolant pump efficiency", "etatf": "AC to resistive power conversion for TF coils", - "etath": "thermal to electric conversion efficiency if `secondary_cycle=2`; otherwise calculated.", + "etath": "thermal to electric conversion efficiency if `i_thermal_electric_conversion=2`; otherwise calculated.", "etave": "IFE driver efficiency vs driver energy (`ifedrv=-1`)", "evapratio": "evaporation ratio: ratio of the heat used to evaporate water\n to the total heat discharged through the tower", "evapvol": "evaporated volume of water (m3)", @@ -9599,9 +9599,9 @@ "fpsepr": "f-value for maximum Psep/R limit (`constraint equation 56`, `iteration variable 97`)", "fptemp": "f-value for peak centrepost temperature (`constraint equation 44`, `iteration variable 68`)", "fptfnuc": "f-value for maximum TF coil nuclear heating (`constraint equation 54`, `iteration variable 95`)", - "fpumpblkt": "fraction of total blanket thermal power required to drive the blanket\n coolant pumps (default assumes water coolant) (`secondary_cycle=0`)", + "fpumpblkt": "fraction of total blanket thermal power required to drive the blanket\n coolant pumps (default assumes water coolant) (`i_thermal_electric_conversion=0`)", "fpumpdiv": "fraction of total divertor thermal power required to drive the divertor\n coolant pumps (default assumes water coolant)", - "fpumpfw": "fraction of total first wall thermal power required to drive the FW coolant\n pumps (default assumes water coolant) (`secondary_cycle=0`)", + "fpumpfw": "fraction of total first wall thermal power required to drive the FW coolant\n pumps (default assumes water coolant) (`i_thermal_electric_conversion=0`)", "fpumpshld": "fraction of total shield thermal power required to drive the shield coolant\n pumps (default assumes water coolant)", "fq": "f-value for edge safety factor (`constraint equation 45`, `iteration variable 71`)", "fqval": "f-value for Q (`constraint equation 28`, `iteration variable 45`)", @@ -9696,7 +9696,7 @@ "fwomzp": "outboard first wall mean zone power density/neutron", "dr_fw_outboard": "outboard first wall thickness, initial estimate as calculated (m)", "temp_fw_coolant_out": "outlet temperature of first wall coolant (K)", - "pres_fw_coolant": "first wall coolant pressure (Pa) (`secondary_cycle>1`)", + "pres_fw_coolant": "first wall coolant pressure (Pa) (`i_thermal_electric_conversion>1`)", "fwtemp": "outboard first wall temperature after a LOCA (K)", "fwvol": "IFE first wall volume (m3)", "fzactual": "Actual impurity fraction of divertor impurity (impvardiv) in the SoL (taking\n impurity_enrichment into account) (`iteration variable 148`)", @@ -9861,7 +9861,7 @@ "infile": "", "info": "", "initialpressure": "initial neutral pressure at the beginning of the dwell phase (Pa)", - "temp_blkt_coolant_in": "inlet temperature of blanket coolant (K) (`secondary_cycle>1`)", + "temp_blkt_coolant_in": "inlet temperature of blanket coolant (K) (`i_thermal_electric_conversion>1`)", "insstrain": "Radial strain in insulator", "insulation_area": "single turn insulation area (m2)", "int_def": "", @@ -10123,10 +10123,10 @@ "nb_tor_ob": "", "nbi_sys_l": "NBI system length, width (m)", "nbi_sys_w": "NBI system length, width (m)", - "n_blkt_inboard_modules_poloidal": "number of inboard blanket modules in poloidal direction (`secondary_cycle>1`)", - "n_blkt_outboard_modules_poloidal": "number of outboard blanket modules in poloidal direction (`secondary_cycle>1`)", - "n_blkt_inboard_modules_toroidal": "number of inboard blanket modules in toroidal direction (`secondary_cycle>1`)", - "n_blkt_outboard_modules_toroidal": "number of outboard blanket modules in toroidal direction (`secondary_cycle>1`)", + "n_blkt_inboard_modules_poloidal": "number of inboard blanket modules in poloidal direction (`i_thermal_electric_conversion>1`)", + "n_blkt_outboard_modules_poloidal": "number of outboard blanket modules in poloidal direction (`i_thermal_electric_conversion>1`)", + "n_blkt_inboard_modules_toroidal": "number of inboard blanket modules in toroidal direction (`i_thermal_electric_conversion>1`)", + "n_blkt_outboard_modules_toroidal": "number of outboard blanket modules in toroidal direction (`i_thermal_electric_conversion>1`)", "nbshield": "neutral beam duct shielding thickness (m)", "nbshinef": "neutral beam shine-through fraction", "nbshinefmax": "maximum neutral beam shine-through fraction (`constraint equation 59`)", @@ -10217,7 +10217,7 @@ "outfile": "", "outgasfactor": "outgassing prefactor kw: outgassing rate at 1 s per unit area (Pa m s-1)", "outgasindex": "outgassing decay index", - "temp_blkt_coolant_out": "Outlet temperature of blanket coolant (K) (`secondary_cycle>1`)\n

    \n
  • input if `i_blkt_coolant_type=1` (helium)
    • \n
  • calculated if `i_blkt_coolant_type=2` (water)
    • \n
", + "temp_blkt_coolant_out": "Outlet temperature of blanket coolant (K) (`i_thermal_electric_conversion>1`)\n
    \n
  • input if `i_blkt_coolant_type=1` (helium)
    • \n
  • calculated if `i_blkt_coolant_type=2` (water)
    • \n
", "output_costs": "Switch for costs output:\n
    \n
  • =0 do not write cost-related outputs to file
    • \n
  • =1 write cost-related outputs to file
    • \n
", "output_huge": "", "output_prefix": "output file prefix", @@ -10598,7 +10598,7 @@ "sec_buildings_h": "security & safety buildings length, width, height (m)", "sec_buildings_l": "security & safety buildings length, width, height (m)", "sec_buildings_w": "security & safety buildings length, width, height (m)", - "secondary_cycle": "Switch for power conversion cycle:\n
    \n
  • =0 Set efficiency for chosen blanket, from detailed models (divertor heat not used)
    • \n
  • =1 Set efficiency for chosen blanket, from detailed models (divertor heat used)
    • \n
  • =2 user input thermal-electric efficiency (etath)
    • \n
  • =3 steam Rankine cycle
    • \n
  • =4 supercritical CO2 cycle
    • \n
", + "i_thermal_electric_conversion": "Switch for power conversion cycle:\n
    \n
  • =0 Set efficiency for chosen blanket, from detailed models (divertor heat not used)
    • \n
  • =1 Set efficiency for chosen blanket, from detailed models (divertor heat used)
    • \n
  • =2 user input thermal-electric efficiency (etath)
    • \n
  • =3 steam Rankine cycle
    • \n
  • =4 supercritical CO2 cycle
    • \n
", "seppowerratio": "", "sfd": "", "sfn": "", @@ -10803,7 +10803,7 @@ "tftmp": "peak helium coolant temperature in TF coils and PF coils (K)", "tftort": "TF coil toroidal thickness (m)", "dr_tf_shld_gap": "Minimum metal-to-metal gap between TF coil and thermal shield (m)", - "temp_fw_max": "maximum temperature of first wall material (K) (`secondary_cycle>1`)", + "temp_fw_max": "maximum temperature of first wall material (K) (`i_thermal_electric_conversion>1`)", "tgain": "IFE target gain (if `ifedrv = 0`) (`iteration variable 83`)", "th_joint_contact": "TF sliding joints contact pad width [m]", "thcomp": "", @@ -10874,7 +10874,7 @@ "triv": "volume of tritium, fuel handling and health physics buildings (m3)", "tsep": "temperature at the separatrix (eV)", "ttarget": "Plasma temperature adjacent to divertor sheath [eV] (`iteration variable 120`)\n Rem : 5 eV is the current limit for tungsten sputtering from argon impurity", - "tturb": "coolant temperature at turbine inlet (K) (`secondary_cycle = 3,4`)", + "tturb": "coolant temperature at turbine inlet (K) (`i_thermal_electric_conversion = 3,4`)", "turbine_hall_h": "turbine hall length, width, height (m)", "turbine_hall_l": "turbine hall length, width, height (m)", "turbine_hall_w": "turbine hall length, width, height (m)", @@ -14233,7 +14233,7 @@ "lb": 10.0, "ub": 1000.0 }, - "secondary_cycle": { + "i_thermal_electric_conversion": { "lb": 0, "ub": 4 }, @@ -18078,7 +18078,7 @@ "iblanket_thickness", "i_coolant_pumping", "i_shield_mat", - "secondary_cycle", + "i_thermal_electric_conversion", "i_blkt_coolant_type", "afwi", "afwo", @@ -20686,7 +20686,7 @@ "sec_buildings_h": "real_variable", "sec_buildings_l": "real_variable", "sec_buildings_w": "real_variable", - "secondary_cycle": "int_variable", + "i_thermal_electric_conversion": "int_variable", "shdr": "real_variable", "shdzl": "real_variable", "shdzu": "real_variable", diff --git a/tests/regression/input_files/helias_5b.IN.DAT b/tests/regression/input_files/helias_5b.IN.DAT index 9262c7a8e3..ab62c972ca 100644 --- a/tests/regression/input_files/helias_5b.IN.DAT +++ b/tests/regression/input_files/helias_5b.IN.DAT @@ -131,7 +131,7 @@ htpmw_blkt = 120.0 *Blanket coolant mechanical pumping power (MW) htpmw_fw = 56.0 *First wall coolant mechanical pumping power (MW) htpmw_div = 24.0 *Divertor coolant mechanical pumping power (MW) i_coolant_pumping = 0 *Switch for pumping power (0: User sets pump power directly) -secondary_cycle = 2 *Switch for power conversion cycle (2: user input thermal-electric efficiency) +i_thermal_electric_conversion = 2 *Switch for power conversion cycle (2: user input thermal-electric efficiency) vfblkt = 0.10 *Coolant void fraction in blanket (blktmodel=0) vfshld = 0.60 *Coolant void fraction in shield diff --git a/tests/regression/input_files/large_tokamak.IN.DAT b/tests/regression/input_files/large_tokamak.IN.DAT index 651df996d6..ba34c63182 100644 --- a/tests/regression/input_files/large_tokamak.IN.DAT +++ b/tests/regression/input_files/large_tokamak.IN.DAT @@ -505,7 +505,7 @@ etahtp = 0.87 etaiso = 0.9 * Switch for secondary cycle - User input thermal-electric efficiency -secondary_cycle = 2 +i_thermal_electric_conversion = 2 * Thermal to electric conversion efficiency etath = 0.4 diff --git a/tests/regression/input_files/large_tokamak_nof.IN.DAT b/tests/regression/input_files/large_tokamak_nof.IN.DAT index 91c2ed441b..5b24176e74 100644 --- a/tests/regression/input_files/large_tokamak_nof.IN.DAT +++ b/tests/regression/input_files/large_tokamak_nof.IN.DAT @@ -487,7 +487,7 @@ etahtp = 0.87 etaiso = 0.9 * Switch for secondary cycle - User input thermal-electric efficiency -secondary_cycle = 2 +i_thermal_electric_conversion = 2 * Thermal to electric conversion efficiency etath = 0.4 diff --git a/tests/regression/input_files/large_tokamak_once_through.IN.DAT b/tests/regression/input_files/large_tokamak_once_through.IN.DAT index 0c896c74d1..40a12964b9 100644 --- a/tests/regression/input_files/large_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/large_tokamak_once_through.IN.DAT @@ -209,7 +209,7 @@ dz_divertor = 0.62 * divertor structure vertical thickness (m) inuclear = 1 * switch for nuclear heating in the coils; qnuc = 1.3e4 * nuclear heating in the coils (W) (`inuclear=1`) i_coolant_pumping = 3 * Switch for pumping power for primary coolant (mechanical power only and peak first wall -secondary_cycle = 2 * Switch for power conversion cycle; +i_thermal_electric_conversion = 2 * Switch for power conversion cycle; vfshld = 0.60 * coolant void fraction in shield etaiso = 0.9 * isentropic efficiency of FW and blanket coolant pumps etahtp = 0.87 * electrical efficiency of primary coolant pumps @@ -220,7 +220,7 @@ runtitle = generic large tokamak * short descriptive title for the run *-------------Heat Transport Variables-------------* -etath = 0.4 * thermal to electric conversion efficiency if `secondary_cycle=2`; otherwise calculated; +etath = 0.4 * thermal to electric conversion efficiency if `i_thermal_electric_conversion=2`; otherwise calculated; ipowerflow = 0 * switch for power flow model; iprimshld = 1 * Switch for shield thermal power destiny; diff --git a/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT b/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT index dacd4232b9..303f5fc467 100644 --- a/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT +++ b/tests/regression/input_files/spherical_tokamak_once_through.IN.DAT @@ -233,7 +233,7 @@ i_blanket_type = 1 * switch for blanket model; i_blkt_inboard = 0 * switch for inboard blanket; inuclear = 0 * switch for nuclear heating in the coils; i_coolant_pumping = 3 * Switch for pumping power for primary coolant (mechanical power only and peak first wall -secondary_cycle = 2 * Switch for power conversion cycle; +i_thermal_electric_conversion = 2 * Switch for power conversion cycle; i_fw_coolant_type = helium * switch for first wall coolant (can be different from blanket coolant); etaiso = 0.9 * isentropic efficiency of FW and blanket coolant pumps etahtp = 0.87 * electrical efficiency of primary coolant pumps @@ -247,7 +247,7 @@ maxcal = 2000 * maximum number of VMCON iterations *-------------Heat Transport Variables-------------* -etath = 0.40 * thermal to electric conversion efficiency if `secondary_cycle=2`; otherwise calculated; +etath = 0.40 * thermal to electric conversion efficiency if `i_thermal_electric_conversion=2`; otherwise calculated; ipowerflow = 0 * switch for power flow model; iprimshld = 1 * Switch for shield thermal power destiny; diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 8813ed1c40..9bd9dff784 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2334,7 +2334,7 @@ etaiso = 0.9 * JUSTIFICATION: Not yet set. *pres_fw_coolant = -* DESCRIPTION: First wall coolant pressure [Pa] (`secondary_cycle>1`) (default = 15.5D6) +* DESCRIPTION: First wall coolant pressure [Pa] (`i_thermal_electric_conversion>1`) (default = 15.5D6) * JUSTIFICATION: Not yet set. i_fw_coolant_type = helium @@ -2398,33 +2398,33 @@ i_blkt_inboard = 0 * JUSTIFICATION: Not yet set. *n_blkt_outboard_modules_poloidal = -* DESCRIPTION: Number of outboard blanket modules in poloidal direction (`secondary_cycle>1`)(default = 8) +* DESCRIPTION: Number of outboard blanket modules in poloidal direction (`i_thermal_electric_conversion>1`)(default = 8) * JUSTIFICATION: Not set as not used *n_blkt_outboard_modules_toroidal = -* DESCRIPTION: Number of outboard blanket modules in toroidal direction (`secondary_cycle>1`)(default =48) +* DESCRIPTION: Number of outboard blanket modules in toroidal direction (`i_thermal_electric_conversion>1`)(default =48) * JUSTIFICATION: Not set as not used *n_blkt_inboard_modules_poloidal = -* DESCRIPTION: Number of inboard blanket modules in poloidal direction (`secondary_cycle>1`)(default = 7) +* DESCRIPTION: Number of inboard blanket modules in poloidal direction (`i_thermal_electric_conversion>1`)(default = 7) * JUSTIFICATION: Not set as not used *n_blkt_inboard_modules_toroidal = -* DESCRIPTION: Number of inboard blanket modules in toroidal direction (`secondary_cycle>1`)(default = 32) +* DESCRIPTION: Number of inboard blanket modules in toroidal direction (`i_thermal_electric_conversion>1`)(default = 32) * JUSTIFICATION: Not set as not used *temp_blkt_coolant_in = -* DESCRIPTION: Inlet temperature of blanket coolant [K] (`secondary_cycle>1`) +* DESCRIPTION: Inlet temperature of blanket coolant [K] (`i_thermal_electric_conversion>1`) * JUSTIFICATION: Not set as not used *temp_blkt_coolant_out = -* DESCRIPTION: Outlet temperature of blanket coolant [K] (`secondary_cycle>1`) +* DESCRIPTION: Outlet temperature of blanket coolant [K] (`i_thermal_electric_conversion>1`) * input if `i_blkt_coolant_type=1` (helium) * calculated if `i_blkt_coolant_type=2` (water) * JUSTIFICATION: Not set as not used *pres_blkt_coolant = -* DESCRIPTION: Blanket coolant pressure [Pa] (`secondary_cycle>1`) (default = 15.5D6) +* DESCRIPTION: Blanket coolant pressure [Pa] (`i_thermal_electric_conversion>1`) (default = 15.5D6) * JUSTIFICATION: Not yet set *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -2688,7 +2688,7 @@ boundu(116) = 1.0 * VARIABLES: temp_fw_peak (K) calculated in-situ *temp_fw_max = -* DESCRIPTION: Maximum temperature of first wall material [K] (`secondary_cycle>1`)(default = 823) +* DESCRIPTION: Maximum temperature of first wall material [K] (`i_thermal_electric_conversion>1`)(default = 823) * JUSTIFICATION: Not set as not used *________________________________________________________________________________________________________________________________________________________________________________________________________________* @@ -3004,7 +3004,7 @@ fipir = 0.58 *----------------------Heat transport / Power settings-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------* *‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾* -secondary_cycle = 2 +i_thermal_electric_conversion = 2 * DESCRIPTION: Switch for power conversion cycle (2: User Input Thermal-Electric Efficiency) * =0 Set efficiency for chosen blanket, from detailed models (divertor heat not used) * =1 Set efficiency for chosen blanket, from detailed models (divertor heat used) diff --git a/tests/regression/input_files/stellarator_helias_once_through.IN.DAT b/tests/regression/input_files/stellarator_helias_once_through.IN.DAT index 1af548c3f6..10340dbd39 100644 --- a/tests/regression/input_files/stellarator_helias_once_through.IN.DAT +++ b/tests/regression/input_files/stellarator_helias_once_through.IN.DAT @@ -194,7 +194,7 @@ fblss = 0.13 * KIT blanket model; steel fraction of breeding zone fhole = 0. * area fraction taken up by other holes (IFE) fblbe = 0.47 * beryllium fraction of blanket by volume (if `iblanket=2`; is Be fraction of breeding zone) i_coolant_pumping = 0 * Switch for pumping power for primary coolant (mechanical power only and peak first wall -secondary_cycle = 2 * Switch for power conversion cycle; +i_thermal_electric_conversion = 2 * Switch for power conversion cycle; fwclfr = 0.1 * first wall coolant fraction (calculated if `lpulse=1` or `ipowerflow=1`) vfshld = 0.6 * coolant void fraction in shield fblli2o = 0.07 * lithium oxide fraction of blanket by volume (stellarator only) @@ -214,7 +214,7 @@ maxcal = 200 * maximum number of VMCON iterations *-------------Heat Transport Variables-------------* -etath = 0.4 * thermal to electric conversion efficiency if `secondary_cycle=2`; otherwise calculated; +etath = 0.4 * thermal to electric conversion efficiency if `i_thermal_electric_conversion=2`; otherwise calculated; htpmw_blkt = 120. * blanket primary coolant mechanical pumping power (MW) htpmw_div = 24. * divertor coolant mechanical pumping power (MW) htpmw_fw = 56. * first wall coolant mechanical pumping power (MW) diff --git a/tests/unit/data/large_tokamak_IN.DAT b/tests/unit/data/large_tokamak_IN.DAT index 412c7ad90d..d5fbe4a09f 100644 --- a/tests/unit/data/large_tokamak_IN.DAT +++ b/tests/unit/data/large_tokamak_IN.DAT @@ -506,7 +506,7 @@ etahtp = 0.87 etaiso = 0.9 * Switch for secondary cycle - User input thermal-electric efficiency -secondary_cycle = 2 +i_thermal_electric_conversion = 2 * Thermal to electric conversion efficiency etath = 0.4 diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index c154e17261..4d032c2ce9 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -980,7 +980,7 @@ Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP 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 + Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 Allowable_nominal_neutron_fluence_at_first_wall_(MW.year/m2)____________ (abktflnc)____________________ 5.0000E+00 @@ -1697,7 +1697,7 @@ etahtp = 0.87 etaiso = 0.9 * Switch for secondary cycle - User input thermal-electric efficiency -secondary_cycle = 2 +i_thermal_electric_conversion = 2 * Thermal to electric conversion efficiency etath = 0.4 diff --git a/tests/unit/test_power.py b/tests/unit/test_power.py index c89fc9506d..3d31ccc8d6 100644 --- a/tests/unit/test_power.py +++ b/tests/unit/test_power.py @@ -2061,7 +2061,7 @@ class Power2Param(NamedTuple): fhcd: Any = None - secondary_cycle: Any = None + i_thermal_electric_conversion: Any = None pnuc_cp: Any = None @@ -2252,7 +2252,7 @@ class Power2Param(NamedTuple): praddiv=33.119482558354782, fdiv=0.115, fhcd=0, - secondary_cycle=2, + i_thermal_electric_conversion=2, pnuc_cp=0, pnucdiv=182.69222981118057, i_coolant_pumping=3, @@ -2354,7 +2354,7 @@ class Power2Param(NamedTuple): praddiv=33.119482558354782, fdiv=0.115, fhcd=0, - secondary_cycle=2, + i_thermal_electric_conversion=2, pnuc_cp=0, pnucdiv=182.6352084763719, i_coolant_pumping=3, @@ -2488,7 +2488,7 @@ def test_power2(power2param, monkeypatch, power): monkeypatch.setattr(fwbs_variables, "fhcd", power2param.fhcd) - monkeypatch.setattr(fwbs_variables, "secondary_cycle", power2param.secondary_cycle) + monkeypatch.setattr(fwbs_variables, "i_thermal_electric_conversion", power2param.i_thermal_electric_conversion) monkeypatch.setattr(fwbs_variables, "pnuc_cp", power2param.pnuc_cp) From e7b8177fc69d24d4fd2773e5bc03e3d419ef754a Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 18 Feb 2025 13:28:07 +0000 Subject: [PATCH 26/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20pnucblkti=20to=20?= =?UTF-8?q?p=5Fblkt=5Fnuclear=5Fheat=5Finboard=5Fmw=20for=20clarity=20and?= =?UTF-8?q?=20consistency=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/blanket_library.py | 8 ++++---- process/power.py | 5 ++++- source/fortran/blanket_library.f90 | 4 ++-- tests/integration/ref_dicts.json | 8 ++++---- tests/unit/test_power.py | 10 ++++++++-- 5 files changed, 22 insertions(+), 13 deletions(-) diff --git a/process/blanket_library.py b/process/blanket_library.py index c23a51f82d..8bc8f1109c 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -1578,7 +1578,7 @@ def thermo_hydraulic_model(self, output: bool): # Neutron power deposited in inboard blanket (MW) if fwbs_variables.i_blkt_inboard == 1: - blanket_library.pnucblkti = ( + blanket_library.p_blkt_nuclear_heat_inboard_mw = ( fwbs_variables.p_blkt_nuclear_heat_total_mw * fwbs_variables.vol_blkt_inboard / fwbs_variables.vol_blkt_total @@ -1646,7 +1646,7 @@ def thermo_hydraulic_model(self, output: bool): f_nuc_fwi = (blanket_library.pnucfwi + fwbs_variables.psurffwi) / ( blanket_library.pnucfwi + fwbs_variables.psurffwi - + blanket_library.pnucblkti + + blanket_library.p_blkt_nuclear_heat_inboard_mw ) f_nuc_fwo = (blanket_library.pnucfwo + fwbs_variables.psurffwo) / ( blanket_library.pnucfwo @@ -1807,7 +1807,7 @@ def thermo_hydraulic_model(self, output: bool): # Mass flow rate for inboard blanket coolant (kg/s) blanket_library.mfblkti = ( 1.0e6 - * (blanket_library.pnucblkti) + * (blanket_library.p_blkt_nuclear_heat_inboard_mw) / ( fwbs_variables.cp_bl * (fwbs_variables.temp_blkt_coolant_out - inlet_tempi) @@ -1835,7 +1835,7 @@ def thermo_hydraulic_model(self, output: bool): if fwbs_variables.i_blkt_inboard == 1: blanket_library.mfblkti = ( 1.0e6 - * (blanket_library.pnucblkti) + * (blanket_library.p_blkt_nuclear_heat_inboard_mw) / ( fwbs_variables.cp_bl * (fwbs_variables.temp_blkt_coolant_out - inlet_tempi) diff --git a/process/power.py b/process/power.py index 6fc8140966..602d62c5f6 100644 --- a/process/power.py +++ b/process/power.py @@ -563,7 +563,10 @@ def power1(self): and plant power balance constituents. None """ - if fwbs_variables.i_coolant_pumping != 2 and fwbs_variables.i_coolant_pumping != 3: + if ( + fwbs_variables.i_coolant_pumping != 2 + and fwbs_variables.i_coolant_pumping != 3 + ): primary_pumping_variables.htpmw_fw_blkt = ( heat_transport_variables.htpmw_fw + heat_transport_variables.htpmw_blkt ) diff --git a/source/fortran/blanket_library.f90 b/source/fortran/blanket_library.f90 index 543583e3b2..3bf4e35e37 100644 --- a/source/fortran/blanket_library.f90 +++ b/source/fortran/blanket_library.f90 @@ -78,7 +78,7 @@ module blanket_library real(dp) :: mffwpi, mffwpo !! Inboard/outboard mass flow rate per coolant pipe (kg/s) - real(dp) :: pnucblkti, pnucblkto + real(dp) :: p_blkt_nuclear_heat_inboard_mw, pnucblkto !! Neutron power deposited inboard/outboard blanket blanket (MW) real(dp) :: mfblkti, mfblkto, mfblkt @@ -156,7 +156,7 @@ subroutine init_blanket_library npfwo = 0.0D0 mffwpi = 0.0D0 mffwpo = 0.0D0 - pnucblkti = 0.0D0 + p_blkt_nuclear_heat_inboard_mw = 0.0D0 pnucblkto = 0.0D0 mfblkti = 0.0D0 mfblkto = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 3306464d29..d6a0e5d955 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3565,7 +3565,7 @@ "pnuc_fw_ratio": 0.0, "pnuc_tot_blk_sector": null, "p_blkt_nuclear_heat_total_mw": 0.0, - "pnucblkti": 0.0, + "p_blkt_nuclear_heat_inboard_mw": 0.0, "pnucblkto": 0.0, "pnucdiv": 0.0, "p_fw_nuclear_heat_total_mw": 0.0, @@ -10323,7 +10323,7 @@ "pnuc_fw_ratio": "", "pnuc_tot_blk_sector": "Total nuclear power deposited in blanket covered sector (FW, BLKT, SHLD, TF) (MW)", "p_blkt_nuclear_heat_total_mw": "nuclear heating in the blanket (MW)", - "pnucblkti": "Neutron power deposited inboard/outboard blanket blanket (MW)", + "p_blkt_nuclear_heat_inboard_mw": "Neutron power deposited inboard/outboard blanket blanket (MW)", "pnucblkto": "Neutron power deposited inboard/outboard blanket blanket (MW)", "pnucdiv": "nuclear heating in the divertor (MW)", "p_fw_nuclear_heat_total_mw": "nuclear heating in the first wall (MW)", @@ -17275,7 +17275,7 @@ "npfwo", "mffwpi", "mffwpo", - "pnucblkti", + "p_blkt_nuclear_heat_inboard_mw", "pnucblkto", "mfblkti", "mfblkto", @@ -18650,7 +18650,7 @@ "tpeakfwo", "pnucfwi", "pnucfwo", - "pnucblkti", + "p_blkt_nuclear_heat_inboard_mw", "pnucblkto", "npfwi", "npfwo", diff --git a/tests/unit/test_power.py b/tests/unit/test_power.py index 3d31ccc8d6..6352ae30a0 100644 --- a/tests/unit/test_power.py +++ b/tests/unit/test_power.py @@ -2488,13 +2488,19 @@ def test_power2(power2param, monkeypatch, power): monkeypatch.setattr(fwbs_variables, "fhcd", power2param.fhcd) - monkeypatch.setattr(fwbs_variables, "i_thermal_electric_conversion", power2param.i_thermal_electric_conversion) + monkeypatch.setattr( + fwbs_variables, + "i_thermal_electric_conversion", + power2param.i_thermal_electric_conversion, + ) monkeypatch.setattr(fwbs_variables, "pnuc_cp", power2param.pnuc_cp) monkeypatch.setattr(fwbs_variables, "pnucdiv", power2param.pnucdiv) - monkeypatch.setattr(fwbs_variables, "i_coolant_pumping", power2param.i_coolant_pumping) + monkeypatch.setattr( + fwbs_variables, "i_coolant_pumping", power2param.i_coolant_pumping + ) monkeypatch.setattr(fwbs_variables, "ptfnuc", power2param.ptfnuc) From e74fb2f5381d4ff4169ec4e5f31e14268e30baca Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 18 Feb 2025 13:29:03 +0000 Subject: [PATCH 27/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20pnucblkto=20to=20?= =?UTF-8?q?p=5Fblkt=5Fnuclear=5Fheat=5Foutboard=5Fmw=20for=20clarity=20and?= =?UTF-8?q?=20consistency=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/blanket_library.py | 8 ++++---- source/fortran/blanket_library.f90 | 4 ++-- tests/integration/ref_dicts.json | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/process/blanket_library.py b/process/blanket_library.py index 8bc8f1109c..c1ed9cbb11 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -1585,7 +1585,7 @@ def thermo_hydraulic_model(self, output: bool): ) # Neutron power deposited in outboard blanket (MW) - blanket_library.pnucblkto = ( + blanket_library.p_blkt_nuclear_heat_outboard_mw = ( fwbs_variables.p_blkt_nuclear_heat_total_mw * fwbs_variables.vol_blkt_outboard / fwbs_variables.vol_blkt_total @@ -1651,7 +1651,7 @@ def thermo_hydraulic_model(self, output: bool): f_nuc_fwo = (blanket_library.pnucfwo + fwbs_variables.psurffwo) / ( blanket_library.pnucfwo + fwbs_variables.psurffwo - + blanket_library.pnucblkto + + blanket_library.p_blkt_nuclear_heat_outboard_mw ) # Outlet FW/inlet BB temp (mass flow FW = mass flow BB) @@ -1788,7 +1788,7 @@ def thermo_hydraulic_model(self, output: bool): # Mass flow rate for outboard blanket coolant (kg/s) blanket_library.mfblkto = ( 1.0e6 - * (blanket_library.pnucblkto) + * (blanket_library.p_blkt_nuclear_heat_outboard_mw) / ( fwbs_variables.cp_bl * (fwbs_variables.temp_blkt_coolant_out - inlet_tempo) @@ -1823,7 +1823,7 @@ def thermo_hydraulic_model(self, output: bool): # Mass flow rate for inboard blanket coolant (kg/s) blanket_library.mfblkto = ( 1.0e6 - * (blanket_library.pnucblkto) + * (blanket_library.p_blkt_nuclear_heat_outboard_mw) / ( fwbs_variables.cp_bl * (fwbs_variables.temp_blkt_coolant_out - inlet_tempo) diff --git a/source/fortran/blanket_library.f90 b/source/fortran/blanket_library.f90 index 3bf4e35e37..1aa26934d4 100644 --- a/source/fortran/blanket_library.f90 +++ b/source/fortran/blanket_library.f90 @@ -78,7 +78,7 @@ module blanket_library real(dp) :: mffwpi, mffwpo !! Inboard/outboard mass flow rate per coolant pipe (kg/s) - real(dp) :: p_blkt_nuclear_heat_inboard_mw, pnucblkto + real(dp) :: p_blkt_nuclear_heat_inboard_mw, p_blkt_nuclear_heat_outboard_mw !! Neutron power deposited inboard/outboard blanket blanket (MW) real(dp) :: mfblkti, mfblkto, mfblkt @@ -157,7 +157,7 @@ subroutine init_blanket_library mffwpi = 0.0D0 mffwpo = 0.0D0 p_blkt_nuclear_heat_inboard_mw = 0.0D0 - pnucblkto = 0.0D0 + p_blkt_nuclear_heat_outboard_mw = 0.0D0 mfblkti = 0.0D0 mfblkto = 0.0D0 mfblkti_liq = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index d6a0e5d955..3e38af6f20 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3566,7 +3566,7 @@ "pnuc_tot_blk_sector": null, "p_blkt_nuclear_heat_total_mw": 0.0, "p_blkt_nuclear_heat_inboard_mw": 0.0, - "pnucblkto": 0.0, + "p_blkt_nuclear_heat_outboard_mw": 0.0, "pnucdiv": 0.0, "p_fw_nuclear_heat_total_mw": 0.0, "pnucfwi": 0.0, @@ -10324,7 +10324,7 @@ "pnuc_tot_blk_sector": "Total nuclear power deposited in blanket covered sector (FW, BLKT, SHLD, TF) (MW)", "p_blkt_nuclear_heat_total_mw": "nuclear heating in the blanket (MW)", "p_blkt_nuclear_heat_inboard_mw": "Neutron power deposited inboard/outboard blanket blanket (MW)", - "pnucblkto": "Neutron power deposited inboard/outboard blanket blanket (MW)", + "p_blkt_nuclear_heat_outboard_mw": "Neutron power deposited inboard/outboard blanket blanket (MW)", "pnucdiv": "nuclear heating in the divertor (MW)", "p_fw_nuclear_heat_total_mw": "nuclear heating in the first wall (MW)", "pnucfwi": "Inboard/outboard first wall nuclear heating (MW)", @@ -17276,7 +17276,7 @@ "mffwpi", "mffwpo", "p_blkt_nuclear_heat_inboard_mw", - "pnucblkto", + "p_blkt_nuclear_heat_outboard_mw", "mfblkti", "mfblkto", "mfblkt", @@ -18651,7 +18651,7 @@ "pnucfwi", "pnucfwo", "p_blkt_nuclear_heat_inboard_mw", - "pnucblkto", + "p_blkt_nuclear_heat_outboard_mw", "npfwi", "npfwo", "npblkti", From 644aea6752c2cba4ba33e0714775773ed009e51a Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 18 Feb 2025 13:34:49 +0000 Subject: [PATCH 28/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20mfblkto=20to=20mf?= =?UTF-8?q?low=5Fblkt=5Foutboard=5Fcoolant?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/blanket_library.py | 22 +++++++++++++++------- source/fortran/blanket_library.f90 | 4 ++-- tests/integration/ref_dicts.json | 8 ++++---- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/process/blanket_library.py b/process/blanket_library.py index c1ed9cbb11..b8dc6d198b 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -811,7 +811,9 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): ) # Mass flow rate per coolant pipe - blanket_library.mfblktpo = blanket_library.mfblkto / blanket_library.npblkto + blanket_library.mfblktpo = ( + blanket_library.mflow_blkt_outboard_coolant / blanket_library.npblkto + ) mfblktpo_liq = blanket_library.mfblkto_liq / npblkto_liq # Coolant velocites in blanket (m/s) # Assume BZ structure has same channel width as FW @@ -884,7 +886,9 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): ) # Mass flow rate per coolant pipe - blanket_library.mfblktpo = blanket_library.mfblkto / blanket_library.npblkto + blanket_library.mfblktpo = ( + blanket_library.mflow_blkt_outboard_coolant / blanket_library.npblkto + ) # Coolant velocity in blanket (m/s) # Assume BZ structure has same channel width as FW @@ -966,7 +970,9 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): ) # Mass flow rate per coolant pipe - blanket_library.mfblktpo = blanket_library.mfblkto / blanket_library.npblkto + blanket_library.mfblktpo = ( + blanket_library.mflow_blkt_outboard_coolant / blanket_library.npblkto + ) # Coolant velocity in blanket (m/s) # Assume BZ structure has same channel width as FW @@ -1743,7 +1749,7 @@ def thermo_hydraulic_model(self, output: bool): # If the blanket is dual-coolant... if fwbs_variables.icooldual == 2: # Mass flow rates for outboard blanket coolants (kg/s) - blanket_library.mfblkto = ( + blanket_library.mflow_blkt_outboard_coolant = ( 1.0e6 * (pnucblkto_struct) / ( @@ -1786,7 +1792,7 @@ def thermo_hydraulic_model(self, output: bool): # If the blanket is single-coolant with liquid metal breeder... elif fwbs_variables.icooldual == 1: # Mass flow rate for outboard blanket coolant (kg/s) - blanket_library.mfblkto = ( + blanket_library.mflow_blkt_outboard_coolant = ( 1.0e6 * (blanket_library.p_blkt_nuclear_heat_outboard_mw) / ( @@ -1821,7 +1827,7 @@ def thermo_hydraulic_model(self, output: bool): # If the blanket is single-coolant with solid breeder... else: # Mass flow rate for inboard blanket coolant (kg/s) - blanket_library.mfblkto = ( + blanket_library.mflow_blkt_outboard_coolant = ( 1.0e6 * (blanket_library.p_blkt_nuclear_heat_outboard_mw) / ( @@ -1913,7 +1919,9 @@ def thermo_hydraulic_model(self, output: bool): # Total coolant mass flow rate in the first wall (kg/s) blanket_library.mffw = blanket_library.mffwi + blanket_library.mffwo # Total coolant mass flow rate in the blanket (kg/s) - blanket_library.mfblkt = blanket_library.mfblkti + blanket_library.mfblkto + blanket_library.mfblkt = ( + blanket_library.mfblkti + blanket_library.mflow_blkt_outboard_coolant + ) # Mechanical pumping power for the first wall (MW) heat_transport_variables.htpmw_fw = self.pumppower( diff --git a/source/fortran/blanket_library.f90 b/source/fortran/blanket_library.f90 index 1aa26934d4..c1606d9668 100644 --- a/source/fortran/blanket_library.f90 +++ b/source/fortran/blanket_library.f90 @@ -81,7 +81,7 @@ module blanket_library real(dp) :: p_blkt_nuclear_heat_inboard_mw, p_blkt_nuclear_heat_outboard_mw !! Neutron power deposited inboard/outboard blanket blanket (MW) - real(dp) :: mfblkti, mfblkto, mfblkt + real(dp) :: mfblkti, mflow_blkt_outboard_coolant, mfblkt !! Inboard/outboard blanket mass flow rate for coolant (kg/s) real(dp):: mfblkti_liq, mfblkto_liq, mfblkt_liq @@ -159,7 +159,7 @@ subroutine init_blanket_library p_blkt_nuclear_heat_inboard_mw = 0.0D0 p_blkt_nuclear_heat_outboard_mw = 0.0D0 mfblkti = 0.0D0 - mfblkto = 0.0D0 + mflow_blkt_outboard_coolant = 0.0D0 mfblkti_liq = 0.0D0 mfblkto_liq = 0.0D0 mfblkt_liq = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 3e38af6f20..d2e50c177c 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3295,7 +3295,7 @@ "meq": null, "mfblkt": 0.0, "mfblkti": 0.0, - "mfblkto": 0.0, + "mflow_blkt_outboard_coolant": 0.0, "mfblktpi": 0.0, "mfblktpo": 0.0, "mffw": 0.0, @@ -10069,7 +10069,7 @@ "meq": "", "mfblkt": "Inboard/outboard blanket mass flow rate for coolant (kg/s)", "mfblkti": "Inboard/outboard blanket mass flow rate for coolant (kg/s)", - "mfblkto": "Inboard/outboard blanket mass flow rate for coolant (kg/s)", + "mflow_blkt_outboard_coolant": "Inboard/outboard blanket mass flow rate for coolant (kg/s)", "mfblktpi": "Inboard/outboard mass flow rate per coolant pipe (kg/s)", "mfblktpo": "Inboard/outboard mass flow rate per coolant pipe (kg/s)", "mffw": "Inboard/outboard total mass flow rate to remove inboard FW power (kg/s)", @@ -17278,7 +17278,7 @@ "p_blkt_nuclear_heat_inboard_mw", "p_blkt_nuclear_heat_outboard_mw", "mfblkti", - "mfblkto", + "mflow_blkt_outboard_coolant", "mfblkt", "mftotal", "npblkti", @@ -18663,7 +18663,7 @@ "mffwo", "mffw", "mfblkti", - "mfblkto", + "mflow_blkt_outboard_coolant", "mfblkt", "mfblktpi", "mfblktpo", From 1cfb57975d3722f71aba1cc5cbd6445c9994f569 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 18 Feb 2025 13:35:27 +0000 Subject: [PATCH 29/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20mfblkti=20to=20mf?= =?UTF-8?q?low=5Fblkt=5Finboard=5Fcoolant=20for=20clarity=20and=20consiste?= =?UTF-8?q?ncy=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/blanket_library.py | 15 ++++++++------- source/fortran/blanket_library.f90 | 4 ++-- tests/integration/ref_dicts.json | 8 ++++---- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/process/blanket_library.py b/process/blanket_library.py index b8dc6d198b..96a95630e8 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -849,7 +849,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): # Mass flow rate per coolant pipe blanket_library.mfblktpi = ( - blanket_library.mfblkti / blanket_library.npblkti + blanket_library.mflow_blkt_inboard_coolant / blanket_library.npblkti ) blanket_library.mfblktpi_liq = blanket_library.mfblkti_liq / npblkti_liq @@ -932,7 +932,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): # Mass flow rate per coolant pipe blanket_library.mfblktpi = ( - blanket_library.mfblkti / blanket_library.npblkti + blanket_library.mflow_blkt_inboard_coolant / blanket_library.npblkti ) # Coolant velocity in blanket (m/s) @@ -997,7 +997,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): # Mass flow rate per coolant pipe blanket_library.mfblktpi = ( - blanket_library.mfblkti / blanket_library.npblkti + blanket_library.mflow_blkt_inboard_coolant / blanket_library.npblkti ) # Coolant velocity in blanket (m/s) @@ -1769,7 +1769,7 @@ def thermo_hydraulic_model(self, output: bool): # If there is an IB blanket... if fwbs_variables.i_blkt_inboard == 1: # Mass flow rates for inboard blanket coolants (kg/s) - blanket_library.mfblkti = ( + blanket_library.mflow_blkt_inboard_coolant = ( 1.0e6 * (pnucblkti_struct) / ( @@ -1811,7 +1811,7 @@ def thermo_hydraulic_model(self, output: bool): # If there is an IB blanket... if fwbs_variables.i_blkt_inboard == 1: # Mass flow rate for inboard blanket coolant (kg/s) - blanket_library.mfblkti = ( + blanket_library.mflow_blkt_inboard_coolant = ( 1.0e6 * (blanket_library.p_blkt_nuclear_heat_inboard_mw) / ( @@ -1839,7 +1839,7 @@ def thermo_hydraulic_model(self, output: bool): # If there is an IB blanket... # Mass flow rate for inboard blanket coolant (kg/s) if fwbs_variables.i_blkt_inboard == 1: - blanket_library.mfblkti = ( + blanket_library.mflow_blkt_inboard_coolant = ( 1.0e6 * (blanket_library.p_blkt_nuclear_heat_inboard_mw) / ( @@ -1920,7 +1920,8 @@ def thermo_hydraulic_model(self, output: bool): blanket_library.mffw = blanket_library.mffwi + blanket_library.mffwo # Total coolant mass flow rate in the blanket (kg/s) blanket_library.mfblkt = ( - blanket_library.mfblkti + blanket_library.mflow_blkt_outboard_coolant + blanket_library.mflow_blkt_inboard_coolant + + blanket_library.mflow_blkt_outboard_coolant ) # Mechanical pumping power for the first wall (MW) diff --git a/source/fortran/blanket_library.f90 b/source/fortran/blanket_library.f90 index c1606d9668..a52e7548b3 100644 --- a/source/fortran/blanket_library.f90 +++ b/source/fortran/blanket_library.f90 @@ -81,7 +81,7 @@ module blanket_library real(dp) :: p_blkt_nuclear_heat_inboard_mw, p_blkt_nuclear_heat_outboard_mw !! Neutron power deposited inboard/outboard blanket blanket (MW) - real(dp) :: mfblkti, mflow_blkt_outboard_coolant, mfblkt + real(dp) :: mflow_blkt_inboard_coolant, mflow_blkt_outboard_coolant, mfblkt !! Inboard/outboard blanket mass flow rate for coolant (kg/s) real(dp):: mfblkti_liq, mfblkto_liq, mfblkt_liq @@ -158,7 +158,7 @@ subroutine init_blanket_library mffwpo = 0.0D0 p_blkt_nuclear_heat_inboard_mw = 0.0D0 p_blkt_nuclear_heat_outboard_mw = 0.0D0 - mfblkti = 0.0D0 + mflow_blkt_inboard_coolant = 0.0D0 mflow_blkt_outboard_coolant = 0.0D0 mfblkti_liq = 0.0D0 mfblkto_liq = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index d2e50c177c..3816c36758 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3294,7 +3294,7 @@ "mean_electric_output": 0.0, "meq": null, "mfblkt": 0.0, - "mfblkti": 0.0, + "mflow_blkt_inboard_coolant": 0.0, "mflow_blkt_outboard_coolant": 0.0, "mfblktpi": 0.0, "mfblktpo": 0.0, @@ -10068,7 +10068,7 @@ "mean_electric_output": "", "meq": "", "mfblkt": "Inboard/outboard blanket mass flow rate for coolant (kg/s)", - "mfblkti": "Inboard/outboard blanket mass flow rate for coolant (kg/s)", + "mflow_blkt_inboard_coolant": "Inboard/outboard blanket mass flow rate for coolant (kg/s)", "mflow_blkt_outboard_coolant": "Inboard/outboard blanket mass flow rate for coolant (kg/s)", "mfblktpi": "Inboard/outboard mass flow rate per coolant pipe (kg/s)", "mfblktpo": "Inboard/outboard mass flow rate per coolant pipe (kg/s)", @@ -17277,7 +17277,7 @@ "mffwpo", "p_blkt_nuclear_heat_inboard_mw", "p_blkt_nuclear_heat_outboard_mw", - "mfblkti", + "mflow_blkt_inboard_coolant", "mflow_blkt_outboard_coolant", "mfblkt", "mftotal", @@ -18662,7 +18662,7 @@ "mffwi", "mffwo", "mffw", - "mfblkti", + "mflow_blkt_inboard_coolant", "mflow_blkt_outboard_coolant", "mfblkt", "mfblktpi", From 385d208c9b73a621647e9417babef62cbc15f63e Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 18 Feb 2025 13:37:51 +0000 Subject: [PATCH 30/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20mfblkt=20to=20mfl?= =?UTF-8?q?ow=5Fblkt=5Fcoolant=5Ftotal=20for=20clarity=20and=20consistency?= =?UTF-8?q?=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/blanket_library.py | 8 ++++---- source/fortran/blanket_library.f90 | 4 ++-- tests/integration/ref_dicts.json | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/process/blanket_library.py b/process/blanket_library.py index 96a95630e8..ad4e63c01b 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -1919,7 +1919,7 @@ def thermo_hydraulic_model(self, output: bool): # Total coolant mass flow rate in the first wall (kg/s) blanket_library.mffw = blanket_library.mffwi + blanket_library.mffwo # Total coolant mass flow rate in the blanket (kg/s) - blanket_library.mfblkt = ( + blanket_library.mflow_blkt_coolant_total = ( blanket_library.mflow_blkt_inboard_coolant + blanket_library.mflow_blkt_outboard_coolant ) @@ -1948,7 +1948,7 @@ def thermo_hydraulic_model(self, output: bool): temp_out=fwbs_variables.temp_blkt_coolant_out.item(), pressure=fwbs_variables.pres_blkt_coolant.item(), pdrop=deltap_blkt.item(), - mf=blanket_library.mfblkt, + mf=blanket_library.mflow_blkt_coolant_total, primary_coolant_switch=( "Helium" if fwbs_variables.i_blkt_coolant_type == 1 else "Water" ), @@ -2100,8 +2100,8 @@ def thermo_hydraulic_model(self, output: bool): po.ovarre( self.outfile, "Blanket coolant mass flow rate (kg/s)", - "(mfblkt)", - fwbs_variables.mfblkt, + "(mflow_blkt_coolant_total)", + fwbs_variables.mflow_blkt_coolant_total, "OP ", ) diff --git a/source/fortran/blanket_library.f90 b/source/fortran/blanket_library.f90 index a52e7548b3..0f884e046e 100644 --- a/source/fortran/blanket_library.f90 +++ b/source/fortran/blanket_library.f90 @@ -81,7 +81,7 @@ module blanket_library real(dp) :: p_blkt_nuclear_heat_inboard_mw, p_blkt_nuclear_heat_outboard_mw !! Neutron power deposited inboard/outboard blanket blanket (MW) - real(dp) :: mflow_blkt_inboard_coolant, mflow_blkt_outboard_coolant, mfblkt + real(dp) :: mflow_blkt_inboard_coolant, mflow_blkt_outboard_coolant, mflow_blkt_coolant_total !! Inboard/outboard blanket mass flow rate for coolant (kg/s) real(dp):: mfblkti_liq, mfblkto_liq, mfblkt_liq @@ -163,7 +163,7 @@ subroutine init_blanket_library mfblkti_liq = 0.0D0 mfblkto_liq = 0.0D0 mfblkt_liq = 0.0D0 - mfblkt = 0.0D0 + mflow_blkt_coolant_total = 0.0D0 mftotal = 0.0D0 npblkti = 0.0D0 npblkto = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 3816c36758..56d592582d 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3293,7 +3293,7 @@ "me_": 9.1093837139e-31, "mean_electric_output": 0.0, "meq": null, - "mfblkt": 0.0, + "mflow_blkt_coolant_total": 0.0, "mflow_blkt_inboard_coolant": 0.0, "mflow_blkt_outboard_coolant": 0.0, "mfblktpi": 0.0, @@ -10067,7 +10067,7 @@ "me_": "", "mean_electric_output": "", "meq": "", - "mfblkt": "Inboard/outboard blanket mass flow rate for coolant (kg/s)", + "mflow_blkt_coolant_total": "Inboard/outboard blanket mass flow rate for coolant (kg/s)", "mflow_blkt_inboard_coolant": "Inboard/outboard blanket mass flow rate for coolant (kg/s)", "mflow_blkt_outboard_coolant": "Inboard/outboard blanket mass flow rate for coolant (kg/s)", "mfblktpi": "Inboard/outboard mass flow rate per coolant pipe (kg/s)", @@ -17279,7 +17279,7 @@ "p_blkt_nuclear_heat_outboard_mw", "mflow_blkt_inboard_coolant", "mflow_blkt_outboard_coolant", - "mfblkt", + "mflow_blkt_coolant_total", "mftotal", "npblkti", "npblkto", @@ -18664,7 +18664,7 @@ "mffw", "mflow_blkt_inboard_coolant", "mflow_blkt_outboard_coolant", - "mfblkt", + "mflow_blkt_coolant_total", "mfblktpi", "mfblktpo", "hblnkt", From 2ee3bb404db623e57f2340983399615b036e5c04 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 18 Feb 2025 13:45:27 +0000 Subject: [PATCH 31/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20bzfllengi=20to=20?= =?UTF-8?q?len=5Fblkt=5Finboard=5Fchannel=5Ftotal=20for=20clarity=20and=20?= =?UTF-8?q?consistency=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/blanket_library.py | 10 +++++----- source/fortran/blanket_library.f90 | 4 ++-- tests/integration/ref_dicts.json | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/process/blanket_library.py b/process/blanket_library.py index ad4e63c01b..d92e745346 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -726,7 +726,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): # Calculate total flow lengths, used for pressure drop calculation # Blanket primary coolant flow - blanket_library.bzfllengi = ( + blanket_library.len_blkt_inboard_channel_total = ( fwbs_variables.bzfllengi_n_rad * blanket_library.bldepti + fwbs_variables.bzfllengi_n_pol * blanket_library.bllengi ) @@ -838,7 +838,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): np.pi * fwbs_variables.radius_fw_channel * fwbs_variables.radius_fw_channel - * blanket_library.bzfllengi + * blanket_library.len_blkt_inboard_channel_total ) # Have DEMO DCLL set here for now npblkti_liq = ( @@ -921,7 +921,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): np.pi * fwbs_variables.radius_fw_channel * fwbs_variables.radius_fw_channel - * blanket_library.bzfllengi + * blanket_library.len_blkt_inboard_channel_total ) # Have DEMO DCLL set here for now npblkti_liq = ( @@ -992,7 +992,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): np.pi * fwbs_variables.radius_fw_channel * fwbs_variables.radius_fw_channel - * blanket_library.bzfllengi + * blanket_library.len_blkt_inboard_channel_total ) # Mass flow rate per coolant pipe @@ -1067,7 +1067,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): output, icoolpump=1, flow_velocity=blanket_library.velblkti, - flleng=blanket_library.bzfllengi, + flleng=blanket_library.len_blkt_inboard_channel_total, no90=no90bz, no180=no180bz, coolant_density=fwbs_variables.den_blkt_coolant, diff --git a/source/fortran/blanket_library.f90 b/source/fortran/blanket_library.f90 index 0f884e046e..15513ed3df 100644 --- a/source/fortran/blanket_library.f90 +++ b/source/fortran/blanket_library.f90 @@ -57,7 +57,7 @@ module blanket_library real(dp) :: bllengi, bllengo !! Inboard/outboard blanket segment poloidal length (m) - real(dp) :: bzfllengi, bzfllengo + real(dp) :: len_blkt_inboard_channel_total, bzfllengo !! Inboard/outboard primary blanket flow lengths (m) real(dp) :: bzfllengi_liq, bzfllengo_liq @@ -141,7 +141,7 @@ subroutine init_blanket_library blwidto = 0.0D0 bllengi = 0.0D0 bllengo = 0.0D0 - bzfllengi = 0.0D0 + len_blkt_inboard_channel_total = 0.0D0 bzfllengi_liq = 0.0D0 bzfllengo_liq = 0.0D0 bzfllengo = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 56d592582d..a9e121ad53 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1177,7 +1177,7 @@ "bvert": 0.0, "bz_ratio_ib": 0.0, "bz_ratio_ob": 0.0, - "bzfllengi": 0.0, + "len_blkt_inboard_channel_total": 0.0, "bzfllengo": 0.0, "c": "2.99792458e10_rkind", "c1div": 0.45, @@ -8964,7 +8964,7 @@ "bvert": "vertical field at plasma (T)", "bz_ratio_ib": "", "bz_ratio_ob": "", - "bzfllengi": "Inboard/outboard blanket flow lengths (m)", + "len_blkt_inboard_channel_total": "Inboard/outboard blanket flow lengths (m)", "bzfllengo": "Inboard/outboard blanket flow lengths (m)", "c": "", "c1div": "fitting coefficient to adjust ptpdiv, ppdiv", @@ -17262,7 +17262,7 @@ "blwidto", "bllengi", "bllengo", - "bzfllengi", + "len_blkt_inboard_channel_total", "bzfllengo", "pnucfwi", "pnucfwo", @@ -18642,7 +18642,7 @@ "pnuc_bkt_ratio", "bldepti", "bldepto", - "bzfllengi", + "len_blkt_inboard_channel_total", "bzfllengo", "velblkti", "velblkto", From a95dc96995403a1e853a2e1d65d9f29a41e7396c Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 18 Feb 2025 13:46:07 +0000 Subject: [PATCH 32/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20bzfllengo=20to=20?= =?UTF-8?q?len=5Fblkt=5Foutboard=5Fchannel=5Ftotal=20for=20clarity=20and?= =?UTF-8?q?=20consistency=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/blanket_library.py | 10 +++++----- source/fortran/blanket_library.f90 | 4 ++-- tests/integration/ref_dicts.json | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/process/blanket_library.py b/process/blanket_library.py index d92e745346..81283b4fda 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -730,7 +730,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): fwbs_variables.bzfllengi_n_rad * blanket_library.bldepti + fwbs_variables.bzfllengi_n_pol * blanket_library.bllengi ) - blanket_library.bzfllengo = ( + blanket_library.len_blkt_outboard_channel_total = ( fwbs_variables.bzfllengo_n_rad * blanket_library.bldepto + fwbs_variables.bzfllengo_n_pol * blanket_library.bllengo ) @@ -802,7 +802,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): np.pi * fwbs_variables.radius_fw_channel * fwbs_variables.radius_fw_channel - * blanket_library.bzfllengo + * blanket_library.len_blkt_outboard_channel_total ) npblkto_liq = ( fwbs_variables.nopipes @@ -877,7 +877,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): np.pi * fwbs_variables.radius_fw_channel * fwbs_variables.radius_fw_channel - * blanket_library.bzfllengo + * blanket_library.len_blkt_outboard_channel_total ) npblkto_liq = ( fwbs_variables.nopipes @@ -966,7 +966,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): np.pi * fwbs_variables.radius_fw_channel * fwbs_variables.radius_fw_channel - * blanket_library.bzfllengo + * blanket_library.len_blkt_outboard_channel_total ) # Mass flow rate per coolant pipe @@ -1051,7 +1051,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): output, icoolpump=1, flow_velocity=blanket_library.velblkto, - flleng=blanket_library.bzfllengo, + flleng=blanket_library.len_blkt_outboard_channel_total, no90=no90bz, no180=no180bz, coolant_density=fwbs_variables.den_blkt_coolant, diff --git a/source/fortran/blanket_library.f90 b/source/fortran/blanket_library.f90 index 15513ed3df..1e6c2bb48a 100644 --- a/source/fortran/blanket_library.f90 +++ b/source/fortran/blanket_library.f90 @@ -57,7 +57,7 @@ module blanket_library real(dp) :: bllengi, bllengo !! Inboard/outboard blanket segment poloidal length (m) - real(dp) :: len_blkt_inboard_channel_total, bzfllengo + real(dp) :: len_blkt_inboard_channel_total, len_blkt_outboard_channel_total !! Inboard/outboard primary blanket flow lengths (m) real(dp) :: bzfllengi_liq, bzfllengo_liq @@ -144,7 +144,7 @@ subroutine init_blanket_library len_blkt_inboard_channel_total = 0.0D0 bzfllengi_liq = 0.0D0 bzfllengo_liq = 0.0D0 - bzfllengo = 0.0D0 + len_blkt_outboard_channel_total = 0.0D0 pnucfwi = 0.0D0 pnucfwo = 0.0D0 tpeakfwi = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index a9e121ad53..7b498eeeb6 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1178,7 +1178,7 @@ "bz_ratio_ib": 0.0, "bz_ratio_ob": 0.0, "len_blkt_inboard_channel_total": 0.0, - "bzfllengo": 0.0, + "len_blkt_outboard_channel_total": 0.0, "c": "2.99792458e10_rkind", "c1div": 0.45, "c21": 0.0, @@ -8965,7 +8965,7 @@ "bz_ratio_ib": "", "bz_ratio_ob": "", "len_blkt_inboard_channel_total": "Inboard/outboard blanket flow lengths (m)", - "bzfllengo": "Inboard/outboard blanket flow lengths (m)", + "len_blkt_outboard_channel_total": "Inboard/outboard blanket flow lengths (m)", "c": "", "c1div": "fitting coefficient to adjust ptpdiv, ppdiv", "c21": "", @@ -17263,7 +17263,7 @@ "bllengi", "bllengo", "len_blkt_inboard_channel_total", - "bzfllengo", + "len_blkt_outboard_channel_total", "pnucfwi", "pnucfwo", "tpeakfwi", @@ -18643,7 +18643,7 @@ "bldepti", "bldepto", "len_blkt_inboard_channel_total", - "bzfllengo", + "len_blkt_outboard_channel_total", "velblkti", "velblkto", "tpeakfwi", From 8a7401ffc1720e03e1fa58bbeeb2035badc9b655 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 18 Feb 2025 13:48:04 +0000 Subject: [PATCH 33/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20velblkti=20to=20v?= =?UTF-8?q?el=5Fblkt=5Finboard=5Fcoolant=20for=20clarity=20and=20consisten?= =?UTF-8?q?cy=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/blanket_library.py | 8 ++++---- source/fortran/blanket_library.f90 | 4 ++-- tests/integration/ref_dicts.json | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/process/blanket_library.py b/process/blanket_library.py index 81283b4fda..e8dbd1f371 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -855,7 +855,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): # Coolant velocites in blanket (m/s) # Assume BZ structure has same channel width as FW - blanket_library.velblkti = self.flow_velocity( + blanket_library.vel_blkt_inboard_coolant = self.flow_velocity( i_channel_shape=1, mass_flow_rate=blanket_library.mfblktpi, flow_density=fwbs_variables.den_blkt_coolant, @@ -937,7 +937,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): # Coolant velocity in blanket (m/s) # Assume BZ structure has same channel width as FW - blanket_library.velblkti = self.flow_velocity( + blanket_library.vel_blkt_inboard_coolant = self.flow_velocity( i_channel_shape=1, mass_flow_rate=blanket_library.mfblktpi, flow_density=fwbs_variables.den_blkt_coolant, @@ -1002,7 +1002,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): # Coolant velocity in blanket (m/s) # Assume BZ structure has same channel width as FW - blanket_library.velblkti = self.flow_velocity( + blanket_library.vel_blkt_inboard_coolant = self.flow_velocity( i_channel_shape=1, mass_flow_rate=blanket_library.mfblktpi, flow_density=fwbs_variables.den_blkt_coolant, @@ -1066,7 +1066,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): deltap_bli = self.deltap_tot( output, icoolpump=1, - flow_velocity=blanket_library.velblkti, + flow_velocity=blanket_library.vel_blkt_inboard_coolant, flleng=blanket_library.len_blkt_inboard_channel_total, no90=no90bz, no180=no180bz, diff --git a/source/fortran/blanket_library.f90 b/source/fortran/blanket_library.f90 index 1e6c2bb48a..5b29b97f74 100644 --- a/source/fortran/blanket_library.f90 +++ b/source/fortran/blanket_library.f90 @@ -96,7 +96,7 @@ module blanket_library real(dp) :: mfblktpi, mfblktpo !! Inboard/outboard mass flow rate per coolant pipe (kg/s) - real(dp) :: velblkti, velblkto + real(dp) :: vel_blkt_inboard_coolant, velblkto !! Inboard/outboard coolant velocity in blanket (m/s) real(dp) :: htpmw_fwi, htpmw_fwo @@ -169,7 +169,7 @@ subroutine init_blanket_library npblkto = 0.0D0 mfblktpi = 0.0D0 mfblktpo = 0.0D0 - velblkti = 0.0D0 + vel_blkt_inboard_coolant = 0.0D0 velblkto = 0.0D0 htpmw_fwi = 0.0D0 htpmw_fwo = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 7b498eeeb6..08d6e2b4ef 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -7904,7 +7904,7 @@ "vdalw": 20.0, "vol_cryostat": 0.0, "vol_vv": 0.0, - "velblkti": 0.0, + "vel_blkt_inboard_coolant": 0.0, "velblkto": 0.0, "verbose": 0.0, "f_a_pf_coil_void": 0.3, @@ -11013,7 +11013,7 @@ "vdalw": "max voltage across TF coil during quench (kV) (`iteration variable 52`)", "vol_cryostat": "cryostat volume (m3)", "vol_vv": "vacuum vessel volume (m3)", - "velblkti": "Inboard/outboard coolant velocity in blanket (m/s)", + "vel_blkt_inboard_coolant": "Inboard/outboard coolant velocity in blanket (m/s)", "velblkto": "Inboard/outboard coolant velocity in blanket (m/s)", "verbose": "switch for turning on/off diagnostic messages\n
    \n
  • =0 turn off diagnostics
    • \n
  • =1 turn on diagnostics
    • \n
", "f_a_pf_coil_void": "winding pack void fraction of PF coil i for coolant", @@ -17285,7 +17285,7 @@ "npblkto", "mfblktpi", "mfblktpo", - "velblkti", + "vel_blkt_inboard_coolant", "velblkto", "htpmw_fwi", "htpmw_fwo", @@ -18644,7 +18644,7 @@ "bldepto", "len_blkt_inboard_channel_total", "len_blkt_outboard_channel_total", - "velblkti", + "vel_blkt_inboard_coolant", "velblkto", "tpeakfwi", "tpeakfwo", From 769bf359faa0a195dbc0a3c8698cb7ccc3f4703e Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 18 Feb 2025 13:48:30 +0000 Subject: [PATCH 34/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20velblkto=20to=20v?= =?UTF-8?q?el=5Fblkt=5Foutboard=5Fcoolant=20for=20clarity=20and=20consiste?= =?UTF-8?q?ncy=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/blanket_library.py | 8 ++++---- source/fortran/blanket_library.f90 | 4 ++-- tests/integration/ref_dicts.json | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/process/blanket_library.py b/process/blanket_library.py index e8dbd1f371..679b1f2fa4 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -817,7 +817,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): mfblktpo_liq = blanket_library.mfblkto_liq / npblkto_liq # Coolant velocites in blanket (m/s) # Assume BZ structure has same channel width as FW - blanket_library.velblkto = self.flow_velocity( + blanket_library.vel_blkt_outboard_coolant = self.flow_velocity( i_channel_shape=1, mass_flow_rate=blanket_library.mfblktpo, flow_density=fwbs_variables.den_blkt_coolant, @@ -892,7 +892,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): # Coolant velocity in blanket (m/s) # Assume BZ structure has same channel width as FW - blanket_library.velblkto = self.flow_velocity( + blanket_library.vel_blkt_outboard_coolant = self.flow_velocity( i_channel_shape=1, mass_flow_rate=blanket_library.mfblktpo, flow_density=fwbs_variables.den_blkt_coolant, @@ -976,7 +976,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): # Coolant velocity in blanket (m/s) # Assume BZ structure has same channel width as FW - blanket_library.velblkto = self.flow_velocity( + blanket_library.vel_blkt_outboard_coolant = self.flow_velocity( i_channel_shape=1, mass_flow_rate=blanket_library.mfblktpo, flow_density=fwbs_variables.den_blkt_coolant, @@ -1050,7 +1050,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): deltap_blo = self.deltap_tot( output, icoolpump=1, - flow_velocity=blanket_library.velblkto, + flow_velocity=blanket_library.vel_blkt_outboard_coolant, flleng=blanket_library.len_blkt_outboard_channel_total, no90=no90bz, no180=no180bz, diff --git a/source/fortran/blanket_library.f90 b/source/fortran/blanket_library.f90 index 5b29b97f74..5c1b46450c 100644 --- a/source/fortran/blanket_library.f90 +++ b/source/fortran/blanket_library.f90 @@ -96,7 +96,7 @@ module blanket_library real(dp) :: mfblktpi, mfblktpo !! Inboard/outboard mass flow rate per coolant pipe (kg/s) - real(dp) :: vel_blkt_inboard_coolant, velblkto + real(dp) :: vel_blkt_inboard_coolant, vel_blkt_outboard_coolant !! Inboard/outboard coolant velocity in blanket (m/s) real(dp) :: htpmw_fwi, htpmw_fwo @@ -170,7 +170,7 @@ subroutine init_blanket_library mfblktpi = 0.0D0 mfblktpo = 0.0D0 vel_blkt_inboard_coolant = 0.0D0 - velblkto = 0.0D0 + vel_blkt_outboard_coolant = 0.0D0 htpmw_fwi = 0.0D0 htpmw_fwo = 0.0D0 htpmw_blkti = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 08d6e2b4ef..c28e33f577 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -7905,7 +7905,7 @@ "vol_cryostat": 0.0, "vol_vv": 0.0, "vel_blkt_inboard_coolant": 0.0, - "velblkto": 0.0, + "vel_blkt_outboard_coolant": 0.0, "verbose": 0.0, "f_a_pf_coil_void": 0.3, "vfblkt": 0.25, @@ -11014,7 +11014,7 @@ "vol_cryostat": "cryostat volume (m3)", "vol_vv": "vacuum vessel volume (m3)", "vel_blkt_inboard_coolant": "Inboard/outboard coolant velocity in blanket (m/s)", - "velblkto": "Inboard/outboard coolant velocity in blanket (m/s)", + "vel_blkt_outboard_coolant": "Inboard/outboard coolant velocity in blanket (m/s)", "verbose": "switch for turning on/off diagnostic messages\n
    \n
  • =0 turn off diagnostics
    • \n
  • =1 turn on diagnostics
    • \n
", "f_a_pf_coil_void": "winding pack void fraction of PF coil i for coolant", "vfblkt": "coolant void fraction in blanket (`blktmodel=0`), (calculated if `blktmodel > 0`)", @@ -17286,7 +17286,7 @@ "mfblktpi", "mfblktpo", "vel_blkt_inboard_coolant", - "velblkto", + "vel_blkt_outboard_coolant", "htpmw_fwi", "htpmw_fwo", "htpmw_blkti", @@ -18645,7 +18645,7 @@ "len_blkt_inboard_channel_total", "len_blkt_outboard_channel_total", "vel_blkt_inboard_coolant", - "velblkto", + "vel_blkt_outboard_coolant", "tpeakfwi", "tpeakfwo", "pnucfwi", From 7dfe8cc0ea10376cce97b55c31a93455e9cbc298 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 18 Feb 2025 13:51:11 +0000 Subject: [PATCH 35/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20npfwo=20to=20n=5F?= =?UTF-8?q?fw=5Foutboard=5Fchannels=20for=20clarity=20and=20consistency=20?= =?UTF-8?q?across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/blanket_library.py | 4 ++-- source/fortran/blanket_library.f90 | 4 ++-- tests/integration/ref_dicts.json | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/process/blanket_library.py b/process/blanket_library.py index 679b1f2fa4..3191232b23 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -771,13 +771,13 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): blanket_library.npfwi = build_variables.a_fw_inboard / ( fwbs_variables.len_fw_channel * fwbs_variables.dx_fw_module ) - blanket_library.npfwo = build_variables.a_fw_outboard / ( + blanket_library.n_fw_outboard_channels = build_variables.a_fw_outboard / ( fwbs_variables.len_fw_channel * fwbs_variables.dx_fw_module ) # Mass flow rate per FW coolant pipe (kg/s): blanket_library.mffwpi = blanket_library.mffwi / blanket_library.npfwi - blanket_library.mffwpo = blanket_library.mffwo / blanket_library.npfwo + blanket_library.mffwpo = blanket_library.mffwo / blanket_library.n_fw_outboard_channels # Coolant velocite in FW (m/s) velfwi = self.flow_velocity( diff --git a/source/fortran/blanket_library.f90 b/source/fortran/blanket_library.f90 index 5c1b46450c..6052aa2b83 100644 --- a/source/fortran/blanket_library.f90 +++ b/source/fortran/blanket_library.f90 @@ -72,7 +72,7 @@ module blanket_library real(dp) :: mffwi, mffwo, mffw !! Inboard/outboard total mass flow rate to remove inboard FW power (kg/s) - real(dp) :: npfwi, npfwo + real(dp) :: npfwi, n_fw_outboard_channels !! Inboard/utboard total number of pipes real(dp) :: mffwpi, mffwpo @@ -153,7 +153,7 @@ subroutine init_blanket_library mffwo = 0.0D0 mffw = 0.0D0 npfwi = 0.0D0 - npfwo = 0.0D0 + n_fw_outboard_channels = 0.0D0 mffwpi = 0.0D0 mffwpo = 0.0D0 p_blkt_nuclear_heat_inboard_mw = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index c28e33f577..4379200984 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3421,7 +3421,7 @@ "npblkto": 0.0, "npdiv": 2.0, "npfwi": 0.0, - "npfwo": 0.0, + "n_fw_outboard_channels": 0.0, "nphcdin": 2.0, "nphcdout": 2.0, "nphx": 0.0, @@ -10181,7 +10181,7 @@ "npblkto": "Inboard/outboard total num of pipes", "npdiv": "number of divertor ports (`i_blanket_type=2` (KIT HCPB))", "npfwi": "Inboard/utboard total number of pipes", - "npfwo": "Inboard/utboard total number of pipes", + "n_fw_outboard_channels": "Inboard/utboard total number of pipes", "nphcdin": "number of inboard ports for heating/current drive (`i_blanket_type=2` (KIT HCPB))", "nphcdout": "number of outboard ports for heating/current drive (`i_blanket_type=2` (KIT HCPB))", "nphx": "number of primary heat exchangers", @@ -17272,7 +17272,7 @@ "mffwo", "mffw", "npfwi", - "npfwo", + "n_fw_outboard_channels", "mffwpi", "mffwpo", "p_blkt_nuclear_heat_inboard_mw", @@ -18653,7 +18653,7 @@ "p_blkt_nuclear_heat_inboard_mw", "p_blkt_nuclear_heat_outboard_mw", "npfwi", - "npfwo", + "n_fw_outboard_channels", "npblkti", "npblkto", "mftotal", From 2eff06b0ff117fab1e5f580faf62b1ed00198e46 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 18 Feb 2025 13:51:31 +0000 Subject: [PATCH 36/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20npfwi=20to=20n=5F?= =?UTF-8?q?fw=5Finboard=5Fchannels=20for=20clarity=20and=20consistency=20a?= =?UTF-8?q?cross=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/blanket_library.py | 4 ++-- source/fortran/blanket_library.f90 | 4 ++-- tests/integration/ref_dicts.json | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/process/blanket_library.py b/process/blanket_library.py index 3191232b23..c9dea9cc6d 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -768,7 +768,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): # FW Pipe Flow and Velocity ###### # Total number of first wall pipes from channel length and dx_fw_module (02/12/2015) - blanket_library.npfwi = build_variables.a_fw_inboard / ( + blanket_library.n_fw_inboard_channels = build_variables.a_fw_inboard / ( fwbs_variables.len_fw_channel * fwbs_variables.dx_fw_module ) blanket_library.n_fw_outboard_channels = build_variables.a_fw_outboard / ( @@ -776,7 +776,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): ) # Mass flow rate per FW coolant pipe (kg/s): - blanket_library.mffwpi = blanket_library.mffwi / blanket_library.npfwi + blanket_library.mffwpi = blanket_library.mffwi / blanket_library.n_fw_inboard_channels blanket_library.mffwpo = blanket_library.mffwo / blanket_library.n_fw_outboard_channels # Coolant velocite in FW (m/s) diff --git a/source/fortran/blanket_library.f90 b/source/fortran/blanket_library.f90 index 6052aa2b83..13ea81f922 100644 --- a/source/fortran/blanket_library.f90 +++ b/source/fortran/blanket_library.f90 @@ -72,7 +72,7 @@ module blanket_library real(dp) :: mffwi, mffwo, mffw !! Inboard/outboard total mass flow rate to remove inboard FW power (kg/s) - real(dp) :: npfwi, n_fw_outboard_channels + real(dp) :: n_fw_inboard_channels, n_fw_outboard_channels !! Inboard/utboard total number of pipes real(dp) :: mffwpi, mffwpo @@ -152,7 +152,7 @@ subroutine init_blanket_library mffwi = 0.0D0 mffwo = 0.0D0 mffw = 0.0D0 - npfwi = 0.0D0 + n_fw_inboard_channels = 0.0D0 n_fw_outboard_channels = 0.0D0 mffwpi = 0.0D0 mffwpo = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 4379200984..10c065d748 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3420,7 +3420,7 @@ "npblkti": 0.0, "npblkto": 0.0, "npdiv": 2.0, - "npfwi": 0.0, + "n_fw_inboard_channels": 0.0, "n_fw_outboard_channels": 0.0, "nphcdin": 2.0, "nphcdout": 2.0, @@ -10180,7 +10180,7 @@ "npblkti": "Inboard/outboard total num of pipes", "npblkto": "Inboard/outboard total num of pipes", "npdiv": "number of divertor ports (`i_blanket_type=2` (KIT HCPB))", - "npfwi": "Inboard/utboard total number of pipes", + "n_fw_inboard_channels": "Inboard/utboard total number of pipes", "n_fw_outboard_channels": "Inboard/utboard total number of pipes", "nphcdin": "number of inboard ports for heating/current drive (`i_blanket_type=2` (KIT HCPB))", "nphcdout": "number of outboard ports for heating/current drive (`i_blanket_type=2` (KIT HCPB))", @@ -17271,7 +17271,7 @@ "mffwi", "mffwo", "mffw", - "npfwi", + "n_fw_inboard_channels", "n_fw_outboard_channels", "mffwpi", "mffwpo", @@ -18652,7 +18652,7 @@ "pnucfwo", "p_blkt_nuclear_heat_inboard_mw", "p_blkt_nuclear_heat_outboard_mw", - "npfwi", + "n_fw_inboard_channels", "n_fw_outboard_channels", "npblkti", "npblkto", From 0fe53d8414944ca2b8f2db1c5032ee4d9415b840 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 18 Feb 2025 13:58:52 +0000 Subject: [PATCH 37/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20npblkti=20to=20n?= =?UTF-8?q?=5Fblkt=5Finboard=5Fchannels=20for=20clarity=20and=20consistenc?= =?UTF-8?q?y=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/blanket_library.py | 12 ++++++------ source/fortran/blanket_library.f90 | 8 ++++---- tests/integration/ref_dicts.json | 8 ++++---- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/process/blanket_library.py b/process/blanket_library.py index c9dea9cc6d..40901ddf7e 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -832,7 +832,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): # Calc total num of pipes (in all inboard modules) from # coolant frac and channel dimensions # Assumes up/down flow, two 90 deg bends per length - blanket_library.npblkti = ( + blanket_library.n_blkt_inboard_channels = ( fwbs_variables.vfblkt * fwbs_variables.vol_blkt_inboard ) / ( np.pi @@ -849,7 +849,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): # Mass flow rate per coolant pipe blanket_library.mfblktpi = ( - blanket_library.mflow_blkt_inboard_coolant / blanket_library.npblkti + blanket_library.mflow_blkt_inboard_coolant / blanket_library.n_blkt_inboard_channels ) blanket_library.mfblktpi_liq = blanket_library.mfblkti_liq / npblkti_liq @@ -915,7 +915,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): # Calc total num of pipes (in all inboard modules) from # coolant frac and channel dimensions # Assumes up/down flow, two 90 deg bends per length - blanket_library.npblkti = ( + blanket_library.n_blkt_inboard_channels = ( fwbs_variables.vfblkt * fwbs_variables.vol_blkt_inboard ) / ( np.pi @@ -932,7 +932,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): # Mass flow rate per coolant pipe blanket_library.mfblktpi = ( - blanket_library.mflow_blkt_inboard_coolant / blanket_library.npblkti + blanket_library.mflow_blkt_inboard_coolant / blanket_library.n_blkt_inboard_channels ) # Coolant velocity in blanket (m/s) @@ -986,7 +986,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): # Calc total num of pipes (in all inboard modules) from # coolant frac and channel dimensions # Assumes up/down flow, two 90 deg bends per length - blanket_library.npblkti = ( + blanket_library.n_blkt_inboard_channels = ( fwbs_variables.vfblkt * fwbs_variables.vol_blkt_inboard ) / ( np.pi @@ -997,7 +997,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): # Mass flow rate per coolant pipe blanket_library.mfblktpi = ( - blanket_library.mflow_blkt_inboard_coolant / blanket_library.npblkti + blanket_library.mflow_blkt_inboard_coolant / blanket_library.n_blkt_inboard_channels ) # Coolant velocity in blanket (m/s) diff --git a/source/fortran/blanket_library.f90 b/source/fortran/blanket_library.f90 index 13ea81f922..5736d94abd 100644 --- a/source/fortran/blanket_library.f90 +++ b/source/fortran/blanket_library.f90 @@ -73,7 +73,7 @@ module blanket_library !! Inboard/outboard total mass flow rate to remove inboard FW power (kg/s) real(dp) :: n_fw_inboard_channels, n_fw_outboard_channels - !! Inboard/utboard total number of pipes + !! Inboard / outboard total number of first wall coolant channels real(dp) :: mffwpi, mffwpo !! Inboard/outboard mass flow rate per coolant pipe (kg/s) @@ -90,8 +90,8 @@ module blanket_library real(dp) :: mftotal !! Total mass flow rate for coolant (kg/s) - real(dp) :: npblkti, npblkto - !! Inboard/outboard total num of pipes + real(dp) :: n_blkt_inboard_channels, npblkto + !! Inboard/outboard total number of blanket coolant pipes real(dp) :: mfblktpi, mfblktpo !! Inboard/outboard mass flow rate per coolant pipe (kg/s) @@ -165,7 +165,7 @@ subroutine init_blanket_library mfblkt_liq = 0.0D0 mflow_blkt_coolant_total = 0.0D0 mftotal = 0.0D0 - npblkti = 0.0D0 + n_blkt_inboard_channels = 0.0D0 npblkto = 0.0D0 mfblktpi = 0.0D0 mfblktpo = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 10c065d748..c3f7e75c91 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3417,7 +3417,7 @@ "np": 2.0, "np1": null, "np1j": null, - "npblkti": 0.0, + "n_blkt_inboard_channels": 0.0, "npblkto": 0.0, "npdiv": 2.0, "n_fw_inboard_channels": 0.0, @@ -10177,7 +10177,7 @@ "np": "Array length", "np1": "", "np1j": "", - "npblkti": "Inboard/outboard total num of pipes", + "n_blkt_inboard_channels": "Inboard/outboard total num of pipes", "npblkto": "Inboard/outboard total num of pipes", "npdiv": "number of divertor ports (`i_blanket_type=2` (KIT HCPB))", "n_fw_inboard_channels": "Inboard/utboard total number of pipes", @@ -17281,7 +17281,7 @@ "mflow_blkt_outboard_coolant", "mflow_blkt_coolant_total", "mftotal", - "npblkti", + "n_blkt_inboard_channels", "npblkto", "mfblktpi", "mfblktpo", @@ -18654,7 +18654,7 @@ "p_blkt_nuclear_heat_outboard_mw", "n_fw_inboard_channels", "n_fw_outboard_channels", - "npblkti", + "n_blkt_inboard_channels", "npblkto", "mftotal", "mffwpi", From c02a00cedc762bff303fc4f35f02b8ba2fa61755 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 18 Feb 2025 13:59:17 +0000 Subject: [PATCH 38/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20npblkto=20to=20n?= =?UTF-8?q?=5Fblkt=5Foutboard=5Fchannels=20for=20clarity=20and=20consisten?= =?UTF-8?q?cy=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/blanket_library.py | 32 ++++++++++++++++++++---------- source/fortran/blanket_library.f90 | 4 ++-- tests/integration/ref_dicts.json | 8 ++++---- 3 files changed, 27 insertions(+), 17 deletions(-) diff --git a/process/blanket_library.py b/process/blanket_library.py index 40901ddf7e..be4e6cc99e 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -776,8 +776,12 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): ) # Mass flow rate per FW coolant pipe (kg/s): - blanket_library.mffwpi = blanket_library.mffwi / blanket_library.n_fw_inboard_channels - blanket_library.mffwpo = blanket_library.mffwo / blanket_library.n_fw_outboard_channels + blanket_library.mffwpi = ( + blanket_library.mffwi / blanket_library.n_fw_inboard_channels + ) + blanket_library.mffwpo = ( + blanket_library.mffwo / blanket_library.n_fw_outboard_channels + ) # Coolant velocite in FW (m/s) velfwi = self.flow_velocity( @@ -796,7 +800,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): # Calc total num of pipes (in all inboard modules) from # coolant frac and channel dimensions # Assumes up/down flow, two 90 deg bends per length - blanket_library.npblkto = ( + blanket_library.n_blkt_outboard_channels = ( fwbs_variables.vfblkt * fwbs_variables.vol_blkt_outboard ) / ( np.pi @@ -812,7 +816,8 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): # Mass flow rate per coolant pipe blanket_library.mfblktpo = ( - blanket_library.mflow_blkt_outboard_coolant / blanket_library.npblkto + blanket_library.mflow_blkt_outboard_coolant + / blanket_library.n_blkt_outboard_channels ) mfblktpo_liq = blanket_library.mfblkto_liq / npblkto_liq # Coolant velocites in blanket (m/s) @@ -849,7 +854,8 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): # Mass flow rate per coolant pipe blanket_library.mfblktpi = ( - blanket_library.mflow_blkt_inboard_coolant / blanket_library.n_blkt_inboard_channels + blanket_library.mflow_blkt_inboard_coolant + / blanket_library.n_blkt_inboard_channels ) blanket_library.mfblktpi_liq = blanket_library.mfblkti_liq / npblkti_liq @@ -871,7 +877,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): # Calc total num of pipes (in all inboard modules) from # coolant frac and channel dimensions # Assumes up/down flow, two 90 deg bends per length - blanket_library.npblkto = ( + blanket_library.n_blkt_outboard_channels = ( fwbs_variables.vfblkt * fwbs_variables.vol_blkt_outboard ) / ( np.pi @@ -887,7 +893,8 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): # Mass flow rate per coolant pipe blanket_library.mfblktpo = ( - blanket_library.mflow_blkt_outboard_coolant / blanket_library.npblkto + blanket_library.mflow_blkt_outboard_coolant + / blanket_library.n_blkt_outboard_channels ) # Coolant velocity in blanket (m/s) @@ -932,7 +939,8 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): # Mass flow rate per coolant pipe blanket_library.mfblktpi = ( - blanket_library.mflow_blkt_inboard_coolant / blanket_library.n_blkt_inboard_channels + blanket_library.mflow_blkt_inboard_coolant + / blanket_library.n_blkt_inboard_channels ) # Coolant velocity in blanket (m/s) @@ -960,7 +968,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): else: # Calculate total number of pipes (in all outboard modules) from coolant fraction and # channel dimensions (assumes up/down flow, two 90 deg bends per length) - blanket_library.npblkto = ( + blanket_library.n_blkt_outboard_channels = ( fwbs_variables.vfblkt * fwbs_variables.vol_blkt_outboard ) / ( np.pi @@ -971,7 +979,8 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): # Mass flow rate per coolant pipe blanket_library.mfblktpo = ( - blanket_library.mflow_blkt_outboard_coolant / blanket_library.npblkto + blanket_library.mflow_blkt_outboard_coolant + / blanket_library.n_blkt_outboard_channels ) # Coolant velocity in blanket (m/s) @@ -997,7 +1006,8 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): # Mass flow rate per coolant pipe blanket_library.mfblktpi = ( - blanket_library.mflow_blkt_inboard_coolant / blanket_library.n_blkt_inboard_channels + blanket_library.mflow_blkt_inboard_coolant + / blanket_library.n_blkt_inboard_channels ) # Coolant velocity in blanket (m/s) diff --git a/source/fortran/blanket_library.f90 b/source/fortran/blanket_library.f90 index 5736d94abd..7c2361c14b 100644 --- a/source/fortran/blanket_library.f90 +++ b/source/fortran/blanket_library.f90 @@ -90,7 +90,7 @@ module blanket_library real(dp) :: mftotal !! Total mass flow rate for coolant (kg/s) - real(dp) :: n_blkt_inboard_channels, npblkto + real(dp) :: n_blkt_inboard_channels, n_blkt_outboard_channels !! Inboard/outboard total number of blanket coolant pipes real(dp) :: mfblktpi, mfblktpo @@ -166,7 +166,7 @@ subroutine init_blanket_library mflow_blkt_coolant_total = 0.0D0 mftotal = 0.0D0 n_blkt_inboard_channels = 0.0D0 - npblkto = 0.0D0 + n_blkt_outboard_channels = 0.0D0 mfblktpi = 0.0D0 mfblktpo = 0.0D0 vel_blkt_inboard_coolant = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index c3f7e75c91..f9d4243f79 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3418,7 +3418,7 @@ "np1": null, "np1j": null, "n_blkt_inboard_channels": 0.0, - "npblkto": 0.0, + "n_blkt_outboard_channels": 0.0, "npdiv": 2.0, "n_fw_inboard_channels": 0.0, "n_fw_outboard_channels": 0.0, @@ -10178,7 +10178,7 @@ "np1": "", "np1j": "", "n_blkt_inboard_channels": "Inboard/outboard total num of pipes", - "npblkto": "Inboard/outboard total num of pipes", + "n_blkt_outboard_channels": "Inboard/outboard total num of pipes", "npdiv": "number of divertor ports (`i_blanket_type=2` (KIT HCPB))", "n_fw_inboard_channels": "Inboard/utboard total number of pipes", "n_fw_outboard_channels": "Inboard/utboard total number of pipes", @@ -17282,7 +17282,7 @@ "mflow_blkt_coolant_total", "mftotal", "n_blkt_inboard_channels", - "npblkto", + "n_blkt_outboard_channels", "mfblktpi", "mfblktpo", "vel_blkt_inboard_coolant", @@ -18655,7 +18655,7 @@ "n_fw_inboard_channels", "n_fw_outboard_channels", "n_blkt_inboard_channels", - "npblkto", + "n_blkt_outboard_channels", "mftotal", "mffwpi", "mffwpo", From 2b94c8766deb37d16e2ee5afeaf5611d745cd0ba Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 18 Feb 2025 14:00:38 +0000 Subject: [PATCH 39/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20volvvi=20to=20vol?= =?UTF-8?q?=5Fvv=5Finboard=20for=20clarity=20and=20consistency=20across=20?= =?UTF-8?q?the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/blanket_library.py | 4 +-- source/fortran/blanket_library.f90 | 4 +-- tests/unit/test_blanket_library.py | 44 ++++++++++++++++-------------- 3 files changed, 28 insertions(+), 24 deletions(-) diff --git a/process/blanket_library.py b/process/blanket_library.py index be4e6cc99e..3479eb16ca 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -218,7 +218,7 @@ def dshaped_component(self, icomponent: int): ) elif icomponent == 2: ( - blanket_library.volvvi, + blanket_library.vol_vv_inboard, blanket_library.volvvo, fwbs_variables.vol_vv, ) = dshellvol( @@ -310,7 +310,7 @@ def elliptical_component(self, icomponent: int): ) if icomponent == 2: ( - blanket_library.volvvi, + blanket_library.vol_vv_inboard, blanket_library.volvvo, fwbs_variables.vol_vv, ) = eshellvol( diff --git a/source/fortran/blanket_library.f90 b/source/fortran/blanket_library.f90 index 7c2361c14b..3c4676aec2 100644 --- a/source/fortran/blanket_library.f90 +++ b/source/fortran/blanket_library.f90 @@ -39,7 +39,7 @@ module blanket_library real(dp) :: volshldi, volshldo !! Volume of inboard and outboard shield (m3) - real(dp) :: volvvi, volvvo + real(dp) :: vol_vv_inboard, volvvo !! Volume of inboard and outboard Vacuum Vessel (m3) real(dp) :: dz_pf_cryostat @@ -133,7 +133,7 @@ subroutine init_blanket_library hvv = 0.0D0 volshldi = 0.0D0 volshldo = 0.0D0 - volvvi = 0.0D0 + vol_vv_inboard = 0.0D0 volvvo = 0.0D0 bldepti = 0.0D0 bldepto = 0.0D0 diff --git a/tests/unit/test_blanket_library.py b/tests/unit/test_blanket_library.py index 83ad295756..9abb7ea1a9 100644 --- a/tests/unit/test_blanket_library.py +++ b/tests/unit/test_blanket_library.py @@ -526,7 +526,7 @@ class DshapedComponentParam(NamedTuple): rminor: Any = None volshldi: Any = None volshldo: Any = None - volvvi: Any = None + vol_vv_inboard: Any = None volvvo: Any = None hblnkt: Any = None hshld: Any = None @@ -544,7 +544,7 @@ class DshapedComponentParam(NamedTuple): expected_vol_vv: Any = None expected_volshldi: Any = None expected_volshldo: Any = None - expected_volvvi: Any = None + expected_vol_vv_inboard: Any = None expected_volvvo: Any = None expected_icomponent: Any = None @@ -583,7 +583,7 @@ class DshapedComponentParam(NamedTuple): rminor=2.5, volshldi=0, volshldo=0, - volvvi=0, + vol_vv_inboard=0, volvvo=0, hblnkt=8.25, hshld=8.75, @@ -601,7 +601,7 @@ class DshapedComponentParam(NamedTuple): expected_vol_vv=0, expected_volshldi=0, expected_volshldo=0, - expected_volvvi=0, + expected_vol_vv_inboard=0, expected_volvvo=0, expected_icomponent=0, ), @@ -636,7 +636,7 @@ class DshapedComponentParam(NamedTuple): rminor=2.5, volshldi=0, volshldo=0, - volvvi=0, + vol_vv_inboard=0, volvvo=0, hblnkt=8.25, hshld=8.75, @@ -654,7 +654,7 @@ class DshapedComponentParam(NamedTuple): expected_vol_vv=0, expected_volshldi=79.896984366095609, expected_volshldo=370.5642451119993, - expected_volvvi=0, + expected_vol_vv_inboard=0, expected_volvvo=0, expected_icomponent=1, ), @@ -689,7 +689,7 @@ class DshapedComponentParam(NamedTuple): rminor=2.5, volshldi=79.896984366095609, volshldo=370.5642451119993, - volvvi=0, + vol_vv_inboard=0, volvvo=0, hblnkt=8.25, hshld=8.75, @@ -707,7 +707,7 @@ class DshapedComponentParam(NamedTuple): expected_vol_vv=340.45369594344834, expected_volshldi=79.896984366095609, expected_volshldo=370.5642451119993, - expected_volvvi=34.253413020620215, + expected_vol_vv_inboard=34.253413020620215, expected_volvvo=306.20028292282814, expected_icomponent=2, ), @@ -793,7 +793,9 @@ def test_dshaped_component(dshapedcomponentparam, monkeypatch, blanket_library_f monkeypatch.setattr(physics_variables, "rminor", dshapedcomponentparam.rminor) monkeypatch.setattr(blanket_library, "volshldi", dshapedcomponentparam.volshldi) monkeypatch.setattr(blanket_library, "volshldo", dshapedcomponentparam.volshldo) - monkeypatch.setattr(blanket_library, "volvvi", dshapedcomponentparam.volvvi) + monkeypatch.setattr( + blanket_library, "vol_vv_inboard", dshapedcomponentparam.vol_vv_inboard + ) monkeypatch.setattr(blanket_library, "volvvo", dshapedcomponentparam.volvvo) monkeypatch.setattr(blanket_library, "hblnkt", dshapedcomponentparam.hblnkt) monkeypatch.setattr(blanket_library, "hshld", dshapedcomponentparam.hshld) @@ -847,7 +849,7 @@ class EllipticalComponentParam(NamedTuple): triang: Any = None volshldi: Any = None volshldo: Any = None - volvvi: Any = None + vol_vv_inboard: Any = None volvvo: Any = None hblnkt: Any = None hshld: Any = None @@ -866,7 +868,7 @@ class EllipticalComponentParam(NamedTuple): expected_vol_vv: Any = None expected_volshldi: Any = None expected_volshldo: Any = None - expected_volvvi: Any = None + expected_vol_vv_inboard: Any = None expected_volvvo: Any = None expected_icomponent: Any = None @@ -903,7 +905,7 @@ class EllipticalComponentParam(NamedTuple): triang=0.5, volshldi=0, volshldo=0, - volvvi=0, + vol_vv_inboard=0, volvvo=0, hblnkt=5.9532752487304119, hshld=6.8032752487304133, @@ -922,7 +924,7 @@ class EllipticalComponentParam(NamedTuple): expected_vol_vv=0, expected_volshldi=0, expected_volshldo=0, - expected_volvvi=0, + expected_vol_vv_inboard=0, expected_volvvo=0, expected_icomponent=0, ), @@ -955,7 +957,7 @@ class EllipticalComponentParam(NamedTuple): triang=0.5, volshldi=0, volshldo=0, - volvvi=0, + vol_vv_inboard=0, volvvo=0, hblnkt=5.9532752487304119, hshld=6.8032752487304133, @@ -974,7 +976,7 @@ class EllipticalComponentParam(NamedTuple): expected_vol_vv=0, expected_volshldi=177.89822933168091, expected_volshldo=946.56393192782434, - expected_volvvi=0, + expected_vol_vv_inboard=0, expected_volvvo=0, expected_icomponent=1, ), @@ -1007,7 +1009,7 @@ class EllipticalComponentParam(NamedTuple): triang=0.5, volshldi=177.89822933168091, volshldo=946.56393192782434, - volvvi=0, + vol_vv_inboard=0, volvvo=0, hblnkt=5.9532752487304119, hshld=6.8032752487304133, @@ -1026,7 +1028,7 @@ class EllipticalComponentParam(NamedTuple): expected_vol_vv=584.07334775041659, expected_volshldi=177.89822933168091, expected_volshldo=946.56393192782434, - expected_volvvi=143.03162449152501, + expected_vol_vv_inboard=143.03162449152501, expected_volvvo=441.04172325889158, expected_icomponent=2, ), @@ -1100,7 +1102,9 @@ def test_elliptical_component( monkeypatch.setattr(physics_variables, "triang", ellipticalcomponentparam.triang) monkeypatch.setattr(blanket_library, "volshldi", ellipticalcomponentparam.volshldi) monkeypatch.setattr(blanket_library, "volshldo", ellipticalcomponentparam.volshldo) - monkeypatch.setattr(blanket_library, "volvvi", ellipticalcomponentparam.volvvi) + monkeypatch.setattr( + blanket_library, "vol_vv_inboard", ellipticalcomponentparam.vol_vv_inboard + ) monkeypatch.setattr(blanket_library, "volvvo", ellipticalcomponentparam.volvvo) monkeypatch.setattr(blanket_library, "hblnkt", ellipticalcomponentparam.hblnkt) monkeypatch.setattr(blanket_library, "hshld", ellipticalcomponentparam.hshld) @@ -1147,8 +1151,8 @@ def test_elliptical_component( assert blanket_library.volshldo == pytest.approx( ellipticalcomponentparam.expected_volshldo ) - assert blanket_library.volvvi == pytest.approx( - ellipticalcomponentparam.expected_volvvi + assert blanket_library.vol_vv_inboard == pytest.approx( + ellipticalcomponentparam.expected_vol_vv_inboard ) assert blanket_library.volvvo == pytest.approx( ellipticalcomponentparam.expected_volvvo From d42e747dfe654c3d09764f31a3f915f551a9bf1a Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 18 Feb 2025 14:01:06 +0000 Subject: [PATCH 40/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20volvvo=20to=20vol?= =?UTF-8?q?=5Fvv=5Foutboard=20for=20clarity=20and=20consistency=20across?= =?UTF-8?q?=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/blanket_library.py | 4 +-- source/fortran/blanket_library.f90 | 4 +-- tests/unit/test_blanket_library.py | 44 ++++++++++++++++-------------- 3 files changed, 28 insertions(+), 24 deletions(-) diff --git a/process/blanket_library.py b/process/blanket_library.py index 3479eb16ca..7ca4bcc9fb 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -219,7 +219,7 @@ def dshaped_component(self, icomponent: int): elif icomponent == 2: ( blanket_library.vol_vv_inboard, - blanket_library.volvvo, + blanket_library.vol_vv_outboard, fwbs_variables.vol_vv, ) = dshellvol( r1, @@ -311,7 +311,7 @@ def elliptical_component(self, icomponent: int): if icomponent == 2: ( blanket_library.vol_vv_inboard, - blanket_library.volvvo, + blanket_library.vol_vv_outboard, fwbs_variables.vol_vv, ) = eshellvol( r1, diff --git a/source/fortran/blanket_library.f90 b/source/fortran/blanket_library.f90 index 3c4676aec2..c4806c730f 100644 --- a/source/fortran/blanket_library.f90 +++ b/source/fortran/blanket_library.f90 @@ -39,7 +39,7 @@ module blanket_library real(dp) :: volshldi, volshldo !! Volume of inboard and outboard shield (m3) - real(dp) :: vol_vv_inboard, volvvo + real(dp) :: vol_vv_inboard, vol_vv_outboard !! Volume of inboard and outboard Vacuum Vessel (m3) real(dp) :: dz_pf_cryostat @@ -134,7 +134,7 @@ subroutine init_blanket_library volshldi = 0.0D0 volshldo = 0.0D0 vol_vv_inboard = 0.0D0 - volvvo = 0.0D0 + vol_vv_outboard = 0.0D0 bldepti = 0.0D0 bldepto = 0.0D0 blwidti = 0.0D0 diff --git a/tests/unit/test_blanket_library.py b/tests/unit/test_blanket_library.py index 9abb7ea1a9..4600e47e3d 100644 --- a/tests/unit/test_blanket_library.py +++ b/tests/unit/test_blanket_library.py @@ -527,7 +527,7 @@ class DshapedComponentParam(NamedTuple): volshldi: Any = None volshldo: Any = None vol_vv_inboard: Any = None - volvvo: Any = None + vol_vv_outboard: Any = None hblnkt: Any = None hshld: Any = None hvv: Any = None @@ -545,7 +545,7 @@ class DshapedComponentParam(NamedTuple): expected_volshldi: Any = None expected_volshldo: Any = None expected_vol_vv_inboard: Any = None - expected_volvvo: Any = None + expected_vol_vv_outboard: Any = None expected_icomponent: Any = None @@ -584,7 +584,7 @@ class DshapedComponentParam(NamedTuple): volshldi=0, volshldo=0, vol_vv_inboard=0, - volvvo=0, + vol_vv_outboard=0, hblnkt=8.25, hshld=8.75, hvv=9.4349999999999987, @@ -602,7 +602,7 @@ class DshapedComponentParam(NamedTuple): expected_volshldi=0, expected_volshldo=0, expected_vol_vv_inboard=0, - expected_volvvo=0, + expected_vol_vv_outboard=0, expected_icomponent=0, ), DshapedComponentParam( @@ -637,7 +637,7 @@ class DshapedComponentParam(NamedTuple): volshldi=0, volshldo=0, vol_vv_inboard=0, - volvvo=0, + vol_vv_outboard=0, hblnkt=8.25, hshld=8.75, hvv=9.4349999999999987, @@ -655,7 +655,7 @@ class DshapedComponentParam(NamedTuple): expected_volshldi=79.896984366095609, expected_volshldo=370.5642451119993, expected_vol_vv_inboard=0, - expected_volvvo=0, + expected_vol_vv_outboard=0, expected_icomponent=1, ), DshapedComponentParam( @@ -690,7 +690,7 @@ class DshapedComponentParam(NamedTuple): volshldi=79.896984366095609, volshldo=370.5642451119993, vol_vv_inboard=0, - volvvo=0, + vol_vv_outboard=0, hblnkt=8.25, hshld=8.75, hvv=9.4349999999999987, @@ -708,7 +708,7 @@ class DshapedComponentParam(NamedTuple): expected_volshldi=79.896984366095609, expected_volshldo=370.5642451119993, expected_vol_vv_inboard=34.253413020620215, - expected_volvvo=306.20028292282814, + expected_vol_vv_outboard=306.20028292282814, expected_icomponent=2, ), ), @@ -796,7 +796,9 @@ def test_dshaped_component(dshapedcomponentparam, monkeypatch, blanket_library_f monkeypatch.setattr( blanket_library, "vol_vv_inboard", dshapedcomponentparam.vol_vv_inboard ) - monkeypatch.setattr(blanket_library, "volvvo", dshapedcomponentparam.volvvo) + monkeypatch.setattr( + blanket_library, "vol_vv_outboard", dshapedcomponentparam.vol_vv_outboard + ) monkeypatch.setattr(blanket_library, "hblnkt", dshapedcomponentparam.hblnkt) monkeypatch.setattr(blanket_library, "hshld", dshapedcomponentparam.hshld) monkeypatch.setattr(blanket_library, "hvv", dshapedcomponentparam.hvv) @@ -850,7 +852,7 @@ class EllipticalComponentParam(NamedTuple): volshldi: Any = None volshldo: Any = None vol_vv_inboard: Any = None - volvvo: Any = None + vol_vv_outboard: Any = None hblnkt: Any = None hshld: Any = None hvv: Any = None @@ -869,7 +871,7 @@ class EllipticalComponentParam(NamedTuple): expected_volshldi: Any = None expected_volshldo: Any = None expected_vol_vv_inboard: Any = None - expected_volvvo: Any = None + expected_vol_vv_outboard: Any = None expected_icomponent: Any = None @@ -906,7 +908,7 @@ class EllipticalComponentParam(NamedTuple): volshldi=0, volshldo=0, vol_vv_inboard=0, - volvvo=0, + vol_vv_outboard=0, hblnkt=5.9532752487304119, hshld=6.8032752487304133, hvv=7.5032752487304135, @@ -925,7 +927,7 @@ class EllipticalComponentParam(NamedTuple): expected_volshldi=0, expected_volshldo=0, expected_vol_vv_inboard=0, - expected_volvvo=0, + expected_vol_vv_outboard=0, expected_icomponent=0, ), EllipticalComponentParam( @@ -958,7 +960,7 @@ class EllipticalComponentParam(NamedTuple): volshldi=0, volshldo=0, vol_vv_inboard=0, - volvvo=0, + vol_vv_outboard=0, hblnkt=5.9532752487304119, hshld=6.8032752487304133, hvv=7.5032752487304135, @@ -977,7 +979,7 @@ class EllipticalComponentParam(NamedTuple): expected_volshldi=177.89822933168091, expected_volshldo=946.56393192782434, expected_vol_vv_inboard=0, - expected_volvvo=0, + expected_vol_vv_outboard=0, expected_icomponent=1, ), EllipticalComponentParam( @@ -1010,7 +1012,7 @@ class EllipticalComponentParam(NamedTuple): volshldi=177.89822933168091, volshldo=946.56393192782434, vol_vv_inboard=0, - volvvo=0, + vol_vv_outboard=0, hblnkt=5.9532752487304119, hshld=6.8032752487304133, hvv=7.5032752487304135, @@ -1029,7 +1031,7 @@ class EllipticalComponentParam(NamedTuple): expected_volshldi=177.89822933168091, expected_volshldo=946.56393192782434, expected_vol_vv_inboard=143.03162449152501, - expected_volvvo=441.04172325889158, + expected_vol_vv_outboard=441.04172325889158, expected_icomponent=2, ), ), @@ -1105,7 +1107,9 @@ def test_elliptical_component( monkeypatch.setattr( blanket_library, "vol_vv_inboard", ellipticalcomponentparam.vol_vv_inboard ) - monkeypatch.setattr(blanket_library, "volvvo", ellipticalcomponentparam.volvvo) + monkeypatch.setattr( + blanket_library, "vol_vv_outboard", ellipticalcomponentparam.vol_vv_outboard + ) monkeypatch.setattr(blanket_library, "hblnkt", ellipticalcomponentparam.hblnkt) monkeypatch.setattr(blanket_library, "hshld", ellipticalcomponentparam.hshld) monkeypatch.setattr(blanket_library, "hvv", ellipticalcomponentparam.hvv) @@ -1154,8 +1158,8 @@ def test_elliptical_component( assert blanket_library.vol_vv_inboard == pytest.approx( ellipticalcomponentparam.expected_vol_vv_inboard ) - assert blanket_library.volvvo == pytest.approx( - ellipticalcomponentparam.expected_volvvo + assert blanket_library.vol_vv_outboard == pytest.approx( + ellipticalcomponentparam.expected_vol_vv_outboard ) From 106826b2739dac7fdce760a271ac1a8e11529920 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 18 Feb 2025 14:05:00 +0000 Subject: [PATCH 41/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20mffwi=20to=20mflo?= =?UTF-8?q?w=5Ffw=5Finboard=5Fcoolant=5Ftotal=20for=20clarity=20and=20cons?= =?UTF-8?q?istency=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/blanket_library.py | 13 +++++++++---- source/fortran/blanket_library.f90 | 4 ++-- tests/integration/ref_dicts.json | 8 ++++---- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/process/blanket_library.py b/process/blanket_library.py index 7ca4bcc9fb..2a2d35f712 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -777,7 +777,8 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): # Mass flow rate per FW coolant pipe (kg/s): blanket_library.mffwpi = ( - blanket_library.mffwi / blanket_library.n_fw_inboard_channels + blanket_library.mflow_fw_inboard_coolant_total + / blanket_library.n_fw_inboard_channels ) blanket_library.mffwpo = ( blanket_library.mffwo / blanket_library.n_fw_outboard_channels @@ -1744,7 +1745,7 @@ def thermo_hydraulic_model(self, output: bool): ) # Total mass flow rate to remove inboard FW power (kg/s) - blanket_library.mffwi = ( + blanket_library.mflow_fw_inboard_coolant_total = ( 1.0e6 * (blanket_library.pnucfwi + fwbs_variables.psurffwi) / (fwbs_variables.cp_fw * (fwoutleti - fwbs_variables.temp_fw_coolant_in)) @@ -1893,7 +1894,9 @@ def thermo_hydraulic_model(self, output: bool): elif fwbs_variables.i_coolant_pumping == 3: deltap_fw_blkt = primary_pumping_variables.dp_fw_blkt # Total coolant mass flow rate in the first wall/blanket (kg/s) - blanket_library.mftotal = blanket_library.mffwi + blanket_library.mffwo + blanket_library.mftotal = ( + blanket_library.mflow_fw_inboard_coolant_total + blanket_library.mffwo + ) # Total mechanical pumping power (MW) primary_pumping_variables.htpmw_fw_blkt = self.pumppower( @@ -1927,7 +1930,9 @@ def thermo_hydraulic_model(self, output: bool): deltap_blkt = primary_pumping_variables.dp_blkt # Total coolant mass flow rate in the first wall (kg/s) - blanket_library.mffw = blanket_library.mffwi + blanket_library.mffwo + blanket_library.mffw = ( + blanket_library.mflow_fw_inboard_coolant_total + blanket_library.mffwo + ) # Total coolant mass flow rate in the blanket (kg/s) blanket_library.mflow_blkt_coolant_total = ( blanket_library.mflow_blkt_inboard_coolant diff --git a/source/fortran/blanket_library.f90 b/source/fortran/blanket_library.f90 index c4806c730f..1d153156b4 100644 --- a/source/fortran/blanket_library.f90 +++ b/source/fortran/blanket_library.f90 @@ -69,7 +69,7 @@ module blanket_library real(dp) :: tpeakfwi, tpeakfwo !! Inboard/outboard first wall peak temperature (K) - real(dp) :: mffwi, mffwo, mffw + real(dp) :: mflow_fw_inboard_coolant_total, mffwo, mffw !! Inboard/outboard total mass flow rate to remove inboard FW power (kg/s) real(dp) :: n_fw_inboard_channels, n_fw_outboard_channels @@ -149,7 +149,7 @@ subroutine init_blanket_library pnucfwo = 0.0D0 tpeakfwi = 0.0D0 tpeakfwo = 0.0D0 - mffwi = 0.0D0 + mflow_fw_inboard_coolant_total = 0.0D0 mffwo = 0.0D0 mffw = 0.0D0 n_fw_inboard_channels = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index f9d4243f79..06c284ea19 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3299,7 +3299,7 @@ "mfblktpi": 0.0, "mfblktpo": 0.0, "mffw": 0.0, - "mffwi": 0.0, + "mflow_fw_inboard_coolant_total": 0.0, "mffwo": 0.0, "mffwpi": 0.0, "mffwpo": 0.0, @@ -10073,7 +10073,7 @@ "mfblktpi": "Inboard/outboard mass flow rate per coolant pipe (kg/s)", "mfblktpo": "Inboard/outboard mass flow rate per coolant pipe (kg/s)", "mffw": "Inboard/outboard total mass flow rate to remove inboard FW power (kg/s)", - "mffwi": "Inboard/outboard total mass flow rate to remove inboard FW power (kg/s)", + "mflow_fw_inboard_coolant_total": "Inboard/outboard total mass flow rate to remove inboard FW power (kg/s)", "mffwo": "Inboard/outboard total mass flow rate to remove inboard FW power (kg/s)", "mffwpi": "Inboard/outboard mass flow rate per coolant pipe (kg/s)", "mffwpo": "Inboard/outboard mass flow rate per coolant pipe (kg/s)", @@ -17268,7 +17268,7 @@ "pnucfwo", "tpeakfwi", "tpeakfwo", - "mffwi", + "mflow_fw_inboard_coolant_total", "mffwo", "mffw", "n_fw_inboard_channels", @@ -18659,7 +18659,7 @@ "mftotal", "mffwpi", "mffwpo", - "mffwi", + "mflow_fw_inboard_coolant_total", "mffwo", "mffw", "mflow_blkt_inboard_coolant", From 19e7158052615f78290a3ae1cd5a4cc5636ac530 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 18 Feb 2025 14:07:38 +0000 Subject: [PATCH 42/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20mffwo=20to=20mflo?= =?UTF-8?q?w=5Ffw=5Foutboard=5Fcoolant=5Ftotal=20for=20clarity=20and=20con?= =?UTF-8?q?sistency=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/blanket_library.py | 11 +++++++---- source/fortran/blanket_library.f90 | 4 ++-- tests/integration/ref_dicts.json | 8 ++++---- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/process/blanket_library.py b/process/blanket_library.py index 2a2d35f712..7d87b8bcc2 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -781,7 +781,8 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): / blanket_library.n_fw_inboard_channels ) blanket_library.mffwpo = ( - blanket_library.mffwo / blanket_library.n_fw_outboard_channels + blanket_library.mflow_fw_outboard_coolant_total + / blanket_library.n_fw_outboard_channels ) # Coolant velocite in FW (m/s) @@ -1751,7 +1752,7 @@ def thermo_hydraulic_model(self, output: bool): / (fwbs_variables.cp_fw * (fwoutleti - fwbs_variables.temp_fw_coolant_in)) ) # Total mass flow rate to remove outboard FW power (kg/s) - blanket_library.mffwo = ( + blanket_library.mflow_fw_outboard_coolant_total = ( 1.0e6 * (blanket_library.pnucfwo + fwbs_variables.psurffwo) / (fwbs_variables.cp_fw * (fwoutleto - fwbs_variables.temp_fw_coolant_in)) @@ -1895,7 +1896,8 @@ def thermo_hydraulic_model(self, output: bool): deltap_fw_blkt = primary_pumping_variables.dp_fw_blkt # Total coolant mass flow rate in the first wall/blanket (kg/s) blanket_library.mftotal = ( - blanket_library.mflow_fw_inboard_coolant_total + blanket_library.mffwo + blanket_library.mflow_fw_inboard_coolant_total + + blanket_library.mflow_fw_outboard_coolant_total ) # Total mechanical pumping power (MW) @@ -1931,7 +1933,8 @@ def thermo_hydraulic_model(self, output: bool): # Total coolant mass flow rate in the first wall (kg/s) blanket_library.mffw = ( - blanket_library.mflow_fw_inboard_coolant_total + blanket_library.mffwo + blanket_library.mflow_fw_inboard_coolant_total + + blanket_library.mflow_fw_outboard_coolant_total ) # Total coolant mass flow rate in the blanket (kg/s) blanket_library.mflow_blkt_coolant_total = ( diff --git a/source/fortran/blanket_library.f90 b/source/fortran/blanket_library.f90 index 1d153156b4..ac798af035 100644 --- a/source/fortran/blanket_library.f90 +++ b/source/fortran/blanket_library.f90 @@ -69,7 +69,7 @@ module blanket_library real(dp) :: tpeakfwi, tpeakfwo !! Inboard/outboard first wall peak temperature (K) - real(dp) :: mflow_fw_inboard_coolant_total, mffwo, mffw + real(dp) :: mflow_fw_inboard_coolant_total, mflow_fw_outboard_coolant_total, mffw !! Inboard/outboard total mass flow rate to remove inboard FW power (kg/s) real(dp) :: n_fw_inboard_channels, n_fw_outboard_channels @@ -150,7 +150,7 @@ subroutine init_blanket_library tpeakfwi = 0.0D0 tpeakfwo = 0.0D0 mflow_fw_inboard_coolant_total = 0.0D0 - mffwo = 0.0D0 + mflow_fw_outboard_coolant_total = 0.0D0 mffw = 0.0D0 n_fw_inboard_channels = 0.0D0 n_fw_outboard_channels = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 06c284ea19..1951dd8fac 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3300,7 +3300,7 @@ "mfblktpo": 0.0, "mffw": 0.0, "mflow_fw_inboard_coolant_total": 0.0, - "mffwo": 0.0, + "mflow_fw_outboard_coolant_total": 0.0, "mffwpi": 0.0, "mffwpo": 0.0, "mfile": 13.0, @@ -10074,7 +10074,7 @@ "mfblktpo": "Inboard/outboard mass flow rate per coolant pipe (kg/s)", "mffw": "Inboard/outboard total mass flow rate to remove inboard FW power (kg/s)", "mflow_fw_inboard_coolant_total": "Inboard/outboard total mass flow rate to remove inboard FW power (kg/s)", - "mffwo": "Inboard/outboard total mass flow rate to remove inboard FW power (kg/s)", + "mflow_fw_outboard_coolant_total": "Inboard/outboard total mass flow rate to remove inboard FW power (kg/s)", "mffwpi": "Inboard/outboard mass flow rate per coolant pipe (kg/s)", "mffwpo": "Inboard/outboard mass flow rate per coolant pipe (kg/s)", "mfile": "Machine-optimised output file unit", @@ -17269,7 +17269,7 @@ "tpeakfwi", "tpeakfwo", "mflow_fw_inboard_coolant_total", - "mffwo", + "mflow_fw_outboard_coolant_total", "mffw", "n_fw_inboard_channels", "n_fw_outboard_channels", @@ -18660,7 +18660,7 @@ "mffwpi", "mffwpo", "mflow_fw_inboard_coolant_total", - "mffwo", + "mflow_fw_outboard_coolant_total", "mffw", "mflow_blkt_inboard_coolant", "mflow_blkt_outboard_coolant", From b9ddc5db3416fc88cc4110a3864c3bd789393dae Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 18 Feb 2025 14:08:17 +0000 Subject: [PATCH 43/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20mffw=20to=20mflow?= =?UTF-8?q?=5Ffw=5Fcoolant=5Ftotal=20for=20clarity=20and=20consistency=20a?= =?UTF-8?q?cross=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/blanket_library.py | 8 ++++---- source/fortran/blanket_library.f90 | 4 ++-- tests/integration/ref_dicts.json | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/process/blanket_library.py b/process/blanket_library.py index 7d87b8bcc2..b5c4e0697c 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -1932,7 +1932,7 @@ def thermo_hydraulic_model(self, output: bool): deltap_blkt = primary_pumping_variables.dp_blkt # Total coolant mass flow rate in the first wall (kg/s) - blanket_library.mffw = ( + blanket_library.mflow_fw_coolant_total = ( blanket_library.mflow_fw_inboard_coolant_total + blanket_library.mflow_fw_outboard_coolant_total ) @@ -1950,7 +1950,7 @@ def thermo_hydraulic_model(self, output: bool): temp_out=fwbs_variables.temp_fw_coolant_out.item(), pressure=fwbs_variables.pres_fw_coolant.item(), pdrop=deltap_fw.item(), - mf=blanket_library.mffw, + mf=blanket_library.mflow_fw_coolant_total, primary_coolant_switch=f2py_compatible_to_string( fwbs_variables.i_fw_coolant_type ), @@ -2069,8 +2069,8 @@ def thermo_hydraulic_model(self, output: bool): po.ovarre( self.outfile, "First wall coolant mass flow rate (kg/s)", - "(mffw)", - fwbs_variables.mffw, + "(mflow_fw_coolant_total)", + fwbs_variables.mflow_fw_coolant_total, "OP ", ) po.ovarrf( diff --git a/source/fortran/blanket_library.f90 b/source/fortran/blanket_library.f90 index ac798af035..a4af6f3206 100644 --- a/source/fortran/blanket_library.f90 +++ b/source/fortran/blanket_library.f90 @@ -69,7 +69,7 @@ module blanket_library real(dp) :: tpeakfwi, tpeakfwo !! Inboard/outboard first wall peak temperature (K) - real(dp) :: mflow_fw_inboard_coolant_total, mflow_fw_outboard_coolant_total, mffw + real(dp) :: mflow_fw_inboard_coolant_total, mflow_fw_outboard_coolant_total, mflow_fw_coolant_total !! Inboard/outboard total mass flow rate to remove inboard FW power (kg/s) real(dp) :: n_fw_inboard_channels, n_fw_outboard_channels @@ -151,7 +151,7 @@ subroutine init_blanket_library tpeakfwo = 0.0D0 mflow_fw_inboard_coolant_total = 0.0D0 mflow_fw_outboard_coolant_total = 0.0D0 - mffw = 0.0D0 + mflow_fw_coolant_total = 0.0D0 n_fw_inboard_channels = 0.0D0 n_fw_outboard_channels = 0.0D0 mffwpi = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 1951dd8fac..963c583154 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3298,7 +3298,7 @@ "mflow_blkt_outboard_coolant": 0.0, "mfblktpi": 0.0, "mfblktpo": 0.0, - "mffw": 0.0, + "mflow_fw_coolant_total": 0.0, "mflow_fw_inboard_coolant_total": 0.0, "mflow_fw_outboard_coolant_total": 0.0, "mffwpi": 0.0, @@ -10072,7 +10072,7 @@ "mflow_blkt_outboard_coolant": "Inboard/outboard blanket mass flow rate for coolant (kg/s)", "mfblktpi": "Inboard/outboard mass flow rate per coolant pipe (kg/s)", "mfblktpo": "Inboard/outboard mass flow rate per coolant pipe (kg/s)", - "mffw": "Inboard/outboard total mass flow rate to remove inboard FW power (kg/s)", + "mflow_fw_coolant_total": "Inboard/outboard total mass flow rate to remove inboard FW power (kg/s)", "mflow_fw_inboard_coolant_total": "Inboard/outboard total mass flow rate to remove inboard FW power (kg/s)", "mflow_fw_outboard_coolant_total": "Inboard/outboard total mass flow rate to remove inboard FW power (kg/s)", "mffwpi": "Inboard/outboard mass flow rate per coolant pipe (kg/s)", @@ -17270,7 +17270,7 @@ "tpeakfwo", "mflow_fw_inboard_coolant_total", "mflow_fw_outboard_coolant_total", - "mffw", + "mflow_fw_coolant_total", "n_fw_inboard_channels", "n_fw_outboard_channels", "mffwpi", @@ -18661,7 +18661,7 @@ "mffwpo", "mflow_fw_inboard_coolant_total", "mflow_fw_outboard_coolant_total", - "mffw", + "mflow_fw_coolant_total", "mflow_blkt_inboard_coolant", "mflow_blkt_outboard_coolant", "mflow_blkt_coolant_total", From d95fa5a3b6be13afd68d5e1dfd6af3e184c2d46a Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 18 Feb 2025 14:26:05 +0000 Subject: [PATCH 44/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20pnucdiv=20to=20p?= =?UTF-8?q?=5Fdiv=5Fnuclear=5Fheat=5Ftotal=5Fmw=20for=20clarity=20and=20co?= =?UTF-8?q?nsistency=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++++----- process/dcll.py | 12 +++---- process/hcpb.py | 18 +++++----- process/io/mfile_comparison.py | 2 +- process/io/sankey_funcs.py | 12 +++---- process/power.py | 8 ++--- process/stellarator.py | 12 +++---- source/fortran/fwbs_variables.f90 | 4 +-- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 ++++++++-------- tests/integration/data/scan_MFILE.DAT | 18 +++++----- tests/integration/ref_dicts.json | 6 ++-- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_ccfe_hcpb.py | 34 ++++++++++++------- tests/unit/test_dcll.py | 22 +++++++----- tests/unit/test_power.py | 12 ++++--- 25 files changed, 123 insertions(+), 107 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index fd285d14ec..1dd54d3054 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -977,7 +977,7 @@ Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6038E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2682E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.3897E+00 OP - Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.4652E+02 OP + Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.4652E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index b573ca34e6..e4de82f306 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -972,7 +972,7 @@ Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6315E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2901E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4138E+00 OP - Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.4906E+02 OP + Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.4906E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index ff881a5996..b30f211445 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -972,7 +972,7 @@ Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6315E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2901E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4138E+00 OP - Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.4906E+02 OP + Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.4906E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 547619c784..2e80d8c15a 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -972,7 +972,7 @@ Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6315E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2901E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4138E+00 OP - Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.4906E+02 OP + Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.4906E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index a9921941ad..3db09fdfe4 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -972,7 +972,7 @@ Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6315E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2901E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4138E+00 OP - Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.4906E+02 OP + Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.4906E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 10fd6f80a7..d41f2ead5c 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -801,7 +801,7 @@ Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_mw)______________________ 2.4609E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4885E+00 OP - Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.8507E+02 OP + Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.8507E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP @@ -1796,7 +1796,7 @@ Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_mw)______________________ 2.4609E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4885E+00 OP - Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.8507E+02 OP + Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.8507E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP @@ -2791,7 +2791,7 @@ Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_mw)______________________ 2.4609E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4885E+00 OP - Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.8507E+02 OP + Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.8507E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP @@ -3786,7 +3786,7 @@ Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_mw)______________________ 2.4609E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4885E+00 OP - Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.8507E+02 OP + Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.8507E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP @@ -4781,7 +4781,7 @@ Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_mw)______________________ 2.4609E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4885E+00 OP - Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.8507E+02 OP + Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.8507E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP @@ -5776,7 +5776,7 @@ Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_mw)______________________ 2.4609E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4885E+00 OP - Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.8507E+02 OP + Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.8507E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP @@ -6771,7 +6771,7 @@ Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_mw)______________________ 2.4609E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4885E+00 OP - Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.8507E+02 OP + Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.8507E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP @@ -7766,7 +7766,7 @@ Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_mw)______________________ 2.4609E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4885E+00 OP - Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.8507E+02 OP + Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.8507E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP @@ -8761,7 +8761,7 @@ Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_mw)______________________ 2.4609E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4885E+00 OP - Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.8507E+02 OP + Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.8507E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP diff --git a/process/dcll.py b/process/dcll.py index 47abe19d0a..a0b1338cad 100644 --- a/process/dcll.py +++ b/process/dcll.py @@ -159,7 +159,7 @@ def dcll_neutronics_and_power(self, output: bool): if physics_variables.idivrt == 2: # Double null configuration # Nuclear heating in the divertor (MW), neutron power times fdiv - fwbs_variables.pnucdiv = ( + fwbs_variables.p_div_nuclear_heat_total_mw = ( physics_variables.neutron_power_total * 2 * fwbs_variables.fdiv ) # Radiation power incident on divertor (MW) @@ -169,7 +169,7 @@ def dcll_neutronics_and_power(self, output: bool): else: # Single null configuration # Nuclear heating in the divertor (MW), neutron power times fdiv - fwbs_variables.pnucdiv = ( + fwbs_variables.p_div_nuclear_heat_total_mw = ( physics_variables.neutron_power_total * fwbs_variables.fdiv ) # Radiation power incident on divertor (MW) @@ -257,8 +257,8 @@ def dcll_neutronics_and_power(self, output: bool): po.ovarre( self.outfile, "Total nuclear heating in the divertor (MW)", - "(pnucdiv)", - fwbs_variables.pnucdiv, + "(p_div_nuclear_heat_total_mw)", + fwbs_variables.p_div_nuclear_heat_total_mw, "OP ", ) po.ovarre( @@ -313,7 +313,7 @@ def dcll_power_and_heating(self, output: bool): ) heat_transport_variables.htpmw_div = heat_transport_variables.fpumpdiv * ( physics_variables.pdivt - + fwbs_variables.pnucdiv + + fwbs_variables.p_div_nuclear_heat_total_mw + fwbs_variables.praddiv ) @@ -323,7 +323,7 @@ def dcll_power_and_heating(self, output: bool): # For divertor,mechanical pumping power is a fraction of thermal power removed by coolant heat_transport_variables.htpmw_div = heat_transport_variables.fpumpdiv * ( physics_variables.pdivt - + fwbs_variables.pnucdiv + + fwbs_variables.p_div_nuclear_heat_total_mw + fwbs_variables.praddiv ) diff --git a/process/hcpb.py b/process/hcpb.py index 181f77a63e..7f63a8c66a 100644 --- a/process/hcpb.py +++ b/process/hcpb.py @@ -191,9 +191,9 @@ def run(self, output: bool): # Old code kept for backward compatibility # --- - # pnucdiv is not changed. + # p_div_nuclear_heat_total_mw is not changed. # The energy due to multiplication, by subtraction: - # emultmw = p_fw_nuclear_heat_total_mw + p_blkt_nuclear_heat_total_mw + pnucshld + ptfnuc + pnucdiv - neutron_power_total + # emultmw = p_fw_nuclear_heat_total_mw + p_blkt_nuclear_heat_total_mw + pnucshld + ptfnuc + p_div_nuclear_heat_total_mw - neutron_power_total # --- # New code, a bit simpler @@ -638,12 +638,12 @@ def nuclear_heating_divertor(self): # Nuclear heating in the divertor just the neutron power times fdiv if physics_variables.idivrt == 2: # Double null configuration - fwbs_variables.pnucdiv = ( + fwbs_variables.p_div_nuclear_heat_total_mw = ( 0.8 * physics_variables.fusion_power * 2 * fwbs_variables.fdiv ) else: # single null configuration - fwbs_variables.pnucdiv = ( + fwbs_variables.p_div_nuclear_heat_total_mw = ( 0.8 * physics_variables.fusion_power * fwbs_variables.fdiv ) @@ -722,7 +722,7 @@ def powerflow_calc(self, output: bool): ) heat_transport_variables.htpmw_div = heat_transport_variables.fpumpdiv * ( physics_variables.pdivt - + fwbs_variables.pnucdiv + + fwbs_variables.p_div_nuclear_heat_total_mw + fwbs_variables.praddiv ) @@ -739,7 +739,7 @@ def powerflow_calc(self, output: bool): ) heat_transport_variables.htpmw_div = heat_transport_variables.fpumpdiv * ( physics_variables.pdivt - + fwbs_variables.pnucdiv + + fwbs_variables.p_div_nuclear_heat_total_mw + fwbs_variables.praddiv ) @@ -782,7 +782,7 @@ def powerflow_calc(self, output: bool): ) heat_transport_variables.htpmw_div = heat_transport_variables.fpumpdiv * ( physics_variables.pdivt - + fwbs_variables.pnucdiv + + fwbs_variables.p_div_nuclear_heat_total_mw + fwbs_variables.praddiv ) if output: @@ -1437,8 +1437,8 @@ def write_output(self): po.ovarre( self.outfile, "Total nuclear heating in the divertor (MW)", - "(pnucdiv)", - fwbs_variables.pnucdiv, + "(p_div_nuclear_heat_total_mw)", + fwbs_variables.p_div_nuclear_heat_total_mw, "OP ", ) po.osubhd(self.outfile, " Diagostic output for nuclear heating :") diff --git a/process/io/mfile_comparison.py b/process/io/mfile_comparison.py index 1b660fd07e..b2916dded3 100644 --- a/process/io/mfile_comparison.py +++ b/process/io/mfile_comparison.py @@ -201,7 +201,7 @@ "p_fw_nuclear_heat_total_mw", "ptfnuc", "pnucshld", - "pnucdiv", + "p_div_nuclear_heat_total_mw", "tbr", "li6enrich", "a_fw_total", diff --git a/process/io/sankey_funcs.py b/process/io/sankey_funcs.py index 8c35a4505f..ec58c93cb5 100644 --- a/process/io/sankey_funcs.py +++ b/process/io/sankey_funcs.py @@ -55,7 +55,7 @@ def plot_full_sankey( pnucemblkt = ( p_blkt_nuclear_heat_total_mw - emultmw ) # External nuclear heating in blanket (MW) - pnucdiv = m_file.data["pnucdiv"].get_scan( + p_div_nuclear_heat_total_mw = m_file.data["p_div_nuclear_heat_total_mw"].get_scan( -1 ) # Nuclear heating in the divertor (MW) p_fw_nuclear_heat_total_mw = m_file.data["p_fw_nuclear_heat_total_mw"].get_scan( @@ -162,7 +162,7 @@ def plot_full_sankey( # Neutrons, -Divertor, -1st wall, -Shield, -TF coils, -Blanket+Energy Mult. neutrons = [ neutron_power_total, - -pnucdiv, + -p_div_nuclear_heat_total_mw, -p_fw_nuclear_heat_total_mw, -pnucshld, -ptfnuc, @@ -263,7 +263,7 @@ def plot_full_sankey( # -------------------------------------- DIVERTOR - 4 ------------------------------------- # Charged P., Neutrons, Photons, Coolant Pumping, Total Divertor - divertor = [pdivt, pnucdiv, praddiv, htpmw_div, -pthermdiv] + divertor = [pdivt, p_div_nuclear_heat_total_mw, praddiv, htpmw_div, -pthermdiv] sankey.add( flows=divertor, # down(in), up(in), down(in), up(in), right(out) @@ -465,7 +465,7 @@ def plot_full_sankey( t.set_position((pos[0]-0.2,pos[1])) if t == diagrams[2].texts[3]: # Divertor t.set_horizontalalignment('right') - t.set_position((pos[0]-0.5*(pnucdiv/totalplasma)-0.1,pos[1])) + t.set_position((pos[0]-0.5*(p_div_nuclear_heat_total_mw/totalplasma)-0.1,pos[1])) if t == diagrams[3].texts[2]: # Rad.FW t.set_horizontalalignment('right') t.set_position((pos[0],pos[1]+0.5*(pradfw/totalplasma)+0.15)) @@ -519,7 +519,7 @@ def plot_sankey(mfilename="MFILE.DAT"): # Plot simplified power flow Sankey Dia pdivt = m_file.data["pdivt"].get_scan( -1 ) # power to conducted to the divertor region (MW) - pnucdiv = m_file.data["pnucdiv"].get_scan( + p_div_nuclear_heat_total_mw = m_file.data["p_div_nuclear_heat_total_mw"].get_scan( -1 ) # nuclear heating in the divertor (MW) p_fw_nuclear_heat_total_mw = m_file.data["p_fw_nuclear_heat_total_mw"].get_scan( @@ -549,7 +549,7 @@ def plot_sankey(mfilename="MFILE.DAT"): # Plot simplified power flow Sankey Dia ) # switch for spherical tokamak (ST) models # Power deposited on divertor (MW) - totaldivetc = pdivt + pnucdiv + praddiv + totaldivetc = pdivt + p_div_nuclear_heat_total_mw + praddiv # Power deposited on Blanket (MW) totalblktetc = ( ( diff --git a/process/power.py b/process/power.py index 602d62c5f6..8bc5b328e9 100644 --- a/process/power.py +++ b/process/power.py @@ -713,7 +713,7 @@ def power1(self): # using physics_variables.pdivt as calculated in physics.f90 self.pthermdiv = ( physics_variables.pdivt - + (fwbs_variables.pnucdiv + fwbs_variables.praddiv) + + (fwbs_variables.p_div_nuclear_heat_total_mw + fwbs_variables.praddiv) + heat_transport_variables.htpmw_div ) @@ -1413,7 +1413,7 @@ def power2(self, output: bool): po.write( self.outfile, ( - f"{fwbs_variables.pnucdiv * self.iprimdiv} {fwbs_variables.pnucdiv * (1 - self.iprimdiv)} {fwbs_variables.pnucdiv}" + f"{fwbs_variables.p_div_nuclear_heat_total_mw * self.iprimdiv} {fwbs_variables.p_div_nuclear_heat_total_mw * (1 - self.iprimdiv)} {fwbs_variables.p_div_nuclear_heat_total_mw}" ), ) po.write( @@ -1437,14 +1437,14 @@ def power2(self, output: bool): primsum = ( primsum - + fwbs_variables.pnucdiv * self.iprimdiv + + fwbs_variables.p_div_nuclear_heat_total_mw * self.iprimdiv + physics_variables.pdivt * self.iprimdiv + fwbs_variables.praddiv * self.iprimdiv + heat_transport_variables.htpmw_div * self.iprimdiv ) secsum = ( secsum - + fwbs_variables.pnucdiv * (1 - self.iprimdiv) + + fwbs_variables.p_div_nuclear_heat_total_mw * (1 - self.iprimdiv) + physics_variables.pdivt * (1 - self.iprimdiv) + fwbs_variables.praddiv * (1 - self.iprimdiv) + heat_transport_variables.htpmw_div * (1 - self.iprimdiv) diff --git a/process/stellarator.py b/process/stellarator.py index 923135e7f2..526b292d51 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -1197,7 +1197,7 @@ def stfwbs(self, output: bool): self.blanket_neutronics() if heat_transport_variables.ipowerflow == 1: - fwbs_variables.pnucdiv = ( + fwbs_variables.p_div_nuclear_heat_total_mw = ( physics_variables.neutron_power_total * fwbs_variables.fdiv ) fwbs_variables.pnuchcd = ( @@ -1205,7 +1205,7 @@ def stfwbs(self, output: bool): ) fwbs_variables.p_fw_nuclear_heat_total_mw = ( physics_variables.neutron_power_total - - fwbs_variables.pnucdiv + - fwbs_variables.p_div_nuclear_heat_total_mw - fwbs_variables.pnucloss - fwbs_variables.pnuchcd ) @@ -1242,7 +1242,7 @@ def stfwbs(self, output: bool): heat_transport_variables.fpumpdiv * ( physics_variables.pdivt - + fwbs_variables.pnucdiv + + fwbs_variables.p_div_nuclear_heat_total_mw + fwbs_variables.praddiv ) ) @@ -1311,7 +1311,7 @@ def stfwbs(self, output: bool): else: # heat_transport_variables.ipowerflow == 1 # Neutron power incident on divertor (MW) - fwbs_variables.pnucdiv = ( + fwbs_variables.p_div_nuclear_heat_total_mw = ( physics_variables.neutron_power_total * fwbs_variables.fdiv ) @@ -1325,7 +1325,7 @@ def stfwbs(self, output: bool): pnucfwbs = ( physics_variables.neutron_power_total - - fwbs_variables.pnucdiv + - fwbs_variables.p_div_nuclear_heat_total_mw - fwbs_variables.pnucloss - fwbs_variables.pnuc_cp - fwbs_variables.pnuchcd @@ -1565,7 +1565,7 @@ def stfwbs(self, output: bool): heat_transport_variables.fpumpdiv * ( physics_variables.pdivt - + fwbs_variables.pnucdiv + + fwbs_variables.p_div_nuclear_heat_total_mw + fwbs_variables.praddiv ) ) diff --git a/source/fortran/fwbs_variables.f90 b/source/fortran/fwbs_variables.f90 index e32caf782d..c1dde5c213 100644 --- a/source/fortran/fwbs_variables.f90 +++ b/source/fortran/fwbs_variables.f90 @@ -118,7 +118,7 @@ module fwbs_variables real(dp) :: pnuc_cp_tf !! TF neutronic nuclear heating in the ST centrepost [MW] - real(dp) :: pnucdiv + real(dp) :: p_div_nuclear_heat_total_mw !! nuclear heating in the divertor [MW] real(dp) :: p_fw_nuclear_heat_total_mw @@ -688,7 +688,7 @@ subroutine init_fwbs_variables qnuc = 0.0D0 li6enrich = 30.0D0 p_blkt_nuclear_heat_total_mw = 0.0D0 - pnucdiv = 0.0D0 + p_div_nuclear_heat_total_mw = 0.0D0 p_fw_nuclear_heat_total_mw = 0.0D0 pnuchcd = 0.0D0 pnucloss = 0.0D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index a6972060d1..74c4e6ea54 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -971,7 +971,7 @@ Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6315E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2901E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4138E+00 OP - Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.4906E+02 OP + Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.4906E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 1a002cc657..ba02ef4cf3 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -972,7 +972,7 @@ Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6315E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2901E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4138E+00 OP - Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.4906E+02 OP + Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.4906E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 71735a856b..3e96add9f7 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -972,7 +972,7 @@ Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6315E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2901E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4138E+00 OP - Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.4906E+02 OP + Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.4906E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index ee4ac865d7..aa86383fa0 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -972,7 +972,7 @@ Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6315E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2901E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4138E+00 OP - Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.4906E+02 OP + Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.4906E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index d07a2934fe..d18179c4ad 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -975,7 +975,7 @@ Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6290E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2880E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4115E+00 OP - Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.4882E+02 OP + Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.4882E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 8dafd66938..1ec11afa2b 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -973,7 +973,7 @@ Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6103E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2733E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.3954E+00 OP - Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.4712E+02 OP + Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.4712E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP @@ -2136,7 +2136,7 @@ Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6251E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2850E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4082E+00 OP - Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.4847E+02 OP + Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.4847E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP @@ -3299,7 +3299,7 @@ Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6329E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2912E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4150E+00 OP - Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.4918E+02 OP + Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.4918E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP @@ -4462,7 +4462,7 @@ Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6357E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2934E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4174E+00 OP - Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.4944E+02 OP + Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.4944E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP @@ -5625,7 +5625,7 @@ Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6383E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2955E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4196E+00 OP - Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.4968E+02 OP + Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.4968E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP @@ -6788,7 +6788,7 @@ Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6332E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2914E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4152E+00 OP - Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.4920E+02 OP + Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.4920E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP @@ -7951,7 +7951,7 @@ Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6364E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2940E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4180E+00 OP - Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.4951E+02 OP + Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.4951E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP @@ -9114,7 +9114,7 @@ Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6387E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2958E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4200E+00 OP - Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.4971E+02 OP + Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.4971E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP @@ -10277,7 +10277,7 @@ Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6326E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2909E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4147E+00 OP - Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.4915E+02 OP + Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.4915E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP @@ -11440,7 +11440,7 @@ Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6432E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2993E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4239E+00 OP - Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.5012E+02 OP + Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.5012E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP @@ -12603,7 +12603,7 @@ Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6529E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.3070E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4323E+00 OP - Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.5101E+02 OP + Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.5101E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP @@ -13766,7 +13766,7 @@ Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6523E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.3065E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4317E+00 OP - Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.5095E+02 OP + Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.5095E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP @@ -14929,7 +14929,7 @@ Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6612E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.3135E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4394E+00 OP - Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.5176E+02 OP + Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.5176E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP @@ -16092,7 +16092,7 @@ Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6699E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.3204E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4470E+00 OP - Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.5256E+02 OP + Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.5256E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP @@ -17255,7 +17255,7 @@ Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6791E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.3277E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4550E+00 OP - Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.5340E+02 OP + Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.5340E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index d9642b8ea8..3784dfbe17 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -801,7 +801,7 @@ Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 2.4609E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4885E+00 OP - Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.8507E+02 OP + Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.8507E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP @@ -1796,7 +1796,7 @@ Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 2.4609E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4885E+00 OP - Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.8507E+02 OP + Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.8507E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP @@ -2791,7 +2791,7 @@ Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 2.4609E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4885E+00 OP - Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.8507E+02 OP + Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.8507E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP @@ -3786,7 +3786,7 @@ Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 2.4609E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4885E+00 OP - Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.8507E+02 OP + Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.8507E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP @@ -4781,7 +4781,7 @@ Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 2.4609E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4885E+00 OP - Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.8507E+02 OP + Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.8507E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP @@ -5776,7 +5776,7 @@ Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 2.4609E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4885E+00 OP - Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.8507E+02 OP + Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.8507E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP @@ -6771,7 +6771,7 @@ Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 2.4609E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4885E+00 OP - Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.8507E+02 OP + Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.8507E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP @@ -7766,7 +7766,7 @@ Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 2.4609E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4885E+00 OP - Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.8507E+02 OP + Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.8507E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP @@ -8761,7 +8761,7 @@ Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 2.4609E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4885E+00 OP - Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.8507E+02 OP + Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.8507E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 963c583154..ad64820d21 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3567,7 +3567,7 @@ "p_blkt_nuclear_heat_total_mw": 0.0, "p_blkt_nuclear_heat_inboard_mw": 0.0, "p_blkt_nuclear_heat_outboard_mw": 0.0, - "pnucdiv": 0.0, + "p_div_nuclear_heat_total_mw": 0.0, "p_fw_nuclear_heat_total_mw": 0.0, "pnucfwi": 0.0, "pnucfwo": 0.0, @@ -10325,7 +10325,7 @@ "p_blkt_nuclear_heat_total_mw": "nuclear heating in the blanket (MW)", "p_blkt_nuclear_heat_inboard_mw": "Neutron power deposited inboard/outboard blanket blanket (MW)", "p_blkt_nuclear_heat_outboard_mw": "Neutron power deposited inboard/outboard blanket blanket (MW)", - "pnucdiv": "nuclear heating in the divertor (MW)", + "p_div_nuclear_heat_total_mw": "nuclear heating in the divertor (MW)", "p_fw_nuclear_heat_total_mw": "nuclear heating in the first wall (MW)", "pnucfwi": "Inboard/outboard first wall nuclear heating (MW)", "pnucfwo": "Inboard/outboard first wall nuclear heating (MW)", @@ -18039,7 +18039,7 @@ "pnuc_cp", "pnuc_cp_sh", "pnuc_cp_tf", - "pnucdiv", + "p_div_nuclear_heat_total_mw", "p_fw_nuclear_heat_total_mw", "pnuchcd", "pnucloss", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 4d032c2ce9..8d85f19dd2 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -975,7 +975,7 @@ Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_mw)______________________ 1.6290E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2880E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4115E+00 OP - Total_nuclear_heating_in_the_divertor_(MW)______________________________ (pnucdiv)_____________________ 1.4882E+02 OP + Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.4882E+02 OP Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP diff --git a/tests/unit/test_ccfe_hcpb.py b/tests/unit/test_ccfe_hcpb.py index 5d4dade37f..c168fc9ae6 100644 --- a/tests/unit/test_ccfe_hcpb.py +++ b/tests/unit/test_ccfe_hcpb.py @@ -719,7 +719,7 @@ def test_nuclear_heating_shield(nuclearheatingshieldparam, monkeypatch, ccfe_hcp class NuclearHeatingDivertorParam(NamedTuple): fdiv: Any = None - pnucdiv: Any = None + p_div_nuclear_heat_total_mw: Any = None pnuchcd: Any = None @@ -729,7 +729,7 @@ class NuclearHeatingDivertorParam(NamedTuple): ip: Any = None - expected_pnucdiv: Any = None + expected_p_div_nuclear_heat_total_mw: Any = None @pytest.mark.parametrize( @@ -737,21 +737,21 @@ class NuclearHeatingDivertorParam(NamedTuple): ( NuclearHeatingDivertorParam( fdiv=0.115, - pnucdiv=0, + p_div_nuclear_heat_total_mw=0, pnuchcd=0, idivrt=1, fusion_power=1986.0623241661431, ip=0, - expected_pnucdiv=182.71773382328519, + expected_p_div_nuclear_heat_total_mw=182.71773382328519, ), NuclearHeatingDivertorParam( fdiv=0.115, - pnucdiv=182.71773382328519, + p_div_nuclear_heat_total_mw=182.71773382328519, pnuchcd=0, idivrt=1, fusion_power=1985.4423932312809, ip=0, - expected_pnucdiv=182.66070017727785, + expected_p_div_nuclear_heat_total_mw=182.66070017727785, ), ), ) @@ -770,7 +770,11 @@ def test_nuclear_heating_divertor(nuclearheatingdivertorparam, monkeypatch, ccfe monkeypatch.setattr(fwbs_variables, "fdiv", nuclearheatingdivertorparam.fdiv) - monkeypatch.setattr(fwbs_variables, "pnucdiv", nuclearheatingdivertorparam.pnucdiv) + monkeypatch.setattr( + fwbs_variables, + "p_div_nuclear_heat_total_mw", + nuclearheatingdivertorparam.p_div_nuclear_heat_total_mw, + ) monkeypatch.setattr(fwbs_variables, "pnuchcd", nuclearheatingdivertorparam.pnuchcd) @@ -784,8 +788,8 @@ def test_nuclear_heating_divertor(nuclearheatingdivertorparam, monkeypatch, ccfe ccfe_hcpb.nuclear_heating_divertor() - assert fwbs_variables.pnucdiv == pytest.approx( - nuclearheatingdivertorparam.expected_pnucdiv + assert fwbs_variables.p_div_nuclear_heat_total_mw == pytest.approx( + nuclearheatingdivertorparam.expected_p_div_nuclear_heat_total_mw ) @@ -818,7 +822,7 @@ class PowerflowCalcParam(NamedTuple): p_blkt_nuclear_heat_total_mw: Any = None - pnucdiv: Any = None + p_div_nuclear_heat_total_mw: Any = None pnucshld: Any = None @@ -903,7 +907,7 @@ class PowerflowCalcParam(NamedTuple): i_coolant_pumping=3, p_fw_nuclear_heat_total_mw=276.80690153753221, p_blkt_nuclear_heat_total_mw=1504.9215740808861, - pnucdiv=182.71773382328519, + p_div_nuclear_heat_total_mw=182.71773382328519, pnucshld=1.3611259588044891, etaiso=0.90000000000000002, pnuc_cp_sh=0, @@ -952,7 +956,7 @@ class PowerflowCalcParam(NamedTuple): i_coolant_pumping=3, p_fw_nuclear_heat_total_mw=230.98304919926957, p_blkt_nuclear_heat_total_mw=1550.1447895848396, - pnucdiv=182.66070017727785, + p_div_nuclear_heat_total_mw=182.66070017727785, pnucshld=1.4038170956592293, etaiso=0.90000000000000002, pnuc_cp_sh=0, @@ -1051,7 +1055,11 @@ def test_powerflow_calc(powerflowcalcparam, monkeypatch, ccfe_hcpb): powerflowcalcparam.p_blkt_nuclear_heat_total_mw, ) - monkeypatch.setattr(fwbs_variables, "pnucdiv", powerflowcalcparam.pnucdiv) + monkeypatch.setattr( + fwbs_variables, + "p_div_nuclear_heat_total_mw", + powerflowcalcparam.p_div_nuclear_heat_total_mw, + ) monkeypatch.setattr(fwbs_variables, "pnucshld", powerflowcalcparam.pnucshld) diff --git a/tests/unit/test_dcll.py b/tests/unit/test_dcll.py index 58430a6a21..78530813b9 100644 --- a/tests/unit/test_dcll.py +++ b/tests/unit/test_dcll.py @@ -35,7 +35,7 @@ class DcllNeutronicsAndPowerParam(NamedTuple): praddiv: Any = None - pnucdiv: Any = None + p_div_nuclear_heat_total_mw: Any = None fhcd: Any = None @@ -75,7 +75,7 @@ class DcllNeutronicsAndPowerParam(NamedTuple): expected_praddiv: Any = None - expected_pnucdiv: Any = None + expected_p_div_nuclear_heat_total_mw: Any = None expected_pradfw: Any = None @@ -95,7 +95,7 @@ class DcllNeutronicsAndPowerParam(NamedTuple): porbitlossmw=0, fdiv=0.115, praddiv=0, - pnucdiv=0, + p_div_nuclear_heat_total_mw=0, fhcd=0, pradhcd=0, pnuchcd=0, @@ -115,7 +115,7 @@ class DcllNeutronicsAndPowerParam(NamedTuple): p_plasma_rad_mw=287.44866938104849, p_fw_alpha_mw=19.835845058655043, expected_praddiv=33.056596978820579, - expected_pnucdiv=182.58994516305046, + expected_p_div_nuclear_heat_total_mw=182.58994516305046, expected_pradfw=254.39207240222791, expected_p_fw_nuclear_heat_total_mw=196.72081918001697, expected_p_blkt_nuclear_heat_total_mw=1533.4949914565693, @@ -127,7 +127,7 @@ class DcllNeutronicsAndPowerParam(NamedTuple): porbitlossmw=0, fdiv=0.115, praddiv=33.056596978820579, - pnucdiv=182.58994516305046, + p_div_nuclear_heat_total_mw=182.58994516305046, fhcd=0, pradhcd=0, pnuchcd=0, @@ -147,7 +147,7 @@ class DcllNeutronicsAndPowerParam(NamedTuple): p_plasma_rad_mw=287.44866938104849, p_fw_alpha_mw=19.829653483586444, expected_praddiv=33.056596978820579, - expected_pnucdiv=182.53295140508826, + expected_p_div_nuclear_heat_total_mw=182.53295140508826, expected_pradfw=254.39207240222791, expected_p_fw_nuclear_heat_total_mw=196.65941460078642, expected_p_blkt_nuclear_heat_total_mw=1533.0163252173013, @@ -186,7 +186,11 @@ def test_dcll_neutronics_and_power(dcllneutronicsandpowerparam, monkeypatch, dcl monkeypatch.setattr(fwbs_variables, "praddiv", dcllneutronicsandpowerparam.praddiv) - monkeypatch.setattr(fwbs_variables, "pnucdiv", dcllneutronicsandpowerparam.pnucdiv) + monkeypatch.setattr( + fwbs_variables, + "p_div_nuclear_heat_total_mw", + dcllneutronicsandpowerparam.p_div_nuclear_heat_total_mw, + ) monkeypatch.setattr(fwbs_variables, "fhcd", dcllneutronicsandpowerparam.fhcd) @@ -262,8 +266,8 @@ def test_dcll_neutronics_and_power(dcllneutronicsandpowerparam, monkeypatch, dcl dcllneutronicsandpowerparam.expected_praddiv ) - assert fwbs_variables.pnucdiv == pytest.approx( - dcllneutronicsandpowerparam.expected_pnucdiv + assert fwbs_variables.p_div_nuclear_heat_total_mw == pytest.approx( + dcllneutronicsandpowerparam.expected_p_div_nuclear_heat_total_mw ) assert fwbs_variables.pradfw == pytest.approx( diff --git a/tests/unit/test_power.py b/tests/unit/test_power.py index 6352ae30a0..4393f433d7 100644 --- a/tests/unit/test_power.py +++ b/tests/unit/test_power.py @@ -2065,7 +2065,7 @@ class Power2Param(NamedTuple): pnuc_cp: Any = None - pnucdiv: Any = None + p_div_nuclear_heat_total_mw: Any = None i_coolant_pumping: Any = None @@ -2254,7 +2254,7 @@ class Power2Param(NamedTuple): fhcd=0, i_thermal_electric_conversion=2, pnuc_cp=0, - pnucdiv=182.69222981118057, + p_div_nuclear_heat_total_mw=182.69222981118057, i_coolant_pumping=3, ptfnuc=0.044178296011112193, pnuchcd=0, @@ -2356,7 +2356,7 @@ class Power2Param(NamedTuple): fhcd=0, i_thermal_electric_conversion=2, pnuc_cp=0, - pnucdiv=182.6352084763719, + p_div_nuclear_heat_total_mw=182.6352084763719, i_coolant_pumping=3, ptfnuc=0.045535131445547841, pnuchcd=0, @@ -2496,7 +2496,11 @@ def test_power2(power2param, monkeypatch, power): monkeypatch.setattr(fwbs_variables, "pnuc_cp", power2param.pnuc_cp) - monkeypatch.setattr(fwbs_variables, "pnucdiv", power2param.pnucdiv) + monkeypatch.setattr( + fwbs_variables, + "p_div_nuclear_heat_total_mw", + power2param.p_div_nuclear_heat_total_mw, + ) monkeypatch.setattr( fwbs_variables, "i_coolant_pumping", power2param.i_coolant_pumping From 37b6a4cfe591eb44bc71fd51d3ecb8c315be1ea6 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 18 Feb 2025 14:27:50 +0000 Subject: [PATCH 45/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20p=5Ffw=5Fnuclear?= =?UTF-8?q?=5Fmw=20to=20p=5Ffw=5Fnuclear=5Fheat=5Ftotal=5Fmw=20for=20clari?= =?UTF-8?q?ty=20and=20consistency=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- examples/data/scan_MFILE.DAT | 18 +++++++++--------- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index d41f2ead5c..4095056e70 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -798,7 +798,7 @@ Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 5.8227E-02 OP - Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_mw)______________________ 2.4609E+02 OP + Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 2.4609E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4885E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.8507E+02 OP @@ -1793,7 +1793,7 @@ Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 5.8227E-02 OP - Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_mw)______________________ 2.4609E+02 OP + Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 2.4609E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4885E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.8507E+02 OP @@ -2788,7 +2788,7 @@ Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 5.8228E-02 OP - Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_mw)______________________ 2.4609E+02 OP + Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 2.4609E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4885E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.8507E+02 OP @@ -3783,7 +3783,7 @@ Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 5.8228E-02 OP - Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_mw)______________________ 2.4609E+02 OP + Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 2.4609E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4885E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.8507E+02 OP @@ -4778,7 +4778,7 @@ Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 5.8228E-02 OP - Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_mw)______________________ 2.4609E+02 OP + Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 2.4609E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4885E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.8507E+02 OP @@ -5773,7 +5773,7 @@ Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 5.8228E-02 OP - Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_mw)______________________ 2.4609E+02 OP + Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 2.4609E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4885E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.8507E+02 OP @@ -6768,7 +6768,7 @@ Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 5.8228E-02 OP - Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_mw)______________________ 2.4609E+02 OP + Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 2.4609E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4885E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.8507E+02 OP @@ -7763,7 +7763,7 @@ Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 5.8228E-02 OP - Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_mw)______________________ 2.4609E+02 OP + Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 2.4609E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4885E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.8507E+02 OP @@ -8758,7 +8758,7 @@ Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 5.8228E-02 OP - Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_mw)______________________ 2.4609E+02 OP + Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 2.4609E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4885E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.8507E+02 OP diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 8d85f19dd2..d21c1b1290 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -972,7 +972,7 @@ 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.5460E-02 OP - Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_mw)______________________ 1.6290E+02 OP + Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6290E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2880E+03 OP Total_nuclear_heating_in_the_shield_(MW)________________________________ (pnucshld)____________________ 1.4115E+00 OP Total_nuclear_heating_in_the_divertor_(MW)______________________________ (p_div_nuclear_heat_total_mw)_____________________ 1.4882E+02 OP From c3cf296143e6111bcaee153d74d211e2531f1d21 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 18 Feb 2025 14:32:52 +0000 Subject: [PATCH 46/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20pradfw=20to=20p?= =?UTF-8?q?=5Ffw=5Frad=5Ftotal=5Fmw=20for=20clarity=20and=20consistency=20?= =?UTF-8?q?across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/dcll.py | 10 +++++----- process/hcpb.py | 6 +++--- process/io/sankey_funcs.py | 12 ++++++------ process/power.py | 14 +++++++------- process/stellarator.py | 12 ++++++------ source/fortran/fwbs_variables.f90 | 6 +++--- tests/integration/ref_dicts.json | 10 +++++----- tests/unit/test_ccfe_hcpb.py | 16 ++++++++-------- tests/unit/test_dcll.py | 18 +++++++++--------- tests/unit/test_power.py | 8 ++++---- 10 files changed, 56 insertions(+), 56 deletions(-) diff --git a/process/dcll.py b/process/dcll.py index a0b1338cad..6e490ac968 100644 --- a/process/dcll.py +++ b/process/dcll.py @@ -187,7 +187,7 @@ def dcll_neutronics_and_power(self, output: bool): # FW # Radiation power incident on first wall (MW) - fwbs_variables.pradfw = ( + fwbs_variables.p_fw_rad_total_mw = ( physics_variables.p_plasma_rad_mw - fwbs_variables.praddiv - fwbs_variables.pradhcd @@ -196,13 +196,13 @@ def dcll_neutronics_and_power(self, output: bool): # Surface heat flux on first wall (MW) # All of the fast particle losses go to the outer wall. fwbs_variables.psurffwo = ( - fwbs_variables.pradfw + fwbs_variables.p_fw_rad_total_mw * build_variables.a_fw_outboard / build_variables.a_fw_total + current_drive_variables.porbitlossmw + physics_variables.p_fw_alpha_mw ) - fwbs_variables.psurffwi = fwbs_variables.pradfw * ( + fwbs_variables.psurffwi = fwbs_variables.p_fw_rad_total_mw * ( 1 - build_variables.a_fw_outboard / build_variables.a_fw_total ) @@ -281,8 +281,8 @@ def dcll_neutronics_and_power(self, output: bool): po.ovarrf( self.outfile, "Radiation heating power into the first wall (MW)", - "(pradfw)", - fwbs_variables.pradfw, + "(p_fw_rad_total_mw)", + fwbs_variables.p_fw_rad_total_mw, "OP ", ) diff --git a/process/hcpb.py b/process/hcpb.py index 7f63a8c66a..b1808cddc7 100644 --- a/process/hcpb.py +++ b/process/hcpb.py @@ -671,7 +671,7 @@ def powerflow_calc(self, output: bool): fwbs_variables.pradhcd = physics_variables.p_plasma_rad_mw * fwbs_variables.fhcd # Radiation power incident on first wall (MW) - fwbs_variables.pradfw = ( + fwbs_variables.p_fw_rad_total_mw = ( physics_variables.p_plasma_rad_mw - fwbs_variables.praddiv - fwbs_variables.pradhcd @@ -692,13 +692,13 @@ def powerflow_calc(self, output: bool): # Surface heat flux on first wall (outboard and inboard) (MW) # All of the fast particle losses go to the outer wall. fwbs_variables.psurffwo = ( - fwbs_variables.pradfw + fwbs_variables.p_fw_rad_total_mw * build_variables.a_fw_outboard / build_variables.a_fw_total + current_drive_variables.porbitlossmw + physics_variables.p_fw_alpha_mw ) - fwbs_variables.psurffwi = fwbs_variables.pradfw * ( + fwbs_variables.psurffwi = fwbs_variables.p_fw_rad_total_mw * ( 1 - build_variables.a_fw_outboard / build_variables.a_fw_total ) diff --git a/process/io/sankey_funcs.py b/process/io/sankey_funcs.py index ec58c93cb5..7956743967 100644 --- a/process/io/sankey_funcs.py +++ b/process/io/sankey_funcs.py @@ -87,7 +87,7 @@ def plot_full_sankey( pradhcd = p_plasma_rad_mw * m_file.data["fhcd"].get_scan( -1 ) # Radiation deposited on HCD (MW) - pradfw = p_plasma_rad_mw - praddiv - pradhcd # Radiation deposited in the FW (MW) + p_fw_rad_total_mw = p_plasma_rad_mw - praddiv - pradhcd # Radiation deposited in the FW (MW) # Used in [DIVERTOR] htpmw_div = m_file.data["htpmw_div"].get_scan(-1) # Divertor coolant pumping power @@ -230,7 +230,7 @@ def plot_full_sankey( # ------------------------------------- RADIATION - 3 ------------------------------------- # Photons, -1st Wall, -Divertor, -H&CD - radiation = [p_plasma_rad_mw, -pradfw, -praddiv, -pradhcd] + radiation = [p_plasma_rad_mw, -p_fw_rad_total_mw, -praddiv, -pradhcd] sankey.add( flows=radiation, # right(in), up(out), up(out), up(out) @@ -298,7 +298,7 @@ def plot_full_sankey( first_wall = [ p_fw_alpha_mw, p_fw_nuclear_heat_total_mw, - pradfw, + p_fw_rad_total_mw, htpmwfw, -pthermfw, ] @@ -468,7 +468,7 @@ def plot_full_sankey( t.set_position((pos[0]-0.5*(p_div_nuclear_heat_total_mw/totalplasma)-0.1,pos[1])) if t == diagrams[3].texts[2]: # Rad.FW t.set_horizontalalignment('right') - t.set_position((pos[0],pos[1]+0.5*(pradfw/totalplasma)+0.15)) + t.set_position((pos[0],pos[1]+0.5*(p_fw_rad_total_mw/totalplasma)+0.15)) if t == diagrams[3].texts[3]: # Charged P. t.set_horizontalalignment('left') t.set_position((pos[0]+0.5*((pdivt+p_fw_alpha_mw)/totalplasma)+0.1,pos[1]+0.05)) @@ -513,7 +513,7 @@ def plot_sankey(mfilename="MFILE.DAT"): # Plot simplified power flow Sankey Dia -1 ) # Area fraction covered by HCD and diagnostics pradhcd = p_plasma_rad_mw * fhcd # Radiation deposited on HCD and diagnostics (MW) - pradfw = ( + p_fw_rad_total_mw = ( p_plasma_rad_mw - praddiv - pradhcd ) # Radiation deposited in the blanket (MW) pdivt = m_file.data["pdivt"].get_scan( @@ -559,7 +559,7 @@ def plot_sankey(mfilename="MFILE.DAT"): # Plot simplified power flow Sankey Dia _nuclear_heat_total_mw + pnucshld - + pradfw + + p_fw_rad_total_mw + p_fw_alpha_mw diff --git a/process/power.py b/process/power.py index 8bc5b328e9..50f03a2d92 100644 --- a/process/power.py +++ b/process/power.py @@ -640,7 +640,7 @@ def power1(self): self.pthermfw_blkt = ( self.pthermblkt_liq + fwbs_variables.p_fw_nuclear_heat_total_mw - + fwbs_variables.pradfw + + fwbs_variables.p_fw_rad_total_mw + ( fwbs_variables.p_blkt_nuclear_heat_total_mw * (1 - fwbs_variables.f_nuc_pow_bz_liq) @@ -654,7 +654,7 @@ def power1(self): self.pthermfw_blkt = ( self.pthermblkt_liq + fwbs_variables.p_fw_nuclear_heat_total_mw - + fwbs_variables.pradfw + + fwbs_variables.p_fw_rad_total_mw + fwbs_variables.p_blkt_nuclear_heat_total_mw + primary_pumping_variables.htpmw_fw_blkt + current_drive_variables.porbitlossmw @@ -664,7 +664,7 @@ def power1(self): else: self.pthermfw_blkt = ( fwbs_variables.p_fw_nuclear_heat_total_mw - + fwbs_variables.pradfw + + fwbs_variables.p_fw_rad_total_mw + fwbs_variables.p_blkt_nuclear_heat_total_mw + primary_pumping_variables.htpmw_fw_blkt + current_drive_variables.porbitlossmw @@ -676,7 +676,7 @@ def power1(self): # First wall and blanket coolant combined self.pthermfw_blkt = ( fwbs_variables.p_fw_nuclear_heat_total_mw - + fwbs_variables.pradfw + + fwbs_variables.p_fw_rad_total_mw + fwbs_variables.p_blkt_nuclear_heat_total_mw + primary_pumping_variables.htpmw_fw_blkt + current_drive_variables.porbitlossmw @@ -688,7 +688,7 @@ def power1(self): # Total power deposited in first wall coolant (MW) self.pthermfw = ( fwbs_variables.p_fw_nuclear_heat_total_mw - + fwbs_variables.pradfw + + fwbs_variables.p_fw_rad_total_mw + heat_transport_variables.htpmw_fw + current_drive_variables.porbitlossmw + physics_variables.p_fw_alpha_mw @@ -1343,14 +1343,14 @@ def power2(self, output: bool): fwbs_variables.p_fw_nuclear_heat_total_mw, ) po.dblcol(self.outfile, "p_fw_alpha_mw", 0.0e0, physics_variables.p_fw_alpha_mw) - po.dblcol(self.outfile, "pradfw", 0.0e0, fwbs_variables.pradfw) + po.dblcol(self.outfile, "p_fw_rad_total_mw", 0.0e0, fwbs_variables.p_fw_rad_total_mw) po.dblcol(self.outfile, "htpmw_fw", 0.0e0, heat_transport_variables.htpmw_fw) primsum = ( primsum + fwbs_variables.p_fw_nuclear_heat_total_mw + physics_variables.p_fw_alpha_mw - + fwbs_variables.pradfw + + fwbs_variables.p_fw_rad_total_mw + heat_transport_variables.htpmw_fw ) secsum = secsum diff --git a/process/stellarator.py b/process/stellarator.py index 526b292d51..ed0d66f133 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -1219,7 +1219,7 @@ def stfwbs(self, output: bool): fwbs_variables.pradhcd = ( physics_variables.p_plasma_rad_mw * fwbs_variables.fhcd ) - fwbs_variables.pradfw = ( + fwbs_variables.p_fw_rad_total_mw = ( physics_variables.p_plasma_rad_mw - fwbs_variables.praddiv - fwbs_variables.pradloss @@ -1228,7 +1228,7 @@ def stfwbs(self, output: bool): heat_transport_variables.htpmw_fw = heat_transport_variables.fpumpfw * ( fwbs_variables.p_fw_nuclear_heat_total_mw - + fwbs_variables.pradfw + + fwbs_variables.p_fw_rad_total_mw + current_drive_variables.porbitlossmw ) heat_transport_variables.htpmw_blkt = ( @@ -1362,7 +1362,7 @@ def stfwbs(self, output: bool): # Radiation power incident on first wall (MW) - fwbs_variables.pradfw = ( + fwbs_variables.p_fw_rad_total_mw = ( physics_variables.p_plasma_rad_mw - fwbs_variables.praddiv - fwbs_variables.pradloss @@ -1412,15 +1412,15 @@ def stfwbs(self, output: bool): decayfwi = fwbs_variables.declfw decayfwo = fwbs_variables.declfw - # Surface heat flux on first wall (MW) (sum = fwbs_variables.pradfw) + # Surface heat flux on first wall (MW) (sum = fwbs_variables.p_fw_rad_total_mw) psurffwi = ( - fwbs_variables.pradfw + fwbs_variables.p_fw_rad_total_mw * build_variables.a_fw_inboard / build_variables.a_fw_total ) psurffwo = ( - fwbs_variables.pradfw + fwbs_variables.p_fw_rad_total_mw * build_variables.a_fw_outboard / build_variables.a_fw_total ) diff --git a/source/fortran/fwbs_variables.f90 b/source/fortran/fwbs_variables.f90 index c1dde5c213..db0bc1b60a 100644 --- a/source/fortran/fwbs_variables.f90 +++ b/source/fortran/fwbs_variables.f90 @@ -180,7 +180,7 @@ module fwbs_variables !! Inboard/outboard FW coolant cross-sectional area void fraction real(dp) :: psurffwi, psurffwo - !! Surface heat flux on first wall [MW] (sum = pradfw) + !! Surface heat flux on first wall [MW] (sum = p_fw_rad_total_mw) real(dp) :: vol_fw_total !! First wall volume [m3] @@ -396,7 +396,7 @@ module fwbs_variables real(dp) :: praddiv !! Radiation power incident on the divertor (MW) - real(dp) :: pradfw + real(dp) :: p_fw_rad_total_mw !! Radiation power incident on the first wall (MW) real(dp) :: pradhcd @@ -764,7 +764,7 @@ subroutine init_fwbs_variables fvolso = 0.64D0 fwclfr = 0.15D0 praddiv = 0.0D0 - pradfw = 0.0D0 + p_fw_rad_total_mw = 0.0D0 pradhcd = 0.0D0 pradloss = 0.0D0 ptfnuc = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index ad64820d21..d13ee79740 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3605,7 +3605,7 @@ "ppump": 0.0, "ppumpmw": 0.0, "praddiv": 0.0, - "pradfw": 0.0, + "p_fw_rad_total_mw": 0.0, "pradhcd": 0.0, "pradloss": 0.0, "p_plasma_rad_mw": 0.0, @@ -10357,7 +10357,7 @@ "ppump": "centrepost coolant pump power (W)", "ppumpmw": "", "praddiv": "Radiation power incident on the divertor (MW)", - "pradfw": "Radiation power incident on the first wall (MW)", + "p_fw_rad_total_mw": "Radiation power incident on the first wall (MW)", "pradhcd": "Radiation power incident on the heating and current drive system (MW)", "pradloss": "Radiation power lost through holes (eventually hits shield) (MW)\n Only used for stellarator", "p_plasma_rad_mw": "total radiation power from inside LCFS (MW)", @@ -10388,8 +10388,8 @@ "pseprmax": "maximum ratio of power crossing the separatrix to plasma major radius (Psep/R) (MW/m)\n (`constraint equation 56`)", "ps_current_fraction": "Pfirsch-Schl\u00fcter current fraction", "psolradmw": "SOL radiation power (MW) (`stellarator only`)", - "psurffwi": "Surface heat flux on first wall (MW) (sum = pradfw)", - "psurffwo": "Surface heat flux on first wall (MW) (sum = pradfw)", + "psurffwi": "Surface heat flux on first wall (MW) (sum = p_fw_rad_total_mw)", + "psurffwo": "Surface heat flux on first wall (MW) (sum = p_fw_rad_total_mw)", "pden_plasma_sync_mw": "synchrotron radiation power per volume (MW/m3)", "ptargf": "IFE target factory power at 6 Hz repetition rate (MW)", "ptarmw": "", @@ -18108,7 +18108,7 @@ "fvolso", "fwclfr", "praddiv", - "pradfw", + "p_fw_rad_total_mw", "pradhcd", "pradloss", "ptfnuc", diff --git a/tests/unit/test_ccfe_hcpb.py b/tests/unit/test_ccfe_hcpb.py index c168fc9ae6..54dae2f831 100644 --- a/tests/unit/test_ccfe_hcpb.py +++ b/tests/unit/test_ccfe_hcpb.py @@ -808,7 +808,7 @@ class PowerflowCalcParam(NamedTuple): fhcd: Any = None - pradfw: Any = None + p_fw_rad_total_mw: Any = None i_blkt_coolant_type: Any = None @@ -876,7 +876,7 @@ class PowerflowCalcParam(NamedTuple): expected_praddiv: Any = None - expected_pradfw: Any = None + expected_p_fw_rad_total_mw: Any = None expected_psurffwi: Any = None @@ -900,7 +900,7 @@ class PowerflowCalcParam(NamedTuple): praddiv=0, pradhcd=0, fhcd=0, - pradfw=0, + p_fw_rad_total_mw=0, i_blkt_coolant_type=1, temp_blkt_coolant_out=823, pres_blkt_coolant=15500000, @@ -934,7 +934,7 @@ class PowerflowCalcParam(NamedTuple): ip=0, ofile=11, expected_praddiv=33.056596978820579, - expected_pradfw=254.39207240222791, + expected_p_fw_rad_total_mw=254.39207240222791, expected_psurffwi=97.271629070225231, expected_psurffwo=176.95628839065773, expected_htpmw_shld=0.0068056297940224456, @@ -949,7 +949,7 @@ class PowerflowCalcParam(NamedTuple): praddiv=33.056596978820579, pradhcd=0, fhcd=0, - pradfw=254.39207240222791, + p_fw_rad_total_mw=254.39207240222791, i_blkt_coolant_type=1, temp_blkt_coolant_out=823, pres_blkt_coolant=15500000, @@ -983,7 +983,7 @@ class PowerflowCalcParam(NamedTuple): ip=0, ofile=11, expected_praddiv=33.056596978820579, - expected_pradfw=254.39207240222791, + expected_p_fw_rad_total_mw=254.39207240222791, expected_psurffwi=97.271629070225259, expected_psurffwo=176.95009681558912, expected_htpmw_shld=0.007019085478296147, @@ -1023,7 +1023,7 @@ def test_powerflow_calc(powerflowcalcparam, monkeypatch, ccfe_hcpb): monkeypatch.setattr(fwbs_variables, "fhcd", powerflowcalcparam.fhcd) - monkeypatch.setattr(fwbs_variables, "pradfw", powerflowcalcparam.pradfw) + monkeypatch.setattr(fwbs_variables, "p_fw_rad_total_mw", powerflowcalcparam.p_fw_rad_total_mw) monkeypatch.setattr( fwbs_variables, "i_blkt_coolant_type", powerflowcalcparam.i_blkt_coolant_type @@ -1141,7 +1141,7 @@ def test_powerflow_calc(powerflowcalcparam, monkeypatch, ccfe_hcpb): assert fwbs_variables.praddiv == pytest.approx(powerflowcalcparam.expected_praddiv) - assert fwbs_variables.pradfw == pytest.approx(powerflowcalcparam.expected_pradfw) + assert fwbs_variables.p_fw_rad_total_mw == pytest.approx(powerflowcalcparam.expected_p_fw_rad_total_mw) assert fwbs_variables.psurffwi == pytest.approx( powerflowcalcparam.expected_psurffwi diff --git a/tests/unit/test_dcll.py b/tests/unit/test_dcll.py index 78530813b9..312af657c7 100644 --- a/tests/unit/test_dcll.py +++ b/tests/unit/test_dcll.py @@ -45,7 +45,7 @@ class DcllNeutronicsAndPowerParam(NamedTuple): pnucshld: Any = None - pradfw: Any = None + p_fw_rad_total_mw: Any = None p_fw_nuclear_heat_total_mw: Any = None @@ -77,7 +77,7 @@ class DcllNeutronicsAndPowerParam(NamedTuple): expected_p_div_nuclear_heat_total_mw: Any = None - expected_pradfw: Any = None + expected_p_fw_rad_total_mw: Any = None expected_p_fw_nuclear_heat_total_mw: Any = None @@ -100,7 +100,7 @@ class DcllNeutronicsAndPowerParam(NamedTuple): pradhcd=0, pnuchcd=0, pnucshld=0, - pradfw=0, + p_fw_rad_total_mw=0, p_fw_nuclear_heat_total_mw=0, psurffwi=0, psurffwo=0, @@ -116,7 +116,7 @@ class DcllNeutronicsAndPowerParam(NamedTuple): p_fw_alpha_mw=19.835845058655043, expected_praddiv=33.056596978820579, expected_p_div_nuclear_heat_total_mw=182.58994516305046, - expected_pradfw=254.39207240222791, + expected_p_fw_rad_total_mw=254.39207240222791, expected_p_fw_nuclear_heat_total_mw=196.72081918001697, expected_p_blkt_nuclear_heat_total_mw=1533.4949914565693, expected_emultmw=325.06710220789364, @@ -132,7 +132,7 @@ class DcllNeutronicsAndPowerParam(NamedTuple): pradhcd=0, pnuchcd=0, pnucshld=0, - pradfw=254.39207240222791, + p_fw_rad_total_mw=254.39207240222791, p_fw_nuclear_heat_total_mw=196.72081918001697, psurffwi=97.271629070225231, psurffwo=176.95628839065773, @@ -148,7 +148,7 @@ class DcllNeutronicsAndPowerParam(NamedTuple): p_fw_alpha_mw=19.829653483586444, expected_praddiv=33.056596978820579, expected_p_div_nuclear_heat_total_mw=182.53295140508826, - expected_pradfw=254.39207240222791, + expected_p_fw_rad_total_mw=254.39207240222791, expected_p_fw_nuclear_heat_total_mw=196.65941460078642, expected_p_blkt_nuclear_heat_total_mw=1533.0163252173013, expected_emultmw=324.96563552675644, @@ -202,7 +202,7 @@ def test_dcll_neutronics_and_power(dcllneutronicsandpowerparam, monkeypatch, dcl fwbs_variables, "pnucshld", dcllneutronicsandpowerparam.pnucshld ) - monkeypatch.setattr(fwbs_variables, "pradfw", dcllneutronicsandpowerparam.pradfw) + monkeypatch.setattr(fwbs_variables, "p_fw_rad_total_mw", dcllneutronicsandpowerparam.p_fw_rad_total_mw) monkeypatch.setattr( fwbs_variables, @@ -270,8 +270,8 @@ def test_dcll_neutronics_and_power(dcllneutronicsandpowerparam, monkeypatch, dcl dcllneutronicsandpowerparam.expected_p_div_nuclear_heat_total_mw ) - assert fwbs_variables.pradfw == pytest.approx( - dcllneutronicsandpowerparam.expected_pradfw + assert fwbs_variables.p_fw_rad_total_mw == pytest.approx( + dcllneutronicsandpowerparam.expected_p_fw_rad_total_mw ) assert fwbs_variables.p_fw_nuclear_heat_total_mw == pytest.approx( diff --git a/tests/unit/test_power.py b/tests/unit/test_power.py index 4393f433d7..013d43fa04 100644 --- a/tests/unit/test_power.py +++ b/tests/unit/test_power.py @@ -2047,7 +2047,7 @@ class Power2Param(NamedTuple): p_blkt_nuclear_heat_total_mw: Any = None - pradfw: Any = None + p_fw_rad_total_mw: Any = None qnuc: Any = None @@ -2245,7 +2245,7 @@ class Power2Param(NamedTuple): emultmw=377.93233088402548, inuclear=1, p_blkt_nuclear_heat_total_mw=1504.711566619962, - pradfw=254.87601794907812, + p_fw_rad_total_mw=254.87601794907812, qnuc=12920, etahtp=0.87000000000000011, emult=1.2690000534057617, @@ -2347,7 +2347,7 @@ class Power2Param(NamedTuple): emultmw=377.8143718115644, inuclear=1, p_blkt_nuclear_heat_total_mw=1549.9285082739402, - pradfw=254.87601794907812, + p_fw_rad_total_mw=254.87601794907812, qnuc=12920, etahtp=0.87000000000000011, emult=1.2690000534057617, @@ -2474,7 +2474,7 @@ def test_power2(power2param, monkeypatch, power): power2param.p_blkt_nuclear_heat_total_mw, ) - monkeypatch.setattr(fwbs_variables, "pradfw", power2param.pradfw) + monkeypatch.setattr(fwbs_variables, "p_fw_rad_total_mw", power2param.p_fw_rad_total_mw) monkeypatch.setattr(fwbs_variables, "qnuc", power2param.qnuc) From f65f2d8ab6eeb2fd6d90b016cc9035cf22d169e0 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 18 Feb 2025 14:38:08 +0000 Subject: [PATCH 47/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20pradhcd=20to=20p?= =?UTF-8?q?=5Ffw=5Fhcd=5Frad=5Ftotal=5Fmw=20for=20clarity=20and=20consiste?= =?UTF-8?q?ncy=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/dcll.py | 6 ++++-- process/hcpb.py | 6 ++++-- process/io/sankey_funcs.py | 25 ++++++++++++++++++++----- process/power.py | 15 +++++++++++---- process/stellarator.py | 8 ++++---- source/fortran/fwbs_variables.f90 | 6 +++--- tests/integration/ref_dicts.json | 6 +++--- tests/unit/test_ccfe_hcpb.py | 20 ++++++++++++++------ tests/unit/test_dcll.py | 18 +++++++++++++----- tests/unit/test_power.py | 14 +++++++++----- 10 files changed, 85 insertions(+), 39 deletions(-) diff --git a/process/dcll.py b/process/dcll.py index 6e490ac968..8c285dbb26 100644 --- a/process/dcll.py +++ b/process/dcll.py @@ -182,7 +182,9 @@ def dcll_neutronics_and_power(self, output: bool): # No nuclear heating of the H & CD fwbs_variables.pnuchcd = 0 # Radiation power incident on HCD apparatus (MW) - fwbs_variables.pradhcd = physics_variables.p_plasma_rad_mw * fwbs_variables.fhcd + fwbs_variables.p_fw_hcd_rad_total_mw = ( + physics_variables.p_plasma_rad_mw * fwbs_variables.fhcd + ) # FW @@ -190,7 +192,7 @@ def dcll_neutronics_and_power(self, output: bool): fwbs_variables.p_fw_rad_total_mw = ( physics_variables.p_plasma_rad_mw - fwbs_variables.praddiv - - fwbs_variables.pradhcd + - fwbs_variables.p_fw_hcd_rad_total_mw ) # Surface heat flux on first wall (MW) diff --git a/process/hcpb.py b/process/hcpb.py index b1808cddc7..0ec86f5ed9 100644 --- a/process/hcpb.py +++ b/process/hcpb.py @@ -668,13 +668,15 @@ def powerflow_calc(self, output: bool): ) # Radiation power incident on HCD apparatus (MW) - fwbs_variables.pradhcd = physics_variables.p_plasma_rad_mw * fwbs_variables.fhcd + fwbs_variables.p_fw_hcd_rad_total_mw = ( + physics_variables.p_plasma_rad_mw * fwbs_variables.fhcd + ) # Radiation power incident on first wall (MW) fwbs_variables.p_fw_rad_total_mw = ( physics_variables.p_plasma_rad_mw - fwbs_variables.praddiv - - fwbs_variables.pradhcd + - fwbs_variables.p_fw_hcd_rad_total_mw ) # If we have chosen pressurised water as the blanket coolant, set the diff --git a/process/io/sankey_funcs.py b/process/io/sankey_funcs.py index 7956743967..6c73e0860a 100644 --- a/process/io/sankey_funcs.py +++ b/process/io/sankey_funcs.py @@ -84,10 +84,12 @@ def plot_full_sankey( praddiv = p_plasma_rad_mw * m_file.data["fdiv"].get_scan( -1 ) # Radiation deposited on the divertor (MW) - pradhcd = p_plasma_rad_mw * m_file.data["fhcd"].get_scan( + p_fw_hcd_rad_total_mw = p_plasma_rad_mw * m_file.data["fhcd"].get_scan( -1 ) # Radiation deposited on HCD (MW) - p_fw_rad_total_mw = p_plasma_rad_mw - praddiv - pradhcd # Radiation deposited in the FW (MW) + p_fw_rad_total_mw = ( + p_plasma_rad_mw - praddiv - p_fw_hcd_rad_total_mw + ) # Radiation deposited in the FW (MW) # Used in [DIVERTOR] htpmw_div = m_file.data["htpmw_div"].get_scan(-1) # Divertor coolant pumping power @@ -230,7 +232,12 @@ def plot_full_sankey( # ------------------------------------- RADIATION - 3 ------------------------------------- # Photons, -1st Wall, -Divertor, -H&CD - radiation = [p_plasma_rad_mw, -p_fw_rad_total_mw, -praddiv, -pradhcd] + radiation = [ + p_plasma_rad_mw, + -p_fw_rad_total_mw, + -praddiv, + -p_fw_hcd_rad_total_mw, + ] sankey.add( flows=radiation, # right(in), up(out), up(out), up(out) @@ -296,11 +303,17 @@ def plot_full_sankey( # Alphas, Neutrons, Photons, Coolant Pumping, Total 1st Wall first_wall = [ + p_fw_alpha_mw, + p_fw_nuclear_heat_total_mw, + p_fw_rad_total_mw, + htpmwfw, + -pthermfw, + , ] sankey.add( flows=first_wall, @@ -512,9 +525,11 @@ def plot_sankey(mfilename="MFILE.DAT"): # Plot simplified power flow Sankey Dia fhcd = m_file.data["fhcd"].get_scan( -1 ) # Area fraction covered by HCD and diagnostics - pradhcd = p_plasma_rad_mw * fhcd # Radiation deposited on HCD and diagnostics (MW) + p_fw_hcd_rad_total_mw = ( + p_plasma_rad_mw * fhcd + ) # Radiation deposited on HCD and diagnostics (MW) p_fw_rad_total_mw = ( - p_plasma_rad_mw - praddiv - pradhcd + p_plasma_rad_mw - praddiv - p_fw_hcd_rad_total_mw ) # Radiation deposited in the blanket (MW) pdivt = m_file.data["pdivt"].get_scan( -1 diff --git a/process/power.py b/process/power.py index 50f03a2d92..a5335b6eac 100644 --- a/process/power.py +++ b/process/power.py @@ -768,7 +768,7 @@ def power1(self): # Secondary thermal power lost to HCD apparatus and diagnostics heat_transport_variables.psechcd = ( - fwbs_variables.pnuchcd + fwbs_variables.pradhcd + fwbs_variables.pnuchcd + fwbs_variables.p_fw_hcd_rad_total_mw ) # Number of primary heat exchangers @@ -1343,7 +1343,9 @@ def power2(self, output: bool): fwbs_variables.p_fw_nuclear_heat_total_mw, ) po.dblcol(self.outfile, "p_fw_alpha_mw", 0.0e0, physics_variables.p_fw_alpha_mw) - po.dblcol(self.outfile, "p_fw_rad_total_mw", 0.0e0, fwbs_variables.p_fw_rad_total_mw) + po.dblcol( + self.outfile, "p_fw_rad_total_mw", 0.0e0, fwbs_variables.p_fw_rad_total_mw + ) po.dblcol(self.outfile, "htpmw_fw", 0.0e0, heat_transport_variables.htpmw_fw) primsum = ( @@ -1475,11 +1477,16 @@ def power2(self, output: bool): po.write(self.outfile, "Losses to H/CD apparatus + diagnostics:") po.dblcol(self.outfile, "pnuchcd", 0.0e0, fwbs_variables.pnuchcd) po.write(self.outfile, "0.0e0 0.0e0 0.0e0") - po.dblcol(self.outfile, "pradhcd", 0.0e0, fwbs_variables.pradhcd) + po.dblcol( + self.outfile, + "p_fw_hcd_rad_total_mw", + 0.0e0, + fwbs_variables.p_fw_hcd_rad_total_mw, + ) po.write(self.outfile, "0.0e0 0.0e0 0.0e0") primsum = primsum - secsum = secsum + fwbs_variables.pnuchcd + fwbs_variables.pradhcd + secsum = secsum + fwbs_variables.pnuchcd + fwbs_variables.p_fw_hcd_rad_total_mw po.oblnkl(self.outfile) # write(self.outfile,'(t10,a)') repeat('-',88) diff --git a/process/stellarator.py b/process/stellarator.py index ed0d66f133..88e9fc59a5 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -1216,14 +1216,14 @@ def stfwbs(self, output: bool): fwbs_variables.praddiv = ( physics_variables.p_plasma_rad_mw * fwbs_variables.fdiv ) - fwbs_variables.pradhcd = ( + fwbs_variables.p_fw_hcd_rad_total_mw = ( physics_variables.p_plasma_rad_mw * fwbs_variables.fhcd ) fwbs_variables.p_fw_rad_total_mw = ( physics_variables.p_plasma_rad_mw - fwbs_variables.praddiv - fwbs_variables.pradloss - - fwbs_variables.pradhcd + - fwbs_variables.p_fw_hcd_rad_total_mw ) heat_transport_variables.htpmw_fw = heat_transport_variables.fpumpfw * ( @@ -1350,7 +1350,7 @@ def stfwbs(self, output: bool): # Radiation power incident on HCD apparatus (MW) - fwbs_variables.pradhcd = ( + fwbs_variables.p_fw_hcd_rad_total_mw = ( physics_variables.p_plasma_rad_mw * fwbs_variables.fhcd ) @@ -1366,7 +1366,7 @@ def stfwbs(self, output: bool): physics_variables.p_plasma_rad_mw - fwbs_variables.praddiv - fwbs_variables.pradloss - - fwbs_variables.pradhcd + - fwbs_variables.p_fw_hcd_rad_total_mw ) # Calculate the power deposited in the first wall, blanket and shield, diff --git a/source/fortran/fwbs_variables.f90 b/source/fortran/fwbs_variables.f90 index db0bc1b60a..3dd3073f3e 100644 --- a/source/fortran/fwbs_variables.f90 +++ b/source/fortran/fwbs_variables.f90 @@ -399,8 +399,8 @@ module fwbs_variables real(dp) :: p_fw_rad_total_mw !! Radiation power incident on the first wall (MW) - real(dp) :: pradhcd - !! Radiation power incident on the heating and current drive system (MW) + real(dp) :: p_fw_hcd_rad_total_mw + !! Radiation power incident on the heating and current drive systems on the first wall (MW) real(dp) :: pradloss !! Radiation power lost through holes (eventually hits shield) (MW) @@ -765,7 +765,7 @@ subroutine init_fwbs_variables fwclfr = 0.15D0 praddiv = 0.0D0 p_fw_rad_total_mw = 0.0D0 - pradhcd = 0.0D0 + p_fw_hcd_rad_total_mw = 0.0D0 pradloss = 0.0D0 ptfnuc = 0.0D0 ptfnucpm3 = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index d13ee79740..d2f9d17487 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3606,7 +3606,7 @@ "ppumpmw": 0.0, "praddiv": 0.0, "p_fw_rad_total_mw": 0.0, - "pradhcd": 0.0, + "p_fw_hcd_rad_total_mw": 0.0, "pradloss": 0.0, "p_plasma_rad_mw": 0.0, "pden_plasma_rad_mw": 0.0, @@ -10358,7 +10358,7 @@ "ppumpmw": "", "praddiv": "Radiation power incident on the divertor (MW)", "p_fw_rad_total_mw": "Radiation power incident on the first wall (MW)", - "pradhcd": "Radiation power incident on the heating and current drive system (MW)", + "p_fw_hcd_rad_total_mw": "Radiation power incident on the heating and current drive system (MW)", "pradloss": "Radiation power lost through holes (eventually hits shield) (MW)\n Only used for stellarator", "p_plasma_rad_mw": "total radiation power from inside LCFS (MW)", "pden_plasma_rad_mw": "total radiation power per volume (MW/m3)", @@ -18109,7 +18109,7 @@ "fwclfr", "praddiv", "p_fw_rad_total_mw", - "pradhcd", + "p_fw_hcd_rad_total_mw", "pradloss", "ptfnuc", "ptfnucpm3", diff --git a/tests/unit/test_ccfe_hcpb.py b/tests/unit/test_ccfe_hcpb.py index 54dae2f831..1856f35f12 100644 --- a/tests/unit/test_ccfe_hcpb.py +++ b/tests/unit/test_ccfe_hcpb.py @@ -804,7 +804,7 @@ class PowerflowCalcParam(NamedTuple): praddiv: Any = None - pradhcd: Any = None + p_fw_hcd_rad_total_mw: Any = None fhcd: Any = None @@ -898,7 +898,7 @@ class PowerflowCalcParam(NamedTuple): porbitlossmw=0, fdiv=0.115, praddiv=0, - pradhcd=0, + p_fw_hcd_rad_total_mw=0, fhcd=0, p_fw_rad_total_mw=0, i_blkt_coolant_type=1, @@ -947,7 +947,7 @@ class PowerflowCalcParam(NamedTuple): porbitlossmw=0, fdiv=0.115, praddiv=33.056596978820579, - pradhcd=0, + p_fw_hcd_rad_total_mw=0, fhcd=0, p_fw_rad_total_mw=254.39207240222791, i_blkt_coolant_type=1, @@ -1019,11 +1019,17 @@ def test_powerflow_calc(powerflowcalcparam, monkeypatch, ccfe_hcpb): monkeypatch.setattr(fwbs_variables, "praddiv", powerflowcalcparam.praddiv) - monkeypatch.setattr(fwbs_variables, "pradhcd", powerflowcalcparam.pradhcd) + monkeypatch.setattr( + fwbs_variables, + "p_fw_hcd_rad_total_mw", + powerflowcalcparam.p_fw_hcd_rad_total_mw, + ) monkeypatch.setattr(fwbs_variables, "fhcd", powerflowcalcparam.fhcd) - monkeypatch.setattr(fwbs_variables, "p_fw_rad_total_mw", powerflowcalcparam.p_fw_rad_total_mw) + monkeypatch.setattr( + fwbs_variables, "p_fw_rad_total_mw", powerflowcalcparam.p_fw_rad_total_mw + ) monkeypatch.setattr( fwbs_variables, "i_blkt_coolant_type", powerflowcalcparam.i_blkt_coolant_type @@ -1141,7 +1147,9 @@ def test_powerflow_calc(powerflowcalcparam, monkeypatch, ccfe_hcpb): assert fwbs_variables.praddiv == pytest.approx(powerflowcalcparam.expected_praddiv) - assert fwbs_variables.p_fw_rad_total_mw == pytest.approx(powerflowcalcparam.expected_p_fw_rad_total_mw) + assert fwbs_variables.p_fw_rad_total_mw == pytest.approx( + powerflowcalcparam.expected_p_fw_rad_total_mw + ) assert fwbs_variables.psurffwi == pytest.approx( powerflowcalcparam.expected_psurffwi diff --git a/tests/unit/test_dcll.py b/tests/unit/test_dcll.py index 312af657c7..d8b8b39e7d 100644 --- a/tests/unit/test_dcll.py +++ b/tests/unit/test_dcll.py @@ -39,7 +39,7 @@ class DcllNeutronicsAndPowerParam(NamedTuple): fhcd: Any = None - pradhcd: Any = None + p_fw_hcd_rad_total_mw: Any = None pnuchcd: Any = None @@ -97,7 +97,7 @@ class DcllNeutronicsAndPowerParam(NamedTuple): praddiv=0, p_div_nuclear_heat_total_mw=0, fhcd=0, - pradhcd=0, + p_fw_hcd_rad_total_mw=0, pnuchcd=0, pnucshld=0, p_fw_rad_total_mw=0, @@ -129,7 +129,7 @@ class DcllNeutronicsAndPowerParam(NamedTuple): praddiv=33.056596978820579, p_div_nuclear_heat_total_mw=182.58994516305046, fhcd=0, - pradhcd=0, + p_fw_hcd_rad_total_mw=0, pnuchcd=0, pnucshld=0, p_fw_rad_total_mw=254.39207240222791, @@ -194,7 +194,11 @@ def test_dcll_neutronics_and_power(dcllneutronicsandpowerparam, monkeypatch, dcl monkeypatch.setattr(fwbs_variables, "fhcd", dcllneutronicsandpowerparam.fhcd) - monkeypatch.setattr(fwbs_variables, "pradhcd", dcllneutronicsandpowerparam.pradhcd) + monkeypatch.setattr( + fwbs_variables, + "p_fw_hcd_rad_total_mw", + dcllneutronicsandpowerparam.p_fw_hcd_rad_total_mw, + ) monkeypatch.setattr(fwbs_variables, "pnuchcd", dcllneutronicsandpowerparam.pnuchcd) @@ -202,7 +206,11 @@ def test_dcll_neutronics_and_power(dcllneutronicsandpowerparam, monkeypatch, dcl fwbs_variables, "pnucshld", dcllneutronicsandpowerparam.pnucshld ) - monkeypatch.setattr(fwbs_variables, "p_fw_rad_total_mw", dcllneutronicsandpowerparam.p_fw_rad_total_mw) + monkeypatch.setattr( + fwbs_variables, + "p_fw_rad_total_mw", + dcllneutronicsandpowerparam.p_fw_rad_total_mw, + ) monkeypatch.setattr( fwbs_variables, diff --git a/tests/unit/test_power.py b/tests/unit/test_power.py index 013d43fa04..fc65720b0d 100644 --- a/tests/unit/test_power.py +++ b/tests/unit/test_power.py @@ -2075,7 +2075,7 @@ class Power2Param(NamedTuple): pnucshld: Any = None - pradhcd: Any = None + p_fw_hcd_rad_total_mw: Any = None p_fw_nuclear_heat_total_mw: Any = None @@ -2259,7 +2259,7 @@ class Power2Param(NamedTuple): ptfnuc=0.044178296011112193, pnuchcd=0, pnucshld=1.3609360176065353, - pradhcd=0, + p_fw_hcd_rad_total_mw=0, p_fw_nuclear_heat_total_mw=276.76827393356979, htpmw_shld=0.0068046800880326762, htpmw_blkt=0, @@ -2361,7 +2361,7 @@ class Power2Param(NamedTuple): ptfnuc=0.045535131445547841, pnuchcd=0, pnucshld=1.4036212304705389, - pradhcd=0, + p_fw_hcd_rad_total_mw=0, p_fw_nuclear_heat_total_mw=230.95082168283884, htpmw_shld=0.0070181061523526943, htpmw_blkt=0, @@ -2474,7 +2474,9 @@ def test_power2(power2param, monkeypatch, power): power2param.p_blkt_nuclear_heat_total_mw, ) - monkeypatch.setattr(fwbs_variables, "p_fw_rad_total_mw", power2param.p_fw_rad_total_mw) + monkeypatch.setattr( + fwbs_variables, "p_fw_rad_total_mw", power2param.p_fw_rad_total_mw + ) monkeypatch.setattr(fwbs_variables, "qnuc", power2param.qnuc) @@ -2512,7 +2514,9 @@ def test_power2(power2param, monkeypatch, power): monkeypatch.setattr(fwbs_variables, "pnucshld", power2param.pnucshld) - monkeypatch.setattr(fwbs_variables, "pradhcd", power2param.pradhcd) + monkeypatch.setattr( + fwbs_variables, "p_fw_hcd_rad_total_mw", power2param.p_fw_hcd_rad_total_mw + ) monkeypatch.setattr( fwbs_variables, From 91c018f62f5efab85b1d5a6ba59e377669e4306b Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 18 Feb 2025 14:41:18 +0000 Subject: [PATCH 48/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20praddiv=20to=20p?= =?UTF-8?q?=5Fdiv=5Frad=5Ftotal=5Fmw=20for=20clarity=20and=20consistency?= =?UTF-8?q?=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/dcll.py | 14 +++++++------- process/hcpb.py | 12 ++++++------ process/io/sankey_funcs.py | 24 ++++++++++++++++-------- process/power.py | 11 +++++++---- process/stellarator.py | 12 ++++++------ source/fortran/fwbs_variables.f90 | 6 +++--- tests/integration/ref_dicts.json | 6 +++--- tests/unit/test_ccfe_hcpb.py | 20 ++++++++++++-------- tests/unit/test_dcll.py | 22 +++++++++++++--------- tests/unit/test_power.py | 10 ++++++---- 10 files changed, 79 insertions(+), 58 deletions(-) diff --git a/process/dcll.py b/process/dcll.py index 8c285dbb26..f81db4558f 100644 --- a/process/dcll.py +++ b/process/dcll.py @@ -163,7 +163,7 @@ def dcll_neutronics_and_power(self, output: bool): physics_variables.neutron_power_total * 2 * fwbs_variables.fdiv ) # Radiation power incident on divertor (MW) - fwbs_variables.praddiv = ( + fwbs_variables.p_div_rad_total_mw = ( physics_variables.p_plasma_rad_mw * 2 * fwbs_variables.fdiv ) else: @@ -173,7 +173,7 @@ def dcll_neutronics_and_power(self, output: bool): physics_variables.neutron_power_total * fwbs_variables.fdiv ) # Radiation power incident on divertor (MW) - fwbs_variables.praddiv = ( + fwbs_variables.p_div_rad_total_mw = ( physics_variables.p_plasma_rad_mw * fwbs_variables.fdiv ) @@ -191,7 +191,7 @@ def dcll_neutronics_and_power(self, output: bool): # Radiation power incident on first wall (MW) fwbs_variables.p_fw_rad_total_mw = ( physics_variables.p_plasma_rad_mw - - fwbs_variables.praddiv + - fwbs_variables.p_div_rad_total_mw - fwbs_variables.p_fw_hcd_rad_total_mw ) @@ -276,8 +276,8 @@ def dcll_neutronics_and_power(self, output: bool): po.ovarrf( self.outfile, "Radiation heating power into the divertor (MW)", - "(praddiv)", - fwbs_variables.praddiv, + "(p_div_rad_total_mw)", + fwbs_variables.p_div_rad_total_mw, "OP ", ) po.ovarrf( @@ -316,7 +316,7 @@ def dcll_power_and_heating(self, output: bool): heat_transport_variables.htpmw_div = heat_transport_variables.fpumpdiv * ( physics_variables.pdivt + fwbs_variables.p_div_nuclear_heat_total_mw - + fwbs_variables.praddiv + + fwbs_variables.p_div_rad_total_mw ) elif fwbs_variables.i_coolant_pumping in [2, 3]: @@ -326,7 +326,7 @@ def dcll_power_and_heating(self, output: bool): heat_transport_variables.htpmw_div = heat_transport_variables.fpumpdiv * ( physics_variables.pdivt + fwbs_variables.p_div_nuclear_heat_total_mw - + fwbs_variables.praddiv + + fwbs_variables.p_div_rad_total_mw ) # Shield power is negligible and this model doesn't have nuclear heating to the shield diff --git a/process/hcpb.py b/process/hcpb.py index 0ec86f5ed9..f7ad7d3488 100644 --- a/process/hcpb.py +++ b/process/hcpb.py @@ -658,12 +658,12 @@ def powerflow_calc(self, output: bool): # Radiation power incident on divertor (MW) if physics_variables.idivrt == 2: # Double null configuration - fwbs_variables.praddiv = ( + fwbs_variables.p_div_rad_total_mw = ( physics_variables.p_plasma_rad_mw * 2.0 * fwbs_variables.fdiv ) else: # single null configuration - fwbs_variables.praddiv = ( + fwbs_variables.p_div_rad_total_mw = ( physics_variables.p_plasma_rad_mw * fwbs_variables.fdiv ) @@ -675,7 +675,7 @@ def powerflow_calc(self, output: bool): # Radiation power incident on first wall (MW) fwbs_variables.p_fw_rad_total_mw = ( physics_variables.p_plasma_rad_mw - - fwbs_variables.praddiv + - fwbs_variables.p_div_rad_total_mw - fwbs_variables.p_fw_hcd_rad_total_mw ) @@ -725,7 +725,7 @@ def powerflow_calc(self, output: bool): heat_transport_variables.htpmw_div = heat_transport_variables.fpumpdiv * ( physics_variables.pdivt + fwbs_variables.p_div_nuclear_heat_total_mw - + fwbs_variables.praddiv + + fwbs_variables.p_div_rad_total_mw ) elif fwbs_variables.i_coolant_pumping == 2: @@ -742,7 +742,7 @@ def powerflow_calc(self, output: bool): heat_transport_variables.htpmw_div = heat_transport_variables.fpumpdiv * ( physics_variables.pdivt + fwbs_variables.p_div_nuclear_heat_total_mw - + fwbs_variables.praddiv + + fwbs_variables.p_div_rad_total_mw ) elif fwbs_variables.i_coolant_pumping == 3: @@ -785,7 +785,7 @@ def powerflow_calc(self, output: bool): heat_transport_variables.htpmw_div = heat_transport_variables.fpumpdiv * ( physics_variables.pdivt + fwbs_variables.p_div_nuclear_heat_total_mw - + fwbs_variables.praddiv + + fwbs_variables.p_div_rad_total_mw ) if output: po.oheadr(self.outfile, "Pumping for primary coolant (helium)") diff --git a/process/io/sankey_funcs.py b/process/io/sankey_funcs.py index 6c73e0860a..b113b0c4bf 100644 --- a/process/io/sankey_funcs.py +++ b/process/io/sankey_funcs.py @@ -81,14 +81,14 @@ def plot_full_sankey( ) # Total radiation Power (MW) # Used in [RADIATION] - praddiv = p_plasma_rad_mw * m_file.data["fdiv"].get_scan( + p_div_rad_total_mw = p_plasma_rad_mw * m_file.data["fdiv"].get_scan( -1 ) # Radiation deposited on the divertor (MW) p_fw_hcd_rad_total_mw = p_plasma_rad_mw * m_file.data["fhcd"].get_scan( -1 ) # Radiation deposited on HCD (MW) p_fw_rad_total_mw = ( - p_plasma_rad_mw - praddiv - p_fw_hcd_rad_total_mw + p_plasma_rad_mw - p_div_rad_total_mw - p_fw_hcd_rad_total_mw ) # Radiation deposited in the FW (MW) # Used in [DIVERTOR] @@ -235,7 +235,7 @@ def plot_full_sankey( radiation = [ p_plasma_rad_mw, -p_fw_rad_total_mw, - -praddiv, + -p_div_rad_total_mw, -p_fw_hcd_rad_total_mw, ] sankey.add( @@ -270,7 +270,13 @@ def plot_full_sankey( # -------------------------------------- DIVERTOR - 4 ------------------------------------- # Charged P., Neutrons, Photons, Coolant Pumping, Total Divertor - divertor = [pdivt, p_div_nuclear_heat_total_mw, praddiv, htpmw_div, -pthermdiv] + divertor = [ + pdivt, + p_div_nuclear_heat_total_mw, + p_div_rad_total_mw, + htpmw_div, + -pthermdiv, + ] sankey.add( flows=divertor, # down(in), up(in), down(in), up(in), right(out) @@ -487,7 +493,7 @@ def plot_full_sankey( t.set_position((pos[0]+0.5*((pdivt+p_fw_alpha_mw)/totalplasma)+0.1,pos[1]+0.05)) if t == diagrams[3].texts[4]: # Rad. Div. t.set_horizontalalignment('right') - t.set_position((pos[0]-0.5*(praddiv/totalplasma)-0.1,pos[1])) + t.set_position((pos[0]-0.5*(p_div_rad_total_mw/totalplasma)-0.1,pos[1])) y += 1""" @@ -521,7 +527,9 @@ def plot_sankey(mfilename="MFILE.DAT"): # Plot simplified power flow Sankey Dia fdiv_2 > 0 ): # Takes into account old MFILE representation of double null divertor fdiv = fdiv_2 - praddiv = p_plasma_rad_mw * fdiv # Radiation deposited on the divertor (MW) + p_div_rad_total_mw = ( + p_plasma_rad_mw * fdiv + ) # Radiation deposited on the divertor (MW) fhcd = m_file.data["fhcd"].get_scan( -1 ) # Area fraction covered by HCD and diagnostics @@ -529,7 +537,7 @@ def plot_sankey(mfilename="MFILE.DAT"): # Plot simplified power flow Sankey Dia p_plasma_rad_mw * fhcd ) # Radiation deposited on HCD and diagnostics (MW) p_fw_rad_total_mw = ( - p_plasma_rad_mw - praddiv - p_fw_hcd_rad_total_mw + p_plasma_rad_mw - p_div_rad_total_mw - p_fw_hcd_rad_total_mw ) # Radiation deposited in the blanket (MW) pdivt = m_file.data["pdivt"].get_scan( -1 @@ -564,7 +572,7 @@ def plot_sankey(mfilename="MFILE.DAT"): # Plot simplified power flow Sankey Dia ) # switch for spherical tokamak (ST) models # Power deposited on divertor (MW) - totaldivetc = pdivt + p_div_nuclear_heat_total_mw + praddiv + totaldivetc = pdivt + p_div_nuclear_heat_total_mw + p_div_rad_total_mw # Power deposited on Blanket (MW) totalblktetc = ( ( diff --git a/process/power.py b/process/power.py index a5335b6eac..d636bb6b11 100644 --- a/process/power.py +++ b/process/power.py @@ -713,7 +713,10 @@ def power1(self): # using physics_variables.pdivt as calculated in physics.f90 self.pthermdiv = ( physics_variables.pdivt - + (fwbs_variables.p_div_nuclear_heat_total_mw + fwbs_variables.praddiv) + + ( + fwbs_variables.p_div_nuclear_heat_total_mw + + fwbs_variables.p_div_rad_total_mw + ) + heat_transport_variables.htpmw_div ) @@ -1427,7 +1430,7 @@ def power2(self, output: bool): po.write( self.outfile, ( - f"{fwbs_variables.praddiv * self.iprimdiv} {fwbs_variables.praddiv * (1 - self.iprimdiv)} {fwbs_variables.praddiv}" + f"{fwbs_variables.p_div_rad_total_mw * self.iprimdiv} {fwbs_variables.p_div_rad_total_mw * (1 - self.iprimdiv)} {fwbs_variables.p_div_rad_total_mw}" ), ) po.write( @@ -1441,14 +1444,14 @@ def power2(self, output: bool): primsum + fwbs_variables.p_div_nuclear_heat_total_mw * self.iprimdiv + physics_variables.pdivt * self.iprimdiv - + fwbs_variables.praddiv * self.iprimdiv + + fwbs_variables.p_div_rad_total_mw * self.iprimdiv + heat_transport_variables.htpmw_div * self.iprimdiv ) secsum = ( secsum + fwbs_variables.p_div_nuclear_heat_total_mw * (1 - self.iprimdiv) + physics_variables.pdivt * (1 - self.iprimdiv) - + fwbs_variables.praddiv * (1 - self.iprimdiv) + + fwbs_variables.p_div_rad_total_mw * (1 - self.iprimdiv) + heat_transport_variables.htpmw_div * (1 - self.iprimdiv) ) diff --git a/process/stellarator.py b/process/stellarator.py index 88e9fc59a5..d9fb8b8fec 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -1213,7 +1213,7 @@ def stfwbs(self, output: bool): fwbs_variables.pradloss = ( physics_variables.p_plasma_rad_mw * fwbs_variables.fhole ) - fwbs_variables.praddiv = ( + fwbs_variables.p_div_rad_total_mw = ( physics_variables.p_plasma_rad_mw * fwbs_variables.fdiv ) fwbs_variables.p_fw_hcd_rad_total_mw = ( @@ -1221,7 +1221,7 @@ def stfwbs(self, output: bool): ) fwbs_variables.p_fw_rad_total_mw = ( physics_variables.p_plasma_rad_mw - - fwbs_variables.praddiv + - fwbs_variables.p_div_rad_total_mw - fwbs_variables.pradloss - fwbs_variables.p_fw_hcd_rad_total_mw ) @@ -1243,7 +1243,7 @@ def stfwbs(self, output: bool): * ( physics_variables.pdivt + fwbs_variables.p_div_nuclear_heat_total_mw - + fwbs_variables.praddiv + + fwbs_variables.p_div_rad_total_mw ) ) @@ -1344,7 +1344,7 @@ def stfwbs(self, output: bool): # Radiation power incident on divertor (MW) - fwbs_variables.praddiv = ( + fwbs_variables.p_div_rad_total_mw = ( physics_variables.p_plasma_rad_mw * fwbs_variables.fdiv ) @@ -1364,7 +1364,7 @@ def stfwbs(self, output: bool): fwbs_variables.p_fw_rad_total_mw = ( physics_variables.p_plasma_rad_mw - - fwbs_variables.praddiv + - fwbs_variables.p_div_rad_total_mw - fwbs_variables.pradloss - fwbs_variables.p_fw_hcd_rad_total_mw ) @@ -1566,7 +1566,7 @@ def stfwbs(self, output: bool): * ( physics_variables.pdivt + fwbs_variables.p_div_nuclear_heat_total_mw - + fwbs_variables.praddiv + + fwbs_variables.p_div_rad_total_mw ) ) diff --git a/source/fortran/fwbs_variables.f90 b/source/fortran/fwbs_variables.f90 index 3dd3073f3e..c13f553ba8 100644 --- a/source/fortran/fwbs_variables.f90 +++ b/source/fortran/fwbs_variables.f90 @@ -393,8 +393,8 @@ module fwbs_variables real(dp) :: fwclfr !! first wall coolant fraction (calculated if `i_pulsed_plant=1` or `ipowerflow=1`) - real(dp) :: praddiv - !! Radiation power incident on the divertor (MW) + real(dp) :: p_div_rad_total_mw + !! Total radiation power incident on the divertor(s) (MW) real(dp) :: p_fw_rad_total_mw !! Radiation power incident on the first wall (MW) @@ -763,7 +763,7 @@ subroutine init_fwbs_variables fvolsi = 1.0D0 fvolso = 0.64D0 fwclfr = 0.15D0 - praddiv = 0.0D0 + p_div_rad_total_mw = 0.0D0 p_fw_rad_total_mw = 0.0D0 p_fw_hcd_rad_total_mw = 0.0D0 pradloss = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index d2f9d17487..34992bb116 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3604,7 +3604,7 @@ "len_plasma_poloidal": 0.0, "ppump": 0.0, "ppumpmw": 0.0, - "praddiv": 0.0, + "p_div_rad_total_mw": 0.0, "p_fw_rad_total_mw": 0.0, "p_fw_hcd_rad_total_mw": 0.0, "pradloss": 0.0, @@ -10356,7 +10356,7 @@ "len_plasma_poloidal": "plasma poloidal perimeter (m)", "ppump": "centrepost coolant pump power (W)", "ppumpmw": "", - "praddiv": "Radiation power incident on the divertor (MW)", + "p_div_rad_total_mw": "Radiation power incident on the divertor (MW)", "p_fw_rad_total_mw": "Radiation power incident on the first wall (MW)", "p_fw_hcd_rad_total_mw": "Radiation power incident on the heating and current drive system (MW)", "pradloss": "Radiation power lost through holes (eventually hits shield) (MW)\n Only used for stellarator", @@ -18107,7 +18107,7 @@ "fvolsi", "fvolso", "fwclfr", - "praddiv", + "p_div_rad_total_mw", "p_fw_rad_total_mw", "p_fw_hcd_rad_total_mw", "pradloss", diff --git a/tests/unit/test_ccfe_hcpb.py b/tests/unit/test_ccfe_hcpb.py index 1856f35f12..24677c1c5b 100644 --- a/tests/unit/test_ccfe_hcpb.py +++ b/tests/unit/test_ccfe_hcpb.py @@ -802,7 +802,7 @@ class PowerflowCalcParam(NamedTuple): fdiv: Any = None - praddiv: Any = None + p_div_rad_total_mw: Any = None p_fw_hcd_rad_total_mw: Any = None @@ -874,7 +874,7 @@ class PowerflowCalcParam(NamedTuple): ofile: Any = None - expected_praddiv: Any = None + expected_p_div_rad_total_mw: Any = None expected_p_fw_rad_total_mw: Any = None @@ -897,7 +897,7 @@ class PowerflowCalcParam(NamedTuple): a_fw_total=1601.1595634509963, porbitlossmw=0, fdiv=0.115, - praddiv=0, + p_div_rad_total_mw=0, p_fw_hcd_rad_total_mw=0, fhcd=0, p_fw_rad_total_mw=0, @@ -933,7 +933,7 @@ class PowerflowCalcParam(NamedTuple): htpmw_fw_blkt=0, ip=0, ofile=11, - expected_praddiv=33.056596978820579, + expected_p_div_rad_total_mw=33.056596978820579, expected_p_fw_rad_total_mw=254.39207240222791, expected_psurffwi=97.271629070225231, expected_psurffwo=176.95628839065773, @@ -946,7 +946,7 @@ class PowerflowCalcParam(NamedTuple): a_fw_total=1891.2865102700493, porbitlossmw=0, fdiv=0.115, - praddiv=33.056596978820579, + p_div_rad_total_mw=33.056596978820579, p_fw_hcd_rad_total_mw=0, fhcd=0, p_fw_rad_total_mw=254.39207240222791, @@ -982,7 +982,7 @@ class PowerflowCalcParam(NamedTuple): htpmw_fw_blkt=202.00455086503842, ip=0, ofile=11, - expected_praddiv=33.056596978820579, + expected_p_div_rad_total_mw=33.056596978820579, expected_p_fw_rad_total_mw=254.39207240222791, expected_psurffwi=97.271629070225259, expected_psurffwo=176.95009681558912, @@ -1017,7 +1017,9 @@ def test_powerflow_calc(powerflowcalcparam, monkeypatch, ccfe_hcpb): monkeypatch.setattr(fwbs_variables, "fdiv", powerflowcalcparam.fdiv) - monkeypatch.setattr(fwbs_variables, "praddiv", powerflowcalcparam.praddiv) + monkeypatch.setattr( + fwbs_variables, "p_div_rad_total_mw", powerflowcalcparam.p_div_rad_total_mw + ) monkeypatch.setattr( fwbs_variables, @@ -1145,7 +1147,9 @@ def test_powerflow_calc(powerflowcalcparam, monkeypatch, ccfe_hcpb): ccfe_hcpb.powerflow_calc(False) - assert fwbs_variables.praddiv == pytest.approx(powerflowcalcparam.expected_praddiv) + assert fwbs_variables.p_div_rad_total_mw == pytest.approx( + powerflowcalcparam.expected_p_div_rad_total_mw + ) assert fwbs_variables.p_fw_rad_total_mw == pytest.approx( powerflowcalcparam.expected_p_fw_rad_total_mw diff --git a/tests/unit/test_dcll.py b/tests/unit/test_dcll.py index d8b8b39e7d..abb08245e7 100644 --- a/tests/unit/test_dcll.py +++ b/tests/unit/test_dcll.py @@ -33,7 +33,7 @@ class DcllNeutronicsAndPowerParam(NamedTuple): fdiv: Any = None - praddiv: Any = None + p_div_rad_total_mw: Any = None p_div_nuclear_heat_total_mw: Any = None @@ -73,7 +73,7 @@ class DcllNeutronicsAndPowerParam(NamedTuple): p_fw_alpha_mw: Any = None - expected_praddiv: Any = None + expected_p_div_rad_total_mw: Any = None expected_p_div_nuclear_heat_total_mw: Any = None @@ -94,7 +94,7 @@ class DcllNeutronicsAndPowerParam(NamedTuple): a_fw_total=1601.1595634509963, porbitlossmw=0, fdiv=0.115, - praddiv=0, + p_div_rad_total_mw=0, p_div_nuclear_heat_total_mw=0, fhcd=0, p_fw_hcd_rad_total_mw=0, @@ -114,7 +114,7 @@ class DcllNeutronicsAndPowerParam(NamedTuple): neutron_power_total=1587.7386535917431, p_plasma_rad_mw=287.44866938104849, p_fw_alpha_mw=19.835845058655043, - expected_praddiv=33.056596978820579, + expected_p_div_rad_total_mw=33.056596978820579, expected_p_div_nuclear_heat_total_mw=182.58994516305046, expected_p_fw_rad_total_mw=254.39207240222791, expected_p_fw_nuclear_heat_total_mw=196.72081918001697, @@ -126,7 +126,7 @@ class DcllNeutronicsAndPowerParam(NamedTuple): a_fw_total=1891.2865102700493, porbitlossmw=0, fdiv=0.115, - praddiv=33.056596978820579, + p_div_rad_total_mw=33.056596978820579, p_div_nuclear_heat_total_mw=182.58994516305046, fhcd=0, p_fw_hcd_rad_total_mw=0, @@ -146,7 +146,7 @@ class DcllNeutronicsAndPowerParam(NamedTuple): neutron_power_total=1587.2430556964196, p_plasma_rad_mw=287.44866938104849, p_fw_alpha_mw=19.829653483586444, - expected_praddiv=33.056596978820579, + expected_p_div_rad_total_mw=33.056596978820579, expected_p_div_nuclear_heat_total_mw=182.53295140508826, expected_p_fw_rad_total_mw=254.39207240222791, expected_p_fw_nuclear_heat_total_mw=196.65941460078642, @@ -184,7 +184,11 @@ def test_dcll_neutronics_and_power(dcllneutronicsandpowerparam, monkeypatch, dcl monkeypatch.setattr(fwbs_variables, "fdiv", dcllneutronicsandpowerparam.fdiv) - monkeypatch.setattr(fwbs_variables, "praddiv", dcllneutronicsandpowerparam.praddiv) + monkeypatch.setattr( + fwbs_variables, + "p_div_rad_total_mw", + dcllneutronicsandpowerparam.p_div_rad_total_mw, + ) monkeypatch.setattr( fwbs_variables, @@ -270,8 +274,8 @@ def test_dcll_neutronics_and_power(dcllneutronicsandpowerparam, monkeypatch, dcl dcll.dcll_neutronics_and_power(False) - assert fwbs_variables.praddiv == pytest.approx( - dcllneutronicsandpowerparam.expected_praddiv + assert fwbs_variables.p_div_rad_total_mw == pytest.approx( + dcllneutronicsandpowerparam.expected_p_div_rad_total_mw ) assert fwbs_variables.p_div_nuclear_heat_total_mw == pytest.approx( diff --git a/tests/unit/test_power.py b/tests/unit/test_power.py index fc65720b0d..651e695f5e 100644 --- a/tests/unit/test_power.py +++ b/tests/unit/test_power.py @@ -2055,7 +2055,7 @@ class Power2Param(NamedTuple): emult: Any = None - praddiv: Any = None + p_div_rad_total_mw: Any = None fdiv: Any = None @@ -2249,7 +2249,7 @@ class Power2Param(NamedTuple): qnuc=12920, etahtp=0.87000000000000011, emult=1.2690000534057617, - praddiv=33.119482558354782, + p_div_rad_total_mw=33.119482558354782, fdiv=0.115, fhcd=0, i_thermal_electric_conversion=2, @@ -2351,7 +2351,7 @@ class Power2Param(NamedTuple): qnuc=12920, etahtp=0.87000000000000011, emult=1.2690000534057617, - praddiv=33.119482558354782, + p_div_rad_total_mw=33.119482558354782, fdiv=0.115, fhcd=0, i_thermal_electric_conversion=2, @@ -2484,7 +2484,9 @@ def test_power2(power2param, monkeypatch, power): monkeypatch.setattr(fwbs_variables, "emult", power2param.emult) - monkeypatch.setattr(fwbs_variables, "praddiv", power2param.praddiv) + monkeypatch.setattr( + fwbs_variables, "p_div_rad_total_mw", power2param.p_div_rad_total_mw + ) monkeypatch.setattr(fwbs_variables, "fdiv", power2param.fdiv) From 038f0be102bb4a425676961bbb7e7aef02f657b1 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 18 Feb 2025 14:48:02 +0000 Subject: [PATCH 49/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20pnuchcd=20to=20p?= =?UTF-8?q?=5Ffw=5Fhcd=5Fnuclear=5Fheat=5Fmw=20for=20clarity=20and=20consi?= =?UTF-8?q?stency=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/dcll.py | 2 +- process/hcpb.py | 2 +- process/power.py | 16 +++++++++++++--- process/stellarator.py | 8 ++++---- source/fortran/fwbs_variables.f90 | 6 +++--- tests/integration/ref_dicts.json | 6 +++--- tests/unit/test_ccfe_hcpb.py | 12 ++++++++---- tests/unit/test_dcll.py | 12 ++++++++---- tests/unit/test_power.py | 10 ++++++---- 9 files changed, 47 insertions(+), 27 deletions(-) diff --git a/process/dcll.py b/process/dcll.py index f81db4558f..ab693de068 100644 --- a/process/dcll.py +++ b/process/dcll.py @@ -180,7 +180,7 @@ def dcll_neutronics_and_power(self, output: bool): # HCD Apperatus # No nuclear heating of the H & CD - fwbs_variables.pnuchcd = 0 + fwbs_variables.p_fw_hcd_nuclear_heat_mw = 0 # Radiation power incident on HCD apparatus (MW) fwbs_variables.p_fw_hcd_rad_total_mw = ( physics_variables.p_plasma_rad_mw * fwbs_variables.fhcd diff --git a/process/hcpb.py b/process/hcpb.py index f7ad7d3488..4f6e8ca21b 100644 --- a/process/hcpb.py +++ b/process/hcpb.py @@ -648,7 +648,7 @@ def nuclear_heating_divertor(self): ) # No heating of the H & CD - fwbs_variables.pnuchcd = 0.0 + fwbs_variables.p_fw_hcd_nuclear_heat_mw = 0.0 def powerflow_calc(self, output: bool): """Calculations for powerflow diff --git a/process/power.py b/process/power.py index d636bb6b11..bb52e525ed 100644 --- a/process/power.py +++ b/process/power.py @@ -771,7 +771,8 @@ def power1(self): # Secondary thermal power lost to HCD apparatus and diagnostics heat_transport_variables.psechcd = ( - fwbs_variables.pnuchcd + fwbs_variables.p_fw_hcd_rad_total_mw + fwbs_variables.p_fw_hcd_nuclear_heat_mw + + fwbs_variables.p_fw_hcd_rad_total_mw ) # Number of primary heat exchangers @@ -1478,7 +1479,12 @@ def power2(self, output: bool): po.oblnkl(self.outfile) po.write(self.outfile, "Losses to H/CD apparatus + diagnostics:") - po.dblcol(self.outfile, "pnuchcd", 0.0e0, fwbs_variables.pnuchcd) + po.dblcol( + self.outfile, + "p_fw_hcd_nuclear_heat_mw", + 0.0e0, + fwbs_variables.p_fw_hcd_nuclear_heat_mw, + ) po.write(self.outfile, "0.0e0 0.0e0 0.0e0") po.dblcol( self.outfile, @@ -1489,7 +1495,11 @@ def power2(self, output: bool): po.write(self.outfile, "0.0e0 0.0e0 0.0e0") primsum = primsum - secsum = secsum + fwbs_variables.pnuchcd + fwbs_variables.p_fw_hcd_rad_total_mw + secsum = ( + secsum + + fwbs_variables.p_fw_hcd_nuclear_heat_mw + + fwbs_variables.p_fw_hcd_rad_total_mw + ) po.oblnkl(self.outfile) # write(self.outfile,'(t10,a)') repeat('-',88) diff --git a/process/stellarator.py b/process/stellarator.py index d9fb8b8fec..43b9b8ab75 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -1200,14 +1200,14 @@ def stfwbs(self, output: bool): fwbs_variables.p_div_nuclear_heat_total_mw = ( physics_variables.neutron_power_total * fwbs_variables.fdiv ) - fwbs_variables.pnuchcd = ( + fwbs_variables.p_fw_hcd_nuclear_heat_mw = ( physics_variables.neutron_power_total * fwbs_variables.fhcd ) fwbs_variables.p_fw_nuclear_heat_total_mw = ( physics_variables.neutron_power_total - fwbs_variables.p_div_nuclear_heat_total_mw - fwbs_variables.pnucloss - - fwbs_variables.pnuchcd + - fwbs_variables.p_fw_hcd_nuclear_heat_mw ) fwbs_variables.pradloss = ( @@ -1317,7 +1317,7 @@ def stfwbs(self, output: bool): # Neutron power incident on HCD apparatus (MW) - fwbs_variables.pnuchcd = ( + fwbs_variables.p_fw_hcd_nuclear_heat_mw = ( physics_variables.neutron_power_total * fwbs_variables.fhcd ) @@ -1328,7 +1328,7 @@ def stfwbs(self, output: bool): - fwbs_variables.p_div_nuclear_heat_total_mw - fwbs_variables.pnucloss - fwbs_variables.pnuc_cp - - fwbs_variables.pnuchcd + - fwbs_variables.p_fw_hcd_nuclear_heat_mw ) # Split between inboard and outboard by first wall area fractions diff --git a/source/fortran/fwbs_variables.f90 b/source/fortran/fwbs_variables.f90 index c13f553ba8..5d9ab199b1 100644 --- a/source/fortran/fwbs_variables.f90 +++ b/source/fortran/fwbs_variables.f90 @@ -124,8 +124,8 @@ module fwbs_variables real(dp) :: p_fw_nuclear_heat_total_mw !! nuclear heating in the first wall [MW] - real(dp) :: pnuchcd - !! nuclear heating in the HCD apparatus and diagnostics [MW] + real(dp) :: p_fw_hcd_nuclear_heat_mw + !! Nuclear heating in the HCD apparatus and diagnostics on the first wall [MW] real(dp) :: pnucloss !! nuclear heating lost via holes [MW] @@ -690,7 +690,7 @@ subroutine init_fwbs_variables p_blkt_nuclear_heat_total_mw = 0.0D0 p_div_nuclear_heat_total_mw = 0.0D0 p_fw_nuclear_heat_total_mw = 0.0D0 - pnuchcd = 0.0D0 + p_fw_hcd_nuclear_heat_mw = 0.0D0 pnucloss = 0.0D0 pnucvvplus = 0.0D0 pnucshld = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 34992bb116..04200fa8b7 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3571,7 +3571,7 @@ "p_fw_nuclear_heat_total_mw": 0.0, "pnucfwi": 0.0, "pnucfwo": 0.0, - "pnuchcd": 0.0, + "p_fw_hcd_nuclear_heat_mw": 0.0, "pnucloss": 0.0, "pnucsh": 0.0, "pnucshld": 0.0, @@ -10329,7 +10329,7 @@ "p_fw_nuclear_heat_total_mw": "nuclear heating in the first wall (MW)", "pnucfwi": "Inboard/outboard first wall nuclear heating (MW)", "pnucfwo": "Inboard/outboard first wall nuclear heating (MW)", - "pnuchcd": "nuclear heating in the HCD apparatus and diagnostics (MW)", + "p_fw_hcd_nuclear_heat_mw": "nuclear heating in the HCD apparatus and diagnostics (MW)", "pnucloss": "nuclear heating lost via holes (MW)", "pnucsh": "Nuclear power generated in shield/VV [MW]", "pnucshld": "nuclear heating in the shield (MW)", @@ -18041,7 +18041,7 @@ "pnuc_cp_tf", "p_div_nuclear_heat_total_mw", "p_fw_nuclear_heat_total_mw", - "pnuchcd", + "p_fw_hcd_nuclear_heat_mw", "pnucloss", "pnucvvplus", "pnucshld", diff --git a/tests/unit/test_ccfe_hcpb.py b/tests/unit/test_ccfe_hcpb.py index 24677c1c5b..474878d0d9 100644 --- a/tests/unit/test_ccfe_hcpb.py +++ b/tests/unit/test_ccfe_hcpb.py @@ -721,7 +721,7 @@ class NuclearHeatingDivertorParam(NamedTuple): p_div_nuclear_heat_total_mw: Any = None - pnuchcd: Any = None + p_fw_hcd_nuclear_heat_mw: Any = None idivrt: Any = None @@ -738,7 +738,7 @@ class NuclearHeatingDivertorParam(NamedTuple): NuclearHeatingDivertorParam( fdiv=0.115, p_div_nuclear_heat_total_mw=0, - pnuchcd=0, + p_fw_hcd_nuclear_heat_mw=0, idivrt=1, fusion_power=1986.0623241661431, ip=0, @@ -747,7 +747,7 @@ class NuclearHeatingDivertorParam(NamedTuple): NuclearHeatingDivertorParam( fdiv=0.115, p_div_nuclear_heat_total_mw=182.71773382328519, - pnuchcd=0, + p_fw_hcd_nuclear_heat_mw=0, idivrt=1, fusion_power=1985.4423932312809, ip=0, @@ -776,7 +776,11 @@ def test_nuclear_heating_divertor(nuclearheatingdivertorparam, monkeypatch, ccfe nuclearheatingdivertorparam.p_div_nuclear_heat_total_mw, ) - monkeypatch.setattr(fwbs_variables, "pnuchcd", nuclearheatingdivertorparam.pnuchcd) + monkeypatch.setattr( + fwbs_variables, + "p_fw_hcd_nuclear_heat_mw", + nuclearheatingdivertorparam.p_fw_hcd_nuclear_heat_mw, + ) monkeypatch.setattr(physics_variables, "idivrt", nuclearheatingdivertorparam.idivrt) diff --git a/tests/unit/test_dcll.py b/tests/unit/test_dcll.py index abb08245e7..32fe3d7d66 100644 --- a/tests/unit/test_dcll.py +++ b/tests/unit/test_dcll.py @@ -41,7 +41,7 @@ class DcllNeutronicsAndPowerParam(NamedTuple): p_fw_hcd_rad_total_mw: Any = None - pnuchcd: Any = None + p_fw_hcd_nuclear_heat_mw: Any = None pnucshld: Any = None @@ -98,7 +98,7 @@ class DcllNeutronicsAndPowerParam(NamedTuple): p_div_nuclear_heat_total_mw=0, fhcd=0, p_fw_hcd_rad_total_mw=0, - pnuchcd=0, + p_fw_hcd_nuclear_heat_mw=0, pnucshld=0, p_fw_rad_total_mw=0, p_fw_nuclear_heat_total_mw=0, @@ -130,7 +130,7 @@ class DcllNeutronicsAndPowerParam(NamedTuple): p_div_nuclear_heat_total_mw=182.58994516305046, fhcd=0, p_fw_hcd_rad_total_mw=0, - pnuchcd=0, + p_fw_hcd_nuclear_heat_mw=0, pnucshld=0, p_fw_rad_total_mw=254.39207240222791, p_fw_nuclear_heat_total_mw=196.72081918001697, @@ -204,7 +204,11 @@ def test_dcll_neutronics_and_power(dcllneutronicsandpowerparam, monkeypatch, dcl dcllneutronicsandpowerparam.p_fw_hcd_rad_total_mw, ) - monkeypatch.setattr(fwbs_variables, "pnuchcd", dcllneutronicsandpowerparam.pnuchcd) + monkeypatch.setattr( + fwbs_variables, + "p_fw_hcd_nuclear_heat_mw", + dcllneutronicsandpowerparam.p_fw_hcd_nuclear_heat_mw, + ) monkeypatch.setattr( fwbs_variables, "pnucshld", dcllneutronicsandpowerparam.pnucshld diff --git a/tests/unit/test_power.py b/tests/unit/test_power.py index 651e695f5e..7d8bcf13a7 100644 --- a/tests/unit/test_power.py +++ b/tests/unit/test_power.py @@ -2071,7 +2071,7 @@ class Power2Param(NamedTuple): ptfnuc: Any = None - pnuchcd: Any = None + p_fw_hcd_nuclear_heat_mw: Any = None pnucshld: Any = None @@ -2257,7 +2257,7 @@ class Power2Param(NamedTuple): p_div_nuclear_heat_total_mw=182.69222981118057, i_coolant_pumping=3, ptfnuc=0.044178296011112193, - pnuchcd=0, + p_fw_hcd_nuclear_heat_mw=0, pnucshld=1.3609360176065353, p_fw_hcd_rad_total_mw=0, p_fw_nuclear_heat_total_mw=276.76827393356979, @@ -2359,7 +2359,7 @@ class Power2Param(NamedTuple): p_div_nuclear_heat_total_mw=182.6352084763719, i_coolant_pumping=3, ptfnuc=0.045535131445547841, - pnuchcd=0, + p_fw_hcd_nuclear_heat_mw=0, pnucshld=1.4036212304705389, p_fw_hcd_rad_total_mw=0, p_fw_nuclear_heat_total_mw=230.95082168283884, @@ -2512,7 +2512,9 @@ def test_power2(power2param, monkeypatch, power): monkeypatch.setattr(fwbs_variables, "ptfnuc", power2param.ptfnuc) - monkeypatch.setattr(fwbs_variables, "pnuchcd", power2param.pnuchcd) + monkeypatch.setattr( + fwbs_variables, "p_fw_hcd_nuclear_heat_mw", power2param.p_fw_hcd_nuclear_heat_mw + ) monkeypatch.setattr(fwbs_variables, "pnucshld", power2param.pnucshld) From 7cd16bf930cd381b8db22a8fbd7fa905ec4c6fb3 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 18 Feb 2025 15:17:00 +0000 Subject: [PATCH 50/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20fblli2sio4=20to?= =?UTF-8?q?=20f=5Fvol=5Fblkt=5Fli4sio4=20for=20clarity=20and=20consistency?= =?UTF-8?q?=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++++------ process/hcpb.py | 14 ++++----- source/fortran/fwbs_variables.f90 | 4 +-- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 18 +++++------ tests/integration/ref_dicts.json | 6 ++-- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_ccfe_hcpb.py | 16 +++++----- 18 files changed, 65 insertions(+), 63 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 1dd54d3054..10841c1304 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -955,7 +955,7 @@ Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 6.9487E-03 OP # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 - Lithium_orthosilicate_fraction__________________________________________ (fblli2sio4)__________________ 3.7500E-01 + Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index e4de82f306..ba6b0056fb 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -950,7 +950,7 @@ Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.0688E-03 OP # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 - Lithium_orthosilicate_fraction__________________________________________ (fblli2sio4)__________________ 3.7500E-01 + Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index b30f211445..6ea988ce70 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -950,7 +950,7 @@ Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.0688E-03 OP # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 - Lithium_orthosilicate_fraction__________________________________________ (fblli2sio4)__________________ 3.7500E-01 + Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 2e80d8c15a..96b0ae7d8c 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -950,7 +950,7 @@ Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.0688E-03 OP # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 - Lithium_orthosilicate_fraction__________________________________________ (fblli2sio4)__________________ 3.7500E-01 + Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 3db09fdfe4..812d2bdb30 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -950,7 +950,7 @@ Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.0688E-03 OP # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 - Lithium_orthosilicate_fraction__________________________________________ (fblli2sio4)__________________ 3.7500E-01 + Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 4095056e70..094bd81b1e 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -779,7 +779,7 @@ Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.4423E-03 OP # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 - Lithium_orthosilicate_fraction__________________________________________ (fblli2sio4)__________________ 3.7500E-01 + Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 @@ -1774,7 +1774,7 @@ Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.4423E-03 OP # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 - Lithium_orthosilicate_fraction__________________________________________ (fblli2sio4)__________________ 3.7500E-01 + Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 @@ -2769,7 +2769,7 @@ Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.4423E-03 OP # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 - Lithium_orthosilicate_fraction__________________________________________ (fblli2sio4)__________________ 3.7500E-01 + Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 @@ -3764,7 +3764,7 @@ Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.4423E-03 OP # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 - Lithium_orthosilicate_fraction__________________________________________ (fblli2sio4)__________________ 3.7500E-01 + Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 @@ -4759,7 +4759,7 @@ Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.4423E-03 OP # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 - Lithium_orthosilicate_fraction__________________________________________ (fblli2sio4)__________________ 3.7500E-01 + Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 @@ -5754,7 +5754,7 @@ Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.4423E-03 OP # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 - Lithium_orthosilicate_fraction__________________________________________ (fblli2sio4)__________________ 3.7500E-01 + Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 @@ -6749,7 +6749,7 @@ Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.4423E-03 OP # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 - Lithium_orthosilicate_fraction__________________________________________ (fblli2sio4)__________________ 3.7500E-01 + Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 @@ -7744,7 +7744,7 @@ Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.4423E-03 OP # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 - Lithium_orthosilicate_fraction__________________________________________ (fblli2sio4)__________________ 3.7500E-01 + Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 @@ -8739,7 +8739,7 @@ Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.4423E-03 OP # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 - Lithium_orthosilicate_fraction__________________________________________ (fblli2sio4)__________________ 3.7500E-01 + Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 diff --git a/process/hcpb.py b/process/hcpb.py index 4f6e8ca21b..832f53d785 100644 --- a/process/hcpb.py +++ b/process/hcpb.py @@ -326,16 +326,16 @@ def component_masses(self): if fwbs_variables.breeder_f > 1.0: fwbs_variables.breeder_f = 1.0 - # fbltibe12 = fblli2sio4 * (1 - breeder_f)/breeder_f + # fbltibe12 = f_vol_blkt_li4sio4 * (1 - breeder_f)/breeder_f # New combined variable breeder_multiplier # Lithium orthosilicate fraction: - fwbs_variables.fblli2sio4 = ( + fwbs_variables.f_vol_blkt_li4sio4 = ( fwbs_variables.breeder_f * fwbs_variables.breeder_multiplier ) # Titanium beryllide fraction, and mass (kg): fwbs_variables.fbltibe12 = ( - fwbs_variables.breeder_multiplier - fwbs_variables.fblli2sio4 + fwbs_variables.breeder_multiplier - fwbs_variables.f_vol_blkt_li4sio4 ) fwbs_variables.whtbltibe12 = ( fwbs_variables.vol_blkt_total * fwbs_variables.fbltibe12 * 2260.0 @@ -344,7 +344,7 @@ def component_masses(self): # Blanket Lithium orthosilicate mass (kg) # Ref: www.rockwoodlithium.com... fwbs_variables.whtblli4sio4 = ( - fwbs_variables.vol_blkt_total * fwbs_variables.fblli2sio4 * 2400.0 + fwbs_variables.vol_blkt_total * fwbs_variables.f_vol_blkt_li4sio4 * 2400.0 ) # TODO sort this out so that costs model uses new variables. @@ -355,7 +355,7 @@ def component_masses(self): # Steel fraction by volume is the remainder: fwbs_variables.fblss_ccfe = ( 1.0 - - fwbs_variables.fblli2sio4 + - fwbs_variables.f_vol_blkt_li4sio4 - fwbs_variables.fbltibe12 - fwbs_variables.vfcblkt - fwbs_variables.vfpblkt @@ -1250,8 +1250,8 @@ def write_output(self): po.ovarrf( self.outfile, "Lithium orthosilicate fraction", - "(fblli2sio4)", - fwbs_variables.fblli2sio4, + "(f_vol_blkt_li4sio4)", + fwbs_variables.f_vol_blkt_li4sio4, "OP ", ) po.ovarrf( diff --git a/source/fortran/fwbs_variables.f90 b/source/fortran/fwbs_variables.f90 index 5d9ab199b1..035ea29371 100644 --- a/source/fortran/fwbs_variables.f90 +++ b/source/fortran/fwbs_variables.f90 @@ -185,7 +185,7 @@ module fwbs_variables real(dp) :: vol_fw_total !! First wall volume [m3] - real(dp) :: fblss_ccfe, fblli2sio4, fbltibe12 + real(dp) :: fblss_ccfe, f_vol_blkt_li4sio4, fbltibe12 !! Fractions of blanket by volume: steel, lithium orthosilicate, titanium beryllide ! KIT HCPB blanket model (i_blanket_type = 2) @@ -710,7 +710,7 @@ subroutine init_fwbs_variables psurffwo = 0.0D0 vol_fw_total = 0.0D0 fblss_ccfe = 0.0D0 - fblli2sio4 = 0.0D0 + f_vol_blkt_li4sio4 = 0.0D0 fbltibe12 = 0.0D0 breedmat = 1 densbreed = 0.0D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 74c4e6ea54..98104a654c 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -949,7 +949,7 @@ Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.0688E-03 OP # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 - Lithium_orthosilicate_fraction__________________________________________ (fblli2sio4)__________________ 3.7500E-01 + Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index ba02ef4cf3..6028d74b9b 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -950,7 +950,7 @@ Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.0688E-03 OP # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 - Lithium_orthosilicate_fraction__________________________________________ (fblli2sio4)__________________ 3.7500E-01 + Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 3e96add9f7..15fb402d57 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -950,7 +950,7 @@ Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.0688E-03 OP # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 - Lithium_orthosilicate_fraction__________________________________________ (fblli2sio4)__________________ 3.7500E-01 + Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index aa86383fa0..47f5d82de6 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -950,7 +950,7 @@ Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.0688E-03 OP # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 - Lithium_orthosilicate_fraction__________________________________________ (fblli2sio4)__________________ 3.7500E-01 + Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index d18179c4ad..3ca33c210f 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -953,7 +953,7 @@ Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.0576E-03 OP # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 - Lithium_orthosilicate_fraction__________________________________________ (fblli2sio4)__________________ 3.7500E-01 + Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 1ec11afa2b..d187476ef6 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -951,7 +951,7 @@ Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 6.9768E-03 OP # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 - Lithium_orthosilicate_fraction__________________________________________ (fblli2sio4)__________________ 3.7500E-01 + Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 @@ -2114,7 +2114,7 @@ Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.0410E-03 OP # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 - Lithium_orthosilicate_fraction__________________________________________ (fblli2sio4)__________________ 3.7500E-01 + Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 @@ -3277,7 +3277,7 @@ Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.0748E-03 OP # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 - Lithium_orthosilicate_fraction__________________________________________ (fblli2sio4)__________________ 3.7500E-01 + Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 @@ -4440,7 +4440,7 @@ Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.0869E-03 OP # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 - Lithium_orthosilicate_fraction__________________________________________ (fblli2sio4)__________________ 3.7500E-01 + Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 @@ -5603,7 +5603,7 @@ Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.0982E-03 OP # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 - Lithium_orthosilicate_fraction__________________________________________ (fblli2sio4)__________________ 3.7500E-01 + Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 @@ -6766,7 +6766,7 @@ Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.0758E-03 OP # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 - Lithium_orthosilicate_fraction__________________________________________ (fblli2sio4)__________________ 3.7500E-01 + Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 @@ -7929,7 +7929,7 @@ Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.0901E-03 OP # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 - Lithium_orthosilicate_fraction__________________________________________ (fblli2sio4)__________________ 3.7500E-01 + Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 @@ -9092,7 +9092,7 @@ Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.1000E-03 OP # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 - Lithium_orthosilicate_fraction__________________________________________ (fblli2sio4)__________________ 3.7500E-01 + Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 @@ -10255,7 +10255,7 @@ Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.0734E-03 OP # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 - Lithium_orthosilicate_fraction__________________________________________ (fblli2sio4)__________________ 3.7500E-01 + Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 @@ -11418,7 +11418,7 @@ Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.1193E-03 OP # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 - Lithium_orthosilicate_fraction__________________________________________ (fblli2sio4)__________________ 3.7500E-01 + Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 @@ -12581,7 +12581,7 @@ Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.1614E-03 OP # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 - Lithium_orthosilicate_fraction__________________________________________ (fblli2sio4)__________________ 3.7500E-01 + Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 @@ -13744,7 +13744,7 @@ Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.1587E-03 OP # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 - Lithium_orthosilicate_fraction__________________________________________ (fblli2sio4)__________________ 3.7500E-01 + Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 @@ -14907,7 +14907,7 @@ Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.1972E-03 OP # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 - Lithium_orthosilicate_fraction__________________________________________ (fblli2sio4)__________________ 3.7500E-01 + Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 @@ -16070,7 +16070,7 @@ Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.2350E-03 OP # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 - Lithium_orthosilicate_fraction__________________________________________ (fblli2sio4)__________________ 3.7500E-01 + Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 @@ -17233,7 +17233,7 @@ Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.2749E-03 OP # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 - Lithium_orthosilicate_fraction__________________________________________ (fblli2sio4)__________________ 3.7500E-01 + Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 3784dfbe17..f396dcee7a 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -779,7 +779,7 @@ Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.4423E-03 OP # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 - Lithium_orthosilicate_fraction__________________________________________ (fblli2sio4)__________________ 3.7500E-01 + Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 @@ -1774,7 +1774,7 @@ Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.4423E-03 OP # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 - Lithium_orthosilicate_fraction__________________________________________ (fblli2sio4)__________________ 3.7500E-01 + Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 @@ -2769,7 +2769,7 @@ Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.4423E-03 OP # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 - Lithium_orthosilicate_fraction__________________________________________ (fblli2sio4)__________________ 3.7500E-01 + Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 @@ -3764,7 +3764,7 @@ Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.4423E-03 OP # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 - Lithium_orthosilicate_fraction__________________________________________ (fblli2sio4)__________________ 3.7500E-01 + Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 @@ -4759,7 +4759,7 @@ Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.4423E-03 OP # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 - Lithium_orthosilicate_fraction__________________________________________ (fblli2sio4)__________________ 3.7500E-01 + Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 @@ -5754,7 +5754,7 @@ Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.4423E-03 OP # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 - Lithium_orthosilicate_fraction__________________________________________ (fblli2sio4)__________________ 3.7500E-01 + Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 @@ -6749,7 +6749,7 @@ Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.4423E-03 OP # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 - Lithium_orthosilicate_fraction__________________________________________ (fblli2sio4)__________________ 3.7500E-01 + Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 @@ -7744,7 +7744,7 @@ Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.4423E-03 OP # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 - Lithium_orthosilicate_fraction__________________________________________ (fblli2sio4)__________________ 3.7500E-01 + Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 @@ -8739,7 +8739,7 @@ Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.4423E-03 OP # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 - Lithium_orthosilicate_fraction__________________________________________ (fblli2sio4)__________________ 3.7500E-01 + Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 04200fa8b7..96c94d5864 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1878,7 +1878,7 @@ "fblhebpo": 0.6713, "fblli": 0.0, "fblli2o": 0.08, - "fblli2sio4": 0.0, + "f_vol_blkt_li4sio4": 0.0, "fbllipb": 0.68, "fblss": 0.09705, "fblss_ccfe": 0.0, @@ -9494,7 +9494,7 @@ "fblhebpo": "helium fraction of outboard blanket back plate by volume (`i_blanket_type=2` (KIT HCPB))", "fblli": "lithium fraction of blanket by volume (stellarator only)", "fblli2o": "lithium oxide fraction of blanket by volume (stellarator only)", - "fblli2sio4": "Fractions of blanket by volume: steel, lithium orthosilicate, titanium beryllide", + "f_vol_blkt_li4sio4": "Fractions of blanket by volume: steel, lithium orthosilicate, titanium beryllide", "fbllipb": "lithium lead fraction of blanket by volume (stellarator only)", "fblss": "KIT blanket model: steel fraction of breeding zone", "fblss_ccfe": "Fractions of blanket by volume: steel, lithium orthosilicate, titanium beryllide", @@ -17296,7 +17296,7 @@ "exp_shield1", "exp_shield2", "fblss_ccfe", - "fblli2sio4", + "f_vol_blkt_li4sio4", "fbltibe12" ], "const_and_precisions": [ diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index d21c1b1290..56a193e7bc 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -953,7 +953,7 @@ Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.0576E-03 OP # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 - Lithium_orthosilicate_fraction__________________________________________ (fblli2sio4)__________________ 3.7500E-01 + Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 diff --git a/tests/unit/test_ccfe_hcpb.py b/tests/unit/test_ccfe_hcpb.py index 474878d0d9..15acb9386a 100644 --- a/tests/unit/test_ccfe_hcpb.py +++ b/tests/unit/test_ccfe_hcpb.py @@ -1516,7 +1516,7 @@ class ComponentMassesParam(NamedTuple): f_a_fw_coolant_outboard: Any = None vol_fw_total: Any = None fblss_ccfe: Any = None - fblli2sio4: Any = None + f_vol_blkt_li4sio4: Any = None fbltibe12: Any = None expected_divsur: Any = None expected_divmas: Any = None @@ -1535,7 +1535,7 @@ class ComponentMassesParam(NamedTuple): expected_fw_armour_mass: Any = None expected_armour_fw_bl_mass: Any = None expected_fblss_ccfe: Any = None - expected_fblli2sio4: Any = None + expected_f_vol_blkt_li4sio4: Any = None expected_fbltibe12: Any = None @@ -1607,7 +1607,7 @@ class ComponentMassesParam(NamedTuple): f_a_fw_coolant_outboard=0, vol_fw_total=0, fblss_ccfe=0, - fblli2sio4=0, + f_vol_blkt_li4sio4=0, fbltibe12=0, expected_divsur=148.78582807401261, expected_divmas=36452.527878133093, @@ -1626,7 +1626,7 @@ class ComponentMassesParam(NamedTuple): expected_fw_armour_mass=112982.36729823884, expected_armour_fw_bl_mass=3263343.5901344167, expected_fblss_ccfe=0.097049999999999997, - expected_fblli2sio4=0.375, + expected_f_vol_blkt_li4sio4=0.375, expected_fbltibe12=0.375, ), ), @@ -1761,7 +1761,9 @@ def test_component_masses(componentmassesparam, monkeypatch, ccfe_hcpb): fwbs_variables, "vol_fw_total", componentmassesparam.vol_fw_total ) monkeypatch.setattr(fwbs_variables, "fblss_ccfe", componentmassesparam.fblss_ccfe) - monkeypatch.setattr(fwbs_variables, "fblli2sio4", componentmassesparam.fblli2sio4) + monkeypatch.setattr( + fwbs_variables, "f_vol_blkt_li4sio4", componentmassesparam.f_vol_blkt_li4sio4 + ) monkeypatch.setattr(fwbs_variables, "fbltibe12", componentmassesparam.fbltibe12) ccfe_hcpb.component_masses() @@ -1815,8 +1817,8 @@ def test_component_masses(componentmassesparam, monkeypatch, ccfe_hcpb): assert fwbs_variables.fblss_ccfe == pytest.approx( componentmassesparam.expected_fblss_ccfe ) - assert fwbs_variables.fblli2sio4 == pytest.approx( - componentmassesparam.expected_fblli2sio4 + assert fwbs_variables.f_vol_blkt_li4sio4 == pytest.approx( + componentmassesparam.expected_f_vol_blkt_li4sio4 ) assert fwbs_variables.fbltibe12 == pytest.approx( componentmassesparam.expected_fbltibe12 From ec4b8bbe416c3ba57fb30721d1dbbf5566e7aa77 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 18 Feb 2025 15:29:29 +0000 Subject: [PATCH 51/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20fbltibe12=20to=20?= =?UTF-8?q?f=5Fvol=5Fblkt=5Ftibe12=20for=20clarity=20and=20consistency=20a?= =?UTF-8?q?cross=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++++------ process/hcpb.py | 12 ++++---- source/fortran/fwbs_variables.f90 | 4 +-- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 18 +++++------ tests/integration/ref_dicts.json | 6 ++-- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_ccfe_hcpb.py | 16 +++++----- 18 files changed, 64 insertions(+), 62 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 10841c1304..3b0390dedc 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -954,7 +954,7 @@ Mechanical_pumping_power_for_divertor_(MW)______________________________ (htpmw_div)___________________ 1.6374E+00 OP Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 6.9487E-03 OP # First wall and blanket : CCFE HCPB model # - Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 + Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index ba6b0056fb..fd2dac0deb 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -949,7 +949,7 @@ Mechanical_pumping_power_for_divertor_(MW)______________________________ (htpmw_div)___________________ 1.6906E+00 OP Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.0688E-03 OP # First wall and blanket : CCFE HCPB model # - Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 + Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 6ea988ce70..29ee62b637 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -949,7 +949,7 @@ Mechanical_pumping_power_for_divertor_(MW)______________________________ (htpmw_div)___________________ 1.6906E+00 OP Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.0688E-03 OP # First wall and blanket : CCFE HCPB model # - Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 + Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 96b0ae7d8c..f8cc3301e8 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -949,7 +949,7 @@ Mechanical_pumping_power_for_divertor_(MW)______________________________ (htpmw_div)___________________ 1.6906E+00 OP Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.0688E-03 OP # First wall and blanket : CCFE HCPB model # - Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 + Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 812d2bdb30..56e0a9d9d2 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -949,7 +949,7 @@ Mechanical_pumping_power_for_divertor_(MW)______________________________ (htpmw_div)___________________ 1.6906E+00 OP Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.0688E-03 OP # First wall and blanket : CCFE HCPB model # - Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 + Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 094bd81b1e..d5fad5b231 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -778,7 +778,7 @@ Mechanical_pumping_power_for_divertor_(MW)______________________________ (htpmw_div)___________________ 1.9453E+00 OP Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.4423E-03 OP # First wall and blanket : CCFE HCPB model # - Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 + Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 @@ -1773,7 +1773,7 @@ Mechanical_pumping_power_for_divertor_(MW)______________________________ (htpmw_div)___________________ 1.9453E+00 OP Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.4423E-03 OP # First wall and blanket : CCFE HCPB model # - Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 + Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 @@ -2768,7 +2768,7 @@ Mechanical_pumping_power_for_divertor_(MW)______________________________ (htpmw_div)___________________ 1.9453E+00 OP Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.4423E-03 OP # First wall and blanket : CCFE HCPB model # - Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 + Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 @@ -3763,7 +3763,7 @@ Mechanical_pumping_power_for_divertor_(MW)______________________________ (htpmw_div)___________________ 1.9453E+00 OP Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.4423E-03 OP # First wall and blanket : CCFE HCPB model # - Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 + Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 @@ -4758,7 +4758,7 @@ Mechanical_pumping_power_for_divertor_(MW)______________________________ (htpmw_div)___________________ 1.9453E+00 OP Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.4423E-03 OP # First wall and blanket : CCFE HCPB model # - Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 + Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 @@ -5753,7 +5753,7 @@ Mechanical_pumping_power_for_divertor_(MW)______________________________ (htpmw_div)___________________ 1.9453E+00 OP Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.4423E-03 OP # First wall and blanket : CCFE HCPB model # - Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 + Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 @@ -6748,7 +6748,7 @@ Mechanical_pumping_power_for_divertor_(MW)______________________________ (htpmw_div)___________________ 1.9453E+00 OP Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.4423E-03 OP # First wall and blanket : CCFE HCPB model # - Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 + Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 @@ -7743,7 +7743,7 @@ Mechanical_pumping_power_for_divertor_(MW)______________________________ (htpmw_div)___________________ 1.9453E+00 OP Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.4423E-03 OP # First wall and blanket : CCFE HCPB model # - Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 + Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 @@ -8738,7 +8738,7 @@ Mechanical_pumping_power_for_divertor_(MW)______________________________ (htpmw_div)___________________ 1.9453E+00 OP Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.4423E-03 OP # First wall and blanket : CCFE HCPB model # - Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 + Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 diff --git a/process/hcpb.py b/process/hcpb.py index 832f53d785..f6412b4d16 100644 --- a/process/hcpb.py +++ b/process/hcpb.py @@ -326,7 +326,7 @@ def component_masses(self): if fwbs_variables.breeder_f > 1.0: fwbs_variables.breeder_f = 1.0 - # fbltibe12 = f_vol_blkt_li4sio4 * (1 - breeder_f)/breeder_f + # f_vol_blkt_tibe12 = f_vol_blkt_li4sio4 * (1 - breeder_f)/breeder_f # New combined variable breeder_multiplier # Lithium orthosilicate fraction: fwbs_variables.f_vol_blkt_li4sio4 = ( @@ -334,11 +334,11 @@ def component_masses(self): ) # Titanium beryllide fraction, and mass (kg): - fwbs_variables.fbltibe12 = ( + fwbs_variables.f_vol_blkt_tibe12 = ( fwbs_variables.breeder_multiplier - fwbs_variables.f_vol_blkt_li4sio4 ) fwbs_variables.whtbltibe12 = ( - fwbs_variables.vol_blkt_total * fwbs_variables.fbltibe12 * 2260.0 + fwbs_variables.vol_blkt_total * fwbs_variables.f_vol_blkt_tibe12 * 2260.0 ) # Blanket Lithium orthosilicate mass (kg) @@ -356,7 +356,7 @@ def component_masses(self): fwbs_variables.fblss_ccfe = ( 1.0 - fwbs_variables.f_vol_blkt_li4sio4 - - fwbs_variables.fbltibe12 + - fwbs_variables.f_vol_blkt_tibe12 - fwbs_variables.vfcblkt - fwbs_variables.vfpblkt ) @@ -1243,8 +1243,8 @@ def write_output(self): po.ovarrf( self.outfile, "Titanium beryllide fraction", - "(fbltibe12)", - fwbs_variables.fbltibe12, + "(f_vol_blkt_tibe12)", + fwbs_variables.f_vol_blkt_tibe12, "OP ", ) po.ovarrf( diff --git a/source/fortran/fwbs_variables.f90 b/source/fortran/fwbs_variables.f90 index 035ea29371..8f04c49e59 100644 --- a/source/fortran/fwbs_variables.f90 +++ b/source/fortran/fwbs_variables.f90 @@ -185,7 +185,7 @@ module fwbs_variables real(dp) :: vol_fw_total !! First wall volume [m3] - real(dp) :: fblss_ccfe, f_vol_blkt_li4sio4, fbltibe12 + real(dp) :: fblss_ccfe, f_vol_blkt_li4sio4, f_vol_blkt_tibe12 !! Fractions of blanket by volume: steel, lithium orthosilicate, titanium beryllide ! KIT HCPB blanket model (i_blanket_type = 2) @@ -711,7 +711,7 @@ subroutine init_fwbs_variables vol_fw_total = 0.0D0 fblss_ccfe = 0.0D0 f_vol_blkt_li4sio4 = 0.0D0 - fbltibe12 = 0.0D0 + f_vol_blkt_tibe12 = 0.0D0 breedmat = 1 densbreed = 0.0D0 fblbe = 0.6D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 98104a654c..c439c77214 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -948,7 +948,7 @@ Mechanical_pumping_power_for_divertor_(MW)______________________________ (htpmw_div)___________________ 1.6906E+00 OP Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.0688E-03 OP # First wall and blanket : CCFE HCPB model # - Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 + Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 6028d74b9b..47c1b36a74 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -949,7 +949,7 @@ Mechanical_pumping_power_for_divertor_(MW)______________________________ (htpmw_div)___________________ 1.6906E+00 OP Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.0688E-03 OP # First wall and blanket : CCFE HCPB model # - Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 + Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 15fb402d57..c3d4d8dfe2 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -949,7 +949,7 @@ Mechanical_pumping_power_for_divertor_(MW)______________________________ (htpmw_div)___________________ 1.6906E+00 OP Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.0688E-03 OP # First wall and blanket : CCFE HCPB model # - Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 + Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 47f5d82de6..8e996679ca 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -949,7 +949,7 @@ Mechanical_pumping_power_for_divertor_(MW)______________________________ (htpmw_div)___________________ 1.6906E+00 OP Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.0688E-03 OP # First wall and blanket : CCFE HCPB model # - Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 + Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 3ca33c210f..729b380580 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -952,7 +952,7 @@ Mechanical_pumping_power_for_divertor_(MW)______________________________ (htpmw_div)___________________ 1.6938E+00 OP Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.0576E-03 OP # First wall and blanket : CCFE HCPB model # - Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 + Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index d187476ef6..8005f7be66 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -950,7 +950,7 @@ Mechanical_pumping_power_for_divertor_(MW)______________________________ (htpmw_div)___________________ 1.6675E+00 OP Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 6.9768E-03 OP # First wall and blanket : CCFE HCPB model # - Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 + Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 @@ -2113,7 +2113,7 @@ Mechanical_pumping_power_for_divertor_(MW)______________________________ (htpmw_div)___________________ 1.6789E+00 OP Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.0410E-03 OP # First wall and blanket : CCFE HCPB model # - Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 + Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 @@ -3276,7 +3276,7 @@ Mechanical_pumping_power_for_divertor_(MW)______________________________ (htpmw_div)___________________ 1.6782E+00 OP Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.0748E-03 OP # First wall and blanket : CCFE HCPB model # - Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 + Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 @@ -4439,7 +4439,7 @@ Mechanical_pumping_power_for_divertor_(MW)______________________________ (htpmw_div)___________________ 1.6810E+00 OP Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.0869E-03 OP # First wall and blanket : CCFE HCPB model # - Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 + Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 @@ -5602,7 +5602,7 @@ Mechanical_pumping_power_for_divertor_(MW)______________________________ (htpmw_div)___________________ 1.6894E+00 OP Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.0982E-03 OP # First wall and blanket : CCFE HCPB model # - Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 + Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 @@ -6765,7 +6765,7 @@ Mechanical_pumping_power_for_divertor_(MW)______________________________ (htpmw_div)___________________ 1.6912E+00 OP Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.0758E-03 OP # First wall and blanket : CCFE HCPB model # - Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 + Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 @@ -7928,7 +7928,7 @@ Mechanical_pumping_power_for_divertor_(MW)______________________________ (htpmw_div)___________________ 1.6952E+00 OP Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.0901E-03 OP # First wall and blanket : CCFE HCPB model # - Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 + Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 @@ -9091,7 +9091,7 @@ Mechanical_pumping_power_for_divertor_(MW)______________________________ (htpmw_div)___________________ 1.6911E+00 OP Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.1000E-03 OP # First wall and blanket : CCFE HCPB model # - Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 + Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 @@ -10254,7 +10254,7 @@ Mechanical_pumping_power_for_divertor_(MW)______________________________ (htpmw_div)___________________ 1.6824E+00 OP Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.0734E-03 OP # First wall and blanket : CCFE HCPB model # - Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 + Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 @@ -11417,7 +11417,7 @@ Mechanical_pumping_power_for_divertor_(MW)______________________________ (htpmw_div)___________________ 1.6915E+00 OP Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.1193E-03 OP # First wall and blanket : CCFE HCPB model # - Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 + Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 @@ -12580,7 +12580,7 @@ Mechanical_pumping_power_for_divertor_(MW)______________________________ (htpmw_div)___________________ 1.6997E+00 OP Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.1614E-03 OP # First wall and blanket : CCFE HCPB model # - Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 + Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 @@ -13743,7 +13743,7 @@ Mechanical_pumping_power_for_divertor_(MW)______________________________ (htpmw_div)___________________ 1.7043E+00 OP Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.1587E-03 OP # First wall and blanket : CCFE HCPB model # - Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 + Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 @@ -14906,7 +14906,7 @@ Mechanical_pumping_power_for_divertor_(MW)______________________________ (htpmw_div)___________________ 1.7121E+00 OP Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.1972E-03 OP # First wall and blanket : CCFE HCPB model # - Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 + Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 @@ -16069,7 +16069,7 @@ Mechanical_pumping_power_for_divertor_(MW)______________________________ (htpmw_div)___________________ 1.7138E+00 OP Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.2350E-03 OP # First wall and blanket : CCFE HCPB model # - Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 + Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 @@ -17232,7 +17232,7 @@ Mechanical_pumping_power_for_divertor_(MW)______________________________ (htpmw_div)___________________ 1.7157E+00 OP Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.2749E-03 OP # First wall and blanket : CCFE HCPB model # - Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 + Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index f396dcee7a..6601bdb75b 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -778,7 +778,7 @@ Mechanical_pumping_power_for_divertor_(MW)______________________________ (htpmw_div)___________________ 1.9453E+00 OP Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.4423E-03 OP # First wall and blanket : CCFE HCPB model # - Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 + Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 @@ -1773,7 +1773,7 @@ Mechanical_pumping_power_for_divertor_(MW)______________________________ (htpmw_div)___________________ 1.9453E+00 OP Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.4423E-03 OP # First wall and blanket : CCFE HCPB model # - Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 + Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 @@ -2768,7 +2768,7 @@ Mechanical_pumping_power_for_divertor_(MW)______________________________ (htpmw_div)___________________ 1.9453E+00 OP Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.4423E-03 OP # First wall and blanket : CCFE HCPB model # - Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 + Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 @@ -3763,7 +3763,7 @@ Mechanical_pumping_power_for_divertor_(MW)______________________________ (htpmw_div)___________________ 1.9453E+00 OP Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.4423E-03 OP # First wall and blanket : CCFE HCPB model # - Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 + Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 @@ -4758,7 +4758,7 @@ Mechanical_pumping_power_for_divertor_(MW)______________________________ (htpmw_div)___________________ 1.9453E+00 OP Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.4423E-03 OP # First wall and blanket : CCFE HCPB model # - Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 + Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 @@ -5753,7 +5753,7 @@ Mechanical_pumping_power_for_divertor_(MW)______________________________ (htpmw_div)___________________ 1.9453E+00 OP Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.4423E-03 OP # First wall and blanket : CCFE HCPB model # - Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 + Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 @@ -6748,7 +6748,7 @@ Mechanical_pumping_power_for_divertor_(MW)______________________________ (htpmw_div)___________________ 1.9453E+00 OP Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.4423E-03 OP # First wall and blanket : CCFE HCPB model # - Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 + Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 @@ -7743,7 +7743,7 @@ Mechanical_pumping_power_for_divertor_(MW)______________________________ (htpmw_div)___________________ 1.9453E+00 OP Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.4423E-03 OP # First wall and blanket : CCFE HCPB model # - Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 + Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 @@ -8738,7 +8738,7 @@ Mechanical_pumping_power_for_divertor_(MW)______________________________ (htpmw_div)___________________ 1.9453E+00 OP Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.4423E-03 OP # First wall and blanket : CCFE HCPB model # - Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 + Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 96c94d5864..700ac23af8 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1882,7 +1882,7 @@ "fbllipb": 0.68, "fblss": 0.09705, "fblss_ccfe": 0.0, - "fbltibe12": 0.0, + "f_vol_blkt_tibe12": 0.0, "fblvd": 0.0, "fb_cs_limit_max": 13.0, "fbreed": 0.51, @@ -9498,7 +9498,7 @@ "fbllipb": "lithium lead fraction of blanket by volume (stellarator only)", "fblss": "KIT blanket model: steel fraction of breeding zone", "fblss_ccfe": "Fractions of blanket by volume: steel, lithium orthosilicate, titanium beryllide", - "fbltibe12": "Fractions of blanket by volume: steel, lithium orthosilicate, titanium beryllide", + "f_vol_blkt_tibe12": "Fractions of blanket by volume: steel, lithium orthosilicate, titanium beryllide", "fblvd": "vanadium fraction of blanket by volume (stellarator only)", "fb_cs_limit_max": "F-value for CS mmax field (`cons. 79`, `itvar 149`)", "fbreed": "fraction of breeder external to device core", @@ -17297,7 +17297,7 @@ "exp_shield2", "fblss_ccfe", "f_vol_blkt_li4sio4", - "fbltibe12" + "f_vol_blkt_tibe12" ], "const_and_precisions": [ "sp_", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 56a193e7bc..e6d4e5c78a 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -952,7 +952,7 @@ Mechanical_pumping_power_for_divertor_(MW)______________________________ (htpmw_div)___________________ 1.6938E+00 OP Mechanical_pumping_power_for_shield_and_vacuum_vessel_(MW)______________ (htpmw_shld)__________________ 7.0576E-03 OP # First wall and blanket : CCFE HCPB model # - Titanium_beryllide_fraction_____________________________________________ (fbltibe12)___________________ 3.7500E-01 + Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 diff --git a/tests/unit/test_ccfe_hcpb.py b/tests/unit/test_ccfe_hcpb.py index 15acb9386a..b6f69005ff 100644 --- a/tests/unit/test_ccfe_hcpb.py +++ b/tests/unit/test_ccfe_hcpb.py @@ -1517,7 +1517,7 @@ class ComponentMassesParam(NamedTuple): vol_fw_total: Any = None fblss_ccfe: Any = None f_vol_blkt_li4sio4: Any = None - fbltibe12: Any = None + f_vol_blkt_tibe12: Any = None expected_divsur: Any = None expected_divmas: Any = None expected_whtblbe: Any = None @@ -1536,7 +1536,7 @@ class ComponentMassesParam(NamedTuple): expected_armour_fw_bl_mass: Any = None expected_fblss_ccfe: Any = None expected_f_vol_blkt_li4sio4: Any = None - expected_fbltibe12: Any = None + expected_f_vol_blkt_tibe12: Any = None @pytest.mark.parametrize( @@ -1608,7 +1608,7 @@ class ComponentMassesParam(NamedTuple): vol_fw_total=0, fblss_ccfe=0, f_vol_blkt_li4sio4=0, - fbltibe12=0, + f_vol_blkt_tibe12=0, expected_divsur=148.78582807401261, expected_divmas=36452.527878133093, expected_whtblbe=1002205.5121936026, @@ -1627,7 +1627,7 @@ class ComponentMassesParam(NamedTuple): expected_armour_fw_bl_mass=3263343.5901344167, expected_fblss_ccfe=0.097049999999999997, expected_f_vol_blkt_li4sio4=0.375, - expected_fbltibe12=0.375, + expected_f_vol_blkt_tibe12=0.375, ), ), ) @@ -1764,7 +1764,9 @@ def test_component_masses(componentmassesparam, monkeypatch, ccfe_hcpb): monkeypatch.setattr( fwbs_variables, "f_vol_blkt_li4sio4", componentmassesparam.f_vol_blkt_li4sio4 ) - monkeypatch.setattr(fwbs_variables, "fbltibe12", componentmassesparam.fbltibe12) + monkeypatch.setattr( + fwbs_variables, "f_vol_blkt_tibe12", componentmassesparam.f_vol_blkt_tibe12 + ) ccfe_hcpb.component_masses() @@ -1820,6 +1822,6 @@ def test_component_masses(componentmassesparam, monkeypatch, ccfe_hcpb): assert fwbs_variables.f_vol_blkt_li4sio4 == pytest.approx( componentmassesparam.expected_f_vol_blkt_li4sio4 ) - assert fwbs_variables.fbltibe12 == pytest.approx( - componentmassesparam.expected_fbltibe12 + assert fwbs_variables.f_vol_blkt_tibe12 == pytest.approx( + componentmassesparam.expected_f_vol_blkt_tibe12 ) From 326474487a81708c5552a93da8d22680a2a23275 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 18 Feb 2025 15:39:51 +0000 Subject: [PATCH 52/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20fblss=5Fccfe=20to?= =?UTF-8?q?=20f=5Fvol=5Fblkt=5Fsteel=20for=20clarity=20and=20consistency?= =?UTF-8?q?=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++++------ process/hcpb.py | 8 ++--- source/fortran/fwbs_variables.f90 | 4 +-- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 18 +++++------ tests/integration/ref_dicts.json | 6 ++-- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_ccfe_hcpb.py | 10 ++++--- 18 files changed, 59 insertions(+), 57 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 3b0390dedc..578d85af92 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -956,7 +956,7 @@ # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 - Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 + Steel_fraction__________________________________________________________ (f_vol_blkt_steel)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 5.8692E+00 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index fd2dac0deb..76abdeaf12 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -951,7 +951,7 @@ # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 - Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 + Steel_fraction__________________________________________________________ (f_vol_blkt_steel)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 5.8692E+00 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 29ee62b637..4abf53c1b9 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -951,7 +951,7 @@ # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 - Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 + Steel_fraction__________________________________________________________ (f_vol_blkt_steel)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 5.8692E+00 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index f8cc3301e8..56fb48dcd9 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -951,7 +951,7 @@ # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 - Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 + Steel_fraction__________________________________________________________ (f_vol_blkt_steel)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 5.8692E+00 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 56e0a9d9d2..62ccf9a076 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -951,7 +951,7 @@ # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 - Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 + Steel_fraction__________________________________________________________ (f_vol_blkt_steel)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 5.8692E+00 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index d5fad5b231..ede7689525 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -780,7 +780,7 @@ # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 - Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 + Steel_fraction__________________________________________________________ (f_vol_blkt_steel)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 7.4780E+00 @@ -1775,7 +1775,7 @@ # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 - Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 + Steel_fraction__________________________________________________________ (f_vol_blkt_steel)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 7.4780E+00 @@ -2770,7 +2770,7 @@ # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 - Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 + Steel_fraction__________________________________________________________ (f_vol_blkt_steel)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 7.4780E+00 @@ -3765,7 +3765,7 @@ # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 - Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 + Steel_fraction__________________________________________________________ (f_vol_blkt_steel)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 7.4780E+00 @@ -4760,7 +4760,7 @@ # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 - Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 + Steel_fraction__________________________________________________________ (f_vol_blkt_steel)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 7.4780E+00 @@ -5755,7 +5755,7 @@ # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 - Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 + Steel_fraction__________________________________________________________ (f_vol_blkt_steel)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 7.4780E+00 @@ -6750,7 +6750,7 @@ # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 - Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 + Steel_fraction__________________________________________________________ (f_vol_blkt_steel)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 7.4780E+00 @@ -7745,7 +7745,7 @@ # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 - Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 + Steel_fraction__________________________________________________________ (f_vol_blkt_steel)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 7.4780E+00 @@ -8740,7 +8740,7 @@ # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 - Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 + Steel_fraction__________________________________________________________ (f_vol_blkt_steel)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 7.4780E+00 diff --git a/process/hcpb.py b/process/hcpb.py index f6412b4d16..8f636926de 100644 --- a/process/hcpb.py +++ b/process/hcpb.py @@ -353,7 +353,7 @@ def component_masses(self): fwbs_variables.wtblli2o = fwbs_variables.whtblli4sio4 # Steel fraction by volume is the remainder: - fwbs_variables.fblss_ccfe = ( + fwbs_variables.f_vol_blkt_steel = ( 1.0 - fwbs_variables.f_vol_blkt_li4sio4 - fwbs_variables.f_vol_blkt_tibe12 @@ -364,7 +364,7 @@ def component_masses(self): # Steel mass (kg) fwbs_variables.m_blkt_steel_total = ( fwbs_variables.vol_blkt_total - * fwbs_variables.fblss_ccfe + * fwbs_variables.f_vol_blkt_steel * fwbs_variables.denstl ) @@ -1257,8 +1257,8 @@ def write_output(self): po.ovarrf( self.outfile, "Steel fraction", - "(fblss_ccfe)", - fwbs_variables.fblss_ccfe, + "(f_vol_blkt_steel)", + fwbs_variables.f_vol_blkt_steel, "OP ", ) po.ovarrf(self.outfile, "Coolant fraction", "(vfcblkt)", fwbs_variables.vfcblkt) diff --git a/source/fortran/fwbs_variables.f90 b/source/fortran/fwbs_variables.f90 index 8f04c49e59..faac45f014 100644 --- a/source/fortran/fwbs_variables.f90 +++ b/source/fortran/fwbs_variables.f90 @@ -185,7 +185,7 @@ module fwbs_variables real(dp) :: vol_fw_total !! First wall volume [m3] - real(dp) :: fblss_ccfe, f_vol_blkt_li4sio4, f_vol_blkt_tibe12 + real(dp) :: f_vol_blkt_steel, f_vol_blkt_li4sio4, f_vol_blkt_tibe12 !! Fractions of blanket by volume: steel, lithium orthosilicate, titanium beryllide ! KIT HCPB blanket model (i_blanket_type = 2) @@ -709,7 +709,7 @@ subroutine init_fwbs_variables psurffwi = 0.0D0 psurffwo = 0.0D0 vol_fw_total = 0.0D0 - fblss_ccfe = 0.0D0 + f_vol_blkt_steel = 0.0D0 f_vol_blkt_li4sio4 = 0.0D0 f_vol_blkt_tibe12 = 0.0D0 breedmat = 1 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index c439c77214..1a467a9e14 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -950,7 +950,7 @@ # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 - Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 + Steel_fraction__________________________________________________________ (f_vol_blkt_steel)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 5.8692E+00 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 47c1b36a74..5e9035a078 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -951,7 +951,7 @@ # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 - Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 + Steel_fraction__________________________________________________________ (f_vol_blkt_steel)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 5.8692E+00 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index c3d4d8dfe2..f1e975a1ef 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -951,7 +951,7 @@ # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 - Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 + Steel_fraction__________________________________________________________ (f_vol_blkt_steel)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 5.8692E+00 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 8e996679ca..add44d1acd 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -951,7 +951,7 @@ # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 - Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 + Steel_fraction__________________________________________________________ (f_vol_blkt_steel)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 5.8692E+00 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 729b380580..4d1d9a2e80 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -954,7 +954,7 @@ # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 - Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 + Steel_fraction__________________________________________________________ (f_vol_blkt_steel)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 5.8692E+00 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 8005f7be66..713d7cf8f5 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -952,7 +952,7 @@ # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 - Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 + Steel_fraction__________________________________________________________ (f_vol_blkt_steel)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 5.8692E+00 @@ -2115,7 +2115,7 @@ # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 - Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 + Steel_fraction__________________________________________________________ (f_vol_blkt_steel)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 5.8692E+00 @@ -3278,7 +3278,7 @@ # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 - Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 + Steel_fraction__________________________________________________________ (f_vol_blkt_steel)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 5.8692E+00 @@ -4441,7 +4441,7 @@ # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 - Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 + Steel_fraction__________________________________________________________ (f_vol_blkt_steel)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 5.8692E+00 @@ -5604,7 +5604,7 @@ # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 - Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 + Steel_fraction__________________________________________________________ (f_vol_blkt_steel)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 5.8692E+00 @@ -6767,7 +6767,7 @@ # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 - Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 + Steel_fraction__________________________________________________________ (f_vol_blkt_steel)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 5.8692E+00 @@ -7930,7 +7930,7 @@ # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 - Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 + Steel_fraction__________________________________________________________ (f_vol_blkt_steel)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 5.8692E+00 @@ -9093,7 +9093,7 @@ # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 - Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 + Steel_fraction__________________________________________________________ (f_vol_blkt_steel)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 5.8692E+00 @@ -10256,7 +10256,7 @@ # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 - Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 + Steel_fraction__________________________________________________________ (f_vol_blkt_steel)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 5.8692E+00 @@ -11419,7 +11419,7 @@ # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 - Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 + Steel_fraction__________________________________________________________ (f_vol_blkt_steel)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 5.8692E+00 @@ -12582,7 +12582,7 @@ # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 - Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 + Steel_fraction__________________________________________________________ (f_vol_blkt_steel)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 5.8692E+00 @@ -13745,7 +13745,7 @@ # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 - Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 + Steel_fraction__________________________________________________________ (f_vol_blkt_steel)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 5.8692E+00 @@ -14908,7 +14908,7 @@ # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 - Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 + Steel_fraction__________________________________________________________ (f_vol_blkt_steel)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 5.8692E+00 @@ -16071,7 +16071,7 @@ # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 - Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 + Steel_fraction__________________________________________________________ (f_vol_blkt_steel)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 5.8692E+00 @@ -17234,7 +17234,7 @@ # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 - Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 + Steel_fraction__________________________________________________________ (f_vol_blkt_steel)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 5.8692E+00 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 6601bdb75b..f625f48e4f 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -780,7 +780,7 @@ # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 - Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 + Steel_fraction__________________________________________________________ (f_vol_blkt_steel)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 7.4780E+00 @@ -1775,7 +1775,7 @@ # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 - Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 + Steel_fraction__________________________________________________________ (f_vol_blkt_steel)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 7.4780E+00 @@ -2770,7 +2770,7 @@ # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 - Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 + Steel_fraction__________________________________________________________ (f_vol_blkt_steel)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 7.4780E+00 @@ -3765,7 +3765,7 @@ # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 - Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 + Steel_fraction__________________________________________________________ (f_vol_blkt_steel)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 7.4780E+00 @@ -4760,7 +4760,7 @@ # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 - Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 + Steel_fraction__________________________________________________________ (f_vol_blkt_steel)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 7.4780E+00 @@ -5755,7 +5755,7 @@ # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 - Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 + Steel_fraction__________________________________________________________ (f_vol_blkt_steel)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 7.4780E+00 @@ -6750,7 +6750,7 @@ # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 - Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 + Steel_fraction__________________________________________________________ (f_vol_blkt_steel)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 7.4780E+00 @@ -7745,7 +7745,7 @@ # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 - Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 + Steel_fraction__________________________________________________________ (f_vol_blkt_steel)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 7.4780E+00 @@ -8740,7 +8740,7 @@ # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 - Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 + Steel_fraction__________________________________________________________ (f_vol_blkt_steel)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 7.4780E+00 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 700ac23af8..a6a0971452 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1881,7 +1881,7 @@ "f_vol_blkt_li4sio4": 0.0, "fbllipb": 0.68, "fblss": 0.09705, - "fblss_ccfe": 0.0, + "f_vol_blkt_steel": 0.0, "f_vol_blkt_tibe12": 0.0, "fblvd": 0.0, "fb_cs_limit_max": 13.0, @@ -9497,7 +9497,7 @@ "f_vol_blkt_li4sio4": "Fractions of blanket by volume: steel, lithium orthosilicate, titanium beryllide", "fbllipb": "lithium lead fraction of blanket by volume (stellarator only)", "fblss": "KIT blanket model: steel fraction of breeding zone", - "fblss_ccfe": "Fractions of blanket by volume: steel, lithium orthosilicate, titanium beryllide", + "f_vol_blkt_steel": "Fractions of blanket by volume: steel, lithium orthosilicate, titanium beryllide", "f_vol_blkt_tibe12": "Fractions of blanket by volume: steel, lithium orthosilicate, titanium beryllide", "fblvd": "vanadium fraction of blanket by volume (stellarator only)", "fb_cs_limit_max": "F-value for CS mmax field (`cons. 79`, `itvar 149`)", @@ -17295,7 +17295,7 @@ "exp_blanket", "exp_shield1", "exp_shield2", - "fblss_ccfe", + "f_vol_blkt_steel", "f_vol_blkt_li4sio4", "f_vol_blkt_tibe12" ], diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index e6d4e5c78a..39fd98ec55 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -954,7 +954,7 @@ # First wall and blanket : CCFE HCPB model # Titanium_beryllide_fraction_____________________________________________ (f_vol_blkt_tibe12)___________________ 3.7500E-01 Lithium_orthosilicate_fraction__________________________________________ (f_vol_blkt_li4sio4)__________________ 3.7500E-01 - Steel_fraction__________________________________________________________ (fblss_ccfe)__________________ 9.7050E-02 + Steel_fraction__________________________________________________________ (f_vol_blkt_steel)__________________ 9.7050E-02 Coolant_fraction________________________________________________________ (vfcblkt)_____________________ 5.2950E-02 Purge_gas_fraction______________________________________________________ (vfpblkt)_____________________ 1.0000E-01 First_Wall_Armour_Volume_(m3)___________________________________________ (fw_armour_vol)_______________ 5.8692E+00 diff --git a/tests/unit/test_ccfe_hcpb.py b/tests/unit/test_ccfe_hcpb.py index b6f69005ff..33921739f6 100644 --- a/tests/unit/test_ccfe_hcpb.py +++ b/tests/unit/test_ccfe_hcpb.py @@ -1515,7 +1515,7 @@ class ComponentMassesParam(NamedTuple): f_a_fw_coolant_inboard: Any = None f_a_fw_coolant_outboard: Any = None vol_fw_total: Any = None - fblss_ccfe: Any = None + f_vol_blkt_steel: Any = None f_vol_blkt_li4sio4: Any = None f_vol_blkt_tibe12: Any = None expected_divsur: Any = None @@ -1606,7 +1606,7 @@ class ComponentMassesParam(NamedTuple): f_a_fw_coolant_inboard=0, f_a_fw_coolant_outboard=0, vol_fw_total=0, - fblss_ccfe=0, + f_vol_blkt_steel=0, f_vol_blkt_li4sio4=0, f_vol_blkt_tibe12=0, expected_divsur=148.78582807401261, @@ -1760,7 +1760,9 @@ def test_component_masses(componentmassesparam, monkeypatch, ccfe_hcpb): monkeypatch.setattr( fwbs_variables, "vol_fw_total", componentmassesparam.vol_fw_total ) - monkeypatch.setattr(fwbs_variables, "fblss_ccfe", componentmassesparam.fblss_ccfe) + monkeypatch.setattr( + fwbs_variables, "f_vol_blkt_steel", componentmassesparam.f_vol_blkt_steel + ) monkeypatch.setattr( fwbs_variables, "f_vol_blkt_li4sio4", componentmassesparam.f_vol_blkt_li4sio4 ) @@ -1816,7 +1818,7 @@ def test_component_masses(componentmassesparam, monkeypatch, ccfe_hcpb): assert fwbs_variables.armour_fw_bl_mass == pytest.approx( componentmassesparam.expected_armour_fw_bl_mass ) - assert fwbs_variables.fblss_ccfe == pytest.approx( + assert fwbs_variables.f_vol_blkt_steel == pytest.approx( componentmassesparam.expected_fblss_ccfe ) assert fwbs_variables.f_vol_blkt_li4sio4 == pytest.approx( From f9d8b8d3359c4a66a63bf3cb1fd28e3d40659643 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 18 Feb 2025 15:41:22 +0000 Subject: [PATCH 53/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20whtbltibe12=20to?= =?UTF-8?q?=20m=5Fblkt=5Ftibe12=20for=20clarity=20and=20consistency=20acro?= =?UTF-8?q?ss=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++++------ process/hcpb.py | 10 +++---- source/fortran/fwbs_variables.f90 | 4 +-- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 18 +++++------ tests/integration/ref_dicts.json | 6 ++-- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_ccfe_hcpb.py | 14 ++++----- 18 files changed, 61 insertions(+), 61 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 578d85af92..1a16c2ddd0 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -967,7 +967,7 @@ First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP - ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP + ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 3.2350E+06 OP diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 76abdeaf12..a206abeb97 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -962,7 +962,7 @@ First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP - ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP + ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 3.2350E+06 OP diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 4abf53c1b9..120d03e199 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -962,7 +962,7 @@ First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP - ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP + ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 3.2350E+06 OP diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 56fb48dcd9..5fda1b863a 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -962,7 +962,7 @@ First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP - ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP + ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 3.2350E+06 OP diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 62ccf9a076..1f03ecf08c 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -962,7 +962,7 @@ First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP - ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP + ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 3.2350E+06 OP diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index ede7689525..7067e656c5 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -791,7 +791,7 @@ First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP - ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP + ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP @@ -1786,7 +1786,7 @@ First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP - ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP + ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP @@ -2781,7 +2781,7 @@ First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP - ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP + ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP @@ -3776,7 +3776,7 @@ First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP - ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP + ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP @@ -4771,7 +4771,7 @@ First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP - ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP + ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP @@ -5766,7 +5766,7 @@ First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP - ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP + ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP @@ -6761,7 +6761,7 @@ First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP - ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP + ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP @@ -7756,7 +7756,7 @@ First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP - ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP + ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP @@ -8751,7 +8751,7 @@ First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP - ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP + ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP diff --git a/process/hcpb.py b/process/hcpb.py index 8f636926de..a7b104e14c 100644 --- a/process/hcpb.py +++ b/process/hcpb.py @@ -337,7 +337,7 @@ def component_masses(self): fwbs_variables.f_vol_blkt_tibe12 = ( fwbs_variables.breeder_multiplier - fwbs_variables.f_vol_blkt_li4sio4 ) - fwbs_variables.whtbltibe12 = ( + fwbs_variables.m_blkt_tibe12 = ( fwbs_variables.vol_blkt_total * fwbs_variables.f_vol_blkt_tibe12 * 2260.0 ) @@ -349,7 +349,7 @@ def component_masses(self): # TODO sort this out so that costs model uses new variables. # #327 For backwards compatibility, set the old blanket masses the same: - fwbs_variables.whtblbe = fwbs_variables.whtbltibe12 + fwbs_variables.whtblbe = fwbs_variables.m_blkt_tibe12 fwbs_variables.wtblli2o = fwbs_variables.whtblli4sio4 # Steel fraction by volume is the remainder: @@ -370,7 +370,7 @@ def component_masses(self): # Total blanket mass (kg) fwbs_variables.m_blkt_total = ( - fwbs_variables.whtbltibe12 + fwbs_variables.m_blkt_tibe12 + fwbs_variables.whtblli4sio4 + fwbs_variables.m_blkt_steel_total ) @@ -1330,8 +1330,8 @@ def write_output(self): po.ovarre( self.outfile, " Blanket Mass - TiBe12 (kg)", - "(whtbltibe12)", - fwbs_variables.whtbltibe12, + "(m_blkt_tibe12)", + fwbs_variables.m_blkt_tibe12, "OP ", ) po.ovarre( diff --git a/source/fortran/fwbs_variables.f90 b/source/fortran/fwbs_variables.f90 index faac45f014..984a2d08f6 100644 --- a/source/fortran/fwbs_variables.f90 +++ b/source/fortran/fwbs_variables.f90 @@ -163,7 +163,7 @@ module fwbs_variables real(dp) :: whtblli4sio4 !! mass of lithium orthosilicate in blanket [kg] (`i_blanket_type=1,3` (CCFE HCPB)) - real(dp) :: whtbltibe12 + real(dp) :: m_blkt_tibe12 !! mass of titanium beryllide in blanket [kg] (`i_blanket_type=1,3` (CCFE HCPB)) real(dp) :: neut_flux_cp @@ -702,7 +702,7 @@ subroutine init_fwbs_variables vfcblkt = 0.05295D0 vfpblkt = 0.1D0 whtblli4sio4 = 0.0D0 - whtbltibe12 = 0.0D0 + m_blkt_tibe12 = 0.0D0 f_neut_shield = -1.0D0 f_a_fw_coolant_inboard = 0.0D0 f_a_fw_coolant_outboard = 0.0D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 1a467a9e14..2fda020584 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -961,7 +961,7 @@ First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP - ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP + ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 3.2350E+06 OP diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 5e9035a078..fb61ecc6f5 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -962,7 +962,7 @@ First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP - ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP + ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 3.2350E+06 OP diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index f1e975a1ef..e4854e71f8 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -962,7 +962,7 @@ First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP - ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP + ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 3.2350E+06 OP diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index add44d1acd..0ed165162d 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -962,7 +962,7 @@ First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP - ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP + ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 3.2350E+06 OP diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 4d1d9a2e80..4ba93da1e9 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -965,7 +965,7 @@ First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP - ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP + ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 3.2350E+06 OP diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 713d7cf8f5..97c19c8e4e 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -963,7 +963,7 @@ First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP - ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP + ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 3.2350E+06 OP @@ -2126,7 +2126,7 @@ First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP - ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP + ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 3.2350E+06 OP @@ -3289,7 +3289,7 @@ First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP - ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP + ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 3.2350E+06 OP @@ -4452,7 +4452,7 @@ First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP - ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP + ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 3.2350E+06 OP @@ -5615,7 +5615,7 @@ First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP - ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP + ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 3.2350E+06 OP @@ -6778,7 +6778,7 @@ First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP - ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP + ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 3.2350E+06 OP @@ -7941,7 +7941,7 @@ First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP - ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP + ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 3.2350E+06 OP @@ -9104,7 +9104,7 @@ First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP - ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP + ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 3.2350E+06 OP @@ -10267,7 +10267,7 @@ First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP - ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP + ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 3.2350E+06 OP @@ -11430,7 +11430,7 @@ First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP - ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP + ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 3.2350E+06 OP @@ -12593,7 +12593,7 @@ First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP - ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP + ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 3.2350E+06 OP @@ -13756,7 +13756,7 @@ First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP - ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP + ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 3.2350E+06 OP @@ -14919,7 +14919,7 @@ First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP - ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP + ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 3.2350E+06 OP @@ -16082,7 +16082,7 @@ First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP - ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP + ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 3.2350E+06 OP @@ -17245,7 +17245,7 @@ First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP - ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP + ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 3.2350E+06 OP diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index f625f48e4f..c07be4120c 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -791,7 +791,7 @@ First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP - ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP + ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP @@ -1786,7 +1786,7 @@ First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP - ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP + ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP @@ -2781,7 +2781,7 @@ First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP - ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP + ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP @@ -3776,7 +3776,7 @@ First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP - ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP + ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP @@ -4771,7 +4771,7 @@ First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP - ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP + ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP @@ -5766,7 +5766,7 @@ First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP - ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP + ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP @@ -6761,7 +6761,7 @@ First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP - ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP + ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP @@ -7756,7 +7756,7 @@ First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP - ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP + ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP @@ -8751,7 +8751,7 @@ First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.4395E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP - ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.2564E+06 OP + ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.2564E+06 OP ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index a6a0971452..6d686a96ec 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -8047,7 +8047,7 @@ "whtblli": 0.0, "whtblli4sio4": 0.0, "m_blkt_steel_total": 0.0, - "whtbltibe12": 0.0, + "m_blkt_tibe12": 0.0, "whtblvd": 0.0, "whtcas": 0.0, "whtcon": 0.0, @@ -11156,7 +11156,7 @@ "whtblli": "mass of blanket - lithium part (kg)", "whtblli4sio4": "mass of lithium orthosilicate in blanket (kg) (`i_blanket_type=1,3` (CCFE HCPB))", "m_blkt_steel_total": "mass of blanket - steel part (kg)", - "whtbltibe12": "mass of titanium beryllide in blanket (kg) (`i_blanket_type=1,3` (CCFE HCPB))", + "m_blkt_tibe12": "mass of titanium beryllide in blanket (kg) (`i_blanket_type=1,3` (CCFE HCPB))", "whtblvd": "mass of blanket - vanadium part (kg)", "whtcas": "mass per coil of external case (kg)", "whtcon": "TF coil conductor mass per coil (kg/coil).\n For `itart=1`, coil is return limb plus centrepost/n_tf_coils", @@ -18053,7 +18053,7 @@ "vfcblkt", "vfpblkt", "whtblli4sio4", - "whtbltibe12", + "m_blkt_tibe12", "neut_flux_cp", "f_neut_shield", "breedmat", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 39fd98ec55..8f1aaa0d3e 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -965,7 +965,7 @@ First_Wall_Armour_Mass_(kg)_____________________________________________ (fw_armour_mass)______________ 1.1298E+05 OP First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP - ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (whtbltibe12)_________________ 1.0042E+06 OP + ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.0042E+06 OP ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 3.2350E+06 OP diff --git a/tests/unit/test_ccfe_hcpb.py b/tests/unit/test_ccfe_hcpb.py index 33921739f6..5b5434c531 100644 --- a/tests/unit/test_ccfe_hcpb.py +++ b/tests/unit/test_ccfe_hcpb.py @@ -1487,7 +1487,7 @@ class ComponentMassesParam(NamedTuple): fwclfr: Any = None breeder_f: Any = None breeder_multiplier: Any = None - whtbltibe12: Any = None + m_blkt_tibe12: Any = None whtblli4sio4: Any = None wtblli2o: Any = None vfcblkt: Any = None @@ -1525,7 +1525,7 @@ class ComponentMassesParam(NamedTuple): expected_m_blkt_total: Any = None expected_m_fw_blkt_div_coolant_total: Any = None expected_fwclfr: Any = None - expected_whtbltibe12: Any = None + expected_m_blkt_tibe12: Any = None expected_whtblli4sio4: Any = None expected_wtblli2o: Any = None expected_whtshld: Any = None @@ -1578,7 +1578,7 @@ class ComponentMassesParam(NamedTuple): fwclfr=0.14999999999999999, breeder_f=0.5, breeder_multiplier=0.75, - whtbltibe12=0, + m_blkt_tibe12=0, whtblli4sio4=0, wtblli2o=0, vfcblkt=0.052949999999999997, @@ -1616,7 +1616,7 @@ class ComponentMassesParam(NamedTuple): expected_m_blkt_total=2961668.0628126911, expected_m_fw_blkt_div_coolant_total=1161.8025382862772, expected_fwclfr=0, - expected_whtbltibe12=1002205.5121936026, + expected_m_blkt_tibe12=1002205.5121936026, expected_whtblli4sio4=1064289.0394976311, expected_wtblli2o=1064289.0394976311, expected_whtshld=2445141.3347883238, @@ -1704,7 +1704,7 @@ def test_component_masses(componentmassesparam, monkeypatch, ccfe_hcpb): monkeypatch.setattr( fwbs_variables, "breeder_multiplier", componentmassesparam.breeder_multiplier ) - monkeypatch.setattr(fwbs_variables, "whtbltibe12", componentmassesparam.whtbltibe12) + monkeypatch.setattr(fwbs_variables, "m_blkt_tibe12", componentmassesparam.m_blkt_tibe12) monkeypatch.setattr( fwbs_variables, "whtblli4sio4", componentmassesparam.whtblli4sio4 ) @@ -1791,8 +1791,8 @@ def test_component_masses(componentmassesparam, monkeypatch, ccfe_hcpb): componentmassesparam.expected_m_fw_blkt_div_coolant_total ) assert fwbs_variables.fwclfr == pytest.approx(componentmassesparam.expected_fwclfr) - assert fwbs_variables.whtbltibe12 == pytest.approx( - componentmassesparam.expected_whtbltibe12 + assert fwbs_variables.m_blkt_tibe12 == pytest.approx( + componentmassesparam.expected_m_blkt_tibe12 ) assert fwbs_variables.whtblli4sio4 == pytest.approx( componentmassesparam.expected_whtblli4sio4 From b2984f8d0aff1bf33b471dfb1744e5f1dad48837 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 18 Feb 2025 15:42:50 +0000 Subject: [PATCH 54/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20whtblli4sio4=20to?= =?UTF-8?q?=20m=5Fblkt=5Fli4sio4=20for=20clarity=20and=20consistency=20acr?= =?UTF-8?q?oss=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++++------ process/hcpb.py | 10 +++---- source/fortran/fwbs_variables.f90 | 4 +-- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 18 +++++------ tests/integration/ref_dicts.json | 6 ++-- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_ccfe_hcpb.py | 8 ++--- 18 files changed, 58 insertions(+), 58 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 1a16c2ddd0..616a8a351f 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -968,7 +968,7 @@ First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.0042E+06 OP - ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP + ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (m_blkt_li4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index a206abeb97..c463df4648 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -963,7 +963,7 @@ First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.0042E+06 OP - ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP + ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (m_blkt_li4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 120d03e199..8c73873227 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -963,7 +963,7 @@ First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.0042E+06 OP - ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP + ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (m_blkt_li4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 5fda1b863a..153f4ce3a1 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -963,7 +963,7 @@ First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.0042E+06 OP - ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP + ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (m_blkt_li4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index 1f03ecf08c..e9ca63cac8 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -963,7 +963,7 @@ First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.0042E+06 OP - ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP + ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (m_blkt_li4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 7067e656c5..8781d7c827 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -792,7 +792,7 @@ First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.2564E+06 OP - ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP + ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (m_blkt_li4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP @@ -1787,7 +1787,7 @@ First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.2564E+06 OP - ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP + ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (m_blkt_li4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP @@ -2782,7 +2782,7 @@ First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.2564E+06 OP - ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP + ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (m_blkt_li4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP @@ -3777,7 +3777,7 @@ First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.2564E+06 OP - ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP + ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (m_blkt_li4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP @@ -4772,7 +4772,7 @@ First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.2564E+06 OP - ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP + ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (m_blkt_li4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP @@ -5767,7 +5767,7 @@ First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.2564E+06 OP - ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP + ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (m_blkt_li4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP @@ -6762,7 +6762,7 @@ First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.2564E+06 OP - ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP + ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (m_blkt_li4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP @@ -7757,7 +7757,7 @@ First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.2564E+06 OP - ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP + ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (m_blkt_li4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP @@ -8752,7 +8752,7 @@ First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.2564E+06 OP - ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP + ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (m_blkt_li4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP diff --git a/process/hcpb.py b/process/hcpb.py index a7b104e14c..b5a50f95f0 100644 --- a/process/hcpb.py +++ b/process/hcpb.py @@ -343,14 +343,14 @@ def component_masses(self): # Blanket Lithium orthosilicate mass (kg) # Ref: www.rockwoodlithium.com... - fwbs_variables.whtblli4sio4 = ( + fwbs_variables.m_blkt_li4sio4 = ( fwbs_variables.vol_blkt_total * fwbs_variables.f_vol_blkt_li4sio4 * 2400.0 ) # TODO sort this out so that costs model uses new variables. # #327 For backwards compatibility, set the old blanket masses the same: fwbs_variables.whtblbe = fwbs_variables.m_blkt_tibe12 - fwbs_variables.wtblli2o = fwbs_variables.whtblli4sio4 + fwbs_variables.wtblli2o = fwbs_variables.m_blkt_li4sio4 # Steel fraction by volume is the remainder: fwbs_variables.f_vol_blkt_steel = ( @@ -371,7 +371,7 @@ def component_masses(self): # Total blanket mass (kg) fwbs_variables.m_blkt_total = ( fwbs_variables.m_blkt_tibe12 - + fwbs_variables.whtblli4sio4 + + fwbs_variables.m_blkt_li4sio4 + fwbs_variables.m_blkt_steel_total ) @@ -1337,8 +1337,8 @@ def write_output(self): po.ovarre( self.outfile, " Blanket Mass - Li4SiO4 (kg)", - "(whtblli4sio4)", - fwbs_variables.whtblli4sio4, + "(m_blkt_li4sio4)", + fwbs_variables.m_blkt_li4sio4, "OP ", ) po.ovarre( diff --git a/source/fortran/fwbs_variables.f90 b/source/fortran/fwbs_variables.f90 index 984a2d08f6..50e451de88 100644 --- a/source/fortran/fwbs_variables.f90 +++ b/source/fortran/fwbs_variables.f90 @@ -160,7 +160,7 @@ module fwbs_variables real(dp) :: vfpblkt !! He purge gas fraction of blanket by volume (`i_blanket_type= 1,3` (CCFE HCPB)) - real(dp) :: whtblli4sio4 + real(dp) :: m_blkt_li4sio4 !! mass of lithium orthosilicate in blanket [kg] (`i_blanket_type=1,3` (CCFE HCPB)) real(dp) :: m_blkt_tibe12 @@ -701,7 +701,7 @@ subroutine init_fwbs_variables breeder_multiplier = 0.75D0 vfcblkt = 0.05295D0 vfpblkt = 0.1D0 - whtblli4sio4 = 0.0D0 + m_blkt_li4sio4 = 0.0D0 m_blkt_tibe12 = 0.0D0 f_neut_shield = -1.0D0 f_a_fw_coolant_inboard = 0.0D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 2fda020584..05656c7b06 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -962,7 +962,7 @@ First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.0042E+06 OP - ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP + ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (m_blkt_li4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index fb61ecc6f5..886deeb56d 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -963,7 +963,7 @@ First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.0042E+06 OP - ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP + ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (m_blkt_li4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index e4854e71f8..ab7e8f2414 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -963,7 +963,7 @@ First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.0042E+06 OP - ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP + ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (m_blkt_li4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 0ed165162d..0bc59d4fe7 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -963,7 +963,7 @@ First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.0042E+06 OP - ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP + ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (m_blkt_li4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 4ba93da1e9..10454bde0c 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -966,7 +966,7 @@ First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.0042E+06 OP - ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP + ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (m_blkt_li4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 97c19c8e4e..37371d27fd 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -964,7 +964,7 @@ First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.0042E+06 OP - ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP + ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (m_blkt_li4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 @@ -2127,7 +2127,7 @@ First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.0042E+06 OP - ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP + ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (m_blkt_li4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 @@ -3290,7 +3290,7 @@ First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.0042E+06 OP - ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP + ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (m_blkt_li4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 @@ -4453,7 +4453,7 @@ First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.0042E+06 OP - ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP + ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (m_blkt_li4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 @@ -5616,7 +5616,7 @@ First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.0042E+06 OP - ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP + ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (m_blkt_li4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 @@ -6779,7 +6779,7 @@ First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.0042E+06 OP - ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP + ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (m_blkt_li4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 @@ -7942,7 +7942,7 @@ First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.0042E+06 OP - ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP + ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (m_blkt_li4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 @@ -9105,7 +9105,7 @@ First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.0042E+06 OP - ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP + ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (m_blkt_li4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 @@ -10268,7 +10268,7 @@ First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.0042E+06 OP - ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP + ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (m_blkt_li4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 @@ -11431,7 +11431,7 @@ First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.0042E+06 OP - ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP + ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (m_blkt_li4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 @@ -12594,7 +12594,7 @@ First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.0042E+06 OP - ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP + ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (m_blkt_li4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 @@ -13757,7 +13757,7 @@ First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.0042E+06 OP - ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP + ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (m_blkt_li4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 @@ -14920,7 +14920,7 @@ First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.0042E+06 OP - ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP + ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (m_blkt_li4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 @@ -16083,7 +16083,7 @@ First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.0042E+06 OP - ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP + ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (m_blkt_li4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 @@ -17246,7 +17246,7 @@ First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.0042E+06 OP - ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP + ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (m_blkt_li4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index c07be4120c..77a427e20f 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -792,7 +792,7 @@ First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.2564E+06 OP - ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP + ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (m_blkt_li4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP @@ -1787,7 +1787,7 @@ First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.2564E+06 OP - ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP + ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (m_blkt_li4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP @@ -2782,7 +2782,7 @@ First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.2564E+06 OP - ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP + ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (m_blkt_li4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP @@ -3777,7 +3777,7 @@ First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.2564E+06 OP - ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP + ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (m_blkt_li4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP @@ -4772,7 +4772,7 @@ First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.2564E+06 OP - ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP + ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (m_blkt_li4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP @@ -5767,7 +5767,7 @@ First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.2564E+06 OP - ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP + ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (m_blkt_li4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP @@ -6762,7 +6762,7 @@ First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.2564E+06 OP - ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP + ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (m_blkt_li4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP @@ -7757,7 +7757,7 @@ First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.2564E+06 OP - ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP + ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (m_blkt_li4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP @@ -8752,7 +8752,7 @@ First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.9300E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 3.7129E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.2564E+06 OP - ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.3342E+06 OP + ____Blanket_Mass_-_Li2SiO4_(kg)_________________________________________ (m_blkt_li4sio4)________________ 1.3342E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 6d686a96ec..e377755cac 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -8045,7 +8045,7 @@ "whtblbreed": 0.0, "m_blkt_total": 0.0, "whtblli": 0.0, - "whtblli4sio4": 0.0, + "m_blkt_li4sio4": 0.0, "m_blkt_steel_total": 0.0, "m_blkt_tibe12": 0.0, "whtblvd": 0.0, @@ -11154,7 +11154,7 @@ "whtblbreed": "mass of blanket - breeder part (kg) (`i_blanket_type=2` (KIT HCPB))", "m_blkt_total": "mass of blanket (kg)", "whtblli": "mass of blanket - lithium part (kg)", - "whtblli4sio4": "mass of lithium orthosilicate in blanket (kg) (`i_blanket_type=1,3` (CCFE HCPB))", + "m_blkt_li4sio4": "mass of lithium orthosilicate in blanket (kg) (`i_blanket_type=1,3` (CCFE HCPB))", "m_blkt_steel_total": "mass of blanket - steel part (kg)", "m_blkt_tibe12": "mass of titanium beryllide in blanket (kg) (`i_blanket_type=1,3` (CCFE HCPB))", "whtblvd": "mass of blanket - vanadium part (kg)", @@ -18052,7 +18052,7 @@ "breeder_multiplier", "vfcblkt", "vfpblkt", - "whtblli4sio4", + "m_blkt_li4sio4", "m_blkt_tibe12", "neut_flux_cp", "f_neut_shield", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 8f1aaa0d3e..833dc4f5be 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -966,7 +966,7 @@ First_Wall_Mass,_excluding_armour_(kg)__________________________________ (m_fw_total)______________________ 1.5449E+05 OP Blanket_Mass_-_Total(kg)________________________________________________ (m_blkt_total)_____________________ 2.9676E+06 OP ____Blanket_Mass_-_TiBe12_(kg)__________________________________________ (m_blkt_tibe12)_________________ 1.0042E+06 OP - ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (whtblli4sio4)________________ 1.0664E+06 OP + ____Blanket_Mass_-_Li4SiO4_(kg)_________________________________________ (m_blkt_li4sio4)________________ 1.0664E+06 OP ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 diff --git a/tests/unit/test_ccfe_hcpb.py b/tests/unit/test_ccfe_hcpb.py index 5b5434c531..b981090a24 100644 --- a/tests/unit/test_ccfe_hcpb.py +++ b/tests/unit/test_ccfe_hcpb.py @@ -1488,7 +1488,7 @@ class ComponentMassesParam(NamedTuple): breeder_f: Any = None breeder_multiplier: Any = None m_blkt_tibe12: Any = None - whtblli4sio4: Any = None + m_blkt_li4sio4: Any = None wtblli2o: Any = None vfcblkt: Any = None vfpblkt: Any = None @@ -1579,7 +1579,7 @@ class ComponentMassesParam(NamedTuple): breeder_f=0.5, breeder_multiplier=0.75, m_blkt_tibe12=0, - whtblli4sio4=0, + m_blkt_li4sio4=0, wtblli2o=0, vfcblkt=0.052949999999999997, vfpblkt=0.10000000000000001, @@ -1706,7 +1706,7 @@ def test_component_masses(componentmassesparam, monkeypatch, ccfe_hcpb): ) monkeypatch.setattr(fwbs_variables, "m_blkt_tibe12", componentmassesparam.m_blkt_tibe12) monkeypatch.setattr( - fwbs_variables, "whtblli4sio4", componentmassesparam.whtblli4sio4 + fwbs_variables, "m_blkt_li4sio4", componentmassesparam.m_blkt_li4sio4 ) monkeypatch.setattr(fwbs_variables, "wtblli2o", componentmassesparam.wtblli2o) monkeypatch.setattr(fwbs_variables, "vfcblkt", componentmassesparam.vfcblkt) @@ -1794,7 +1794,7 @@ def test_component_masses(componentmassesparam, monkeypatch, ccfe_hcpb): assert fwbs_variables.m_blkt_tibe12 == pytest.approx( componentmassesparam.expected_m_blkt_tibe12 ) - assert fwbs_variables.whtblli4sio4 == pytest.approx( + assert fwbs_variables.m_blkt_li4sio4 == pytest.approx( componentmassesparam.expected_whtblli4sio4 ) assert fwbs_variables.wtblli2o == pytest.approx( From 02fe1deb4411ed82f15a9a315bc9f6a84dc74278 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 18 Feb 2025 15:44:10 +0000 Subject: [PATCH 55/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20whtblbe=20to=20m?= =?UTF-8?q?=5Fblkt=5Fberyllium=20for=20clarity=20and=20consistency=20acros?= =?UTF-8?q?s=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/costs.py | 4 +++- process/costs_2015.py | 2 +- process/hcpb.py | 2 +- process/ife.py | 2 +- process/stellarator.py | 12 ++++++------ source/fortran/fwbs_variables.f90 | 4 ++-- tests/integration/ref_dicts.json | 6 +++--- tests/unit/test_ccfe_hcpb.py | 20 ++++++++++++-------- tests/unit/test_costs_1990.py | 10 ++++++---- tests/unit/test_ife.py | 8 +++++--- 10 files changed, 40 insertions(+), 30 deletions(-) diff --git a/process/costs.py b/process/costs.py index 78c76e39f4..fc488aea5c 100644 --- a/process/costs.py +++ b/process/costs.py @@ -1207,7 +1207,9 @@ def acc2212(self): self.c22122 = 1.0e-6 * fwbs_variables.whtblli * cost_variables.ucblli else: # Solid blanket (Li2O + Be) - self.c22121 = 1.0e-6 * fwbs_variables.whtblbe * cost_variables.ucblbe + self.c22121 = ( + 1.0e-6 * fwbs_variables.m_blkt_beryllium * cost_variables.ucblbe + ) if fwbs_variables.i_blanket_type == 2: # KIT model self.c22122 = ( diff --git a/process/costs_2015.py b/process/costs_2015.py index 93a0104b80..03c0efaef9 100644 --- a/process/costs_2015.py +++ b/process/costs_2015.py @@ -331,7 +331,7 @@ def calc_fwbs_costs(self): # Reference cost of titanium beryllide pebble manufacture (2014 $) self.s_cref[23] = 450.0e6 # Scale with mass of titanium beryllide pebbles (kg) - self.s_k[23] = fwbs_variables.whtblbe + self.s_k[23] = fwbs_variables.m_blkt_beryllium self.s_kref[23] = 1.0e5 self.s_cost[23] = ( self.s_cost_factor[23] diff --git a/process/hcpb.py b/process/hcpb.py index b5a50f95f0..95ad13909f 100644 --- a/process/hcpb.py +++ b/process/hcpb.py @@ -349,7 +349,7 @@ def component_masses(self): # TODO sort this out so that costs model uses new variables. # #327 For backwards compatibility, set the old blanket masses the same: - fwbs_variables.whtblbe = fwbs_variables.m_blkt_tibe12 + fwbs_variables.m_blkt_beryllium = fwbs_variables.m_blkt_tibe12 fwbs_variables.wtblli2o = fwbs_variables.m_blkt_li4sio4 # Steel fraction by volume is the remainder: diff --git a/process/ife.py b/process/ife.py index 9d5c68f600..a8ec599b11 100644 --- a/process/ife.py +++ b/process/ife.py @@ -1790,7 +1790,7 @@ def ifefbs(self, output: bool = False): ) # Other masses - fwbs_variables.whtblbe = 0.0 + fwbs_variables.m_blkt_beryllium = 0.0 fwbs_variables.whtblvd = 0.0 fwbs_variables.m_blkt_steel_total = 0.0 fwbs_variables.wtblli2o = 0.0 diff --git a/process/stellarator.py b/process/stellarator.py index 43b9b8ab75..85bda5182d 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -1626,11 +1626,11 @@ def stfwbs(self, output: bool): fwbs_variables.wtblli2o = ( fwbs_variables.vol_blkt_total * fwbs_variables.fblli2o * 2010.0e0 ) - fwbs_variables.whtblbe = ( + fwbs_variables.m_blkt_beryllium = ( fwbs_variables.vol_blkt_total * fwbs_variables.fblbe * 1850.0e0 ) fwbs_variables.m_blkt_total = ( - fwbs_variables.wtblli2o + fwbs_variables.whtblbe + fwbs_variables.wtblli2o + fwbs_variables.m_blkt_beryllium ) fwbs_variables.m_blkt_steel_total = ( @@ -1665,7 +1665,7 @@ def stfwbs(self, output: bool): + build_variables.blbpoth * (1.0e0 - fwbs_variables.fblhebpo) ) ) - fwbs_variables.whtblbe = ( + fwbs_variables.m_blkt_beryllium = ( 1850.0e0 * fwbs_variables.fblbe * ( @@ -1699,7 +1699,7 @@ def stfwbs(self, output: bool): ) fwbs_variables.m_blkt_total = ( fwbs_variables.m_blkt_steel_total - + fwbs_variables.whtblbe + + fwbs_variables.m_blkt_beryllium + fwbs_variables.whtblbreed ) @@ -2215,10 +2215,10 @@ def stfwbs(self, output: bool): # if ((fwbs_variables.blkttype == 1)or(fwbs_variables.blkttype == 2)) : # po.write(self.outfile,601) vol_blkt_inboard, vol_blkt_outboard, vol_blkt_total, m_blkt_total, vfblkt, fbllipb, wtbllipb, fblli, whtblli, fblss, m_blkt_steel_total, fblvd, whtblvd, volshldi, volshldo, volshld, whtshld, vfshld, fwbs_variables.wpenshld # else: # (also if ipowerflow=0) - # po.write(self.outfile,600) vol_blkt_inboard, vol_blkt_outboard, vol_blkt_total, m_blkt_total, vfblkt, fblbe, whtblbe, fblli2o, wtblli2o, fblss, m_blkt_steel_total, fblvd, whtblvd, volshldi, volshldo, volshld, whtshld, vfshld, fwbs_variables.wpenshld + # po.write(self.outfile,600) vol_blkt_inboard, vol_blkt_outboard, vol_blkt_total, m_blkt_total, vfblkt, fblbe, m_blkt_beryllium, fblli2o, wtblli2o, fblss, m_blkt_steel_total, fblvd, whtblvd, volshldi, volshldo, volshld, whtshld, vfshld, fwbs_variables.wpenshld # else: - # po.write(self.outfile,602) vol_blkt_inboard, vol_blkt_outboard, vol_blkt_total, m_blkt_total, vfblkt, (fwbs_variables.vol_blkt_inboard/fwbs_variables.vol_blkt_total * build_variables.blbuith/build_variables.dr_blkt_inboard + fwbs_variables.vol_blkt_outboard/fwbs_variables.vol_blkt_total * build_variables.blbuoth/build_variables.dr_blkt_outboard) * fblbe, whtblbe, (fwbs_variables.vol_blkt_inboard/fwbs_variables.vol_blkt_total * build_variables.blbuith/build_variables.dr_blkt_inboard + fwbs_variables.vol_blkt_outboard/fwbs_variables.vol_blkt_total * build_variables.blbuoth/build_variables.dr_blkt_outboard) * fblbreed, whtblbreed, fwbs_variables.vol_blkt_inboard/fwbs_variables.vol_blkt_total/build_variables.dr_blkt_inboard * (build_variables.blbuith * fwbs_variables.fblss + build_variables.blbmith * (1.0e0-fwbs_variables.fblhebmi) + build_variables.blbpith * (1.0e0-fwbs_variables.fblhebpi)) + fwbs_variables.vol_blkt_outboard/fwbs_variables.vol_blkt_total/build_variables.dr_blkt_outboard * (build_variables.blbuoth * fwbs_variables.fblss + build_variables.blbmoth * (1.0e0-fwbs_variables.fblhebmo) + build_variables.blbpoth * (1.0e0-fwbs_variables.fblhebpo)), m_blkt_steel_total, volshldi, volshldo, volshld, whtshld, vfshld, fwbs_variables.wpenshld + # po.write(self.outfile,602) vol_blkt_inboard, vol_blkt_outboard, vol_blkt_total, m_blkt_total, vfblkt, (fwbs_variables.vol_blkt_inboard/fwbs_variables.vol_blkt_total * build_variables.blbuith/build_variables.dr_blkt_inboard + fwbs_variables.vol_blkt_outboard/fwbs_variables.vol_blkt_total * build_variables.blbuoth/build_variables.dr_blkt_outboard) * fblbe, m_blkt_beryllium, (fwbs_variables.vol_blkt_inboard/fwbs_variables.vol_blkt_total * build_variables.blbuith/build_variables.dr_blkt_inboard + fwbs_variables.vol_blkt_outboard/fwbs_variables.vol_blkt_total * build_variables.blbuoth/build_variables.dr_blkt_outboard) * fblbreed, whtblbreed, fwbs_variables.vol_blkt_inboard/fwbs_variables.vol_blkt_total/build_variables.dr_blkt_inboard * (build_variables.blbuith * fwbs_variables.fblss + build_variables.blbmith * (1.0e0-fwbs_variables.fblhebmi) + build_variables.blbpith * (1.0e0-fwbs_variables.fblhebpi)) + fwbs_variables.vol_blkt_outboard/fwbs_variables.vol_blkt_total/build_variables.dr_blkt_outboard * (build_variables.blbuoth * fwbs_variables.fblss + build_variables.blbmoth * (1.0e0-fwbs_variables.fblhebmo) + build_variables.blbpoth * (1.0e0-fwbs_variables.fblhebpo)), m_blkt_steel_total, volshldi, volshldo, volshld, whtshld, vfshld, fwbs_variables.wpenshld # 600 format( t32,'volume (m3)',t45,'vol fraction',t62,'weight (kg)'/ t32,'-----------',t45,'------------',t62,'-----------'/ ' Inboard blanket' ,t32,1pe10.3,/ ' Outboard blanket' ,t32,1pe10.3,/ ' Total blanket' ,t32,1pe10.3,t62,1pe10.3/ ' Void fraction' ,t45,1pe10.3,/ ' Blanket Be ',t45,1pe10.3,t62,1pe10.3/ ' Blanket Li2O ',t45,1pe10.3,t62,1pe10.3/ ' Blanket ss ',t45,1pe10.3,t62,1pe10.3/ ' Blanket Vd ',t45,1pe10.3,t62,1pe10.3/ ' Inboard shield' ,t32,1pe10.3,/ ' Outboard shield' ,t32,1pe10.3,/ ' Primary shield',t32,1pe10.3,t62,1pe10.3/ ' Void fraction' ,t45,1pe10.3,/ ' Penetration shield' ,t62,1pe10.3) diff --git a/source/fortran/fwbs_variables.f90 b/source/fortran/fwbs_variables.f90 index 50e451de88..612bd74fff 100644 --- a/source/fortran/fwbs_variables.f90 +++ b/source/fortran/fwbs_variables.f90 @@ -250,7 +250,7 @@ module fwbs_variables real(dp) :: whtblbreed !! mass of blanket - breeder part [kg] (`i_blanket_type=2` (KIT HCPB)) - real(dp) :: whtblbe + real(dp) :: m_blkt_beryllium !! mass of blanket - beryllium part [kg] ! CCFE HCPB model with Tritium Breeding Ratio calculation (i_blanket_type=3) @@ -729,7 +729,7 @@ subroutine init_fwbs_variables tritprate = 0.0D0 wallpf = 1.21D0 whtblbreed = 0.0D0 - whtblbe = 0.0D0 + m_blkt_beryllium = 0.0D0 iblanket_thickness = 2 i_coolant_pumping = 2 i_shield_mat = 0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index e377755cac..9f314c0962 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -8041,7 +8041,7 @@ "wgt": 500000.0, "wgt2": 100000.0, "whole_site_area": 1000000.0, - "whtblbe": 0.0, + "m_blkt_beryllium": 0.0, "whtblbreed": 0.0, "m_blkt_total": 0.0, "whtblli": 0.0, @@ -11150,7 +11150,7 @@ "wgt": "reactor building crane capacity (kg) (calculated if 0 is input)", "wgt2": "hot cell crane capacity (kg) (calculated if 0 is input)", "whole_site_area": "area of entire plant site (m2); default 1.0E6 m2 (i.e. 1 km2)", - "whtblbe": "mass of blanket - beryllium part (kg)", + "m_blkt_beryllium": "mass of blanket - beryllium part (kg)", "whtblbreed": "mass of blanket - breeder part (kg) (`i_blanket_type=2` (KIT HCPB))", "m_blkt_total": "mass of blanket (kg)", "whtblli": "mass of blanket - lithium part (kg)", @@ -18074,7 +18074,7 @@ "vvhemax", "wallpf", "whtblbreed", - "whtblbe", + "m_blkt_beryllium", "iblanket_thickness", "i_coolant_pumping", "i_shield_mat", diff --git a/tests/unit/test_ccfe_hcpb.py b/tests/unit/test_ccfe_hcpb.py index b981090a24..2b38d144fe 100644 --- a/tests/unit/test_ccfe_hcpb.py +++ b/tests/unit/test_ccfe_hcpb.py @@ -1477,7 +1477,7 @@ class ComponentMassesParam(NamedTuple): a_fw_total: Any = None vol_blkt_total: Any = None vfblkt: Any = None - whtblbe: Any = None + m_blkt_beryllium: Any = None m_blkt_steel_total: Any = None denstl: Any = None m_blkt_total: Any = None @@ -1520,7 +1520,7 @@ class ComponentMassesParam(NamedTuple): f_vol_blkt_tibe12: Any = None expected_divsur: Any = None expected_divmas: Any = None - expected_whtblbe: Any = None + expected_m_blkt_beryllium: Any = None expected_m_blkt_steel_total: Any = None expected_m_blkt_total: Any = None expected_m_fw_blkt_div_coolant_total: Any = None @@ -1568,7 +1568,7 @@ class ComponentMassesParam(NamedTuple): a_fw_total=1343.9683762356615, vol_blkt_total=1182.5433772195902, vfblkt=0.25, - whtblbe=0, + m_blkt_beryllium=0, m_blkt_steel_total=0, denstl=7800, m_blkt_total=0, @@ -1611,7 +1611,7 @@ class ComponentMassesParam(NamedTuple): f_vol_blkt_tibe12=0, expected_divsur=148.78582807401261, expected_divmas=36452.527878133093, - expected_whtblbe=1002205.5121936026, + expected_m_blkt_beryllium=1002205.5121936026, expected_m_blkt_steel_total=895173.51112145756, expected_m_blkt_total=2961668.0628126911, expected_m_fw_blkt_div_coolant_total=1161.8025382862772, @@ -1684,7 +1684,9 @@ def test_component_masses(componentmassesparam, monkeypatch, ccfe_hcpb): fwbs_variables, "vol_blkt_total", componentmassesparam.vol_blkt_total ) monkeypatch.setattr(fwbs_variables, "vfblkt", componentmassesparam.vfblkt) - monkeypatch.setattr(fwbs_variables, "whtblbe", componentmassesparam.whtblbe) + monkeypatch.setattr( + fwbs_variables, "m_blkt_beryllium", componentmassesparam.m_blkt_beryllium + ) monkeypatch.setattr( fwbs_variables, "m_blkt_steel_total", componentmassesparam.m_blkt_steel_total ) @@ -1704,7 +1706,9 @@ def test_component_masses(componentmassesparam, monkeypatch, ccfe_hcpb): monkeypatch.setattr( fwbs_variables, "breeder_multiplier", componentmassesparam.breeder_multiplier ) - monkeypatch.setattr(fwbs_variables, "m_blkt_tibe12", componentmassesparam.m_blkt_tibe12) + monkeypatch.setattr( + fwbs_variables, "m_blkt_tibe12", componentmassesparam.m_blkt_tibe12 + ) monkeypatch.setattr( fwbs_variables, "m_blkt_li4sio4", componentmassesparam.m_blkt_li4sio4 ) @@ -1778,8 +1782,8 @@ def test_component_masses(componentmassesparam, monkeypatch, ccfe_hcpb): assert divertor_variables.divmas == pytest.approx( componentmassesparam.expected_divmas ) - assert fwbs_variables.whtblbe == pytest.approx( - componentmassesparam.expected_whtblbe + assert fwbs_variables.m_blkt_beryllium == pytest.approx( + componentmassesparam.expected_m_blkt_beryllium ) assert fwbs_variables.m_blkt_steel_total == pytest.approx( componentmassesparam.expected_m_blkt_steel_total diff --git a/tests/unit/test_costs_1990.py b/tests/unit/test_costs_1990.py index 266d850516..43dc165234 100644 --- a/tests/unit/test_costs_1990.py +++ b/tests/unit/test_costs_1990.py @@ -1149,7 +1149,7 @@ class Acc2212Param(NamedTuple): whtblvd: Any = None - whtblbe: Any = None + m_blkt_beryllium: Any = None m_blkt_steel_total: Any = None @@ -1216,7 +1216,7 @@ class Acc2212Param(NamedTuple): wtblli2o=1258110.2710352642, whtblbreed=0, whtblvd=0, - whtblbe=1184720.5052248738, + m_blkt_beryllium=1184720.5052248738, m_blkt_steel_total=1058196.5489677608, wtbllipb=0, ucflib=84, @@ -1270,7 +1270,7 @@ class Acc2212Param(NamedTuple): wtblli2o=1260437.468838267, whtblbreed=0, whtblvd=0, - whtblbe=1186911.9498227015, + m_blkt_beryllium=1186911.9498227015, m_blkt_steel_total=1060153.955039866, wtbllipb=0, ucflib=84, @@ -1354,7 +1354,9 @@ def test_acc2212(acc2212param, monkeypatch, costs): monkeypatch.setattr(fwbs_variables, "whtblvd", acc2212param.whtblvd) - monkeypatch.setattr(fwbs_variables, "whtblbe", acc2212param.whtblbe) + monkeypatch.setattr( + fwbs_variables, "m_blkt_beryllium", acc2212param.m_blkt_beryllium + ) monkeypatch.setattr( fwbs_variables, "m_blkt_steel_total", acc2212param.m_blkt_steel_total diff --git a/tests/unit/test_ife.py b/tests/unit/test_ife.py index ad54eef5a0..d0ed719179 100644 --- a/tests/unit/test_ife.py +++ b/tests/unit/test_ife.py @@ -1215,7 +1215,7 @@ class IfefbsParam(NamedTuple): m_fw_total: Any = None m_blkt_total: Any = None whtshld: Any = None - whtblbe: Any = None + m_blkt_beryllium: Any = None whtblvd: Any = None m_blkt_steel_total: Any = None wtblli2o: Any = None @@ -1265,7 +1265,7 @@ class IfefbsParam(NamedTuple): m_fw_total=0, m_blkt_total=0, whtshld=0, - whtblbe=0, + m_blkt_beryllium=0, whtblvd=0, m_blkt_steel_total=0, wtblli2o=0, @@ -1550,7 +1550,9 @@ def test_ifefbs(ifefbsparam, monkeypatch, ife): monkeypatch.setattr(fwbs_variables, "m_fw_total", ifefbsparam.m_fw_total) monkeypatch.setattr(fwbs_variables, "m_blkt_total", ifefbsparam.m_blkt_total) monkeypatch.setattr(fwbs_variables, "whtshld", ifefbsparam.whtshld) - monkeypatch.setattr(fwbs_variables, "whtblbe", ifefbsparam.whtblbe) + monkeypatch.setattr( + fwbs_variables, "m_blkt_beryllium", ifefbsparam.m_blkt_beryllium + ) monkeypatch.setattr(fwbs_variables, "whtblvd", ifefbsparam.whtblvd) monkeypatch.setattr( fwbs_variables, "m_blkt_steel_total", ifefbsparam.m_blkt_steel_total From 62304fded17dbd8e04d1e56f96e5f0af8feb3860 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 18 Feb 2025 15:46:09 +0000 Subject: [PATCH 56/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20wtblli2o=20to=20m?= =?UTF-8?q?=5Fblkt=5Fli2o=20for=20clarity=20and=20consistency=20across=20t?= =?UTF-8?q?he=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/costs.py | 4 ++-- process/costs_2015.py | 4 ++-- process/hcpb.py | 2 +- process/ife.py | 8 ++++---- process/stellarator.py | 6 +++--- source/fortran/fwbs_variables.f90 | 4 ++-- tests/integration/ref_dicts.json | 6 +++--- tests/unit/test_ccfe_hcpb.py | 14 +++++++------- tests/unit/test_costs_1990.py | 8 ++++---- tests/unit/test_ife.py | 6 +++--- 10 files changed, 31 insertions(+), 31 deletions(-) diff --git a/process/costs.py b/process/costs.py index fc488aea5c..32af7a0321 100644 --- a/process/costs.py +++ b/process/costs.py @@ -1218,7 +1218,7 @@ def acc2212(self): else: # CCFE model self.c22122 = ( - 1.0e-6 * fwbs_variables.wtblli2o * cost_variables.ucblli2o + 1.0e-6 * fwbs_variables.m_blkt_li2o * cost_variables.ucblli2o ) self.c22123 = ( @@ -1234,7 +1234,7 @@ def acc2212(self): # FLiBe and lithium self.c22121 = 0.0e0 - self.c22122 = 1.0e-6 * fwbs_variables.wtblli2o * cost_variables.ucblli2o + self.c22122 = 1.0e-6 * fwbs_variables.m_blkt_li2o * cost_variables.ucblli2o self.c22123 = ( 1.0e-6 * fwbs_variables.m_blkt_steel_total * cost_variables.ucblss ) diff --git a/process/costs_2015.py b/process/costs_2015.py index 03c0efaef9..bd68fd6fc4 100644 --- a/process/costs_2015.py +++ b/process/costs_2015.py @@ -299,7 +299,7 @@ def calc_fwbs_costs(self): ) # Mass of lithium (kg). Lithium orthosilicate is 22% lithium by mass. - mass_li = fwbs_variables.wtblli2o * 0.22 + mass_li = fwbs_variables.m_blkt_li2o * 0.22 # Total swu for lithium in blanket total_swu = swu * mass_li @@ -319,7 +319,7 @@ def calc_fwbs_costs(self): # Reference cost of lithium pebble manufacture (2014 $) self.s_cref[22] = 6.5e4 # Scale with mass of pebbles (kg) - self.s_k[22] = fwbs_variables.wtblli2o + self.s_k[22] = fwbs_variables.m_blkt_li2o self.s_kref[22] = 10.0e0 self.s_cost[22] = ( self.s_cost_factor[22] diff --git a/process/hcpb.py b/process/hcpb.py index 95ad13909f..5818d043a8 100644 --- a/process/hcpb.py +++ b/process/hcpb.py @@ -350,7 +350,7 @@ def component_masses(self): # TODO sort this out so that costs model uses new variables. # #327 For backwards compatibility, set the old blanket masses the same: fwbs_variables.m_blkt_beryllium = fwbs_variables.m_blkt_tibe12 - fwbs_variables.wtblli2o = fwbs_variables.m_blkt_li4sio4 + fwbs_variables.m_blkt_li2o = fwbs_variables.m_blkt_li4sio4 # Steel fraction by volume is the remainder: fwbs_variables.f_vol_blkt_steel = ( diff --git a/process/ife.py b/process/ife.py index a8ec599b11..5ac2445a99 100644 --- a/process/ife.py +++ b/process/ife.py @@ -1793,15 +1793,15 @@ def ifefbs(self, output: bool = False): fwbs_variables.m_blkt_beryllium = 0.0 fwbs_variables.whtblvd = 0.0 fwbs_variables.m_blkt_steel_total = 0.0 - fwbs_variables.wtblli2o = 0.0 + fwbs_variables.m_blkt_li2o = 0.0 fwbs_variables.whtblli = 0.0 for j in range(3): fwbs_variables.m_blkt_steel_total = ( fwbs_variables.m_blkt_steel_total + ife_variables.blmatm[j, 1] ) - fwbs_variables.wtblli2o = ( - fwbs_variables.wtblli2o + ife_variables.blmatm[j, 4] + fwbs_variables.m_blkt_li2o = ( + fwbs_variables.m_blkt_li2o + ife_variables.blmatm[j, 4] ) fwbs_variables.whtblli = fwbs_variables.whtblli + ife_variables.blmatm[j, 8] @@ -1827,7 +1827,7 @@ def ifefbs(self, output: bool = False): # Following assumes that use of FLiBe and Li2O are # mutually exclusive ife_variables.mflibe = ife_variables.mflibe / (1.0 - ife_variables.fbreed) - fwbs_variables.wtblli2o = fwbs_variables.wtblli2o / (1.0 - ife_variables.fbreed) + fwbs_variables.m_blkt_li2o = fwbs_variables.m_blkt_li2o / (1.0 - ife_variables.fbreed) fwbs_variables.whtblli = fwbs_variables.whtblli / (1.0 - ife_variables.fbreed) # Blanket and first wall lifetimes (HYLIFE-II: = plant life) diff --git a/process/stellarator.py b/process/stellarator.py index 85bda5182d..8887a14603 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -1623,14 +1623,14 @@ def stfwbs(self, output: bool): fwbs_variables.wtbllipb + fwbs_variables.whtblli ) else: # solid breeder (HCPB); always for ipowerflow=0 - fwbs_variables.wtblli2o = ( + fwbs_variables.m_blkt_li2o = ( fwbs_variables.vol_blkt_total * fwbs_variables.fblli2o * 2010.0e0 ) fwbs_variables.m_blkt_beryllium = ( fwbs_variables.vol_blkt_total * fwbs_variables.fblbe * 1850.0e0 ) fwbs_variables.m_blkt_total = ( - fwbs_variables.wtblli2o + fwbs_variables.m_blkt_beryllium + fwbs_variables.m_blkt_li2o + fwbs_variables.m_blkt_beryllium ) fwbs_variables.m_blkt_steel_total = ( @@ -2215,7 +2215,7 @@ def stfwbs(self, output: bool): # if ((fwbs_variables.blkttype == 1)or(fwbs_variables.blkttype == 2)) : # po.write(self.outfile,601) vol_blkt_inboard, vol_blkt_outboard, vol_blkt_total, m_blkt_total, vfblkt, fbllipb, wtbllipb, fblli, whtblli, fblss, m_blkt_steel_total, fblvd, whtblvd, volshldi, volshldo, volshld, whtshld, vfshld, fwbs_variables.wpenshld # else: # (also if ipowerflow=0) - # po.write(self.outfile,600) vol_blkt_inboard, vol_blkt_outboard, vol_blkt_total, m_blkt_total, vfblkt, fblbe, m_blkt_beryllium, fblli2o, wtblli2o, fblss, m_blkt_steel_total, fblvd, whtblvd, volshldi, volshldo, volshld, whtshld, vfshld, fwbs_variables.wpenshld + # po.write(self.outfile,600) vol_blkt_inboard, vol_blkt_outboard, vol_blkt_total, m_blkt_total, vfblkt, fblbe, m_blkt_beryllium, fblli2o, m_blkt_li2o, fblss, m_blkt_steel_total, fblvd, whtblvd, volshldi, volshldo, volshld, whtshld, vfshld, fwbs_variables.wpenshld # else: # po.write(self.outfile,602) vol_blkt_inboard, vol_blkt_outboard, vol_blkt_total, m_blkt_total, vfblkt, (fwbs_variables.vol_blkt_inboard/fwbs_variables.vol_blkt_total * build_variables.blbuith/build_variables.dr_blkt_inboard + fwbs_variables.vol_blkt_outboard/fwbs_variables.vol_blkt_total * build_variables.blbuoth/build_variables.dr_blkt_outboard) * fblbe, m_blkt_beryllium, (fwbs_variables.vol_blkt_inboard/fwbs_variables.vol_blkt_total * build_variables.blbuith/build_variables.dr_blkt_inboard + fwbs_variables.vol_blkt_outboard/fwbs_variables.vol_blkt_total * build_variables.blbuoth/build_variables.dr_blkt_outboard) * fblbreed, whtblbreed, fwbs_variables.vol_blkt_inboard/fwbs_variables.vol_blkt_total/build_variables.dr_blkt_inboard * (build_variables.blbuith * fwbs_variables.fblss + build_variables.blbmith * (1.0e0-fwbs_variables.fblhebmi) + build_variables.blbpith * (1.0e0-fwbs_variables.fblhebpi)) + fwbs_variables.vol_blkt_outboard/fwbs_variables.vol_blkt_total/build_variables.dr_blkt_outboard * (build_variables.blbuoth * fwbs_variables.fblss + build_variables.blbmoth * (1.0e0-fwbs_variables.fblhebmo) + build_variables.blbpoth * (1.0e0-fwbs_variables.fblhebpo)), m_blkt_steel_total, volshldi, volshldo, volshld, whtshld, vfshld, fwbs_variables.wpenshld diff --git a/source/fortran/fwbs_variables.f90 b/source/fortran/fwbs_variables.f90 index 612bd74fff..40af95bd7e 100644 --- a/source/fortran/fwbs_variables.f90 +++ b/source/fortran/fwbs_variables.f90 @@ -475,7 +475,7 @@ module fwbs_variables real(dp) :: fblvd !! vanadium fraction of blanket by volume (stellarator only) - real(dp) :: wtblli2o + real(dp) :: m_blkt_li2o !! mass of blanket - Li_2O part [kg] real(dp) :: wtbllipb @@ -789,7 +789,7 @@ subroutine init_fwbs_variables fblli2o = 0.08D0 fbllipb = 0.68D0 fblvd = 0.0D0 - wtblli2o = 0.0D0 + m_blkt_li2o = 0.0D0 wtbllipb = 0.0D0 whtblvd = 0.0D0 whtblli = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 9f314c0962..c529034d8e 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -8075,7 +8075,7 @@ "wrbi": 0.0, "wsvfac": 1.9, "wsvol": 0.0, - "wtblli2o": 0.0, + "m_blkt_li2o": 0.0, "wtbllipb": 0.0, "m_pf_coil_conductor": 0.0, "wtgpd": 0.0, @@ -11184,7 +11184,7 @@ "wrbi": "distance from centre of machine to building wall (m)", "wsvfac": "warm shop building volume multiplication factor", "wsvol": "volume of warm shop building (m3)", - "wtblli2o": "mass of blanket - Li_2O part (kg)", + "m_blkt_li2o": "mass of blanket - Li_2O part (kg)", "wtbllipb": "mass of blanket - Li-Pb part (kg)", "m_pf_coil_conductor": "conductor mass for PF coil i (kg)", "wtgpd": "mass of fuel used per day (g)", @@ -18132,7 +18132,7 @@ "fblli2o", "fbllipb", "fblvd", - "wtblli2o", + "m_blkt_li2o", "wtbllipb", "whtblvd", "whtblli", diff --git a/tests/unit/test_ccfe_hcpb.py b/tests/unit/test_ccfe_hcpb.py index 2b38d144fe..0b8dfb5164 100644 --- a/tests/unit/test_ccfe_hcpb.py +++ b/tests/unit/test_ccfe_hcpb.py @@ -1489,7 +1489,7 @@ class ComponentMassesParam(NamedTuple): breeder_multiplier: Any = None m_blkt_tibe12: Any = None m_blkt_li4sio4: Any = None - wtblli2o: Any = None + m_blkt_li2o: Any = None vfcblkt: Any = None vfpblkt: Any = None whtshld: Any = None @@ -1527,7 +1527,7 @@ class ComponentMassesParam(NamedTuple): expected_fwclfr: Any = None expected_m_blkt_tibe12: Any = None expected_whtblli4sio4: Any = None - expected_wtblli2o: Any = None + expected_m_blkt_li2o: Any = None expected_whtshld: Any = None expected_wpenshld: Any = None expected_m_fw_total: Any = None @@ -1580,7 +1580,7 @@ class ComponentMassesParam(NamedTuple): breeder_multiplier=0.75, m_blkt_tibe12=0, m_blkt_li4sio4=0, - wtblli2o=0, + m_blkt_li2o=0, vfcblkt=0.052949999999999997, vfpblkt=0.10000000000000001, whtshld=0, @@ -1618,7 +1618,7 @@ class ComponentMassesParam(NamedTuple): expected_fwclfr=0, expected_m_blkt_tibe12=1002205.5121936026, expected_whtblli4sio4=1064289.0394976311, - expected_wtblli2o=1064289.0394976311, + expected_m_blkt_li2o=1064289.0394976311, expected_whtshld=2445141.3347883238, expected_wpenshld=2445141.3347883238, expected_m_fw_total=188693.16002348688, @@ -1712,7 +1712,7 @@ def test_component_masses(componentmassesparam, monkeypatch, ccfe_hcpb): monkeypatch.setattr( fwbs_variables, "m_blkt_li4sio4", componentmassesparam.m_blkt_li4sio4 ) - monkeypatch.setattr(fwbs_variables, "wtblli2o", componentmassesparam.wtblli2o) + monkeypatch.setattr(fwbs_variables, "m_blkt_li2o", componentmassesparam.m_blkt_li2o) monkeypatch.setattr(fwbs_variables, "vfcblkt", componentmassesparam.vfcblkt) monkeypatch.setattr(fwbs_variables, "vfpblkt", componentmassesparam.vfpblkt) monkeypatch.setattr(fwbs_variables, "whtshld", componentmassesparam.whtshld) @@ -1801,8 +1801,8 @@ def test_component_masses(componentmassesparam, monkeypatch, ccfe_hcpb): assert fwbs_variables.m_blkt_li4sio4 == pytest.approx( componentmassesparam.expected_whtblli4sio4 ) - assert fwbs_variables.wtblli2o == pytest.approx( - componentmassesparam.expected_wtblli2o + assert fwbs_variables.m_blkt_li2o == pytest.approx( + componentmassesparam.expected_m_blkt_li2o ) assert fwbs_variables.whtshld == pytest.approx( componentmassesparam.expected_whtshld diff --git a/tests/unit/test_costs_1990.py b/tests/unit/test_costs_1990.py index 43dc165234..510649b332 100644 --- a/tests/unit/test_costs_1990.py +++ b/tests/unit/test_costs_1990.py @@ -1143,7 +1143,7 @@ class Acc2212Param(NamedTuple): whtblli: Any = None - wtblli2o: Any = None + m_blkt_li2o: Any = None whtblbreed: Any = None @@ -1213,7 +1213,7 @@ class Acc2212Param(NamedTuple): fkind=1, i_blanket_type=1, whtblli=0, - wtblli2o=1258110.2710352642, + m_blkt_li2o=1258110.2710352642, whtblbreed=0, whtblvd=0, m_blkt_beryllium=1184720.5052248738, @@ -1267,7 +1267,7 @@ class Acc2212Param(NamedTuple): fkind=1, i_blanket_type=1, whtblli=0, - wtblli2o=1260437.468838267, + m_blkt_li2o=1260437.468838267, whtblbreed=0, whtblvd=0, m_blkt_beryllium=1186911.9498227015, @@ -1348,7 +1348,7 @@ def test_acc2212(acc2212param, monkeypatch, costs): monkeypatch.setattr(fwbs_variables, "whtblli", acc2212param.whtblli) - monkeypatch.setattr(fwbs_variables, "wtblli2o", acc2212param.wtblli2o) + monkeypatch.setattr(fwbs_variables, "m_blkt_li2o", acc2212param.m_blkt_li2o) monkeypatch.setattr(fwbs_variables, "whtblbreed", acc2212param.whtblbreed) diff --git a/tests/unit/test_ife.py b/tests/unit/test_ife.py index d0ed719179..a79d11ba52 100644 --- a/tests/unit/test_ife.py +++ b/tests/unit/test_ife.py @@ -1218,7 +1218,7 @@ class IfefbsParam(NamedTuple): m_blkt_beryllium: Any = None whtblvd: Any = None m_blkt_steel_total: Any = None - wtblli2o: Any = None + m_blkt_li2o: Any = None whtblli: Any = None life_blkt_fpy: Any = None life_fw_fpy: Any = None @@ -1268,7 +1268,7 @@ class IfefbsParam(NamedTuple): m_blkt_beryllium=0, whtblvd=0, m_blkt_steel_total=0, - wtblli2o=0, + m_blkt_li2o=0, whtblli=0, life_blkt_fpy=0, life_fw_fpy=0, @@ -1557,7 +1557,7 @@ def test_ifefbs(ifefbsparam, monkeypatch, ife): monkeypatch.setattr( fwbs_variables, "m_blkt_steel_total", ifefbsparam.m_blkt_steel_total ) - monkeypatch.setattr(fwbs_variables, "wtblli2o", ifefbsparam.wtblli2o) + monkeypatch.setattr(fwbs_variables, "m_blkt_li2o", ifefbsparam.m_blkt_li2o) monkeypatch.setattr(fwbs_variables, "whtblli", ifefbsparam.whtblli) monkeypatch.setattr(fwbs_variables, "life_blkt_fpy", ifefbsparam.life_blkt_fpy) monkeypatch.setattr(fwbs_variables, "life_fw_fpy", ifefbsparam.life_fw_fpy) From 70bf95993bbb33cc2487b54ba9092150e03325ec Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 18 Feb 2025 15:47:44 +0000 Subject: [PATCH 57/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20whtblvd=20to=20m?= =?UTF-8?q?=5Fblkt=5Fvanadium=20for=20clarity=20and=20consistency=20across?= =?UTF-8?q?=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/costs.py | 4 +++- process/ife.py | 6 ++++-- process/stellarator.py | 8 ++++---- source/fortran/fwbs_variables.f90 | 4 ++-- tests/integration/ref_dicts.json | 6 +++--- tests/unit/test_costs_1990.py | 8 ++++---- tests/unit/test_ife.py | 6 +++--- 7 files changed, 23 insertions(+), 19 deletions(-) diff --git a/process/costs.py b/process/costs.py index 32af7a0321..27f88ad614 100644 --- a/process/costs.py +++ b/process/costs.py @@ -1224,7 +1224,9 @@ def acc2212(self): self.c22123 = ( 1.0e-6 * fwbs_variables.m_blkt_steel_total * cost_variables.ucblss ) - self.c22124 = 1.0e-6 * fwbs_variables.whtblvd * cost_variables.ucblvd + self.c22124 = ( + 1.0e-6 * fwbs_variables.m_blkt_vanadium * cost_variables.ucblvd + ) self.c22125 = 0.0e0 self.c22126 = 0.0e0 self.c22127 = 0.0e0 diff --git a/process/ife.py b/process/ife.py index 5ac2445a99..825191f57a 100644 --- a/process/ife.py +++ b/process/ife.py @@ -1791,7 +1791,7 @@ def ifefbs(self, output: bool = False): # Other masses fwbs_variables.m_blkt_beryllium = 0.0 - fwbs_variables.whtblvd = 0.0 + fwbs_variables.m_blkt_vanadium = 0.0 fwbs_variables.m_blkt_steel_total = 0.0 fwbs_variables.m_blkt_li2o = 0.0 fwbs_variables.whtblli = 0.0 @@ -1827,7 +1827,9 @@ def ifefbs(self, output: bool = False): # Following assumes that use of FLiBe and Li2O are # mutually exclusive ife_variables.mflibe = ife_variables.mflibe / (1.0 - ife_variables.fbreed) - fwbs_variables.m_blkt_li2o = fwbs_variables.m_blkt_li2o / (1.0 - ife_variables.fbreed) + fwbs_variables.m_blkt_li2o = fwbs_variables.m_blkt_li2o / ( + 1.0 - ife_variables.fbreed + ) fwbs_variables.whtblli = fwbs_variables.whtblli / (1.0 - ife_variables.fbreed) # Blanket and first wall lifetimes (HYLIFE-II: = plant life) diff --git a/process/stellarator.py b/process/stellarator.py index 8887a14603..5b9b33f9a5 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -1638,14 +1638,14 @@ def stfwbs(self, output: bool): * fwbs_variables.denstl * fwbs_variables.fblss ) - fwbs_variables.whtblvd = ( + fwbs_variables.m_blkt_vanadium = ( fwbs_variables.vol_blkt_total * 5870.0e0 * fwbs_variables.fblvd ) fwbs_variables.m_blkt_total = ( fwbs_variables.m_blkt_total + fwbs_variables.m_blkt_steel_total - + fwbs_variables.whtblvd + + fwbs_variables.m_blkt_vanadium ) else: # volume fractions proportional to sub-assembly thicknesses @@ -2213,9 +2213,9 @@ def stfwbs(self, output: bool): # if (fwbs_variables.blktmodel == 0) : # if ((fwbs_variables.blkttype == 1)or(fwbs_variables.blkttype == 2)) : - # po.write(self.outfile,601) vol_blkt_inboard, vol_blkt_outboard, vol_blkt_total, m_blkt_total, vfblkt, fbllipb, wtbllipb, fblli, whtblli, fblss, m_blkt_steel_total, fblvd, whtblvd, volshldi, volshldo, volshld, whtshld, vfshld, fwbs_variables.wpenshld + # po.write(self.outfile,601) vol_blkt_inboard, vol_blkt_outboard, vol_blkt_total, m_blkt_total, vfblkt, fbllipb, wtbllipb, fblli, whtblli, fblss, m_blkt_steel_total, fblvd, m_blkt_vanadium, volshldi, volshldo, volshld, whtshld, vfshld, fwbs_variables.wpenshld # else: # (also if ipowerflow=0) - # po.write(self.outfile,600) vol_blkt_inboard, vol_blkt_outboard, vol_blkt_total, m_blkt_total, vfblkt, fblbe, m_blkt_beryllium, fblli2o, m_blkt_li2o, fblss, m_blkt_steel_total, fblvd, whtblvd, volshldi, volshldo, volshld, whtshld, vfshld, fwbs_variables.wpenshld + # po.write(self.outfile,600) vol_blkt_inboard, vol_blkt_outboard, vol_blkt_total, m_blkt_total, vfblkt, fblbe, m_blkt_beryllium, fblli2o, m_blkt_li2o, fblss, m_blkt_steel_total, fblvd, m_blkt_vanadium, volshldi, volshldo, volshld, whtshld, vfshld, fwbs_variables.wpenshld # else: # po.write(self.outfile,602) vol_blkt_inboard, vol_blkt_outboard, vol_blkt_total, m_blkt_total, vfblkt, (fwbs_variables.vol_blkt_inboard/fwbs_variables.vol_blkt_total * build_variables.blbuith/build_variables.dr_blkt_inboard + fwbs_variables.vol_blkt_outboard/fwbs_variables.vol_blkt_total * build_variables.blbuoth/build_variables.dr_blkt_outboard) * fblbe, m_blkt_beryllium, (fwbs_variables.vol_blkt_inboard/fwbs_variables.vol_blkt_total * build_variables.blbuith/build_variables.dr_blkt_inboard + fwbs_variables.vol_blkt_outboard/fwbs_variables.vol_blkt_total * build_variables.blbuoth/build_variables.dr_blkt_outboard) * fblbreed, whtblbreed, fwbs_variables.vol_blkt_inboard/fwbs_variables.vol_blkt_total/build_variables.dr_blkt_inboard * (build_variables.blbuith * fwbs_variables.fblss + build_variables.blbmith * (1.0e0-fwbs_variables.fblhebmi) + build_variables.blbpith * (1.0e0-fwbs_variables.fblhebpi)) + fwbs_variables.vol_blkt_outboard/fwbs_variables.vol_blkt_total/build_variables.dr_blkt_outboard * (build_variables.blbuoth * fwbs_variables.fblss + build_variables.blbmoth * (1.0e0-fwbs_variables.fblhebmo) + build_variables.blbpoth * (1.0e0-fwbs_variables.fblhebpo)), m_blkt_steel_total, volshldi, volshldo, volshld, whtshld, vfshld, fwbs_variables.wpenshld diff --git a/source/fortran/fwbs_variables.f90 b/source/fortran/fwbs_variables.f90 index 40af95bd7e..aac5b5940d 100644 --- a/source/fortran/fwbs_variables.f90 +++ b/source/fortran/fwbs_variables.f90 @@ -481,7 +481,7 @@ module fwbs_variables real(dp) :: wtbllipb !! mass of blanket - Li-Pb part [kg] - real(dp) :: whtblvd + real(dp) :: m_blkt_vanadium !! mass of blanket - vanadium part [kg] real(dp) :: whtblli @@ -791,7 +791,7 @@ subroutine init_fwbs_variables fblvd = 0.0D0 m_blkt_li2o = 0.0D0 wtbllipb = 0.0D0 - whtblvd = 0.0D0 + m_blkt_vanadium = 0.0D0 whtblli = 0.0D0 vfblkt = 0.25D0 blktmodel = 0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index c529034d8e..f44c0978aa 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -8048,7 +8048,7 @@ "m_blkt_li4sio4": 0.0, "m_blkt_steel_total": 0.0, "m_blkt_tibe12": 0.0, - "whtblvd": 0.0, + "m_blkt_vanadium": 0.0, "whtcas": 0.0, "whtcon": 0.0, "whtconal": 0.0, @@ -11157,7 +11157,7 @@ "m_blkt_li4sio4": "mass of lithium orthosilicate in blanket (kg) (`i_blanket_type=1,3` (CCFE HCPB))", "m_blkt_steel_total": "mass of blanket - steel part (kg)", "m_blkt_tibe12": "mass of titanium beryllide in blanket (kg) (`i_blanket_type=1,3` (CCFE HCPB))", - "whtblvd": "mass of blanket - vanadium part (kg)", + "m_blkt_vanadium": "mass of blanket - vanadium part (kg)", "whtcas": "mass per coil of external case (kg)", "whtcon": "TF coil conductor mass per coil (kg/coil).\n For `itart=1`, coil is return limb plus centrepost/n_tf_coils", "whtconal": "Aluminium mass in TF coil conductor (kg/coil).\n For `itart=1`, coil is return limb plus centrepost/n_tf_coils", @@ -18134,7 +18134,7 @@ "fblvd", "m_blkt_li2o", "wtbllipb", - "whtblvd", + "m_blkt_vanadium", "whtblli", "vfblkt", "blktmodel", diff --git a/tests/unit/test_costs_1990.py b/tests/unit/test_costs_1990.py index 510649b332..60b9182ba6 100644 --- a/tests/unit/test_costs_1990.py +++ b/tests/unit/test_costs_1990.py @@ -1147,7 +1147,7 @@ class Acc2212Param(NamedTuple): whtblbreed: Any = None - whtblvd: Any = None + m_blkt_vanadium: Any = None m_blkt_beryllium: Any = None @@ -1215,7 +1215,7 @@ class Acc2212Param(NamedTuple): whtblli=0, m_blkt_li2o=1258110.2710352642, whtblbreed=0, - whtblvd=0, + m_blkt_vanadium=0, m_blkt_beryllium=1184720.5052248738, m_blkt_steel_total=1058196.5489677608, wtbllipb=0, @@ -1269,7 +1269,7 @@ class Acc2212Param(NamedTuple): whtblli=0, m_blkt_li2o=1260437.468838267, whtblbreed=0, - whtblvd=0, + m_blkt_vanadium=0, m_blkt_beryllium=1186911.9498227015, m_blkt_steel_total=1060153.955039866, wtbllipb=0, @@ -1352,7 +1352,7 @@ def test_acc2212(acc2212param, monkeypatch, costs): monkeypatch.setattr(fwbs_variables, "whtblbreed", acc2212param.whtblbreed) - monkeypatch.setattr(fwbs_variables, "whtblvd", acc2212param.whtblvd) + monkeypatch.setattr(fwbs_variables, "m_blkt_vanadium", acc2212param.m_blkt_vanadium) monkeypatch.setattr( fwbs_variables, "m_blkt_beryllium", acc2212param.m_blkt_beryllium diff --git a/tests/unit/test_ife.py b/tests/unit/test_ife.py index a79d11ba52..896aebc148 100644 --- a/tests/unit/test_ife.py +++ b/tests/unit/test_ife.py @@ -1216,7 +1216,7 @@ class IfefbsParam(NamedTuple): m_blkt_total: Any = None whtshld: Any = None m_blkt_beryllium: Any = None - whtblvd: Any = None + m_blkt_vanadium: Any = None m_blkt_steel_total: Any = None m_blkt_li2o: Any = None whtblli: Any = None @@ -1266,7 +1266,7 @@ class IfefbsParam(NamedTuple): m_blkt_total=0, whtshld=0, m_blkt_beryllium=0, - whtblvd=0, + m_blkt_vanadium=0, m_blkt_steel_total=0, m_blkt_li2o=0, whtblli=0, @@ -1553,7 +1553,7 @@ def test_ifefbs(ifefbsparam, monkeypatch, ife): monkeypatch.setattr( fwbs_variables, "m_blkt_beryllium", ifefbsparam.m_blkt_beryllium ) - monkeypatch.setattr(fwbs_variables, "whtblvd", ifefbsparam.whtblvd) + monkeypatch.setattr(fwbs_variables, "m_blkt_vanadium", ifefbsparam.m_blkt_vanadium) monkeypatch.setattr( fwbs_variables, "m_blkt_steel_total", ifefbsparam.m_blkt_steel_total ) From 68329cf5495875a358ba48c18aad5f0486203ec4 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 18 Feb 2025 15:48:41 +0000 Subject: [PATCH 58/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20whtblli=20to=20m?= =?UTF-8?q?=5Fblkt=5Flithium=20for=20clarity=20and=20consistency=20across?= =?UTF-8?q?=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/costs.py | 6 ++++-- process/ife.py | 14 +++++++++----- process/stellarator.py | 6 +++--- source/fortran/fwbs_variables.f90 | 4 ++-- tests/integration/ref_dicts.json | 6 +++--- tests/unit/test_costs_1990.py | 8 ++++---- tests/unit/test_ife.py | 6 +++--- 7 files changed, 28 insertions(+), 22 deletions(-) diff --git a/process/costs.py b/process/costs.py index 27f88ad614..898d560a02 100644 --- a/process/costs.py +++ b/process/costs.py @@ -1204,7 +1204,9 @@ def acc2212(self): if fwbs_variables.i_blanket_type == 4: # Liquid blanket (LiPb + Li) self.c22121 = 1.0e-6 * fwbs_variables.wtbllipb * cost_variables.ucbllipb - self.c22122 = 1.0e-6 * fwbs_variables.whtblli * cost_variables.ucblli + self.c22122 = ( + 1.0e-6 * fwbs_variables.m_blkt_lithium * cost_variables.ucblli + ) else: # Solid blanket (Li2O + Be) self.c22121 = ( @@ -1260,7 +1262,7 @@ def acc2212(self): ) ) self.c22127 = 1.0e-6 * ife_variables.ucflib * ife_variables.mflibe - self.c22128 = 1.0e-6 * cost_variables.ucblli * fwbs_variables.whtblli + self.c22128 = 1.0e-6 * cost_variables.ucblli * fwbs_variables.m_blkt_lithium self.c22121 = cost_variables.fkind * self.c22121 * cmlsa[cost_variables.lsa - 1] self.c22122 = cost_variables.fkind * self.c22122 * cmlsa[cost_variables.lsa - 1] diff --git a/process/ife.py b/process/ife.py index 825191f57a..6775beb4f5 100644 --- a/process/ife.py +++ b/process/ife.py @@ -1794,7 +1794,7 @@ def ifefbs(self, output: bool = False): fwbs_variables.m_blkt_vanadium = 0.0 fwbs_variables.m_blkt_steel_total = 0.0 fwbs_variables.m_blkt_li2o = 0.0 - fwbs_variables.whtblli = 0.0 + fwbs_variables.m_blkt_lithium = 0.0 for j in range(3): fwbs_variables.m_blkt_steel_total = ( @@ -1803,7 +1803,9 @@ def ifefbs(self, output: bool = False): fwbs_variables.m_blkt_li2o = ( fwbs_variables.m_blkt_li2o + ife_variables.blmatm[j, 4] ) - fwbs_variables.whtblli = fwbs_variables.whtblli + ife_variables.blmatm[j, 8] + fwbs_variables.m_blkt_lithium = ( + fwbs_variables.m_blkt_lithium + ife_variables.blmatm[j, 8] + ) # Total mass of FLiBe ife_variables.mflibe = ife_variables.chmatm[3] @@ -1830,7 +1832,9 @@ def ifefbs(self, output: bool = False): fwbs_variables.m_blkt_li2o = fwbs_variables.m_blkt_li2o / ( 1.0 - ife_variables.fbreed ) - fwbs_variables.whtblli = fwbs_variables.whtblli / (1.0 - ife_variables.fbreed) + fwbs_variables.m_blkt_lithium = fwbs_variables.m_blkt_lithium / ( + 1.0 - ife_variables.fbreed + ) # Blanket and first wall lifetimes (HYLIFE-II: = plant life) if (ife_variables.ifetyp == 3) or (ife_variables.ifetyp == 4): @@ -1870,8 +1874,8 @@ def ifefbs(self, output: bool = False): process_output.ovarre( self.outfile, "Blanket lithium mass (kg)", - "(whtblli)", - fwbs_variables.whtblli, + "(m_blkt_lithium)", + fwbs_variables.m_blkt_lithium, ) process_output.ovarre( self.outfile, diff --git a/process/stellarator.py b/process/stellarator.py index 5b9b33f9a5..0fd9df3410 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -1616,11 +1616,11 @@ def stfwbs(self, output: bool): fwbs_variables.wtbllipb = ( fwbs_variables.vol_blkt_total * fwbs_variables.fbllipb * 9400.0e0 ) - fwbs_variables.whtblli = ( + fwbs_variables.m_blkt_lithium = ( fwbs_variables.vol_blkt_total * fwbs_variables.fblli * 534.0e0 ) fwbs_variables.m_blkt_total = ( - fwbs_variables.wtbllipb + fwbs_variables.whtblli + fwbs_variables.wtbllipb + fwbs_variables.m_blkt_lithium ) else: # solid breeder (HCPB); always for ipowerflow=0 fwbs_variables.m_blkt_li2o = ( @@ -2213,7 +2213,7 @@ def stfwbs(self, output: bool): # if (fwbs_variables.blktmodel == 0) : # if ((fwbs_variables.blkttype == 1)or(fwbs_variables.blkttype == 2)) : - # po.write(self.outfile,601) vol_blkt_inboard, vol_blkt_outboard, vol_blkt_total, m_blkt_total, vfblkt, fbllipb, wtbllipb, fblli, whtblli, fblss, m_blkt_steel_total, fblvd, m_blkt_vanadium, volshldi, volshldo, volshld, whtshld, vfshld, fwbs_variables.wpenshld + # po.write(self.outfile,601) vol_blkt_inboard, vol_blkt_outboard, vol_blkt_total, m_blkt_total, vfblkt, fbllipb, wtbllipb, fblli, m_blkt_lithium, fblss, m_blkt_steel_total, fblvd, m_blkt_vanadium, volshldi, volshldo, volshld, whtshld, vfshld, fwbs_variables.wpenshld # else: # (also if ipowerflow=0) # po.write(self.outfile,600) vol_blkt_inboard, vol_blkt_outboard, vol_blkt_total, m_blkt_total, vfblkt, fblbe, m_blkt_beryllium, fblli2o, m_blkt_li2o, fblss, m_blkt_steel_total, fblvd, m_blkt_vanadium, volshldi, volshldo, volshld, whtshld, vfshld, fwbs_variables.wpenshld diff --git a/source/fortran/fwbs_variables.f90 b/source/fortran/fwbs_variables.f90 index aac5b5940d..381d8199ac 100644 --- a/source/fortran/fwbs_variables.f90 +++ b/source/fortran/fwbs_variables.f90 @@ -484,7 +484,7 @@ module fwbs_variables real(dp) :: m_blkt_vanadium !! mass of blanket - vanadium part [kg] - real(dp) :: whtblli + real(dp) :: m_blkt_lithium !! mass of blanket - lithium part [kg] real(dp) :: vfblkt @@ -792,7 +792,7 @@ subroutine init_fwbs_variables m_blkt_li2o = 0.0D0 wtbllipb = 0.0D0 m_blkt_vanadium = 0.0D0 - whtblli = 0.0D0 + m_blkt_lithium = 0.0D0 vfblkt = 0.25D0 blktmodel = 0 declblkt = 0.075D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index f44c0978aa..71c826176f 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -8044,7 +8044,7 @@ "m_blkt_beryllium": 0.0, "whtblbreed": 0.0, "m_blkt_total": 0.0, - "whtblli": 0.0, + "m_blkt_lithium": 0.0, "m_blkt_li4sio4": 0.0, "m_blkt_steel_total": 0.0, "m_blkt_tibe12": 0.0, @@ -11153,7 +11153,7 @@ "m_blkt_beryllium": "mass of blanket - beryllium part (kg)", "whtblbreed": "mass of blanket - breeder part (kg) (`i_blanket_type=2` (KIT HCPB))", "m_blkt_total": "mass of blanket (kg)", - "whtblli": "mass of blanket - lithium part (kg)", + "m_blkt_lithium": "mass of blanket - lithium part (kg)", "m_blkt_li4sio4": "mass of lithium orthosilicate in blanket (kg) (`i_blanket_type=1,3` (CCFE HCPB))", "m_blkt_steel_total": "mass of blanket - steel part (kg)", "m_blkt_tibe12": "mass of titanium beryllide in blanket (kg) (`i_blanket_type=1,3` (CCFE HCPB))", @@ -18135,7 +18135,7 @@ "m_blkt_li2o", "wtbllipb", "m_blkt_vanadium", - "whtblli", + "m_blkt_lithium", "vfblkt", "blktmodel", "declblkt", diff --git a/tests/unit/test_costs_1990.py b/tests/unit/test_costs_1990.py index 60b9182ba6..4c45c1d2d1 100644 --- a/tests/unit/test_costs_1990.py +++ b/tests/unit/test_costs_1990.py @@ -1141,7 +1141,7 @@ class Acc2212Param(NamedTuple): i_blanket_type: Any = None - whtblli: Any = None + m_blkt_lithium: Any = None m_blkt_li2o: Any = None @@ -1212,7 +1212,7 @@ class Acc2212Param(NamedTuple): lsa=2, fkind=1, i_blanket_type=1, - whtblli=0, + m_blkt_lithium=0, m_blkt_li2o=1258110.2710352642, whtblbreed=0, m_blkt_vanadium=0, @@ -1266,7 +1266,7 @@ class Acc2212Param(NamedTuple): lsa=2, fkind=1, i_blanket_type=1, - whtblli=0, + m_blkt_lithium=0, m_blkt_li2o=1260437.468838267, whtblbreed=0, m_blkt_vanadium=0, @@ -1346,7 +1346,7 @@ def test_acc2212(acc2212param, monkeypatch, costs): monkeypatch.setattr(fwbs_variables, "i_blanket_type", acc2212param.i_blanket_type) - monkeypatch.setattr(fwbs_variables, "whtblli", acc2212param.whtblli) + monkeypatch.setattr(fwbs_variables, "m_blkt_lithium", acc2212param.m_blkt_lithium) monkeypatch.setattr(fwbs_variables, "m_blkt_li2o", acc2212param.m_blkt_li2o) diff --git a/tests/unit/test_ife.py b/tests/unit/test_ife.py index 896aebc148..8389090913 100644 --- a/tests/unit/test_ife.py +++ b/tests/unit/test_ife.py @@ -1219,7 +1219,7 @@ class IfefbsParam(NamedTuple): m_blkt_vanadium: Any = None m_blkt_steel_total: Any = None m_blkt_li2o: Any = None - whtblli: Any = None + m_blkt_lithium: Any = None life_blkt_fpy: Any = None life_fw_fpy: Any = None chmatm: Any = None @@ -1269,7 +1269,7 @@ class IfefbsParam(NamedTuple): m_blkt_vanadium=0, m_blkt_steel_total=0, m_blkt_li2o=0, - whtblli=0, + m_blkt_lithium=0, life_blkt_fpy=0, life_fw_fpy=0, chmatm=np.array( @@ -1558,7 +1558,7 @@ def test_ifefbs(ifefbsparam, monkeypatch, ife): fwbs_variables, "m_blkt_steel_total", ifefbsparam.m_blkt_steel_total ) monkeypatch.setattr(fwbs_variables, "m_blkt_li2o", ifefbsparam.m_blkt_li2o) - monkeypatch.setattr(fwbs_variables, "whtblli", ifefbsparam.whtblli) + monkeypatch.setattr(fwbs_variables, "m_blkt_lithium", ifefbsparam.m_blkt_lithium) monkeypatch.setattr(fwbs_variables, "life_blkt_fpy", ifefbsparam.life_blkt_fpy) monkeypatch.setattr(fwbs_variables, "life_fw_fpy", ifefbsparam.life_fw_fpy) monkeypatch.setattr(ife_variables, "chmatm", ifefbsparam.chmatm) From 559b010cab853005867a4116ae76e87d3c8f4b3c Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 18 Feb 2025 15:58:09 +0000 Subject: [PATCH 59/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20fhcd=20to=20f=5Fa?= =?UTF-8?q?=5Ffw=5Fhcd=20for=20clarity=20and=20consistency=20across=20the?= =?UTF-8?q?=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proc-pages/fusion-devices/stellarator.md | 2 +- .../data/csv_output_large_tokamak_MFILE.DAT | 4 +- examples/data/large_tokamak_1_MFILE.DAT | 4 +- examples/data/large_tokamak_2_MFILE.DAT | 4 +- examples/data/large_tokamak_3_MFILE.DAT | 4 +- examples/data/large_tokamak_4_MFILE.DAT | 4 +- examples/data/scan_MFILE.DAT | 36 +++++------ process/blanket_library.py | 6 +- process/build.py | 10 ++-- process/dcll.py | 6 +- process/hcpb.py | 2 +- process/io/sankey_funcs.py | 6 +- process/physics.py | 12 ++-- process/power.py | 12 ++-- process/stellarator.py | 19 +++--- process/utilities/errorlist.json | 2 +- source/fortran/fwbs_variables.f90 | 6 +- source/fortran/input.f90 | 6 +- .../data/large_tokamak_1_MFILE.DAT | 4 +- .../data/large_tokamak_2_MFILE.DAT | 4 +- .../data/large_tokamak_3_MFILE.DAT | 4 +- .../data/large_tokamak_4_MFILE.DAT | 4 +- .../integration/data/large_tokamak_MFILE.DAT | 4 +- tests/integration/data/scan_2D_MFILE.DAT | 60 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 36 +++++------ tests/integration/ref_dicts.json | 10 ++-- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 4 +- tests/unit/test_blanket_library.py | 8 ++- tests/unit/test_ccfe_hcpb.py | 8 +-- tests/unit/test_dcll.py | 10 ++-- tests/unit/test_power.py | 8 +-- tests/unit/test_stellarator.py | 8 +-- 33 files changed, 163 insertions(+), 156 deletions(-) diff --git a/documentation/proc-pages/fusion-devices/stellarator.md b/documentation/proc-pages/fusion-devices/stellarator.md index 3715d0dcc2..399d4f70a6 100644 --- a/documentation/proc-pages/fusion-devices/stellarator.md +++ b/documentation/proc-pages/fusion-devices/stellarator.md @@ -263,7 +263,7 @@ fblli2o = 0.07 *Lithium oxide fraction of blanket by volume (only relevant for m fbllipb = 0. *Lithium lead fraction of blanket by volume (only relevant for mass calculations) fblss = 0.13 *Stainless steel fraction of blanket by volume (only relevant for mass calculations) fblvd = 0. *Vanadium fraction of blanket by volume (only relevant for mass calculations) -fhole = 0. *Area fraction taken up by other holes (in addition to fdiv and fhcd when ipowerflow=1) +fhole = 0. *Area fraction taken up by other holes (in addition to fdiv and f_a_fw_hcd when ipowerflow=1) fwclfr = 0.1 *First wall coolant fraction (only relevant for mass calculations) i_coolant_pumping = 1 *Switch for pumping power (0: User sets pump power directly) htpmw_blkt = 120. *Blanket coolant mechanical pumping power (MW) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 616a8a351f..6653b7c055 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -1108,8 +1108,8 @@ # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 - H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 + H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 + First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index c463df4648..9c395c1206 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -1103,8 +1103,8 @@ # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 - H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 + H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 + First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 8c73873227..9943fff8ba 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -1103,8 +1103,8 @@ # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 - H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 + H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 + First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 153f4ce3a1..2dc5e5e747 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -1103,8 +1103,8 @@ # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 - H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 + H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 + First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index e9ca63cac8..fe6d6eb76a 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -1103,8 +1103,8 @@ # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 - H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 + H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 + First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 8781d7c827..21c9709ff0 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -930,8 +930,8 @@ # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 - H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 + H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 + First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -1925,8 +1925,8 @@ # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 - H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 + H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 + First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -2920,8 +2920,8 @@ # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 - H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 + H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 + First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -3915,8 +3915,8 @@ # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 - H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 + H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 + First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -4910,8 +4910,8 @@ # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 - H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 + H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 + First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -5905,8 +5905,8 @@ # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 - H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 + H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 + First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -6900,8 +6900,8 @@ # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 - H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 + H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 + First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -7895,8 +7895,8 @@ # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 - H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 + H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 + First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -8890,8 +8890,8 @@ # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 - H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 + H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 + First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP diff --git a/process/blanket_library.py b/process/blanket_library.py index b5c4e0697c..370b566e82 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -333,14 +333,14 @@ def apply_coverage_factors(self): # double null configuration build_variables.blareaob = ( build_variables.blarea - * (1.0 - 2.0 * fwbs_variables.fdiv - fwbs_variables.fhcd) + * (1.0 - 2.0 * fwbs_variables.fdiv - fwbs_variables.f_a_fw_hcd) - build_variables.blareaib ) else: # single null configuration build_variables.blareaob = ( build_variables.blarea - * (1.0 - fwbs_variables.fdiv - fwbs_variables.fhcd) + * (1.0 - fwbs_variables.fdiv - fwbs_variables.f_a_fw_hcd) - build_variables.blareaib ) @@ -348,7 +348,7 @@ def apply_coverage_factors(self): fwbs_variables.vol_blkt_outboard = ( fwbs_variables.vol_blkt_total - * (1.0 - fwbs_variables.fdiv - fwbs_variables.fhcd) + * (1.0 - fwbs_variables.fdiv - fwbs_variables.f_a_fw_hcd) - fwbs_variables.vol_blkt_inboard ) fwbs_variables.vol_blkt_total = ( diff --git a/process/build.py b/process/build.py index 4168d4c401..1ce9601cf2 100644 --- a/process/build.py +++ b/process/build.py @@ -2059,18 +2059,18 @@ def calculate_radial_build(self, output: bool) -> None: if physics_variables.idivrt == 2: # Double null configuration build_variables.a_fw_outboard = build_variables.a_fw_outboard * ( - 1.0e0 - 2.0e0 * fwbs_variables.fdiv - fwbs_variables.fhcd + 1.0e0 - 2.0e0 * fwbs_variables.fdiv - fwbs_variables.f_a_fw_hcd ) build_variables.a_fw_inboard = build_variables.a_fw_inboard * ( - 1.0e0 - 2.0e0 * fwbs_variables.fdiv - fwbs_variables.fhcd + 1.0e0 - 2.0e0 * fwbs_variables.fdiv - fwbs_variables.f_a_fw_hcd ) else: # Single null configuration build_variables.a_fw_outboard = build_variables.a_fw_outboard * ( - 1.0e0 - fwbs_variables.fdiv - fwbs_variables.fhcd + 1.0e0 - fwbs_variables.fdiv - fwbs_variables.f_a_fw_hcd ) build_variables.a_fw_inboard = build_variables.a_fw_inboard * ( - 1.0e0 - fwbs_variables.fdiv - fwbs_variables.fhcd + 1.0e0 - fwbs_variables.fdiv - fwbs_variables.f_a_fw_hcd ) build_variables.a_fw_total = ( @@ -2079,7 +2079,7 @@ def calculate_radial_build(self, output: bool) -> None: if build_variables.a_fw_outboard <= 0.0e0: error_handling.fdiags[0] = fwbs_variables.fdiv - error_handling.fdiags[1] = fwbs_variables.fhcd + error_handling.fdiags[1] = fwbs_variables.f_a_fw_hcd error_handling.report_error(61) # diff --git a/process/dcll.py b/process/dcll.py index ab693de068..6c9f65f548 100644 --- a/process/dcll.py +++ b/process/dcll.py @@ -123,10 +123,10 @@ def dcll_neutronics_and_power(self, output: bool): if physics_variables.idivrt == 2: # Double null configuration - covf = 1 - (2 * fwbs_variables.fdiv) - fwbs_variables.fhcd + covf = 1 - (2 * fwbs_variables.fdiv) - fwbs_variables.f_a_fw_hcd else: # Single null configuration - covf = 1 - fwbs_variables.fdiv - fwbs_variables.fhcd + covf = 1 - fwbs_variables.fdiv - fwbs_variables.f_a_fw_hcd # Nuclear heating in the first wall (MW) fwbs_variables.p_fw_nuclear_heat_total_mw = ( @@ -183,7 +183,7 @@ def dcll_neutronics_and_power(self, output: bool): fwbs_variables.p_fw_hcd_nuclear_heat_mw = 0 # Radiation power incident on HCD apparatus (MW) fwbs_variables.p_fw_hcd_rad_total_mw = ( - physics_variables.p_plasma_rad_mw * fwbs_variables.fhcd + physics_variables.p_plasma_rad_mw * fwbs_variables.f_a_fw_hcd ) # FW diff --git a/process/hcpb.py b/process/hcpb.py index 5818d043a8..dbfa7590fd 100644 --- a/process/hcpb.py +++ b/process/hcpb.py @@ -669,7 +669,7 @@ def powerflow_calc(self, output: bool): # Radiation power incident on HCD apparatus (MW) fwbs_variables.p_fw_hcd_rad_total_mw = ( - physics_variables.p_plasma_rad_mw * fwbs_variables.fhcd + physics_variables.p_plasma_rad_mw * fwbs_variables.f_a_fw_hcd ) # Radiation power incident on first wall (MW) diff --git a/process/io/sankey_funcs.py b/process/io/sankey_funcs.py index b113b0c4bf..8ac2b5eb4d 100644 --- a/process/io/sankey_funcs.py +++ b/process/io/sankey_funcs.py @@ -84,7 +84,7 @@ def plot_full_sankey( p_div_rad_total_mw = p_plasma_rad_mw * m_file.data["fdiv"].get_scan( -1 ) # Radiation deposited on the divertor (MW) - p_fw_hcd_rad_total_mw = p_plasma_rad_mw * m_file.data["fhcd"].get_scan( + p_fw_hcd_rad_total_mw = p_plasma_rad_mw * m_file.data["f_a_fw_hcd"].get_scan( -1 ) # Radiation deposited on HCD (MW) p_fw_rad_total_mw = ( @@ -530,11 +530,11 @@ def plot_sankey(mfilename="MFILE.DAT"): # Plot simplified power flow Sankey Dia p_div_rad_total_mw = ( p_plasma_rad_mw * fdiv ) # Radiation deposited on the divertor (MW) - fhcd = m_file.data["fhcd"].get_scan( + f_a_fw_hcd = m_file.data["f_a_fw_hcd"].get_scan( -1 ) # Area fraction covered by HCD and diagnostics p_fw_hcd_rad_total_mw = ( - p_plasma_rad_mw * fhcd + p_plasma_rad_mw * f_a_fw_hcd ) # Radiation deposited on HCD and diagnostics (MW) p_fw_rad_total_mw = ( p_plasma_rad_mw - p_div_rad_total_mw - p_fw_hcd_rad_total_mw diff --git a/process/physics.py b/process/physics.py index 47f59606ea..87b0736c85 100644 --- a/process/physics.py +++ b/process/physics.py @@ -2149,14 +2149,14 @@ def physics(self): if physics_variables.idivrt == 2: # Double null configuration physics_variables.pflux_fw_neutron_mw = ( - (1.0e0 - fwbs_variables.fhcd - 2.0e0 * fwbs_variables.fdiv) + (1.0e0 - fwbs_variables.f_a_fw_hcd - 2.0e0 * fwbs_variables.fdiv) * physics_variables.neutron_power_total / build_variables.a_fw_total ) else: # Single null Configuration physics_variables.pflux_fw_neutron_mw = ( - (1.0e0 - fwbs_variables.fhcd - fwbs_variables.fdiv) + (1.0e0 - fwbs_variables.f_a_fw_hcd - fwbs_variables.fdiv) * physics_variables.neutron_power_total / build_variables.a_fw_total ) @@ -2465,19 +2465,19 @@ def physics(self): if physics_variables.idivrt == 2: # Double Null configuration in - including SoL radiation physics_variables.pflux_fw_rad_mw = ( - 1.0e0 - fwbs_variables.fhcd - 2.0e0 * fwbs_variables.fdiv + 1.0e0 - fwbs_variables.f_a_fw_hcd - 2.0e0 * fwbs_variables.fdiv ) * physics_variables.p_plasma_rad_mw / build_variables.a_fw_total + ( - 1.0e0 - fwbs_variables.fhcd - 2.0e0 * fwbs_variables.fdiv + 1.0e0 - fwbs_variables.f_a_fw_hcd - 2.0e0 * fwbs_variables.fdiv ) * physics_variables.rad_fraction_sol * physics_variables.pdivt / ( build_variables.a_fw_total ) else: # Single null configuration - including SoL radaition physics_variables.pflux_fw_rad_mw = ( - (1.0e0 - fwbs_variables.fhcd - fwbs_variables.fdiv) + (1.0e0 - fwbs_variables.f_a_fw_hcd - fwbs_variables.fdiv) * physics_variables.p_plasma_rad_mw / build_variables.a_fw_total - + (1.0e0 - fwbs_variables.fhcd - fwbs_variables.fdiv) + + (1.0e0 - fwbs_variables.f_a_fw_hcd - fwbs_variables.fdiv) * physics_variables.rad_fraction_sol * physics_variables.pdivt / build_variables.a_fw_total diff --git a/process/power.py b/process/power.py index bb52e525ed..2461362ec1 100644 --- a/process/power.py +++ b/process/power.py @@ -1076,8 +1076,8 @@ def power2(self, output: bool): po.ovarre( self.outfile, "H/CD apparatus + diagnostics area fraction", - "(fhcd)", - fwbs_variables.fhcd, + "(f_a_fw_hcd)", + fwbs_variables.f_a_fw_hcd, ) if physics_variables.idivrt == 2: @@ -1085,16 +1085,16 @@ def power2(self, output: bool): po.ovarre( self.outfile, "First wall area fraction ", - "(1-2fdiv-fhcd)", - 1.0e0 - 2.0e0 * fwbs_variables.fdiv - fwbs_variables.fhcd, + "(1-2fdiv-f_a_fw_hcd)", + 1.0e0 - 2.0e0 * fwbs_variables.fdiv - fwbs_variables.f_a_fw_hcd, ) else: # Single null configuration po.ovarre( self.outfile, "First wall area fraction ", - "(1-fdiv-fhcd)", - 1.0e0 - fwbs_variables.fdiv - fwbs_variables.fhcd, + "(1-fdiv-f_a_fw_hcd)", + 1.0e0 - fwbs_variables.fdiv - fwbs_variables.f_a_fw_hcd, ) po.ovarin( diff --git a/process/stellarator.py b/process/stellarator.py index 0fd9df3410..a1a58ec99a 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -476,7 +476,10 @@ def stbild(self, output: bool): ) * build_variables.a_fw_total else: build_variables.a_fw_total = ( - 1.0e0 - fwbs_variables.fhole - fwbs_variables.fdiv - fwbs_variables.fhcd + 1.0e0 + - fwbs_variables.fhole + - fwbs_variables.fdiv + - fwbs_variables.f_a_fw_hcd ) * build_variables.a_fw_total if output: @@ -1143,7 +1146,7 @@ def stfwbs(self, output: bool): 1.0e0 - fwbs_variables.fhole - fwbs_variables.fdiv - - fwbs_variables.fhcd + - fwbs_variables.f_a_fw_hcd ) ) @@ -1201,7 +1204,7 @@ def stfwbs(self, output: bool): physics_variables.neutron_power_total * fwbs_variables.fdiv ) fwbs_variables.p_fw_hcd_nuclear_heat_mw = ( - physics_variables.neutron_power_total * fwbs_variables.fhcd + physics_variables.neutron_power_total * fwbs_variables.f_a_fw_hcd ) fwbs_variables.p_fw_nuclear_heat_total_mw = ( physics_variables.neutron_power_total @@ -1217,7 +1220,7 @@ def stfwbs(self, output: bool): physics_variables.p_plasma_rad_mw * fwbs_variables.fdiv ) fwbs_variables.p_fw_hcd_rad_total_mw = ( - physics_variables.p_plasma_rad_mw * fwbs_variables.fhcd + physics_variables.p_plasma_rad_mw * fwbs_variables.f_a_fw_hcd ) fwbs_variables.p_fw_rad_total_mw = ( physics_variables.p_plasma_rad_mw @@ -1318,7 +1321,7 @@ def stfwbs(self, output: bool): # Neutron power incident on HCD apparatus (MW) fwbs_variables.p_fw_hcd_nuclear_heat_mw = ( - physics_variables.neutron_power_total * fwbs_variables.fhcd + physics_variables.neutron_power_total * fwbs_variables.f_a_fw_hcd ) # Neutron power deposited in first wall, blanket and shield (MW) @@ -1351,7 +1354,7 @@ def stfwbs(self, output: bool): # Radiation power incident on HCD apparatus (MW) fwbs_variables.p_fw_hcd_rad_total_mw = ( - physics_variables.p_plasma_rad_mw * fwbs_variables.fhcd + physics_variables.p_plasma_rad_mw * fwbs_variables.f_a_fw_hcd ) # Radiation power lost through holes (eventually hits shield) (MW) @@ -4302,7 +4305,7 @@ def stphys(self, output): ( 1.0e0 - fwbs_variables.fhole - - fwbs_variables.fhcd + - fwbs_variables.f_a_fw_hcd - fwbs_variables.fdiv ) * physics_variables.neutron_power_total @@ -4429,7 +4432,7 @@ def stphys(self, output): ( 1.0e0 - fwbs_variables.fhole - - fwbs_variables.fhcd + - fwbs_variables.f_a_fw_hcd - fwbs_variables.fdiv ) * physics_variables.p_plasma_rad_mw diff --git a/process/utilities/errorlist.json b/process/utilities/errorlist.json index c731ca4f70..3a6f8172b3 100644 --- a/process/utilities/errorlist.json +++ b/process/utilities/errorlist.json @@ -313,7 +313,7 @@ { "no": 61, "level": 3, - "message": "RADIALB: fhole+fdiv+fhcd is too high for a credible outboard wall area" + "message": "RADIALB: fhole+fdiv+f_a_fw_hcd is too high for a credible outboard wall area" }, { "no": 62, diff --git a/source/fortran/fwbs_variables.f90 b/source/fortran/fwbs_variables.f90 index 381d8199ac..f052b5755c 100644 --- a/source/fortran/fwbs_variables.f90 +++ b/source/fortran/fwbs_variables.f90 @@ -50,8 +50,8 @@ module fwbs_variables real(dp) :: fdiv !! Solid angle fraction taken by one divertor - real(dp) :: fhcd - !! area fraction covered by heating/current drive apparatus plus diagnostics + real(dp) :: f_a_fw_hcd + !! area fraction of first wall covered by heating/current drive apparatus plus diagnostics real(dp) :: fhole !! area fraction taken up by other holes (IFE) @@ -674,7 +674,7 @@ subroutine init_fwbs_variables emultmw = 0.0D0 fblss = 0.09705D0 fdiv = 0.115D0 - fhcd = 0.0D0 + f_a_fw_hcd = 0.0D0 fhole = 0.0D0 i_fw_blkt_vv_shape = 2 life_fw_fpy = 0.0D0 diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index dc858ac1ae..fc4847bdf1 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -208,7 +208,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) use fwbs_variables, only: fblhebpo, vfblkt, fdiv, fvolso, i_fw_coolant_type, & dx_fw_module, i_blanket_type, blktmodel, afwi, fblli2o, nphcdin, breeder_multiplier, & fw_armour_thickness, roughness, fwclfr, breedmat, fblli, fblvd, & - iblanket_thickness, vfcblkt, breeder_f, fbllipb, fhcd, vfshld, fblhebmi, & + iblanket_thickness, vfcblkt, breeder_f, fbllipb, f_a_fw_hcd, vfshld, fblhebmi, & f_neut_shield, fw_th_conductivity, n_blkt_inboard_modules_toroidal, dr_fw_wall, afwo, & fvolsi, etahtp, n_blkt_outboard_modules_poloidal, pres_fw_coolant, emult, temp_fw_coolant_out, n_blkt_inboard_modules_poloidal, & fblhebpi, fblss, temp_blkt_coolant_in, temp_blkt_coolant_out, fblbreed, qnuc, pres_blkt_coolant, & @@ -2084,8 +2084,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('fdiv') call parse_real_variable('fdiv', fdiv, 0.0D0, 1.0D0, & 'Divertor area fraction') - case ('fhcd') - call parse_real_variable('fhcd', fhcd, 0.0D0, 1.0D0, & + case ('f_a_fw_hcd') + call parse_real_variable('f_a_fw_hcd', f_a_fw_hcd, 0.0D0, 1.0D0, & 'HCD + diagnostics area fraction') case ('fhole') call parse_real_variable('fhole', fhole, 0.0D0, 1.0D0, & diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 05656c7b06..6dd9e2c7c2 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -1102,8 +1102,8 @@ # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 - H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 + H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 + First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 886deeb56d..bbef75b965 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -1103,8 +1103,8 @@ # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 - H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 + H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 + First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index ab7e8f2414..a1a94af955 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -1103,8 +1103,8 @@ # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 - H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 + H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 + First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 0bc59d4fe7..d74c00ecbd 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -1103,8 +1103,8 @@ # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 - H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 + H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 + First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index 10454bde0c..cc36764f56 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -1106,8 +1106,8 @@ # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 - H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 + H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 + First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 37371d27fd..329b0b8db1 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -1104,8 +1104,8 @@ # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 - H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 + H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 + First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -2267,8 +2267,8 @@ # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 - H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 + H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 + First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -3430,8 +3430,8 @@ # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 - H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 + H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 + First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -4593,8 +4593,8 @@ # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 - H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 + H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 + First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -5756,8 +5756,8 @@ # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 - H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 + H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 + First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -6919,8 +6919,8 @@ # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 - H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 + H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 + First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -8082,8 +8082,8 @@ # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 - H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 + H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 + First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -9245,8 +9245,8 @@ # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 - H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 + H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 + First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -10408,8 +10408,8 @@ # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 - H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 + H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 + First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -11571,8 +11571,8 @@ # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 - H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 + H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 + First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -12734,8 +12734,8 @@ # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 - H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 + H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 + First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -13897,8 +13897,8 @@ # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 - H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 + H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 + First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -15060,8 +15060,8 @@ # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 - H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 + H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 + First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -16223,8 +16223,8 @@ # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 - H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 + H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 + First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -17386,8 +17386,8 @@ # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 - H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 + H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 + First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 77a427e20f..d0537b1732 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -930,8 +930,8 @@ # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 - H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 + H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 + First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -1925,8 +1925,8 @@ # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 - H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 + H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 + First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -2920,8 +2920,8 @@ # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 - H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 + H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 + First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -3915,8 +3915,8 @@ # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 - H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 + H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 + First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -4910,8 +4910,8 @@ # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 - H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 + H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 + First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -5905,8 +5905,8 @@ # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 - H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 + H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 + First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -6900,8 +6900,8 @@ # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 - H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 + H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 + First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -7895,8 +7895,8 @@ # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 - H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 + H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 + First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -8890,8 +8890,8 @@ # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 - H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 + H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 + First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 71c826176f..29f29e1a81 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1938,7 +1938,7 @@ "fgrosbop": 0.0, "fgwped": 0.85, "fgwsep": 0.5, - "fhcd": 0.0, + "f_a_fw_hcd": 0.0, "f_helium3": 0.0, "fhldiv": 1.0, "fhole": 0.0, @@ -9545,7 +9545,7 @@ "fgrosbop": "scaled fraction of gross power to balance-of-plant", "fgwped": "fraction of Greenwald density to set as pedestal-top density. If `<0`, pedestal-top\n density set manually using neped (`ipedestal>=1`). Needs to be `>0` if `ipedestal = 3`.\n (`iteration variable 145`)", "fgwsep": "fraction of Greenwald density to set as separatrix density. If `<0`, separatrix\n density set manually using nesep (`ipedestal>=1`). Needs to be `>0` if `ipedestal = 3`.\n (`iteration variable 152`)", - "fhcd": "area fraction covered by heating/current drive apparatus plus diagnostics", + "f_a_fw_hcd": "area fraction covered by heating/current drive apparatus plus diagnostics", "f_helium3": "helium-3 fuel fraction", "fhldiv": "f-value for divertor heat load (`constraint equation 18`, `iteration variable 27`)", "fhole": "area fraction taken up by other holes (IFE)", @@ -12673,7 +12673,7 @@ "lb": -1.0, "ub": 1.0 }, - "fhcd": { + "f_a_fw_hcd": { "lb": 0.0, "ub": 1.0 }, @@ -18022,7 +18022,7 @@ "emultmw", "fblss", "fdiv", - "fhcd", + "f_a_fw_hcd", "fhole", "i_fw_blkt_vv_shape", "life_fw_fpy", @@ -20276,7 +20276,7 @@ "fgamcd": "real_variable", "fgwped": "real_variable", "fgwsep": "real_variable", - "fhcd": "real_variable", + "f_a_fw_hcd": "real_variable", "f_helium3": "real_variable", "fhldiv": "real_variable", "fhole": "real_variable", diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 9bd9dff784..d4d1a48782 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2359,7 +2359,7 @@ i_fw_coolant_type = helium * DESCRIPTION: First wall coolant fraction (calculated if `i_pulsed_plant=1` or `ipowerflow=1`) * JUSTIFICATION: Not using ipowerflow = 1 -*fhcd = +*f_a_fw_hcd = * DESCRIPTION: Area fraction covered by heating/current drive apparatus plus diagnostics * JUSTIFICATION: Not yet set diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 833dc4f5be..c97e17f86a 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -1106,8 +1106,8 @@ # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 - H/CD_apparatus_+_diagnostics_area_fraction______________________________ (fhcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-fhcd)_________________ 8.8500E-01 + H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 + First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP diff --git a/tests/unit/test_blanket_library.py b/tests/unit/test_blanket_library.py index 4600e47e3d..9c73a19cea 100644 --- a/tests/unit/test_blanket_library.py +++ b/tests/unit/test_blanket_library.py @@ -1171,7 +1171,7 @@ class ApplyCoverageFactorsParam(NamedTuple): shareaob: Any = None sharea: Any = None fdiv: Any = None - fhcd: Any = None + f_a_fw_hcd: Any = None vol_blkt_outboard: Any = None vol_blkt_inboard: Any = None vol_blkt_total: Any = None @@ -1205,7 +1205,7 @@ class ApplyCoverageFactorsParam(NamedTuple): shareaob=1344.1106481995357, sharea=2044.1779608740142, fdiv=0.115, - fhcd=0, + f_a_fw_hcd=0, vol_blkt_outboard=1020.3677420460117, vol_blkt_inboard=315.83946385183026, vol_blkt_total=1336.207205897842, @@ -1250,7 +1250,9 @@ def test_apply_coverage_factors( monkeypatch.setattr(build_variables, "shareaob", applycoveragefactorsparam.shareaob) monkeypatch.setattr(build_variables, "sharea", applycoveragefactorsparam.sharea) monkeypatch.setattr(fwbs_variables, "fdiv", applycoveragefactorsparam.fdiv) - monkeypatch.setattr(fwbs_variables, "fhcd", applycoveragefactorsparam.fhcd) + monkeypatch.setattr( + fwbs_variables, "f_a_fw_hcd", applycoveragefactorsparam.f_a_fw_hcd + ) monkeypatch.setattr( fwbs_variables, "vol_blkt_outboard", applycoveragefactorsparam.vol_blkt_outboard ) diff --git a/tests/unit/test_ccfe_hcpb.py b/tests/unit/test_ccfe_hcpb.py index 0b8dfb5164..ce349d2ff4 100644 --- a/tests/unit/test_ccfe_hcpb.py +++ b/tests/unit/test_ccfe_hcpb.py @@ -810,7 +810,7 @@ class PowerflowCalcParam(NamedTuple): p_fw_hcd_rad_total_mw: Any = None - fhcd: Any = None + f_a_fw_hcd: Any = None p_fw_rad_total_mw: Any = None @@ -903,7 +903,7 @@ class PowerflowCalcParam(NamedTuple): fdiv=0.115, p_div_rad_total_mw=0, p_fw_hcd_rad_total_mw=0, - fhcd=0, + f_a_fw_hcd=0, p_fw_rad_total_mw=0, i_blkt_coolant_type=1, temp_blkt_coolant_out=823, @@ -952,7 +952,7 @@ class PowerflowCalcParam(NamedTuple): fdiv=0.115, p_div_rad_total_mw=33.056596978820579, p_fw_hcd_rad_total_mw=0, - fhcd=0, + f_a_fw_hcd=0, p_fw_rad_total_mw=254.39207240222791, i_blkt_coolant_type=1, temp_blkt_coolant_out=823, @@ -1031,7 +1031,7 @@ def test_powerflow_calc(powerflowcalcparam, monkeypatch, ccfe_hcpb): powerflowcalcparam.p_fw_hcd_rad_total_mw, ) - monkeypatch.setattr(fwbs_variables, "fhcd", powerflowcalcparam.fhcd) + monkeypatch.setattr(fwbs_variables, "f_a_fw_hcd", powerflowcalcparam.f_a_fw_hcd) monkeypatch.setattr( fwbs_variables, "p_fw_rad_total_mw", powerflowcalcparam.p_fw_rad_total_mw diff --git a/tests/unit/test_dcll.py b/tests/unit/test_dcll.py index 32fe3d7d66..988fc52edb 100644 --- a/tests/unit/test_dcll.py +++ b/tests/unit/test_dcll.py @@ -37,7 +37,7 @@ class DcllNeutronicsAndPowerParam(NamedTuple): p_div_nuclear_heat_total_mw: Any = None - fhcd: Any = None + f_a_fw_hcd: Any = None p_fw_hcd_rad_total_mw: Any = None @@ -96,7 +96,7 @@ class DcllNeutronicsAndPowerParam(NamedTuple): fdiv=0.115, p_div_rad_total_mw=0, p_div_nuclear_heat_total_mw=0, - fhcd=0, + f_a_fw_hcd=0, p_fw_hcd_rad_total_mw=0, p_fw_hcd_nuclear_heat_mw=0, pnucshld=0, @@ -128,7 +128,7 @@ class DcllNeutronicsAndPowerParam(NamedTuple): fdiv=0.115, p_div_rad_total_mw=33.056596978820579, p_div_nuclear_heat_total_mw=182.58994516305046, - fhcd=0, + f_a_fw_hcd=0, p_fw_hcd_rad_total_mw=0, p_fw_hcd_nuclear_heat_mw=0, pnucshld=0, @@ -196,7 +196,9 @@ def test_dcll_neutronics_and_power(dcllneutronicsandpowerparam, monkeypatch, dcl dcllneutronicsandpowerparam.p_div_nuclear_heat_total_mw, ) - monkeypatch.setattr(fwbs_variables, "fhcd", dcllneutronicsandpowerparam.fhcd) + monkeypatch.setattr( + fwbs_variables, "f_a_fw_hcd", dcllneutronicsandpowerparam.f_a_fw_hcd + ) monkeypatch.setattr( fwbs_variables, diff --git a/tests/unit/test_power.py b/tests/unit/test_power.py index 7d8bcf13a7..57390ccbb7 100644 --- a/tests/unit/test_power.py +++ b/tests/unit/test_power.py @@ -2059,7 +2059,7 @@ class Power2Param(NamedTuple): fdiv: Any = None - fhcd: Any = None + f_a_fw_hcd: Any = None i_thermal_electric_conversion: Any = None @@ -2251,7 +2251,7 @@ class Power2Param(NamedTuple): emult=1.2690000534057617, p_div_rad_total_mw=33.119482558354782, fdiv=0.115, - fhcd=0, + f_a_fw_hcd=0, i_thermal_electric_conversion=2, pnuc_cp=0, p_div_nuclear_heat_total_mw=182.69222981118057, @@ -2353,7 +2353,7 @@ class Power2Param(NamedTuple): emult=1.2690000534057617, p_div_rad_total_mw=33.119482558354782, fdiv=0.115, - fhcd=0, + f_a_fw_hcd=0, i_thermal_electric_conversion=2, pnuc_cp=0, p_div_nuclear_heat_total_mw=182.6352084763719, @@ -2490,7 +2490,7 @@ def test_power2(power2param, monkeypatch, power): monkeypatch.setattr(fwbs_variables, "fdiv", power2param.fdiv) - monkeypatch.setattr(fwbs_variables, "fhcd", power2param.fhcd) + monkeypatch.setattr(fwbs_variables, "f_a_fw_hcd", power2param.f_a_fw_hcd) monkeypatch.setattr( fwbs_variables, diff --git a/tests/unit/test_stellarator.py b/tests/unit/test_stellarator.py index 45872a3795..789bd36193 100644 --- a/tests/unit/test_stellarator.py +++ b/tests/unit/test_stellarator.py @@ -274,7 +274,7 @@ class StbildParam(NamedTuple): fdiv: Any = None - fhcd: Any = None + f_a_fw_hcd: Any = None fhole: Any = None @@ -376,7 +376,7 @@ class StbildParam(NamedTuple): radius_fw_channel=0.0060000000000000001, blktmodel=0, fdiv=0.115, - fhcd=0, + f_a_fw_hcd=0, fhole=0, dr_fw_wall=0.0030000000000000001, ipowerflow=1, @@ -446,7 +446,7 @@ class StbildParam(NamedTuple): radius_fw_channel=0.0060000000000000001, blktmodel=0, fdiv=0.021924555536480182, - fhcd=0, + f_a_fw_hcd=0, fhole=0, dr_fw_wall=0.0030000000000000001, ipowerflow=1, @@ -593,7 +593,7 @@ def test_stbild(stbildparam, monkeypatch, stellarator): monkeypatch.setattr(fwbs_variables, "fdiv", stbildparam.fdiv) - monkeypatch.setattr(fwbs_variables, "fhcd", stbildparam.fhcd) + monkeypatch.setattr(fwbs_variables, "f_a_fw_hcd", stbildparam.f_a_fw_hcd) monkeypatch.setattr(fwbs_variables, "fhole", stbildparam.fhole) From 158cf0e9bb6669f1f104b7304ba13413056d064c Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 18 Feb 2025 16:02:11 +0000 Subject: [PATCH 60/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20fdiv=20to=20f=5Fs?= =?UTF-8?q?ter=5Fdiv=5Fsingle=20for=20clarity=20and=20consistency=20across?= =?UTF-8?q?=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...conversion-and-heat-dissipation-systems.md | 2 +- .../proc-pages/fusion-devices/stellarator.md | 2 +- .../data/csv_output_large_tokamak_MFILE.DAT | 6 +- examples/data/large_tokamak_1_MFILE.DAT | 6 +- examples/data/large_tokamak_2_MFILE.DAT | 6 +- examples/data/large_tokamak_3_MFILE.DAT | 6 +- examples/data/large_tokamak_4_MFILE.DAT | 6 +- examples/data/scan_MFILE.DAT | 54 +++++------ process/blanket_library.py | 24 ++--- process/build.py | 14 +-- process/dcll.py | 24 ++--- process/hcpb.py | 27 +++--- process/io/sankey_funcs.py | 12 +-- process/physics.py | 32 +++++-- process/power.py | 16 ++-- process/stellarator.py | 20 +++-- process/utilities/errorlist.json | 2 +- source/fortran/fwbs_variables.f90 | 4 +- source/fortran/input.f90 | 6 +- .../data/large_tokamak_1_MFILE.DAT | 6 +- .../data/large_tokamak_2_MFILE.DAT | 6 +- .../data/large_tokamak_3_MFILE.DAT | 6 +- .../data/large_tokamak_4_MFILE.DAT | 6 +- .../integration/data/large_tokamak_MFILE.DAT | 6 +- tests/integration/data/scan_2D_MFILE.DAT | 90 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 54 +++++------ tests/integration/ref_dicts.json | 10 +-- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 6 +- tests/unit/test_blanket_library.py | 18 ++-- tests/unit/test_ccfe_hcpb.py | 22 +++-- tests/unit/test_dcll.py | 12 ++- tests/unit/test_power.py | 10 ++- tests/unit/test_stellarator.py | 10 ++- 34 files changed, 298 insertions(+), 235 deletions(-) diff --git a/documentation/proc-pages/eng-models/power-conversion-and-heat-dissipation-systems.md b/documentation/proc-pages/eng-models/power-conversion-and-heat-dissipation-systems.md index 0c72ee5331..bc908248b6 100644 --- a/documentation/proc-pages/eng-models/power-conversion-and-heat-dissipation-systems.md +++ b/documentation/proc-pages/eng-models/power-conversion-and-heat-dissipation-systems.md @@ -13,7 +13,7 @@ turbines. Figure 1 shows the power flow. All of the charged particle transport power leaving the plasma (excluding the `1-f_alpha_plasma` portion of the alpha power that escapes directly to the first wall) is assumed to be absorbed in the divertor, -along with a proportion `fdiv` of the radiation power and the neutron power. +along with a proportion `f_ster_div_single` of the radiation power and the neutron power. Switch `iprimdiv` may be used to specify whether the thermal power deposited in the divertor becomes high-grade thermal power (`iprimdiv` = 1) or low-grade waste heat (see Figure 1). diff --git a/documentation/proc-pages/fusion-devices/stellarator.md b/documentation/proc-pages/fusion-devices/stellarator.md index 399d4f70a6..fc1ca32c07 100644 --- a/documentation/proc-pages/fusion-devices/stellarator.md +++ b/documentation/proc-pages/fusion-devices/stellarator.md @@ -263,7 +263,7 @@ fblli2o = 0.07 *Lithium oxide fraction of blanket by volume (only relevant for m fbllipb = 0. *Lithium lead fraction of blanket by volume (only relevant for mass calculations) fblss = 0.13 *Stainless steel fraction of blanket by volume (only relevant for mass calculations) fblvd = 0. *Vanadium fraction of blanket by volume (only relevant for mass calculations) -fhole = 0. *Area fraction taken up by other holes (in addition to fdiv and f_a_fw_hcd when ipowerflow=1) +fhole = 0. *Area fraction taken up by other holes (in addition to f_ster_div_single and f_a_fw_hcd when ipowerflow=1) fwclfr = 0.1 *First wall coolant fraction (only relevant for mass calculations) i_coolant_pumping = 1 *Switch for pumping power (0: User sets pump power directly) htpmw_blkt = 120. *Blanket coolant mechanical pumping power (MW) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 6653b7c055..54d71f92d2 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -981,7 +981,7 @@ Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP - Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 + Solid_angle_fraction_taken_by_on_divertor_______________________________ (f_ster_div_single)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 @@ -1107,9 +1107,9 @@ Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 3.4704E+01 OP # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 - Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 + Divertor_area_fraction_of_whole_toroid_surface__________________________ (f_ster_div_single)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 + First_wall_area_fraction________________________________________________ (1-f_ster_div_single-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 9c395c1206..2438a233ee 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -976,7 +976,7 @@ Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP - Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 + Solid_angle_fraction_taken_by_on_divertor_______________________________ (f_ster_div_single)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 @@ -1102,9 +1102,9 @@ Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 3.6566E+01 OP # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 - Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 + Divertor_area_fraction_of_whole_toroid_surface__________________________ (f_ster_div_single)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 + First_wall_area_fraction________________________________________________ (1-f_ster_div_single-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index 9943fff8ba..b6beed7a3a 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -976,7 +976,7 @@ Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP - Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 + Solid_angle_fraction_taken_by_on_divertor_______________________________ (f_ster_div_single)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 @@ -1102,9 +1102,9 @@ Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 3.6566E+01 OP # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 - Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 + Divertor_area_fraction_of_whole_toroid_surface__________________________ (f_ster_div_single)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 + First_wall_area_fraction________________________________________________ (1-f_ster_div_single-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index 2dc5e5e747..e72680b55f 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -976,7 +976,7 @@ Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP - Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 + Solid_angle_fraction_taken_by_on_divertor_______________________________ (f_ster_div_single)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 @@ -1102,9 +1102,9 @@ Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 3.6566E+01 OP # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 - Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 + Divertor_area_fraction_of_whole_toroid_surface__________________________ (f_ster_div_single)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 + First_wall_area_fraction________________________________________________ (1-f_ster_div_single-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index fe6d6eb76a..e7d4598400 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -976,7 +976,7 @@ Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP - Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 + Solid_angle_fraction_taken_by_on_divertor_______________________________ (f_ster_div_single)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 @@ -1102,9 +1102,9 @@ Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 3.6566E+01 OP # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 - Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 + Divertor_area_fraction_of_whole_toroid_surface__________________________ (f_ster_div_single)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 + First_wall_area_fraction________________________________________________ (1-f_ster_div_single-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index 21c9709ff0..f0749ceaab 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -805,7 +805,7 @@ Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP - Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 + Solid_angle_fraction_taken_by_on_divertor_______________________________ (f_ster_div_single)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 @@ -929,9 +929,9 @@ Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 4.0732E+01 OP # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 - Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 + Divertor_area_fraction_of_whole_toroid_surface__________________________ (f_ster_div_single)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 + First_wall_area_fraction________________________________________________ (1-f_ster_div_single-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -1800,7 +1800,7 @@ Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP - Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 + Solid_angle_fraction_taken_by_on_divertor_______________________________ (f_ster_div_single)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 @@ -1924,9 +1924,9 @@ Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 4.0732E+01 OP # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 - Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 + Divertor_area_fraction_of_whole_toroid_surface__________________________ (f_ster_div_single)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 + First_wall_area_fraction________________________________________________ (1-f_ster_div_single-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -2795,7 +2795,7 @@ Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP - Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 + Solid_angle_fraction_taken_by_on_divertor_______________________________ (f_ster_div_single)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 @@ -2919,9 +2919,9 @@ Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 4.0732E+01 OP # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 - Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 + Divertor_area_fraction_of_whole_toroid_surface__________________________ (f_ster_div_single)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 + First_wall_area_fraction________________________________________________ (1-f_ster_div_single-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -3790,7 +3790,7 @@ Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP - Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 + Solid_angle_fraction_taken_by_on_divertor_______________________________ (f_ster_div_single)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 @@ -3914,9 +3914,9 @@ Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 4.0732E+01 OP # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 - Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 + Divertor_area_fraction_of_whole_toroid_surface__________________________ (f_ster_div_single)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 + First_wall_area_fraction________________________________________________ (1-f_ster_div_single-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -4785,7 +4785,7 @@ Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP - Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 + Solid_angle_fraction_taken_by_on_divertor_______________________________ (f_ster_div_single)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 @@ -4909,9 +4909,9 @@ Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 4.0732E+01 OP # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 - Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 + Divertor_area_fraction_of_whole_toroid_surface__________________________ (f_ster_div_single)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 + First_wall_area_fraction________________________________________________ (1-f_ster_div_single-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -5780,7 +5780,7 @@ Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP - Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 + Solid_angle_fraction_taken_by_on_divertor_______________________________ (f_ster_div_single)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 @@ -5904,9 +5904,9 @@ Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 4.0732E+01 OP # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 - Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 + Divertor_area_fraction_of_whole_toroid_surface__________________________ (f_ster_div_single)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 + First_wall_area_fraction________________________________________________ (1-f_ster_div_single-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -6775,7 +6775,7 @@ Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP - Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 + Solid_angle_fraction_taken_by_on_divertor_______________________________ (f_ster_div_single)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 @@ -6899,9 +6899,9 @@ Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 4.0732E+01 OP # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 - Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 + Divertor_area_fraction_of_whole_toroid_surface__________________________ (f_ster_div_single)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 + First_wall_area_fraction________________________________________________ (1-f_ster_div_single-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -7770,7 +7770,7 @@ Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP - Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 + Solid_angle_fraction_taken_by_on_divertor_______________________________ (f_ster_div_single)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 @@ -7894,9 +7894,9 @@ Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 4.0732E+01 OP # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 - Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 + Divertor_area_fraction_of_whole_toroid_surface__________________________ (f_ster_div_single)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 + First_wall_area_fraction________________________________________________ (1-f_ster_div_single-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -8765,7 +8765,7 @@ Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP - Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 + Solid_angle_fraction_taken_by_on_divertor_______________________________ (f_ster_div_single)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 @@ -8889,9 +8889,9 @@ Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 4.0732E+01 OP # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 - Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 + Divertor_area_fraction_of_whole_toroid_surface__________________________ (f_ster_div_single)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 + First_wall_area_fraction________________________________________________ (1-f_ster_div_single-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP diff --git a/process/blanket_library.py b/process/blanket_library.py index 370b566e82..d4d3d515b1 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -333,14 +333,18 @@ def apply_coverage_factors(self): # double null configuration build_variables.blareaob = ( build_variables.blarea - * (1.0 - 2.0 * fwbs_variables.fdiv - fwbs_variables.f_a_fw_hcd) + * ( + 1.0 + - 2.0 * fwbs_variables.f_ster_div_single + - fwbs_variables.f_a_fw_hcd + ) - build_variables.blareaib ) else: # single null configuration build_variables.blareaob = ( build_variables.blarea - * (1.0 - fwbs_variables.fdiv - fwbs_variables.f_a_fw_hcd) + * (1.0 - fwbs_variables.f_ster_div_single - fwbs_variables.f_a_fw_hcd) - build_variables.blareaib ) @@ -348,7 +352,7 @@ def apply_coverage_factors(self): fwbs_variables.vol_blkt_outboard = ( fwbs_variables.vol_blkt_total - * (1.0 - fwbs_variables.fdiv - fwbs_variables.f_a_fw_hcd) + * (1.0 - fwbs_variables.f_ster_div_single - fwbs_variables.f_a_fw_hcd) - fwbs_variables.vol_blkt_inboard ) fwbs_variables.vol_blkt_total = ( @@ -1172,7 +1176,7 @@ def blanket_mod_pol_height(self): blanket_library.bllengo = ( 0.5 * ptor - * (1.0 - 2.0 * fwbs_variables.fdiv) + * (1.0 - 2.0 * fwbs_variables.f_ster_div_single) / fwbs_variables.n_blkt_outboard_modules_poloidal ) else: @@ -1180,7 +1184,7 @@ def blanket_mod_pol_height(self): blanket_library.bllengo = ( 0.5 * ptor - * (1.0 - fwbs_variables.fdiv) + * (1.0 - fwbs_variables.f_ster_div_single) / fwbs_variables.n_blkt_outboard_modules_poloidal ) @@ -1206,7 +1210,7 @@ def blanket_mod_pol_height(self): ptor = np.pi * (3.0 * (a + b) - np.sqrt((3.0 * a + b) * (a + 3.0 * b))) # Calculate inboard blanket poloidal length and segment, subtracting divertor length (m) - # Assume divertor lies between the two ellipses, so fraction fdiv still applies + # Assume divertor lies between the two ellipses, so fraction f_ster_div_single still applies # kit hcll version only had the single null option if physics_variables.idivrt == 2: @@ -1214,7 +1218,7 @@ def blanket_mod_pol_height(self): blanket_library.bllengi = ( 0.5 * ptor - * (1.0 - 2.0 * fwbs_variables.fdiv) + * (1.0 - 2.0 * fwbs_variables.f_ster_div_single) / fwbs_variables.n_blkt_inboard_modules_poloidal ) else: @@ -1222,7 +1226,7 @@ def blanket_mod_pol_height(self): blanket_library.bllengi = ( 0.5 * ptor - * (1.0 - fwbs_variables.fdiv) + * (1.0 - fwbs_variables.f_ster_div_single) / fwbs_variables.n_blkt_inboard_modules_poloidal ) @@ -1244,7 +1248,7 @@ def blanket_mod_pol_height(self): blanket_library.bllengo = ( 0.5 * ptor - * (1.0 - 2.0 * fwbs_variables.fdiv) + * (1.0 - 2.0 * fwbs_variables.f_ster_div_single) / fwbs_variables.n_blkt_outboard_modules_poloidal ) else: @@ -1252,7 +1256,7 @@ def blanket_mod_pol_height(self): blanket_library.bllengo = ( 0.5 * ptor - * (1.0 - fwbs_variables.fdiv) + * (1.0 - fwbs_variables.f_ster_div_single) / fwbs_variables.n_blkt_outboard_modules_poloidal ) diff --git a/process/build.py b/process/build.py index 1ce9601cf2..30b1e7e5e5 100644 --- a/process/build.py +++ b/process/build.py @@ -2059,18 +2059,22 @@ def calculate_radial_build(self, output: bool) -> None: if physics_variables.idivrt == 2: # Double null configuration build_variables.a_fw_outboard = build_variables.a_fw_outboard * ( - 1.0e0 - 2.0e0 * fwbs_variables.fdiv - fwbs_variables.f_a_fw_hcd + 1.0e0 + - 2.0e0 * fwbs_variables.f_ster_div_single + - fwbs_variables.f_a_fw_hcd ) build_variables.a_fw_inboard = build_variables.a_fw_inboard * ( - 1.0e0 - 2.0e0 * fwbs_variables.fdiv - fwbs_variables.f_a_fw_hcd + 1.0e0 + - 2.0e0 * fwbs_variables.f_ster_div_single + - fwbs_variables.f_a_fw_hcd ) else: # Single null configuration build_variables.a_fw_outboard = build_variables.a_fw_outboard * ( - 1.0e0 - fwbs_variables.fdiv - fwbs_variables.f_a_fw_hcd + 1.0e0 - fwbs_variables.f_ster_div_single - fwbs_variables.f_a_fw_hcd ) build_variables.a_fw_inboard = build_variables.a_fw_inboard * ( - 1.0e0 - fwbs_variables.fdiv - fwbs_variables.f_a_fw_hcd + 1.0e0 - fwbs_variables.f_ster_div_single - fwbs_variables.f_a_fw_hcd ) build_variables.a_fw_total = ( @@ -2078,7 +2082,7 @@ def calculate_radial_build(self, output: bool) -> None: ) if build_variables.a_fw_outboard <= 0.0e0: - error_handling.fdiags[0] = fwbs_variables.fdiv + error_handling.fdiags[0] = fwbs_variables.f_ster_div_single error_handling.fdiags[1] = fwbs_variables.f_a_fw_hcd error_handling.report_error(61) diff --git a/process/dcll.py b/process/dcll.py index 6c9f65f548..81352d3bf0 100644 --- a/process/dcll.py +++ b/process/dcll.py @@ -123,10 +123,12 @@ def dcll_neutronics_and_power(self, output: bool): if physics_variables.idivrt == 2: # Double null configuration - covf = 1 - (2 * fwbs_variables.fdiv) - fwbs_variables.f_a_fw_hcd + covf = ( + 1 - (2 * fwbs_variables.f_ster_div_single) - fwbs_variables.f_a_fw_hcd + ) else: # Single null configuration - covf = 1 - fwbs_variables.fdiv - fwbs_variables.f_a_fw_hcd + covf = 1 - fwbs_variables.f_ster_div_single - fwbs_variables.f_a_fw_hcd # Nuclear heating in the first wall (MW) fwbs_variables.p_fw_nuclear_heat_total_mw = ( @@ -158,23 +160,25 @@ def dcll_neutronics_and_power(self, output: bool): if physics_variables.idivrt == 2: # Double null configuration - # Nuclear heating in the divertor (MW), neutron power times fdiv + # Nuclear heating in the divertor (MW), neutron power times f_ster_div_single fwbs_variables.p_div_nuclear_heat_total_mw = ( - physics_variables.neutron_power_total * 2 * fwbs_variables.fdiv + physics_variables.neutron_power_total + * 2 + * fwbs_variables.f_ster_div_single ) # Radiation power incident on divertor (MW) fwbs_variables.p_div_rad_total_mw = ( - physics_variables.p_plasma_rad_mw * 2 * fwbs_variables.fdiv + physics_variables.p_plasma_rad_mw * 2 * fwbs_variables.f_ster_div_single ) else: # Single null configuration - # Nuclear heating in the divertor (MW), neutron power times fdiv + # Nuclear heating in the divertor (MW), neutron power times f_ster_div_single fwbs_variables.p_div_nuclear_heat_total_mw = ( - physics_variables.neutron_power_total * fwbs_variables.fdiv + physics_variables.neutron_power_total * fwbs_variables.f_ster_div_single ) # Radiation power incident on divertor (MW) fwbs_variables.p_div_rad_total_mw = ( - physics_variables.p_plasma_rad_mw * fwbs_variables.fdiv + physics_variables.p_plasma_rad_mw * fwbs_variables.f_ster_div_single ) # HCD Apperatus @@ -218,8 +222,8 @@ def dcll_neutronics_and_power(self, output: bool): po.ovarre( self.outfile, "Solid angle fraction taken by on divertor", - "(fdiv)", - fwbs_variables.fdiv, + "(f_ster_div_single)", + fwbs_variables.f_ster_div_single, ) po.ovarre(self.outfile, "Blanket coverage factor", "(covf)", covf) diff --git a/process/hcpb.py b/process/hcpb.py index dbfa7590fd..5ec410231c 100644 --- a/process/hcpb.py +++ b/process/hcpb.py @@ -140,7 +140,9 @@ def run(self, output: bool): # end if # Solid angle fraction taken by the breeding blankets/shields - f_geom_blanket = 1 - physics_variables.idivrt * fwbs_variables.fdiv - f_geom_cp + f_geom_blanket = ( + 1 - physics_variables.idivrt * fwbs_variables.f_ster_div_single - f_geom_cp + ) # Power to the first wall (MW) fwbs_variables.p_fw_nuclear_heat_total_mw = ( @@ -632,19 +634,22 @@ def nuclear_heating_divertor(self): # coils. It turns out that emult is also approx constant, but this is not used. No energy # multiplication in the divertor - # Overwrite global variable for fdiv 07/11/18 SIM: Removed having spoken to JM - # fdiv = 0.115D0 + # Overwrite global variable for f_ster_div_single 07/11/18 SIM: Removed having spoken to JM + # f_ster_div_single = 0.115D0 - # Nuclear heating in the divertor just the neutron power times fdiv + # Nuclear heating in the divertor just the neutron power times f_ster_div_single if physics_variables.idivrt == 2: # Double null configuration fwbs_variables.p_div_nuclear_heat_total_mw = ( - 0.8 * physics_variables.fusion_power * 2 * fwbs_variables.fdiv + 0.8 + * physics_variables.fusion_power + * 2 + * fwbs_variables.f_ster_div_single ) else: # single null configuration fwbs_variables.p_div_nuclear_heat_total_mw = ( - 0.8 * physics_variables.fusion_power * fwbs_variables.fdiv + 0.8 * physics_variables.fusion_power * fwbs_variables.f_ster_div_single ) # No heating of the H & CD @@ -659,12 +664,14 @@ def powerflow_calc(self, output: bool): if physics_variables.idivrt == 2: # Double null configuration fwbs_variables.p_div_rad_total_mw = ( - physics_variables.p_plasma_rad_mw * 2.0 * fwbs_variables.fdiv + physics_variables.p_plasma_rad_mw + * 2.0 + * fwbs_variables.f_ster_div_single ) else: # single null configuration fwbs_variables.p_div_rad_total_mw = ( - physics_variables.p_plasma_rad_mw * fwbs_variables.fdiv + physics_variables.p_plasma_rad_mw * fwbs_variables.f_ster_div_single ) # Radiation power incident on HCD apparatus (MW) @@ -1468,8 +1475,8 @@ def write_output(self): po.ovarre( self.outfile, "Solid angle fraction taken by on divertor", - "(fdiv)", - fwbs_variables.fdiv, + "(f_ster_div_single)", + fwbs_variables.f_ster_div_single, ) po.ovarin( diff --git a/process/io/sankey_funcs.py b/process/io/sankey_funcs.py index 8ac2b5eb4d..cc313045bc 100644 --- a/process/io/sankey_funcs.py +++ b/process/io/sankey_funcs.py @@ -81,7 +81,7 @@ def plot_full_sankey( ) # Total radiation Power (MW) # Used in [RADIATION] - p_div_rad_total_mw = p_plasma_rad_mw * m_file.data["fdiv"].get_scan( + p_div_rad_total_mw = p_plasma_rad_mw * m_file.data["f_ster_div_single"].get_scan( -1 ) # Radiation deposited on the divertor (MW) p_fw_hcd_rad_total_mw = p_plasma_rad_mw * m_file.data["f_a_fw_hcd"].get_scan( @@ -519,16 +519,18 @@ def plot_sankey(mfilename="MFILE.DAT"): # Plot simplified power flow Sankey Dia p_plasma_rad_mw = m_file.data["p_plasma_rad_mw"].get_scan( -1 ) # Total radiation Power (MW) - fdiv = m_file.data["fdiv"].get_scan(-1) # Area fraction taken up by divertor - fdiv_2 = m_file.data["2*fdiv"].get_scan( + f_ster_div_single = m_file.data["f_ster_div_single"].get_scan( + -1 + ) # Area fraction taken up by divertor + fdiv_2 = m_file.data["2*f_ster_div_single"].get_scan( -1 ) # Area fraction taken up by double null divertor if ( fdiv_2 > 0 ): # Takes into account old MFILE representation of double null divertor - fdiv = fdiv_2 + f_ster_div_single = fdiv_2 p_div_rad_total_mw = ( - p_plasma_rad_mw * fdiv + p_plasma_rad_mw * f_ster_div_single ) # Radiation deposited on the divertor (MW) f_a_fw_hcd = m_file.data["f_a_fw_hcd"].get_scan( -1 diff --git a/process/physics.py b/process/physics.py index 87b0736c85..b8dfea81ef 100644 --- a/process/physics.py +++ b/process/physics.py @@ -2149,14 +2149,22 @@ def physics(self): if physics_variables.idivrt == 2: # Double null configuration physics_variables.pflux_fw_neutron_mw = ( - (1.0e0 - fwbs_variables.f_a_fw_hcd - 2.0e0 * fwbs_variables.fdiv) + ( + 1.0e0 + - fwbs_variables.f_a_fw_hcd + - 2.0e0 * fwbs_variables.f_ster_div_single + ) * physics_variables.neutron_power_total / build_variables.a_fw_total ) else: # Single null Configuration physics_variables.pflux_fw_neutron_mw = ( - (1.0e0 - fwbs_variables.f_a_fw_hcd - fwbs_variables.fdiv) + ( + 1.0e0 + - fwbs_variables.f_a_fw_hcd + - fwbs_variables.f_ster_div_single + ) * physics_variables.neutron_power_total / build_variables.a_fw_total ) @@ -2465,19 +2473,31 @@ def physics(self): if physics_variables.idivrt == 2: # Double Null configuration in - including SoL radiation physics_variables.pflux_fw_rad_mw = ( - 1.0e0 - fwbs_variables.f_a_fw_hcd - 2.0e0 * fwbs_variables.fdiv + 1.0e0 + - fwbs_variables.f_a_fw_hcd + - 2.0e0 * fwbs_variables.f_ster_div_single ) * physics_variables.p_plasma_rad_mw / build_variables.a_fw_total + ( - 1.0e0 - fwbs_variables.f_a_fw_hcd - 2.0e0 * fwbs_variables.fdiv + 1.0e0 + - fwbs_variables.f_a_fw_hcd + - 2.0e0 * fwbs_variables.f_ster_div_single ) * physics_variables.rad_fraction_sol * physics_variables.pdivt / ( build_variables.a_fw_total ) else: # Single null configuration - including SoL radaition physics_variables.pflux_fw_rad_mw = ( - (1.0e0 - fwbs_variables.f_a_fw_hcd - fwbs_variables.fdiv) + ( + 1.0e0 + - fwbs_variables.f_a_fw_hcd + - fwbs_variables.f_ster_div_single + ) * physics_variables.p_plasma_rad_mw / build_variables.a_fw_total - + (1.0e0 - fwbs_variables.f_a_fw_hcd - fwbs_variables.fdiv) + + ( + 1.0e0 + - fwbs_variables.f_a_fw_hcd + - fwbs_variables.f_ster_div_single + ) * physics_variables.rad_fraction_sol * physics_variables.pdivt / build_variables.a_fw_total diff --git a/process/power.py b/process/power.py index 2461362ec1..9d61f1f517 100644 --- a/process/power.py +++ b/process/power.py @@ -1061,16 +1061,16 @@ def power2(self, output: bool): po.ovarre( self.outfile, "Double Null Divertor area fraction of whole toroid surface", - "(2*fdiv)", - 2.0e0 * fwbs_variables.fdiv, + "(2*f_ster_div_single)", + 2.0e0 * fwbs_variables.f_ster_div_single, ) else: # Single null configuration po.ovarre( self.outfile, "Divertor area fraction of whole toroid surface", - "(fdiv)", - fwbs_variables.fdiv, + "(f_ster_div_single)", + fwbs_variables.f_ster_div_single, ) po.ovarre( @@ -1086,15 +1086,17 @@ def power2(self, output: bool): self.outfile, "First wall area fraction ", "(1-2fdiv-f_a_fw_hcd)", - 1.0e0 - 2.0e0 * fwbs_variables.fdiv - fwbs_variables.f_a_fw_hcd, + 1.0e0 + - 2.0e0 * fwbs_variables.f_ster_div_single + - fwbs_variables.f_a_fw_hcd, ) else: # Single null configuration po.ovarre( self.outfile, "First wall area fraction ", - "(1-fdiv-f_a_fw_hcd)", - 1.0e0 - fwbs_variables.fdiv - fwbs_variables.f_a_fw_hcd, + "(1-f_ster_div_single-f_a_fw_hcd)", + 1.0e0 - fwbs_variables.f_ster_div_single - fwbs_variables.f_a_fw_hcd, ) po.ovarin( diff --git a/process/stellarator.py b/process/stellarator.py index a1a58ec99a..c6f817b50d 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -478,7 +478,7 @@ def stbild(self, output: bool): build_variables.a_fw_total = ( 1.0e0 - fwbs_variables.fhole - - fwbs_variables.fdiv + - fwbs_variables.f_ster_div_single - fwbs_variables.f_a_fw_hcd ) * build_variables.a_fw_total @@ -920,7 +920,7 @@ def stdiv(self, output: bool): divertor_variables.hldiv = q_div divertor_variables.divsur = darea - fwbs_variables.fdiv = darea / build_variables.a_fw_total + fwbs_variables.f_ster_div_single = darea / build_variables.a_fw_total if output: po.oheadr(self.outfile, "Divertor") @@ -1145,7 +1145,7 @@ def stfwbs(self, output: bool): * ( 1.0e0 - fwbs_variables.fhole - - fwbs_variables.fdiv + - fwbs_variables.f_ster_div_single - fwbs_variables.f_a_fw_hcd ) ) @@ -1201,7 +1201,8 @@ def stfwbs(self, output: bool): if heat_transport_variables.ipowerflow == 1: fwbs_variables.p_div_nuclear_heat_total_mw = ( - physics_variables.neutron_power_total * fwbs_variables.fdiv + physics_variables.neutron_power_total + * fwbs_variables.f_ster_div_single ) fwbs_variables.p_fw_hcd_nuclear_heat_mw = ( physics_variables.neutron_power_total * fwbs_variables.f_a_fw_hcd @@ -1217,7 +1218,7 @@ def stfwbs(self, output: bool): physics_variables.p_plasma_rad_mw * fwbs_variables.fhole ) fwbs_variables.p_div_rad_total_mw = ( - physics_variables.p_plasma_rad_mw * fwbs_variables.fdiv + physics_variables.p_plasma_rad_mw * fwbs_variables.f_ster_div_single ) fwbs_variables.p_fw_hcd_rad_total_mw = ( physics_variables.p_plasma_rad_mw * fwbs_variables.f_a_fw_hcd @@ -1315,7 +1316,8 @@ def stfwbs(self, output: bool): # Neutron power incident on divertor (MW) fwbs_variables.p_div_nuclear_heat_total_mw = ( - physics_variables.neutron_power_total * fwbs_variables.fdiv + physics_variables.neutron_power_total + * fwbs_variables.f_ster_div_single ) # Neutron power incident on HCD apparatus (MW) @@ -1348,7 +1350,7 @@ def stfwbs(self, output: bool): # Radiation power incident on divertor (MW) fwbs_variables.p_div_rad_total_mw = ( - physics_variables.p_plasma_rad_mw * fwbs_variables.fdiv + physics_variables.p_plasma_rad_mw * fwbs_variables.f_ster_div_single ) # Radiation power incident on HCD apparatus (MW) @@ -4306,7 +4308,7 @@ def stphys(self, output): 1.0e0 - fwbs_variables.fhole - fwbs_variables.f_a_fw_hcd - - fwbs_variables.fdiv + - fwbs_variables.f_ster_div_single ) * physics_variables.neutron_power_total / build_variables.a_fw_total @@ -4433,7 +4435,7 @@ def stphys(self, output): 1.0e0 - fwbs_variables.fhole - fwbs_variables.f_a_fw_hcd - - fwbs_variables.fdiv + - fwbs_variables.f_ster_div_single ) * physics_variables.p_plasma_rad_mw / build_variables.a_fw_total diff --git a/process/utilities/errorlist.json b/process/utilities/errorlist.json index 3a6f8172b3..a904309d60 100644 --- a/process/utilities/errorlist.json +++ b/process/utilities/errorlist.json @@ -313,7 +313,7 @@ { "no": 61, "level": 3, - "message": "RADIALB: fhole+fdiv+f_a_fw_hcd is too high for a credible outboard wall area" + "message": "RADIALB: fhole+f_ster_div_single+f_a_fw_hcd is too high for a credible outboard wall area" }, { "no": 62, diff --git a/source/fortran/fwbs_variables.f90 b/source/fortran/fwbs_variables.f90 index f052b5755c..73fcd5246c 100644 --- a/source/fortran/fwbs_variables.f90 +++ b/source/fortran/fwbs_variables.f90 @@ -47,7 +47,7 @@ module fwbs_variables real(dp) :: fblss !! KIT blanket model: steel fraction of breeding zone - real(dp) :: fdiv + real(dp) :: f_ster_div_single !! Solid angle fraction taken by one divertor real(dp) :: f_a_fw_hcd @@ -673,7 +673,7 @@ subroutine init_fwbs_variables emult = 1.269D0 emultmw = 0.0D0 fblss = 0.09705D0 - fdiv = 0.115D0 + f_ster_div_single = 0.115D0 f_a_fw_hcd = 0.0D0 fhole = 0.0D0 i_fw_blkt_vv_shape = 2 diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index fc4847bdf1..eeb63a02f6 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -205,7 +205,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) omegan, prn1, frrp, xpertin, c1div, betai, bpsout, xparain, fdiva, & zeffdiv, hldivlim, rlenmax, dz_divertor, c3div, & hldiv, i_hldiv - use fwbs_variables, only: fblhebpo, vfblkt, fdiv, fvolso, i_fw_coolant_type, & + use fwbs_variables, only: fblhebpo, vfblkt, f_ster_div_single, fvolso, i_fw_coolant_type, & dx_fw_module, i_blanket_type, blktmodel, afwi, fblli2o, nphcdin, breeder_multiplier, & fw_armour_thickness, roughness, fwclfr, breedmat, fblli, fblvd, & iblanket_thickness, vfcblkt, breeder_f, fbllipb, f_a_fw_hcd, vfshld, fblhebmi, & @@ -2081,8 +2081,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('fblvd') call parse_real_variable('fblvd', fblvd, 0.0D0, 1.0D0, & 'Vanadium fraction of blanket') - case ('fdiv') - call parse_real_variable('fdiv', fdiv, 0.0D0, 1.0D0, & + case ('f_ster_div_single') + call parse_real_variable('f_ster_div_single', f_ster_div_single, 0.0D0, 1.0D0, & 'Divertor area fraction') case ('f_a_fw_hcd') call parse_real_variable('f_a_fw_hcd', f_a_fw_hcd, 0.0D0, 1.0D0, & diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 6dd9e2c7c2..3d814898dc 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -975,7 +975,7 @@ Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP - Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 + Solid_angle_fraction_taken_by_on_divertor_______________________________ (f_ster_div_single)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 @@ -1101,9 +1101,9 @@ Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 3.6566E+01 OP # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 - Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 + Divertor_area_fraction_of_whole_toroid_surface__________________________ (f_ster_div_single)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 + First_wall_area_fraction________________________________________________ (1-f_ster_div_single-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index bbef75b965..31d2a3fa0a 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -976,7 +976,7 @@ Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP - Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 + Solid_angle_fraction_taken_by_on_divertor_______________________________ (f_ster_div_single)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 @@ -1102,9 +1102,9 @@ Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 3.6566E+01 OP # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 - Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 + Divertor_area_fraction_of_whole_toroid_surface__________________________ (f_ster_div_single)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 + First_wall_area_fraction________________________________________________ (1-f_ster_div_single-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index a1a94af955..611cd5a6c1 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -976,7 +976,7 @@ Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP - Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 + Solid_angle_fraction_taken_by_on_divertor_______________________________ (f_ster_div_single)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 @@ -1102,9 +1102,9 @@ Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 3.6566E+01 OP # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 - Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 + Divertor_area_fraction_of_whole_toroid_surface__________________________ (f_ster_div_single)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 + First_wall_area_fraction________________________________________________ (1-f_ster_div_single-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index d74c00ecbd..e0810c7488 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -976,7 +976,7 @@ Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP - Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 + Solid_angle_fraction_taken_by_on_divertor_______________________________ (f_ster_div_single)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 @@ -1102,9 +1102,9 @@ Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 3.6566E+01 OP # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 - Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 + Divertor_area_fraction_of_whole_toroid_surface__________________________ (f_ster_div_single)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 + First_wall_area_fraction________________________________________________ (1-f_ster_div_single-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index cc36764f56..babaaf0fbd 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -979,7 +979,7 @@ Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP - Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 + Solid_angle_fraction_taken_by_on_divertor_______________________________ (f_ster_div_single)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 @@ -1105,9 +1105,9 @@ Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 3.6515E+01 OP # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 - Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 + Divertor_area_fraction_of_whole_toroid_surface__________________________ (f_ster_div_single)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 + First_wall_area_fraction________________________________________________ (1-f_ster_div_single-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 329b0b8db1..3c703192a6 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -977,7 +977,7 @@ Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP - Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 + Solid_angle_fraction_taken_by_on_divertor_______________________________ (f_ster_div_single)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 @@ -1103,9 +1103,9 @@ Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 3.6258E+01 OP # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 - Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 + Divertor_area_fraction_of_whole_toroid_surface__________________________ (f_ster_div_single)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 + First_wall_area_fraction________________________________________________ (1-f_ster_div_single-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -2140,7 +2140,7 @@ Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP - Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 + Solid_angle_fraction_taken_by_on_divertor_______________________________ (f_ster_div_single)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 @@ -2266,9 +2266,9 @@ Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 3.6086E+01 OP # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 - Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 + Divertor_area_fraction_of_whole_toroid_surface__________________________ (f_ster_div_single)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 + First_wall_area_fraction________________________________________________ (1-f_ster_div_single-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -3303,7 +3303,7 @@ Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP - Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 + Solid_angle_fraction_taken_by_on_divertor_______________________________ (f_ster_div_single)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 @@ -3429,9 +3429,9 @@ Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 3.5859E+01 OP # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 - Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 + Divertor_area_fraction_of_whole_toroid_surface__________________________ (f_ster_div_single)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 + First_wall_area_fraction________________________________________________ (1-f_ster_div_single-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -4466,7 +4466,7 @@ Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP - Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 + Solid_angle_fraction_taken_by_on_divertor_______________________________ (f_ster_div_single)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 @@ -4592,9 +4592,9 @@ Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 3.5830E+01 OP # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 - Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 + Divertor_area_fraction_of_whole_toroid_surface__________________________ (f_ster_div_single)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 + First_wall_area_fraction________________________________________________ (1-f_ster_div_single-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -5629,7 +5629,7 @@ Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP - Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 + Solid_angle_fraction_taken_by_on_divertor_______________________________ (f_ster_div_single)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 @@ -5755,9 +5755,9 @@ Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 3.6107E+01 OP # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 - Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 + Divertor_area_fraction_of_whole_toroid_surface__________________________ (f_ster_div_single)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 + First_wall_area_fraction________________________________________________ (1-f_ster_div_single-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -6792,7 +6792,7 @@ Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP - Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 + Solid_angle_fraction_taken_by_on_divertor_______________________________ (f_ster_div_single)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 @@ -6918,9 +6918,9 @@ Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 3.6398E+01 OP # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 - Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 + Divertor_area_fraction_of_whole_toroid_surface__________________________ (f_ster_div_single)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 + First_wall_area_fraction________________________________________________ (1-f_ster_div_single-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -7955,7 +7955,7 @@ Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP - Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 + Solid_angle_fraction_taken_by_on_divertor_______________________________ (f_ster_div_single)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 @@ -8081,9 +8081,9 @@ Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 3.6363E+01 OP # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 - Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 + Divertor_area_fraction_of_whole_toroid_surface__________________________ (f_ster_div_single)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 + First_wall_area_fraction________________________________________________ (1-f_ster_div_single-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -9118,7 +9118,7 @@ Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP - Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 + Solid_angle_fraction_taken_by_on_divertor_______________________________ (f_ster_div_single)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 @@ -9244,9 +9244,9 @@ Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 3.6160E+01 OP # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 - Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 + Divertor_area_fraction_of_whole_toroid_surface__________________________ (f_ster_div_single)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 + First_wall_area_fraction________________________________________________ (1-f_ster_div_single-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -10281,7 +10281,7 @@ Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP - Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 + Solid_angle_fraction_taken_by_on_divertor_______________________________ (f_ster_div_single)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 @@ -10407,9 +10407,9 @@ Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 3.5938E+01 OP # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 - Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 + Divertor_area_fraction_of_whole_toroid_surface__________________________ (f_ster_div_single)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 + First_wall_area_fraction________________________________________________ (1-f_ster_div_single-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -11444,7 +11444,7 @@ Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP - Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 + Solid_angle_fraction_taken_by_on_divertor_______________________________ (f_ster_div_single)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 @@ -11570,9 +11570,9 @@ Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 3.5931E+01 OP # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 - Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 + Divertor_area_fraction_of_whole_toroid_surface__________________________ (f_ster_div_single)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 + First_wall_area_fraction________________________________________________ (1-f_ster_div_single-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -12607,7 +12607,7 @@ Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP - Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 + Solid_angle_fraction_taken_by_on_divertor_______________________________ (f_ster_div_single)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 @@ -12733,9 +12733,9 @@ Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 3.6168E+01 OP # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 - Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 + Divertor_area_fraction_of_whole_toroid_surface__________________________ (f_ster_div_single)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 + First_wall_area_fraction________________________________________________ (1-f_ster_div_single-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -13770,7 +13770,7 @@ Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP - Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 + Solid_angle_fraction_taken_by_on_divertor_______________________________ (f_ster_div_single)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 @@ -13896,9 +13896,9 @@ Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 3.6396E+01 OP # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 - Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 + Divertor_area_fraction_of_whole_toroid_surface__________________________ (f_ster_div_single)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 + First_wall_area_fraction________________________________________________ (1-f_ster_div_single-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -14933,7 +14933,7 @@ Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP - Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 + Solid_angle_fraction_taken_by_on_divertor_______________________________ (f_ster_div_single)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 @@ -15059,9 +15059,9 @@ Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 3.6384E+01 OP # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 - Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 + Divertor_area_fraction_of_whole_toroid_surface__________________________ (f_ster_div_single)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 + First_wall_area_fraction________________________________________________ (1-f_ster_div_single-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -16096,7 +16096,7 @@ Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP - Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 + Solid_angle_fraction_taken_by_on_divertor_______________________________ (f_ster_div_single)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 @@ -16222,9 +16222,9 @@ Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 3.6204E+01 OP # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 - Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 + Divertor_area_fraction_of_whole_toroid_surface__________________________ (f_ster_div_single)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 + First_wall_area_fraction________________________________________________ (1-f_ster_div_single-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -17259,7 +17259,7 @@ Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP - Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 + Solid_angle_fraction_taken_by_on_divertor_______________________________ (f_ster_div_single)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 @@ -17385,9 +17385,9 @@ Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 3.6020E+01 OP # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 - Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 + Divertor_area_fraction_of_whole_toroid_surface__________________________ (f_ster_div_single)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 + First_wall_area_fraction________________________________________________ (1-f_ster_div_single-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index d0537b1732..62514209c0 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -805,7 +805,7 @@ Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP - Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 + Solid_angle_fraction_taken_by_on_divertor_______________________________ (f_ster_div_single)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 @@ -929,9 +929,9 @@ Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 4.0732E+01 OP # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 - Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 + Divertor_area_fraction_of_whole_toroid_surface__________________________ (f_ster_div_single)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 + First_wall_area_fraction________________________________________________ (1-f_ster_div_single-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -1800,7 +1800,7 @@ Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP - Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 + Solid_angle_fraction_taken_by_on_divertor_______________________________ (f_ster_div_single)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 @@ -1924,9 +1924,9 @@ Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 4.0732E+01 OP # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 - Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 + Divertor_area_fraction_of_whole_toroid_surface__________________________ (f_ster_div_single)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 + First_wall_area_fraction________________________________________________ (1-f_ster_div_single-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -2795,7 +2795,7 @@ Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP - Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 + Solid_angle_fraction_taken_by_on_divertor_______________________________ (f_ster_div_single)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 @@ -2919,9 +2919,9 @@ Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 4.0732E+01 OP # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 - Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 + Divertor_area_fraction_of_whole_toroid_surface__________________________ (f_ster_div_single)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 + First_wall_area_fraction________________________________________________ (1-f_ster_div_single-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -3790,7 +3790,7 @@ Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP - Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 + Solid_angle_fraction_taken_by_on_divertor_______________________________ (f_ster_div_single)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 @@ -3914,9 +3914,9 @@ Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 4.0732E+01 OP # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 - Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 + Divertor_area_fraction_of_whole_toroid_surface__________________________ (f_ster_div_single)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 + First_wall_area_fraction________________________________________________ (1-f_ster_div_single-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -4785,7 +4785,7 @@ Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP - Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 + Solid_angle_fraction_taken_by_on_divertor_______________________________ (f_ster_div_single)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 @@ -4909,9 +4909,9 @@ Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 4.0732E+01 OP # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 - Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 + Divertor_area_fraction_of_whole_toroid_surface__________________________ (f_ster_div_single)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 + First_wall_area_fraction________________________________________________ (1-f_ster_div_single-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -5780,7 +5780,7 @@ Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP - Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 + Solid_angle_fraction_taken_by_on_divertor_______________________________ (f_ster_div_single)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 @@ -5904,9 +5904,9 @@ Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 4.0732E+01 OP # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 - Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 + Divertor_area_fraction_of_whole_toroid_surface__________________________ (f_ster_div_single)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 + First_wall_area_fraction________________________________________________ (1-f_ster_div_single-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -6775,7 +6775,7 @@ Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP - Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 + Solid_angle_fraction_taken_by_on_divertor_______________________________ (f_ster_div_single)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 @@ -6899,9 +6899,9 @@ Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 4.0732E+01 OP # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 - Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 + Divertor_area_fraction_of_whole_toroid_surface__________________________ (f_ster_div_single)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 + First_wall_area_fraction________________________________________________ (1-f_ster_div_single-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -7770,7 +7770,7 @@ Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP - Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 + Solid_angle_fraction_taken_by_on_divertor_______________________________ (f_ster_div_single)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 @@ -7894,9 +7894,9 @@ Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 4.0732E+01 OP # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 - Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 + Divertor_area_fraction_of_whole_toroid_surface__________________________ (f_ster_div_single)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 + First_wall_area_fraction________________________________________________ (1-f_ster_div_single-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP @@ -8765,7 +8765,7 @@ Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9990E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.7209E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP - Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 + Solid_angle_fraction_taken_by_on_divertor_______________________________ (f_ster_div_single)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 @@ -8889,9 +8889,9 @@ Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 4.0732E+01 OP # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 - Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 + Divertor_area_fraction_of_whole_toroid_surface__________________________ (f_ster_div_single)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 + First_wall_area_fraction________________________________________________ (1-f_ster_div_single-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 29f29e1a81..9c9e10dae6 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -1920,7 +1920,7 @@ "FLT_DEFAULT", "FLT_DEFAULT" ], - "fdiv": 0.115, + "f_ster_div_single": 0.115, "fdiva": 1.11, "fdivcol": 1.0, "fdivwet": 0.333333333333333, @@ -9527,7 +9527,7 @@ "f_deuterium": "deuterium fuel fraction", "fdfs": "radial gradient ratio", "fdiags": "", - "fdiv": "Solid angle fraction taken by one divertor", + "f_ster_div_single": "Solid angle fraction taken by one divertor", "fdiva": "divertor area fudge factor (for ITER, Sept 1990)", "fdivcol": "f-value for divertor collisionality (`constraint equation 22`, `iteration variable 34`)", "fdivwet": "wetted fraction of the divertor area", @@ -12621,7 +12621,7 @@ "lb": 0.0, "ub": 20.0 }, - "fdiv": { + "f_ster_div_single": { "lb": 0.0, "ub": 1.0 }, @@ -18021,7 +18021,7 @@ "emult", "emultmw", "fblss", - "fdiv", + "f_ster_div_single", "f_a_fw_hcd", "fhole", "i_fw_blkt_vv_shape", @@ -20263,7 +20263,7 @@ "fdene": "real_variable", "f_deuterium": "real_variable", "fdfs": "real_variable", - "fdiv": "real_variable", + "f_ster_div_single": "real_variable", "fdiva": "real_variable", "fdivcol": "real_variable", "fdivwet": "real_variable", diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index d4d1a48782..83b6ed36ec 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2306,7 +2306,7 @@ etaiso = 0.9 * DESCRIPTION: Isentropic efficiency of FW and blanket coolant pumps (default = 0.85) * JUSTIFICATION: Not set as not used -*fdiv = +*f_ster_div_single = * DESCRIPTION: Solid angle fraction taken by one divertor * JUSTIFICATION: Not yet set diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index c97e17f86a..9a8ee17d6d 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -979,7 +979,7 @@ Blanket_exponential_factor______________________________________________ (exp_blanket)_________________ 9.9936E-01 OP Shield:_first_exponential_______________________________________________ (exp_shield1)_________________ 1.9523E-03 OP Shield:_second_exponential______________________________________________ (exp_shield2)_________________ 2.5427E-01 OP - Solid_angle_fraction_taken_by_on_divertor_______________________________ (fdiv)________________________ 1.1500E-01 + Solid_angle_fraction_taken_by_on_divertor_______________________________ (f_ster_div_single)________________________ 1.1500E-01 Switch_for_plant_secondary_cycle________________________________________ (i_thermal_electric_conversion)_____________ 2 First_wall_coolant_pressure_(Pa)________________________________________ (pres_fw_coolant)__________________ 1.5500E+07 Blanket_coolant_pressure_(Pa)___________________________________________ (pres_blkt_coolant)__________________ 1.5500E+07 @@ -1105,9 +1105,9 @@ Electric_power_for_cryogenic_plant_(MW)_________________________________ (crypmw)______________________ 3.6515E+01 OP # Plant Power / Heat Transport Balance # Neutron_power_multiplication_in_blanket_________________________________ (emult)_______________________ 1.2690E+00 - Divertor_area_fraction_of_whole_toroid_surface__________________________ (fdiv)________________________ 1.1500E-01 + Divertor_area_fraction_of_whole_toroid_surface__________________________ (f_ster_div_single)________________________ 1.1500E-01 H/CD_apparatus_+_diagnostics_area_fraction______________________________ (f_a_fw_hcd)________________________ 0.0000E+00 - First_wall_area_fraction________________________________________________ (1-fdiv-f_a_fw_hcd)_________________ 8.8500E-01 + First_wall_area_fraction________________________________________________ (1-f_ster_div_single-f_a_fw_hcd)_________________ 8.8500E-01 Switch_for_pumping_of_primary_coolant___________________________________ (i_coolant_pumping)_____________ 3 Mechanical_pumping_power_for_FW_cooling_loop_including_heat_exchanger_(M (htpmw_fw)____________________ 0.0000E+00 OP Mechanical_pumping_power_for_blanket_cooling_loop_including_heat_exchang (htpmw_blkt)__________________ 0.0000E+00 OP diff --git a/tests/unit/test_blanket_library.py b/tests/unit/test_blanket_library.py index 9c73a19cea..190feedc38 100644 --- a/tests/unit/test_blanket_library.py +++ b/tests/unit/test_blanket_library.py @@ -1170,7 +1170,7 @@ class ApplyCoverageFactorsParam(NamedTuple): shareaib: Any = None shareaob: Any = None sharea: Any = None - fdiv: Any = None + f_ster_div_single: Any = None f_a_fw_hcd: Any = None vol_blkt_outboard: Any = None vol_blkt_inboard: Any = None @@ -1204,7 +1204,7 @@ class ApplyCoverageFactorsParam(NamedTuple): shareaib=700.06731267447844, shareaob=1344.1106481995357, sharea=2044.1779608740142, - fdiv=0.115, + f_ster_div_single=0.115, f_a_fw_hcd=0, vol_blkt_outboard=1020.3677420460117, vol_blkt_inboard=315.83946385183026, @@ -1249,7 +1249,9 @@ def test_apply_coverage_factors( monkeypatch.setattr(build_variables, "shareaib", applycoveragefactorsparam.shareaib) monkeypatch.setattr(build_variables, "shareaob", applycoveragefactorsparam.shareaob) monkeypatch.setattr(build_variables, "sharea", applycoveragefactorsparam.sharea) - monkeypatch.setattr(fwbs_variables, "fdiv", applycoveragefactorsparam.fdiv) + monkeypatch.setattr( + fwbs_variables, "f_ster_div_single", applycoveragefactorsparam.f_ster_div_single + ) monkeypatch.setattr( fwbs_variables, "f_a_fw_hcd", applycoveragefactorsparam.f_a_fw_hcd ) @@ -1503,7 +1505,7 @@ class BlanketModPolHeightParam(NamedTuple): dr_fw_plasma_gap_outboard: Any = None i_fw_blkt_vv_shape: Any = None n_blkt_inboard_modules_poloidal: Any = None - fdiv: Any = None + f_ster_div_single: Any = None n_blkt_outboard_modules_poloidal: Any = None itart: Any = None rminor: Any = None @@ -1525,7 +1527,7 @@ class BlanketModPolHeightParam(NamedTuple): dr_fw_plasma_gap_outboard=0.25, i_fw_blkt_vv_shape=2, n_blkt_inboard_modules_poloidal=7, - fdiv=0.115, + f_ster_div_single=0.115, n_blkt_outboard_modules_poloidal=8, itart=0, rminor=2.6666666666666665, @@ -1543,7 +1545,7 @@ class BlanketModPolHeightParam(NamedTuple): dr_fw_plasma_gap_outboard=0.10000000000000001, i_fw_blkt_vv_shape=1, n_blkt_inboard_modules_poloidal=7, - fdiv=0.115, + f_ster_div_single=0.115, n_blkt_outboard_modules_poloidal=8, itart=1, rminor=2.5, @@ -1594,7 +1596,9 @@ def test_blanket_mod_pol_height( "n_blkt_inboard_modules_poloidal", blanketmodpolheightparam.n_blkt_inboard_modules_poloidal, ) - monkeypatch.setattr(fwbs_variables, "fdiv", blanketmodpolheightparam.fdiv) + monkeypatch.setattr( + fwbs_variables, "f_ster_div_single", blanketmodpolheightparam.f_ster_div_single + ) monkeypatch.setattr( fwbs_variables, "n_blkt_outboard_modules_poloidal", diff --git a/tests/unit/test_ccfe_hcpb.py b/tests/unit/test_ccfe_hcpb.py index ce349d2ff4..a8c13239f7 100644 --- a/tests/unit/test_ccfe_hcpb.py +++ b/tests/unit/test_ccfe_hcpb.py @@ -717,7 +717,7 @@ def test_nuclear_heating_shield(nuclearheatingshieldparam, monkeypatch, ccfe_hcp class NuclearHeatingDivertorParam(NamedTuple): - fdiv: Any = None + f_ster_div_single: Any = None p_div_nuclear_heat_total_mw: Any = None @@ -736,7 +736,7 @@ class NuclearHeatingDivertorParam(NamedTuple): "nuclearheatingdivertorparam", ( NuclearHeatingDivertorParam( - fdiv=0.115, + f_ster_div_single=0.115, p_div_nuclear_heat_total_mw=0, p_fw_hcd_nuclear_heat_mw=0, idivrt=1, @@ -745,7 +745,7 @@ class NuclearHeatingDivertorParam(NamedTuple): expected_p_div_nuclear_heat_total_mw=182.71773382328519, ), NuclearHeatingDivertorParam( - fdiv=0.115, + f_ster_div_single=0.115, p_div_nuclear_heat_total_mw=182.71773382328519, p_fw_hcd_nuclear_heat_mw=0, idivrt=1, @@ -768,7 +768,11 @@ def test_nuclear_heating_divertor(nuclearheatingdivertorparam, monkeypatch, ccfe :type monkeypatch: _pytest.monkeypatch.monkeypatch """ - monkeypatch.setattr(fwbs_variables, "fdiv", nuclearheatingdivertorparam.fdiv) + monkeypatch.setattr( + fwbs_variables, + "f_ster_div_single", + nuclearheatingdivertorparam.f_ster_div_single, + ) monkeypatch.setattr( fwbs_variables, @@ -804,7 +808,7 @@ class PowerflowCalcParam(NamedTuple): porbitlossmw: Any = None - fdiv: Any = None + f_ster_div_single: Any = None p_div_rad_total_mw: Any = None @@ -900,7 +904,7 @@ class PowerflowCalcParam(NamedTuple): a_fw_outboard=988.92586580655245, a_fw_total=1601.1595634509963, porbitlossmw=0, - fdiv=0.115, + f_ster_div_single=0.115, p_div_rad_total_mw=0, p_fw_hcd_rad_total_mw=0, f_a_fw_hcd=0, @@ -949,7 +953,7 @@ class PowerflowCalcParam(NamedTuple): a_fw_outboard=1168.1172772224481, a_fw_total=1891.2865102700493, porbitlossmw=0, - fdiv=0.115, + f_ster_div_single=0.115, p_div_rad_total_mw=33.056596978820579, p_fw_hcd_rad_total_mw=0, f_a_fw_hcd=0, @@ -1019,7 +1023,9 @@ def test_powerflow_calc(powerflowcalcparam, monkeypatch, ccfe_hcpb): current_drive_variables, "porbitlossmw", powerflowcalcparam.porbitlossmw ) - monkeypatch.setattr(fwbs_variables, "fdiv", powerflowcalcparam.fdiv) + monkeypatch.setattr( + fwbs_variables, "f_ster_div_single", powerflowcalcparam.f_ster_div_single + ) monkeypatch.setattr( fwbs_variables, "p_div_rad_total_mw", powerflowcalcparam.p_div_rad_total_mw diff --git a/tests/unit/test_dcll.py b/tests/unit/test_dcll.py index 988fc52edb..aa1544ac88 100644 --- a/tests/unit/test_dcll.py +++ b/tests/unit/test_dcll.py @@ -31,7 +31,7 @@ class DcllNeutronicsAndPowerParam(NamedTuple): porbitlossmw: Any = None - fdiv: Any = None + f_ster_div_single: Any = None p_div_rad_total_mw: Any = None @@ -93,7 +93,7 @@ class DcllNeutronicsAndPowerParam(NamedTuple): a_fw_outboard=988.92586580655245, a_fw_total=1601.1595634509963, porbitlossmw=0, - fdiv=0.115, + f_ster_div_single=0.115, p_div_rad_total_mw=0, p_div_nuclear_heat_total_mw=0, f_a_fw_hcd=0, @@ -125,7 +125,7 @@ class DcllNeutronicsAndPowerParam(NamedTuple): a_fw_outboard=1168.1172772224481, a_fw_total=1891.2865102700493, porbitlossmw=0, - fdiv=0.115, + f_ster_div_single=0.115, p_div_rad_total_mw=33.056596978820579, p_div_nuclear_heat_total_mw=182.58994516305046, f_a_fw_hcd=0, @@ -182,7 +182,11 @@ def test_dcll_neutronics_and_power(dcllneutronicsandpowerparam, monkeypatch, dcl dcllneutronicsandpowerparam.porbitlossmw, ) - monkeypatch.setattr(fwbs_variables, "fdiv", dcllneutronicsandpowerparam.fdiv) + monkeypatch.setattr( + fwbs_variables, + "f_ster_div_single", + dcllneutronicsandpowerparam.f_ster_div_single, + ) monkeypatch.setattr( fwbs_variables, diff --git a/tests/unit/test_power.py b/tests/unit/test_power.py index 57390ccbb7..3892982124 100644 --- a/tests/unit/test_power.py +++ b/tests/unit/test_power.py @@ -2057,7 +2057,7 @@ class Power2Param(NamedTuple): p_div_rad_total_mw: Any = None - fdiv: Any = None + f_ster_div_single: Any = None f_a_fw_hcd: Any = None @@ -2250,7 +2250,7 @@ class Power2Param(NamedTuple): etahtp=0.87000000000000011, emult=1.2690000534057617, p_div_rad_total_mw=33.119482558354782, - fdiv=0.115, + f_ster_div_single=0.115, f_a_fw_hcd=0, i_thermal_electric_conversion=2, pnuc_cp=0, @@ -2352,7 +2352,7 @@ class Power2Param(NamedTuple): etahtp=0.87000000000000011, emult=1.2690000534057617, p_div_rad_total_mw=33.119482558354782, - fdiv=0.115, + f_ster_div_single=0.115, f_a_fw_hcd=0, i_thermal_electric_conversion=2, pnuc_cp=0, @@ -2488,7 +2488,9 @@ def test_power2(power2param, monkeypatch, power): fwbs_variables, "p_div_rad_total_mw", power2param.p_div_rad_total_mw ) - monkeypatch.setattr(fwbs_variables, "fdiv", power2param.fdiv) + monkeypatch.setattr( + fwbs_variables, "f_ster_div_single", power2param.f_ster_div_single + ) monkeypatch.setattr(fwbs_variables, "f_a_fw_hcd", power2param.f_a_fw_hcd) diff --git a/tests/unit/test_stellarator.py b/tests/unit/test_stellarator.py index 789bd36193..eed3d301ef 100644 --- a/tests/unit/test_stellarator.py +++ b/tests/unit/test_stellarator.py @@ -272,7 +272,7 @@ class StbildParam(NamedTuple): blktmodel: Any = None - fdiv: Any = None + f_ster_div_single: Any = None f_a_fw_hcd: Any = None @@ -375,7 +375,7 @@ class StbildParam(NamedTuple): required_radial_space=0, radius_fw_channel=0.0060000000000000001, blktmodel=0, - fdiv=0.115, + f_ster_div_single=0.115, f_a_fw_hcd=0, fhole=0, dr_fw_wall=0.0030000000000000001, @@ -445,7 +445,7 @@ class StbildParam(NamedTuple): required_radial_space=2.0332922403587861, radius_fw_channel=0.0060000000000000001, blktmodel=0, - fdiv=0.021924555536480182, + f_ster_div_single=0.021924555536480182, f_a_fw_hcd=0, fhole=0, dr_fw_wall=0.0030000000000000001, @@ -591,7 +591,9 @@ def test_stbild(stbildparam, monkeypatch, stellarator): monkeypatch.setattr(fwbs_variables, "blktmodel", stbildparam.blktmodel) - monkeypatch.setattr(fwbs_variables, "fdiv", stbildparam.fdiv) + monkeypatch.setattr( + fwbs_variables, "f_ster_div_single", stbildparam.f_ster_div_single + ) monkeypatch.setattr(fwbs_variables, "f_a_fw_hcd", stbildparam.f_a_fw_hcd) From 03ebd8a2b8024b90d2296a6f91a0d319cc809aa3 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 18 Feb 2025 16:03:24 +0000 Subject: [PATCH 61/74] :memo: Update documentation to include standards for solid angles and clarify magnetic field strength prefix --- documentation/proc-pages/development/standards.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/documentation/proc-pages/development/standards.md b/documentation/proc-pages/development/standards.md index fba170b8d0..8daf908309 100644 --- a/documentation/proc-pages/development/standards.md +++ b/documentation/proc-pages/development/standards.md @@ -312,7 +312,7 @@ This should be used for units of $\text{kg} \cdot \text{m}^{-2}\text{s}^{-1}$ ##### Magnetic field strengths -- Magnetic field strengths should start with the `b_` +- Magnetic field strengths should start with the `b_` prefix --------------------- @@ -337,6 +337,12 @@ This should be used for units of $\text{kg} \cdot \text{m}^{-2}\text{s}^{-1}$ --------------------- +##### Solid Angles + +- Solid angles should start with the `ster_` prefix. Short for steradians. + +--------------------- + ##### Lifetimes - Lifetimes of components should start with the `life_` prefix. From 0b7db1e5a79d24c0297505b6284d00c4d8eeeb6f Mon Sep 17 00:00:00 2001 From: mn3981 Date: Tue, 18 Feb 2025 16:05:33 +0000 Subject: [PATCH 62/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20li6enrich=20to=20?= =?UTF-8?q?f=5Fblkt=5Fli6=5Fenrichment=20for=20clarity=20and=20consistency?= =?UTF-8?q?=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/caller.py | 2 +- process/costs_2015.py | 4 ++-- process/hcpb.py | 13 ++++++---- process/io/mfile_comparison.py | 2 +- process/output.py | 2 +- process/stellarator.py | 9 ++++--- source/fortran/fwbs_variables.f90 | 4 ++-- source/fortran/input.f90 | 6 ++--- source/fortran/iteration_variables.f90 | 12 +++++----- source/fortran/numerics.f90 | 2 +- tests/integration/ref_dicts.json | 24 +++++++++---------- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/test_ccfe_hcpb.py | 6 ++--- 13 files changed, 48 insertions(+), 40 deletions(-) diff --git a/process/caller.py b/process/caller.py index d7d56e6cb7..be6f9b2362 100644 --- a/process/caller.py +++ b/process/caller.py @@ -291,7 +291,7 @@ def _call_models_once(self, xc: np.ndarray) -> None: self.models.ccfe_hcpb.run(output=False) ft.fwbs_variables.tbr = self.models.ccfe_hcpb.tbr_shimwell( ft.fwbs_variables.breeder_f, - ft.fwbs_variables.li6enrich, + ft.fwbs_variables.f_blkt_li6_enrichment, ft.fwbs_variables.iblanket_thickness, output=False, ) diff --git a/process/costs_2015.py b/process/costs_2015.py index bd68fd6fc4..6537da91cb 100644 --- a/process/costs_2015.py +++ b/process/costs_2015.py @@ -269,11 +269,11 @@ def calc_fwbs_costs(self): self.s_label[21] = "Lithium enrichment" # Zero cost for natural enrichment - if fwbs_variables.li6enrich <= 7.42e0: + if fwbs_variables.f_blkt_li6_enrichment <= 7.42e0: self.s_cost[21] = 0.0e0 else: # Percentage of lithium 6 in the product - product_li6 = min(fwbs_variables.li6enrich, 99.99e0) / 100.0e0 + product_li6 = min(fwbs_variables.f_blkt_li6_enrichment, 99.99e0) / 100.0e0 # SWU will be calculated for a unit mass of product (P=1) # Feed to product mass ratio diff --git a/process/hcpb.py b/process/hcpb.py index 5ec410231c..e16de6cfb3 100644 --- a/process/hcpb.py +++ b/process/hcpb.py @@ -1117,11 +1117,13 @@ def st_centrepost_nuclear_heating(self, pneut, sh_width): return pnuc_cp_tf, pnuc_cp_sh, pnuc_cp - def tbr_shimwell(self, breeder_f, li6enrich, iblanket_thickness, output: bool): + def tbr_shimwell( + self, breeder_f, f_blkt_li6_enrichment, iblanket_thickness, output: bool + ): """Calculates TBR author: Michael Kovari breeder_f : input real : Volume of Li4SiO4 / (Volume of Be12Ti + Li4SiO4) - li6enrich : input real : lithium-6 enrichment (%) + f_blkt_li6_enrichment : input real : lithium-6 enrichment (%) iblanket_thickness : input integer : blanket thickness switch tbr : output real : 5-year time-averaged tritium breeding ratio """ @@ -1149,7 +1151,7 @@ def tbr_shimwell(self, breeder_f, li6enrich, iblanket_thickness, output: bool): v18 = [0.18795823903, 0.198976219881, 0.190845918447] v19 = [-0.0256707269253, -0.0192924115968, -0.0257699008284] - y = li6enrich / 100 + y = f_blkt_li6_enrichment / 100 tbr = ( v1[iblanket_thickness - 1] + v2[iblanket_thickness - 1] * breeder_f @@ -1174,7 +1176,10 @@ def tbr_shimwell(self, breeder_f, li6enrich, iblanket_thickness, output: bool): if output: po.ovarrf( - self.outfile, "Lithium-6 enrichment (%)", "(li6enrich)", li6enrich + self.outfile, + "Lithium-6 enrichment (%)", + "(f_blkt_li6_enrichment)", + f_blkt_li6_enrichment, ) po.ovarrf( self.outfile, diff --git a/process/io/mfile_comparison.py b/process/io/mfile_comparison.py index b2916dded3..c99fe35613 100644 --- a/process/io/mfile_comparison.py +++ b/process/io/mfile_comparison.py @@ -203,7 +203,7 @@ "pnucshld", "p_div_nuclear_heat_total_mw", "tbr", - "li6enrich", + "f_blkt_li6_enrichment", "a_fw_total", "emult", ] diff --git a/process/output.py b/process/output.py index 8ac5e1bf8c..cb0e3bcd48 100644 --- a/process/output.py +++ b/process/output.py @@ -98,7 +98,7 @@ def write(models, _outfile): models.ccfe_hcpb.run(output=True) ft.fwbs_variables.tbr = models.ccfe_hcpb.tbr_shimwell( ft.fwbs_variables.breeder_f, - ft.fwbs_variables.li6enrich, + ft.fwbs_variables.f_blkt_li6_enrichment, ft.fwbs_variables.iblanket_thickness, output=True, ) diff --git a/process/stellarator.py b/process/stellarator.py index c6f817b50d..a3c7671691 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -1066,7 +1066,10 @@ def blanket_neutronics(self): # Tritium breeding ratio fwbs_variables.tbr = self.hcpb.tbr_shimwell( - fwbs_variables.vol_blkt_total, fwbs_variables.li6enrich, 1, output=False + fwbs_variables.vol_blkt_total, + fwbs_variables.f_blkt_li6_enrichment, + 1, + output=False, ) # Use older model to calculate neutron fluence since it @@ -2122,8 +2125,8 @@ def stfwbs(self, output: bool): po.ovarre( self.outfile, "Lithium-6 enrichment (%)", - "(li6enrich)", - fwbs_variables.li6enrich, + "(f_blkt_li6_enrichment)", + fwbs_variables.f_blkt_li6_enrichment, ) po.ovarre( self.outfile, "Tritium breeding ratio", "(tbr)", fwbs_variables.tbr diff --git a/source/fortran/fwbs_variables.f90 b/source/fortran/fwbs_variables.f90 index 73fcd5246c..41b29a7c53 100644 --- a/source/fortran/fwbs_variables.f90 +++ b/source/fortran/fwbs_variables.f90 @@ -103,7 +103,7 @@ module fwbs_variables real(dp) :: qnuc !! nuclear heating in the coils (W) (`inuclear=1`) - real(dp) :: li6enrich + real(dp) :: f_blkt_li6_enrichment !! lithium-6 enrichment of breeding material (%) real(dp) :: p_blkt_nuclear_heat_total_mw @@ -686,7 +686,7 @@ subroutine init_fwbs_variables i_blkt_inboard = 1 inuclear = 0 qnuc = 0.0D0 - li6enrich = 30.0D0 + f_blkt_li6_enrichment = 30.0D0 p_blkt_nuclear_heat_total_mw = 0.0D0 p_div_nuclear_heat_total_mw = 0.0D0 p_fw_nuclear_heat_total_mw = 0.0D0 diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index eeb63a02f6..9152cb4978 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -217,7 +217,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) npdiv, f_fw_peak, i_coolant_pumping, dr_pf_cryostat, i_thermal_electric_conversion, secondary_cycle_liq, & denstl, declfw, nphcdout, i_blkt_inboard, vfpblkt, temp_fw_coolant_in, wallpf, fblbe, & fhole, i_fw_blkt_vv_shape, coolp, temp_fw_max, irefprop, len_fw_channel, & - li6enrich, etaiso, n_blkt_outboard_modules_toroidal, fvoldw, i_shield_mat, i_bb_liq, & + f_blkt_li6_enrichment, etaiso, n_blkt_outboard_modules_toroidal, fvoldw, i_shield_mat, i_bb_liq, & icooldual, ifci, inlet_temp_liq, outlet_temp_liq, bz_channel_conduct_liq, i_fw_blkt_shared_coolant, ims, & i_blkt_coolant_type, emult use heat_transport_variables, only: htpmw_fw, baseel, fmgdmw, htpmw_div, & @@ -2140,8 +2140,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) call parse_real_variable('qnuc', qnuc, 0.0D0, 1.0D6, & 'nuclear heating in the coils (W)') - case ('li6enrich') - call parse_real_variable('li6enrich', li6enrich, 7.40D0, 100.0D0, & + case ('f_blkt_li6_enrichment') + call parse_real_variable('f_blkt_li6_enrichment', f_blkt_li6_enrichment, 7.40D0, 100.0D0, & 'Li-6 enrichment') ! CCFE hcpb BB module (also includes the CP shielding for ST) diff --git a/source/fortran/iteration_variables.f90 b/source/fortran/iteration_variables.f90 index 06918bbafe..cbdb1ff5b4 100755 --- a/source/fortran/iteration_variables.f90 +++ b/source/fortran/iteration_variables.f90 @@ -2185,25 +2185,25 @@ end subroutine set_itv_97 !--------------------------------- subroutine init_itv_98 - !!
  • (98) li6enrich + !!
  • (98) f_blkt_li6_enrichment use numerics, only: lablxc, boundl, boundu implicit none - lablxc(98) = 'li6enrich ' + lablxc(98) = 'f_blkt_li6_enrichment ' boundl(98) = 10.00D0 boundu(98) = 100.0D0 end subroutine init_itv_98 real(kind(1.d0)) function itv_98() - use fwbs_variables, only: li6enrich + use fwbs_variables, only: f_blkt_li6_enrichment implicit none - itv_98 = li6enrich + itv_98 = f_blkt_li6_enrichment end function itv_98 subroutine set_itv_98(ratio) - use fwbs_variables, only: li6enrich + use fwbs_variables, only: f_blkt_li6_enrichment implicit none real(kind(1.d0)) :: ratio - li6enrich = ratio + f_blkt_li6_enrichment = ratio end subroutine set_itv_98 !!
  • (99) NOT USED diff --git a/source/fortran/numerics.f90 b/source/fortran/numerics.f90 index 3f71b9bf36..55d872c6d9 100755 --- a/source/fortran/numerics.f90 +++ b/source/fortran/numerics.f90 @@ -303,7 +303,7 @@ module numerics !!
  • (95) fptfnuc (f-value for equation 54) !!
  • (96) fvvhe (f-value for equation 55) !!
  • (97) fpsepr (f-value for equation 56) - !!
  • (98) li6enrich + !!
  • (98) f_blkt_li6_enrichment !!
  • (99) NOT USED !!
  • (100) NOT USED !!
  • (101) NOT USED diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 9c9e10dae6..65c3dd9a70 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3216,7 +3216,7 @@ "lfn_": 256.0, "lh": null, "lhat": 4.33, - "li6enrich": 30.0, + "f_blkt_li6_enrichment": 30.0, "life_dpa": 50.0, "light_build_cost_per_vol": 270.0, "line": "", @@ -9956,8 +9956,8 @@ "ksic": "power fraction for outboard double-null scrape-off plasma", "lablcc": "lablcc(ipeqns) : labels describing constraint equations (corresponding itvs)
      \n
      \n
    • ( 1) Beta (consistency equation) (itv 5)\n
    • ( 2) Global power balance (consistency equation) (itv 10,1,2,3,4,6,11)\n
    • ( 3) Ion power balance DEPRECATED (itv 10,1,2,3,4,6,11)\n
    • ( 4) Electron power balance DEPRECATED (itv 10,1,2,3,4,6,11)\n
    • ( 5) Density upper limit (itv 9,1,2,3,4,5,6)\n
    • ( 6) (Epsilon x beta poloidal) upper limit (itv 8,1,2,3,4,6)\n
    • ( 7) Beam ion density (NBI) (consistency equation) (itv 7)\n
    • ( 8) Neutron wall load upper limit (itv 14,1,2,3,4,6)\n
    • ( 9) Fusion power upper limit (itv 26,1,2,3,4,6)\n
    • (10) Toroidal field 1/R (consistency equation) (itv 12,1,2,3,13 )\n
    • (11) Radial build (consistency equation) (itv 3,1,13,16,29,42,61)\n
    • (12) Volt second lower limit (STEADY STATE) (itv 15,1,2,3)\n
    • (13) Burn time lower limit (PULSE) (itv 21,1,16,17,29,42,44,61)\n (itv 19,1,2,3,6)\n
    • (14) Neutral beam decay lengths to plasma centre (NBI) (consistency equation)\n
    • (15) LH power threshold limit (itv 103)\n
    • (16) Net electric power lower limit (itv 25,1,2,3)\n
    • (17) Radiation fraction upper limit (itv 28)\n
    • (18) Divertor heat load upper limit (itv 27)\n
    • (19) MVA upper limit (itv 30)\n
    • (20) Neutral beam tangency radius upper limit (NBI) (itv 33,31,3,13)\n
    • (21) Plasma minor radius lower limit (itv 32)\n
    • (22) Divertor collisionality upper limit (itv 34,43)\n
    • (23) Conducting shell to plasma minor radius ratio upper limit\n (itv 104,1,74)\n
    • (24) Beta upper limit (itv 36,1,2,3,4,6,18)\n
    • (25) Peak toroidal field upper limit (itv 35,3,13,29)\n
    • (26) Central solenoid EOF current density upper limit (i_pf_conductor=0)\n (itv 38,37,41,12)\n
    • (27) Central solenoid BOP current density upper limit (i_pf_conductor=0)\n (itv 39,37,41,12)\n
    • (28) Fusion gain Q lower limit (itv 45,47,40)\n
    • (29) Inboard radial build consistency (itv 3,1,13,16,29,42,61)\n
    • (30) Injection power upper limit (itv 46,47,11)\n
    • (31) TF coil case stress upper limit (SCTF) (itv 48,56,57,58,59,60,24)\n
    • (32) TF coil conduit stress upper limit (SCTF) (itv 49,56,57,58,59,60,24)\n
    • (33) I_op / I_critical (TF coil) (SCTF) (itv 50,56,57,58,59,60,24)\n
    • (34) Dump voltage upper limit (SCTF) (itv 51,52,56,57,58,59,60,24)\n
    • (35) J_winding pack/J_protection upper limit (SCTF) (itv 53,56,57,58,59,60,24)\n
    • (36) TF coil temperature margin lower limit (SCTF) (itv 54,55,56,57,58,59,60,24)\n
    • (37) Current drive gamma upper limit (itv 40,47)\n
    • (38) First wall coolant temperature rise upper limit (itv 62)\n
    • (39) First wall peak temperature upper limit (itv 63)\n
    • (40) Start-up injection power lower limit (PULSE) (itv 64)\n
    • (41) Plasma current ramp-up time lower limit (PULSE) (itv 66,65)\n
    • (42) Cycle time lower limit (PULSE) (itv 17,67,65)\n
    • (43) Average centrepost temperature\n (TART) (consistency equation) (itv 13,20,69,70)\n
    • (44) Peak centrepost temperature upper limit (TART) (itv 68,69,70)\n
    • (45) Edge safety factor lower limit (TART) (itv 71,1,2,3)\n
    • (46) Equation for Ip/Irod upper limit (TART) (itv 72,2,60)\n
    • (47) NOT USED\n
    • (48) Poloidal beta upper limit (itv 79,2,3,18)\n
    • (49) NOT USED\n
    • (50) IFE repetition rate upper limit (IFE)\n
    • (51) Startup volt-seconds consistency (PULSE) (itv 16,29,3,1)\n
    • (52) Tritium breeding ratio lower limit (itv 89,90,91)\n
    • (53) Neutron fluence on TF coil upper limit (itv 92,93,94)\n
    • (54) Peak TF coil nuclear heating upper limit (itv 95,93,94)\n
    • (55) Vacuum vessel helium concentration upper limit i_blanket_type =2 (itv 96,93,94)\n
    • (56) Pseparatrix/Rmajor upper limit (itv 97,1,3)\n
    • (57) NOT USED\n
    • (58) NOT USED\n
    • (59) Neutral beam shine-through fraction upper limit (NBI) (itv 105,6,19,4 )\n
    • (60) Central solenoid temperature margin lower limit (SCTF) (itv 106)\n
    • (61) Minimum availability value (itv 107)\n
    • (62) f_alpha_energy_confinement the ratio of particle to energy confinement times (itv 110)\n
    • (63) The number of ITER-like vacuum pumps niterpump < tfno (itv 111)\n
    • (64) Zeff less than or equal to zeffmax (itv 112)\n
    • (65) Dump time set by VV loads (itv 56, 113)\n
    • (66) Limit on rate of change of energy in poloidal field\n (Use iteration variable 65(t_current_ramp_up), 115)\n
    • (67) Simple Radiation Wall load limit (itv 116, 4,6)\n
    • (68) Psep * Bt / qAR upper limit (itv 117)\n
    • (69) ensure separatrix power = the value from Kallenbach divertor (itv 118)\n
    • (70) ensure that teomp = separatrix temperature in the pedestal profile,\n (itv 119 (tesep))\n
    • (71) ensure that neomp = separatrix density (nesep) x neratio\n
    • (72) central solenoid shear stress limit (Tresca yield criterion) (itv 123 foh_stress)\n
    • (73) Psep >= Plh + Paux (itv 137 (fplhsep))\n
    • (74) TFC quench < tmax_croco (itv 141 (fcqt))\n
    • (75) TFC current/copper area < Maximum (itv 143 f_coppera_m2)\n
    • (76) Eich critical separatrix density\n
    • (77) TF coil current per turn upper limit\n
    • (78) Reinke criterion impurity fraction lower limit (itv 147 freinke)\n
    • (79) Peak CS field upper limit (itv 149 fb_cs_limit_max)\n
    • (80) Divertor power lower limit pdivt (itv 153 fpdivlim)\n
    • (81) Ne(0) > ne(ped) constraint (itv 154 fne0)\n
    • (82) toroidalgap > tftort constraint (itv 171 ftoroidalgap)\n
    • (83) Radial build consistency for stellarators (itv 172 f_avspace)\n
    • (84) Lower limit for beta (itv 173 fbeta_min)\n
    • (85) Constraint for CP lifetime\n
    • (86) Constraint for TF coil turn dimension\n
    • (87) Constraint for cryogenic power\n
    • (88) Constraint for TF coil strain absolute value\n
    • (89) Constraint for CS coil quench protection\n
    • (90) Checking if the design point is ECRH ignitable (itv 164 fecrh_ignition)
    \n\n\n\n", "lablmm": "lablmm(ipnfoms) : labels describing figures of merit:
      \n
      \n
    • ( 1) major radius\n
    • ( 2) not used\n
    • ( 3) neutron wall load\n
    • ( 4) P_tf + P_pf\n
    • ( 5) fusion gain Q\n
    • ( 6) cost of electricity\n
    • ( 7) capital cost (direct cost if ireactor=0,\n constructed cost otherwise)\n
    • ( 8) aspect ratio\n
    • ( 9) divertor heat load\n
    • (10) toroidal field\n
    • (11) total injected power\n
    • (12) hydrogen plant capital cost OBSOLETE\n
    • (13) hydrogen production rate OBSOLETE\n
    • (14) pulse length\n
    • (15) plant availability factor (N.B. requires\n iavail=1 to be set)\n
    • (16) linear combination of major radius (minimised) and pulse length (maximised)\n note: FoM should be minimised only!\n
    • (17) net electrical output\n
    • (18) Null Figure of Merit\n
    • (19) linear combination of big Q and pulse length (maximised)\n note: FoM should be minimised only!
    \n\n\n", - "lablxc": "lablxc(ipnvars) : labels describing iteration variables
      \n
      \n
    • ( 1) aspect\n
    • ( 2) bt\n
    • ( 3) rmajor\n
    • ( 4) te\n
    • ( 5) beta\n
    • ( 6) dene\n
    • ( 7) f_nd_beam_electron\n
    • ( 8) fbeta_poloidal_eps (f-value for equation 6)\n
    • ( 9) fdene (f-value for equation 5)\n
    • (10) hfact\n
    • (11) pheat\n
    • (12) oacdcp\n
    • (13) dr_tf_inboard (NOT RECOMMENDED)\n
    • (14) fwalld (f-value for equation 8)\n
    • (15) fvs (f-value for equation 12)\n
    • (16) dr_cs\n
    • (17) tdwell\n
    • (18) q\n
    • (19) beam_energy\n
    • (20) temp_cp_average\n
    • (21) ftburn (f-value for equation 13)\n
    • (22) NOT USED\n
    • (23) fcoolcp\n
    • (24) NOT USED\n
    • (25) fpnetel (f-value for equation 16)\n
    • (26) ffuspow (f-value for equation 9)\n
    • (27) fhldiv (f-value for equation 18)\n
    • (28) fradpwr (f-value for equation 17), total radiation fraction\n
    • (29) dr_bore\n
    • (30) fmva (f-value for equation 19)\n
    • (31) gapomin\n
    • (32) frminor (f-value for equation 21)\n
    • (33) fportsz (f-value for equation 20)\n
    • (34) fdivcol (f-value for equation 22)\n
    • (35) fpeakb (f-value for equation 25)\n
    • (36) fbeta_max (f-value for equation 24)\n
    • (37) j_cs_flat_top_end\n
    • (38) fjohc (f-value for equation 26)\n
    • (39) fjohc0 (f-value for equation 27)\n
    • (40) fgamcd (f-value for equation 37)\n
    • (41) f_j_cs_start_pulse_end_flat_top\n
    • (42) dr_cs_tf_gap\n
    • (43) NOT USED\n
    • (44) fvsbrnni\n
    • (45) fqval (f-value for equation 28)\n
    • (46) fpinj (f-value for equation 30)\n
    • (47) feffcd\n
    • (48) fstrcase (f-value for equation 31)\n
    • (49) fstrcond (f-value for equation 32)\n
    • (50) fiooic (f-value for equation 33)\n
    • (51) fvdump (f-value for equation 34)\n
    • (52) vdalw\n
    • (53) fjprot (f-value for equation 35)\n
    • (54) ftmargtf (f-value for equation 36)\n
    • (55) NOT USED\n
    • (56) tdmptf\n
    • (57) thkcas\n
    • (58) thwcndut\n
    • (59) fcutfsu\n
    • (60) cpttf\n
    • (61) dr_shld_vv_gap_inboard\n
    • (62) fdtmp (f-value for equation 38)\n
    • (63) ftpeak (f-value for equation 39)\n
    • (64) fauxmn (f-value for equation 40)\n
    • (65) tohs\n
    • (66) ftohs (f-value for equation 41)\n
    • (67) ftcycl (f-value for equation 42)\n
    • (68) fptemp (f-value for equation 44)\n
    • (69) rcool\n
    • (70) vcool\n
    • (71) fq (f-value for equation 45)\n
    • (72) fipir (f-value for equation 46)\n
    • (73) dr_fw_plasma_gap_inboard\n
    • (74) dr_fw_plasma_gap_outboard\n
    • (75) tfootfi\n
    • (76) NOT USED\n
    • (77) NOT USED\n
    • (78) NOT USED\n
    • (79) fbeta_poloidal (f-value for equation 48)\n
    • (80) NOT USED\n
    • (81) edrive\n
    • (82) drveff\n
    • (83) tgain\n
    • (84) chrad\n
    • (85) pdrive\n
    • (86) frrmax (f-value for equation 50)\n
    • (87) NOT USED\n
    • (88) NOT USED\n
    • (89) ftbr (f-value for equation 52)\n
    • (90) blbuith\n
    • (91) blbuoth\n
    • (92) fflutf (f-value for equation 53)\n
    • (93) dr_shld_inboard\n
    • (94) dr_shld_outboard\n
    • (95) fptfnuc (f-value for equation 54)\n
    • (96) fvvhe (f-value for equation 55)\n
    • (97) fpsepr (f-value for equation 56)\n
    • (98) li6enrich\n
    • (99) NOT USED\n
    • (100) NOT USED\n
    • (101) NOT USED\n
    • (102) fimpvar\n
    • (103) fl_h_threshold (f-value for equation 15)\n
    • (104)fr_conducting_wall (f-value for equation 23)\n
    • (105) fnbshinef (f-value for equation 59)\n
    • (106) ftmargoh (f-value for equation 60)\n
    • (107) favail (f-value for equation 61)\n
    • (108) breeder_f: Volume of Li4SiO4 / (Volume of Be12Ti + Li4SiO4)\n
    • (109) f_nd_alpha_electron: thermal alpha density / electron density\n
    • (110) falpha_energy_confinement: Lower limit on f_alpha_energy_confinement the ratio of alpha\n
    • (111) fniterpump: f-value for constraint that number\n
    • (112) fzeffmax: f-value for max Zeff (f-value for equation 64)\n
    • (113) ftaucq: f-value for minimum quench time (f-value for equation 65)\n
    • (114) len_fw_channel: Length of a single first wall channel\n
    • (115) fpoloidalpower: f-value for max rate of change of\n
    • (116) fradwall: f-value for radiation wall load limit (eq. 67)\n
    • (117) fpsepbqar: f-value for Psep*Bt/qar upper limit (eq. 68)\n
    • (118) fpsep: f-value to ensure separatrix power is less than\n
    • (119) tesep: separatrix temperature calculated by the Kallenbach divertor model\n
    • (120) ttarget: Plasma temperature adjacent to divertor sheath [eV]\n
    • (121) neratio: ratio of mean SOL density at OMP to separatrix density at OMP\n
    • (122) f_a_cs_steel : streel fraction of Central Solenoid\n
    • (123) foh_stress : f-value for CS coil Tresca yield criterion (f-value for eq. 72)\n
    • (124) qtargettotal : Power density on target including surface recombination [W/m2]\n
    • (125) fimp(3) : Beryllium density fraction relative to electron density\n
    • (126) fimp(4) : Carbon density fraction relative to electron density\n
    • (127) fimp(5) : Nitrogen fraction relative to electron density\n
    • (128) fimp(6) : Oxygen density fraction relative to electron density\n
    • (129) fimp(7) : Neon density fraction relative to electron density\n
    • (130) fimp(8) : Silicon density fraction relative to electron density\n
    • (131) fimp(9) : Argon density fraction relative to electron density\n
    • (132) fimp(10) : Iron density fraction relative to electron density\n
    • (133) fimp(11) : Nickel density fraction relative to electron density\n
    • (134) fimp(12) : Krypton density fraction relative to electron density\n
    • (135) fimp(13) : Xenon density fraction relative to electron density\n
    • (136) fimp(14) : Tungsten density fraction relative to electron density\n
    • (137) fplhsep (f-value for equation 73)\n
    • (138) rebco_thickness : thickness of REBCO layer in tape (m)\n
    • (139) copper_thick : thickness of copper layer in tape (m)\n
    • (140) dr_tf_wp : radial thickness of TFC winding pack (m)\n
    • (141) fcqt : TF coil quench temperature < tmax_croco (f-value for equation 74)\n
    • (142) nesep : electron density at separatrix [m-3]\n
    • (143) f_copperA_m2 : TF coil current / copper area < Maximum value\n
    • (144) fnesep : Eich critical electron density at separatrix\n
    • (145) fgwped : fraction of Greenwald density to set as pedestal-top density\n
    • (146) fcpttf : F-value for TF coil current per turn limit (constraint equation 77)\n
    • (147) freinke : F-value for Reinke detachment criterion (constraint equation 78)\n
    • (148) fzactual : fraction of impurity at SOL with Reinke detachment criterion\n
    • (149) fb_cs_limit_max : F-value for max peak CS field (con. 79, itvar 149)\n
    • (152) fb_cs_limit_max : Ratio of separatrix density to Greenwald density\n
    • (153) fpdivlim : F-value for minimum pdivt (con. 80)\n
    • (154) fne0 : F-value for ne(0) > ne(ped) (con. 81)\n
    • (155) pfusife : IFE input fusion power (MW) (ifedrv=3 only)\n
    • (156) rrin : Input IFE repetition rate (Hz) (ifedrv=3 only)\n
    • (157) fvs_cs_pf_total_ramp : F-value for available to required start up flux (con. 51)\n
    • (158) croco_thick : Thickness of CroCo copper tube (m)\n
    • (159) ftoroidalgap : F-value for toroidalgap > tftort constraint (con. 82)\n
    • (160) f_avspace (f-value for equation 83)\n
    • (161) fbeta_min (f-value for equation 84)\n
    • (162) r_cp_top : Top outer radius of the centropost (ST only) (m)\n
    • (163) f_t_turn_tf : f-value for TF coils WP trurn squared dimension constraint\n
    • (164) f_crypmw : f-value for cryogenic plant power\n
    • (165) fstr_wp : f-value for TF coil strain absolute value\n
    • (166) f_copperaoh_m2 : CS coil current /copper area < Maximum value\n
    • (167) fecrh_ignition: f-value for equation 90\n
    • (168) EMPTY : Description\n
    • (169) EMPTY : Description\n
    • (170) EMPTY : Description\n
    • (171) EMPTY : Description\n
    • (172) EMPTY : Description\n
    • (173) EMPTY : Description\n
    • (174) EMPTY : Description\n
    • (175) EMPTY : Description\n\n\n\n", - "lablxc": "lablxc(ipnvars) : labels describing iteration variables
        \n
        \n
      • ( 1) aspect\n
      • ( 2) bt\n
      • ( 3) rmajor\n
      • ( 4) te\n
      • ( 5) beta\n
      • ( 6) dene\n
      • ( 7) f_nd_beam_electron\n
      • ( 8) fbeta_poloidal_eps (f-value for equation 6)\n
      • ( 9) fdene (f-value for equation 5)\n
      • (10) hfact\n
      • (11) pheat\n
      • (12) oacdcp\n
      • (13) dr_tf_inboard (NOT RECOMMENDED)\n
      • (14) fwalld (f-value for equation 8)\n
      • (15) fvs (f-value for equation 12)\n
      • (16) dr_cs\n
      • (17) t_between_pulse\n
      • (18) q\n
      • (19) beam_energy\n
      • (20) temp_cp_average\n
      • (21) ft_burn (f-value for equation 13)\n
      • (22) NOT USED\n
      • (23) fcoolcp\n
      • (24) NOT USED\n
      • (25) fpnetel (f-value for equation 16)\n
      • (26) ffuspow (f-value for equation 9)\n
      • (27) fhldiv (f-value for equation 18)\n
      • (28) fradpwr (f-value for equation 17), total radiation fraction\n
      • (29) dr_bore\n
      • (30) fmva (f-value for equation 19)\n
      • (31) gapomin\n
      • (32) frminor (f-value for equation 21)\n
      • (33) fportsz (f-value for equation 20)\n
      • (34) fdivcol (f-value for equation 22)\n
      • (35) fpeakb (f-value for equation 25)\n
      • (36) fbeta_max (f-value for equation 24)\n
      • (37) j_cs_flat_top_end\n
      • (38) fjohc (f-value for equation 26)\n
      • (39) fjohc0 (f-value for equation 27)\n
      • (40) fgamcd (f-value for equation 37)\n
      • (41) f_j_cs_start_pulse_end_flat_top\n
      • (42) dr_cs_tf_gap\n
      • (43) NOT USED\n
      • (44) fvsbrnni\n
      • (45) fqval (f-value for equation 28)\n
      • (46) fpinj (f-value for equation 30)\n
      • (47) feffcd\n
      • (48) fstrcase (f-value for equation 31)\n
      • (49) fstrcond (f-value for equation 32)\n
      • (50) fiooic (f-value for equation 33)\n
      • (51) fvdump (f-value for equation 34)\n
      • (52) vdalw\n
      • (53) fjprot (f-value for equation 35)\n
      • (54) ftmargtf (f-value for equation 36)\n
      • (55) NOT USED\n
      • (56) tdmptf\n
      • (57) thkcas\n
      • (58) thwcndut\n
      • (59) fcutfsu\n
      • (60) cpttf\n
      • (61) dr_shld_vv_gap_inboard\n
      • (62) fdtmp (f-value for equation 38)\n
      • (63) ftpeak (f-value for equation 39)\n
      • (64) fauxmn (f-value for equation 40)\n
      • (65) t_current_ramp_up\n
      • (66) ft_current_ramp_up (f-value for equation 41)\n
      • (67) ftcycl (f-value for equation 42)\n
      • (68) fptemp (f-value for equation 44)\n
      • (69) rcool\n
      • (70) vcool\n
      • (71) fq (f-value for equation 45)\n
      • (72) fipir (f-value for equation 46)\n
      • (73) dr_fw_plasma_gap_inboard\n
      • (74) dr_fw_plasma_gap_outboard\n
      • (75) tfootfi\n
      • (76) NOT USED\n
      • (77) NOT USED\n
      • (78) NOT USED\n
      • (79) fbetap (f-value for equation 48)\n
      • (80) NOT USED\n
      • (81) edrive\n
      • (82) drveff\n
      • (83) tgain\n
      • (84) chrad\n
      • (85) pdrive\n
      • (86) frrmax (f-value for equation 50)\n
      • (87) NOT USED\n
      • (88) NOT USED\n
      • (89) ftbr (f-value for equation 52)\n
      • (90) blbuith\n
      • (91) blbuoth\n
      • (92) fflutf (f-value for equation 53)\n
      • (93) dr_shld_inboard\n
      • (94) dr_shld_outboard\n
      • (95) fptfnuc (f-value for equation 54)\n
      • (96) fvvhe (f-value for equation 55)\n
      • (97) fpsepr (f-value for equation 56)\n
      • (98) li6enrich\n
      • (99) NOT USED\n
      • (100) NOT USED\n
      • (101) NOT USED\n
      • (102) fimpvar\n
      • (103) fl_h_threshold (f-value for equation 15)\n
      • (104)fr_conducting_wall (f-value for equation 23)\n
      • (105) fnbshinef (f-value for equation 59)\n
      • (106) ftmargoh (f-value for equation 60)\n
      • (107) favail (f-value for equation 61)\n
      • (108) breeder_f: Volume of Li4SiO4 / (Volume of Be12Ti + Li4SiO4)\n
      • (109) f_nd_alpha_electron: thermal alpha density / electron density\n
      • (110) falpha_energy_confinement: Lower limit on f_alpha_energy_confinement the ratio of alpha\n
      • (111) fniterpump: f-value for constraint that number\n
      • (112) fzeffmax: f-value for max Zeff (f-value for equation 64)\n
      • (113) ftaucq: f-value for minimum quench time (f-value for equation 65)\n
      • (114) len_fw_channel: Length of a single first wall channel\n
      • (115) fpoloidalpower: f-value for max rate of change of\n
      • (116) fradwall: f-value for radiation wall load limit (eq. 67)\n
      • (117) fpsepbqar: f-value for Psep*Bt/qar upper limit (eq. 68)\n
      • (118) fpsep: f-value to ensure separatrix power is less than\n
      • (119) tesep: separatrix temperature calculated by the Kallenbach divertor model\n
      • (120) ttarget: Plasma temperature adjacent to divertor sheath [eV]\n
      • (121) neratio: ratio of mean SOL density at OMP to separatrix density at OMP\n
      • (122) f_a_cs_steel : streel fraction of Central Solenoid\n
      • (123) foh_stress : f-value for CS coil Tresca yield criterion (f-value for eq. 72)\n
      • (124) qtargettotal : Power density on target including surface recombination [W/m2]\n
      • (125) fimp(3) : Beryllium density fraction relative to electron density\n
      • (126) fimp(4) : Carbon density fraction relative to electron density\n
      • (127) fimp(5) : Nitrogen fraction relative to electron density\n
      • (128) fimp(6) : Oxygen density fraction relative to electron density\n
      • (129) fimp(7) : Neon density fraction relative to electron density\n
      • (130) fimp(8) : Silicon density fraction relative to electron density\n
      • (131) fimp(9) : Argon density fraction relative to electron density\n
      • (132) fimp(10) : Iron density fraction relative to electron density\n
      • (133) fimp(11) : Nickel density fraction relative to electron density\n
      • (134) fimp(12) : Krypton density fraction relative to electron density\n
      • (135) fimp(13) : Xenon density fraction relative to electron density\n
      • (136) fimp(14) : Tungsten density fraction relative to electron density\n
      • (137) fplhsep (f-value for equation 73)\n
      • (138) rebco_thickness : thickness of REBCO layer in tape (m)\n
      • (139) copper_thick : thickness of copper layer in tape (m)\n
      • (140) dr_tf_wp : radial thickness of TFC winding pack (m)\n
      • (141) fcqt : TF coil quench temperature < tmax_croco (f-value for equation 74)\n
      • (142) nesep : electron density at separatrix [m-3]\n
      • (143) f_copperA_m2 : TF coil current / copper area < Maximum value\n
      • (144) fnesep : Eich critical electron density at separatrix\n
      • (145) fgwped : fraction of Greenwald density to set as pedestal-top density\n
      • (146) fcpttf : F-value for TF coil current per turn limit (constraint equation 77)\n
      • (147) freinke : F-value for Reinke detachment criterion (constraint equation 78)\n
      • (148) fzactual : fraction of impurity at SOL with Reinke detachment criterion\n
      • (149) fb_cs_limit_max : F-value for max peak CS field (con. 79, itvar 149)\n
      • (152) fb_cs_limit_max : Ratio of separatrix density to Greenwald density\n
      • (153) fpdivlim : F-value for minimum pdivt (con. 80)\n
      • (154) fne0 : F-value for ne(0) > ne(ped) (con. 81)\n
      • (155) pfusife : IFE input fusion power (MW) (ifedrv=3 only)\n
      • (156) rrin : Input IFE repetition rate (Hz) (ifedrv=3 only)\n
      • (157) fvs_cs_pf_total_ramp : F-value for available to required start up flux (con. 51)\n
      • (158) croco_thick : Thickness of CroCo copper tube (m)\n
      • (159) ftoroidalgap : F-value for toroidalgap > tftort constraint (con. 82)\n
      • (160) f_avspace (f-value for equation 83)\n
      • (161) fbeta_min (f-value for equation 84)\n
      • (162) r_cp_top : Top outer radius of the centropost (ST only) (m)\n
      • (163) f_t_turn_tf : f-value for TF coils WP trurn squared dimension constraint\n
      • (164) f_crypmw : f-value for cryogenic plant power\n
      • (165) fstr_wp : f-value for TF coil strain absolute value\n
      • (166) f_copperaoh_m2 : CS coil current /copper area < Maximum value\n
      • (167) fecrh_ignition: f-value for equation 90\n
      • (168) EMPTY : Description\n
      • (169) EMPTY : Description\n
      • (170) EMPTY : Description\n
      • (171) EMPTY : Description\n
      • (172) EMPTY : Description\n
      • (173) EMPTY : Description\n
      • (174) EMPTY : Description\n
      • (175) EMPTY : Description\n\n\n\n", + "lablxc": "lablxc(ipnvars) : labels describing iteration variables
          \n
          \n
        • ( 1) aspect\n
        • ( 2) bt\n
        • ( 3) rmajor\n
        • ( 4) te\n
        • ( 5) beta\n
        • ( 6) dene\n
        • ( 7) f_nd_beam_electron\n
        • ( 8) fbeta_poloidal_eps (f-value for equation 6)\n
        • ( 9) fdene (f-value for equation 5)\n
        • (10) hfact\n
        • (11) pheat\n
        • (12) oacdcp\n
        • (13) dr_tf_inboard (NOT RECOMMENDED)\n
        • (14) fwalld (f-value for equation 8)\n
        • (15) fvs (f-value for equation 12)\n
        • (16) dr_cs\n
        • (17) tdwell\n
        • (18) q\n
        • (19) beam_energy\n
        • (20) temp_cp_average\n
        • (21) ftburn (f-value for equation 13)\n
        • (22) NOT USED\n
        • (23) fcoolcp\n
        • (24) NOT USED\n
        • (25) fpnetel (f-value for equation 16)\n
        • (26) ffuspow (f-value for equation 9)\n
        • (27) fhldiv (f-value for equation 18)\n
        • (28) fradpwr (f-value for equation 17), total radiation fraction\n
        • (29) dr_bore\n
        • (30) fmva (f-value for equation 19)\n
        • (31) gapomin\n
        • (32) frminor (f-value for equation 21)\n
        • (33) fportsz (f-value for equation 20)\n
        • (34) fdivcol (f-value for equation 22)\n
        • (35) fpeakb (f-value for equation 25)\n
        • (36) fbeta_max (f-value for equation 24)\n
        • (37) j_cs_flat_top_end\n
        • (38) fjohc (f-value for equation 26)\n
        • (39) fjohc0 (f-value for equation 27)\n
        • (40) fgamcd (f-value for equation 37)\n
        • (41) f_j_cs_start_pulse_end_flat_top\n
        • (42) dr_cs_tf_gap\n
        • (43) NOT USED\n
        • (44) fvsbrnni\n
        • (45) fqval (f-value for equation 28)\n
        • (46) fpinj (f-value for equation 30)\n
        • (47) feffcd\n
        • (48) fstrcase (f-value for equation 31)\n
        • (49) fstrcond (f-value for equation 32)\n
        • (50) fiooic (f-value for equation 33)\n
        • (51) fvdump (f-value for equation 34)\n
        • (52) vdalw\n
        • (53) fjprot (f-value for equation 35)\n
        • (54) ftmargtf (f-value for equation 36)\n
        • (55) NOT USED\n
        • (56) tdmptf\n
        • (57) thkcas\n
        • (58) thwcndut\n
        • (59) fcutfsu\n
        • (60) cpttf\n
        • (61) dr_shld_vv_gap_inboard\n
        • (62) fdtmp (f-value for equation 38)\n
        • (63) ftpeak (f-value for equation 39)\n
        • (64) fauxmn (f-value for equation 40)\n
        • (65) tohs\n
        • (66) ftohs (f-value for equation 41)\n
        • (67) ftcycl (f-value for equation 42)\n
        • (68) fptemp (f-value for equation 44)\n
        • (69) rcool\n
        • (70) vcool\n
        • (71) fq (f-value for equation 45)\n
        • (72) fipir (f-value for equation 46)\n
        • (73) dr_fw_plasma_gap_inboard\n
        • (74) dr_fw_plasma_gap_outboard\n
        • (75) tfootfi\n
        • (76) NOT USED\n
        • (77) NOT USED\n
        • (78) NOT USED\n
        • (79) fbeta_poloidal (f-value for equation 48)\n
        • (80) NOT USED\n
        • (81) edrive\n
        • (82) drveff\n
        • (83) tgain\n
        • (84) chrad\n
        • (85) pdrive\n
        • (86) frrmax (f-value for equation 50)\n
        • (87) NOT USED\n
        • (88) NOT USED\n
        • (89) ftbr (f-value for equation 52)\n
        • (90) blbuith\n
        • (91) blbuoth\n
        • (92) fflutf (f-value for equation 53)\n
        • (93) dr_shld_inboard\n
        • (94) dr_shld_outboard\n
        • (95) fptfnuc (f-value for equation 54)\n
        • (96) fvvhe (f-value for equation 55)\n
        • (97) fpsepr (f-value for equation 56)\n
        • (98) f_blkt_li6_enrichment\n
        • (99) NOT USED\n
        • (100) NOT USED\n
        • (101) NOT USED\n
        • (102) fimpvar\n
        • (103) fl_h_threshold (f-value for equation 15)\n
        • (104)fr_conducting_wall (f-value for equation 23)\n
        • (105) fnbshinef (f-value for equation 59)\n
        • (106) ftmargoh (f-value for equation 60)\n
        • (107) favail (f-value for equation 61)\n
        • (108) breeder_f: Volume of Li4SiO4 / (Volume of Be12Ti + Li4SiO4)\n
        • (109) f_nd_alpha_electron: thermal alpha density / electron density\n
        • (110) falpha_energy_confinement: Lower limit on f_alpha_energy_confinement the ratio of alpha\n
        • (111) fniterpump: f-value for constraint that number\n
        • (112) fzeffmax: f-value for max Zeff (f-value for equation 64)\n
        • (113) ftaucq: f-value for minimum quench time (f-value for equation 65)\n
        • (114) len_fw_channel: Length of a single first wall channel\n
        • (115) fpoloidalpower: f-value for max rate of change of\n
        • (116) fradwall: f-value for radiation wall load limit (eq. 67)\n
        • (117) fpsepbqar: f-value for Psep*Bt/qar upper limit (eq. 68)\n
        • (118) fpsep: f-value to ensure separatrix power is less than\n
        • (119) tesep: separatrix temperature calculated by the Kallenbach divertor model\n
        • (120) ttarget: Plasma temperature adjacent to divertor sheath [eV]\n
        • (121) neratio: ratio of mean SOL density at OMP to separatrix density at OMP\n
        • (122) f_a_cs_steel : streel fraction of Central Solenoid\n
        • (123) foh_stress : f-value for CS coil Tresca yield criterion (f-value for eq. 72)\n
        • (124) qtargettotal : Power density on target including surface recombination [W/m2]\n
        • (125) fimp(3) : Beryllium density fraction relative to electron density\n
        • (126) fimp(4) : Carbon density fraction relative to electron density\n
        • (127) fimp(5) : Nitrogen fraction relative to electron density\n
        • (128) fimp(6) : Oxygen density fraction relative to electron density\n
        • (129) fimp(7) : Neon density fraction relative to electron density\n
        • (130) fimp(8) : Silicon density fraction relative to electron density\n
        • (131) fimp(9) : Argon density fraction relative to electron density\n
        • (132) fimp(10) : Iron density fraction relative to electron density\n
        • (133) fimp(11) : Nickel density fraction relative to electron density\n
        • (134) fimp(12) : Krypton density fraction relative to electron density\n
        • (135) fimp(13) : Xenon density fraction relative to electron density\n
        • (136) fimp(14) : Tungsten density fraction relative to electron density\n
        • (137) fplhsep (f-value for equation 73)\n
        • (138) rebco_thickness : thickness of REBCO layer in tape (m)\n
        • (139) copper_thick : thickness of copper layer in tape (m)\n
        • (140) dr_tf_wp : radial thickness of TFC winding pack (m)\n
        • (141) fcqt : TF coil quench temperature < tmax_croco (f-value for equation 74)\n
        • (142) nesep : electron density at separatrix [m-3]\n
        • (143) f_copperA_m2 : TF coil current / copper area < Maximum value\n
        • (144) fnesep : Eich critical electron density at separatrix\n
        • (145) fgwped : fraction of Greenwald density to set as pedestal-top density\n
        • (146) fcpttf : F-value for TF coil current per turn limit (constraint equation 77)\n
        • (147) freinke : F-value for Reinke detachment criterion (constraint equation 78)\n
        • (148) fzactual : fraction of impurity at SOL with Reinke detachment criterion\n
        • (149) fb_cs_limit_max : F-value for max peak CS field (con. 79, itvar 149)\n
        • (152) fb_cs_limit_max : Ratio of separatrix density to Greenwald density\n
        • (153) fpdivlim : F-value for minimum pdivt (con. 80)\n
        • (154) fne0 : F-value for ne(0) > ne(ped) (con. 81)\n
        • (155) pfusife : IFE input fusion power (MW) (ifedrv=3 only)\n
        • (156) rrin : Input IFE repetition rate (Hz) (ifedrv=3 only)\n
        • (157) fvs_cs_pf_total_ramp : F-value for available to required start up flux (con. 51)\n
        • (158) croco_thick : Thickness of CroCo copper tube (m)\n
        • (159) ftoroidalgap : F-value for toroidalgap > tftort constraint (con. 82)\n
        • (160) f_avspace (f-value for equation 83)\n
        • (161) fbeta_min (f-value for equation 84)\n
        • (162) r_cp_top : Top outer radius of the centropost (ST only) (m)\n
        • (163) f_t_turn_tf : f-value for TF coils WP trurn squared dimension constraint\n
        • (164) f_crypmw : f-value for cryogenic plant power\n
        • (165) fstr_wp : f-value for TF coil strain absolute value\n
        • (166) f_copperaoh_m2 : CS coil current /copper area < Maximum value\n
        • (167) fecrh_ignition: f-value for equation 90\n
        • (168) EMPTY : Description\n
        • (169) EMPTY : Description\n
        • (170) EMPTY : Description\n
        • (171) EMPTY : Description\n
        • (172) EMPTY : Description\n
        • (173) EMPTY : Description\n
        • (174) EMPTY : Description\n
        • (175) EMPTY : Description\n\n\n\n", + "lablxc": "lablxc(ipnvars) : labels describing iteration variables
            \n
            \n
          • ( 1) aspect\n
          • ( 2) bt\n
          • ( 3) rmajor\n
          • ( 4) te\n
          • ( 5) beta\n
          • ( 6) dene\n
          • ( 7) f_nd_beam_electron\n
          • ( 8) fbeta_poloidal_eps (f-value for equation 6)\n
          • ( 9) fdene (f-value for equation 5)\n
          • (10) hfact\n
          • (11) pheat\n
          • (12) oacdcp\n
          • (13) dr_tf_inboard (NOT RECOMMENDED)\n
          • (14) fwalld (f-value for equation 8)\n
          • (15) fvs (f-value for equation 12)\n
          • (16) dr_cs\n
          • (17) t_between_pulse\n
          • (18) q\n
          • (19) beam_energy\n
          • (20) temp_cp_average\n
          • (21) ft_burn (f-value for equation 13)\n
          • (22) NOT USED\n
          • (23) fcoolcp\n
          • (24) NOT USED\n
          • (25) fpnetel (f-value for equation 16)\n
          • (26) ffuspow (f-value for equation 9)\n
          • (27) fhldiv (f-value for equation 18)\n
          • (28) fradpwr (f-value for equation 17), total radiation fraction\n
          • (29) dr_bore\n
          • (30) fmva (f-value for equation 19)\n
          • (31) gapomin\n
          • (32) frminor (f-value for equation 21)\n
          • (33) fportsz (f-value for equation 20)\n
          • (34) fdivcol (f-value for equation 22)\n
          • (35) fpeakb (f-value for equation 25)\n
          • (36) fbeta_max (f-value for equation 24)\n
          • (37) j_cs_flat_top_end\n
          • (38) fjohc (f-value for equation 26)\n
          • (39) fjohc0 (f-value for equation 27)\n
          • (40) fgamcd (f-value for equation 37)\n
          • (41) f_j_cs_start_pulse_end_flat_top\n
          • (42) dr_cs_tf_gap\n
          • (43) NOT USED\n
          • (44) fvsbrnni\n
          • (45) fqval (f-value for equation 28)\n
          • (46) fpinj (f-value for equation 30)\n
          • (47) feffcd\n
          • (48) fstrcase (f-value for equation 31)\n
          • (49) fstrcond (f-value for equation 32)\n
          • (50) fiooic (f-value for equation 33)\n
          • (51) fvdump (f-value for equation 34)\n
          • (52) vdalw\n
          • (53) fjprot (f-value for equation 35)\n
          • (54) ftmargtf (f-value for equation 36)\n
          • (55) NOT USED\n
          • (56) tdmptf\n
          • (57) thkcas\n
          • (58) thwcndut\n
          • (59) fcutfsu\n
          • (60) cpttf\n
          • (61) dr_shld_vv_gap_inboard\n
          • (62) fdtmp (f-value for equation 38)\n
          • (63) ftpeak (f-value for equation 39)\n
          • (64) fauxmn (f-value for equation 40)\n
          • (65) t_current_ramp_up\n
          • (66) ft_current_ramp_up (f-value for equation 41)\n
          • (67) ftcycl (f-value for equation 42)\n
          • (68) fptemp (f-value for equation 44)\n
          • (69) rcool\n
          • (70) vcool\n
          • (71) fq (f-value for equation 45)\n
          • (72) fipir (f-value for equation 46)\n
          • (73) dr_fw_plasma_gap_inboard\n
          • (74) dr_fw_plasma_gap_outboard\n
          • (75) tfootfi\n
          • (76) NOT USED\n
          • (77) NOT USED\n
          • (78) NOT USED\n
          • (79) fbetap (f-value for equation 48)\n
          • (80) NOT USED\n
          • (81) edrive\n
          • (82) drveff\n
          • (83) tgain\n
          • (84) chrad\n
          • (85) pdrive\n
          • (86) frrmax (f-value for equation 50)\n
          • (87) NOT USED\n
          • (88) NOT USED\n
          • (89) ftbr (f-value for equation 52)\n
          • (90) blbuith\n
          • (91) blbuoth\n
          • (92) fflutf (f-value for equation 53)\n
          • (93) dr_shld_inboard\n
          • (94) dr_shld_outboard\n
          • (95) fptfnuc (f-value for equation 54)\n
          • (96) fvvhe (f-value for equation 55)\n
          • (97) fpsepr (f-value for equation 56)\n
          • (98) f_blkt_li6_enrichment\n
          • (99) NOT USED\n
          • (100) NOT USED\n
          • (101) NOT USED\n
          • (102) fimpvar\n
          • (103) fl_h_threshold (f-value for equation 15)\n
          • (104)fr_conducting_wall (f-value for equation 23)\n
          • (105) fnbshinef (f-value for equation 59)\n
          • (106) ftmargoh (f-value for equation 60)\n
          • (107) favail (f-value for equation 61)\n
          • (108) breeder_f: Volume of Li4SiO4 / (Volume of Be12Ti + Li4SiO4)\n
          • (109) f_nd_alpha_electron: thermal alpha density / electron density\n
          • (110) falpha_energy_confinement: Lower limit on f_alpha_energy_confinement the ratio of alpha\n
          • (111) fniterpump: f-value for constraint that number\n
          • (112) fzeffmax: f-value for max Zeff (f-value for equation 64)\n
          • (113) ftaucq: f-value for minimum quench time (f-value for equation 65)\n
          • (114) len_fw_channel: Length of a single first wall channel\n
          • (115) fpoloidalpower: f-value for max rate of change of\n
          • (116) fradwall: f-value for radiation wall load limit (eq. 67)\n
          • (117) fpsepbqar: f-value for Psep*Bt/qar upper limit (eq. 68)\n
          • (118) fpsep: f-value to ensure separatrix power is less than\n
          • (119) tesep: separatrix temperature calculated by the Kallenbach divertor model\n
          • (120) ttarget: Plasma temperature adjacent to divertor sheath [eV]\n
          • (121) neratio: ratio of mean SOL density at OMP to separatrix density at OMP\n
          • (122) f_a_cs_steel : streel fraction of Central Solenoid\n
          • (123) foh_stress : f-value for CS coil Tresca yield criterion (f-value for eq. 72)\n
          • (124) qtargettotal : Power density on target including surface recombination [W/m2]\n
          • (125) fimp(3) : Beryllium density fraction relative to electron density\n
          • (126) fimp(4) : Carbon density fraction relative to electron density\n
          • (127) fimp(5) : Nitrogen fraction relative to electron density\n
          • (128) fimp(6) : Oxygen density fraction relative to electron density\n
          • (129) fimp(7) : Neon density fraction relative to electron density\n
          • (130) fimp(8) : Silicon density fraction relative to electron density\n
          • (131) fimp(9) : Argon density fraction relative to electron density\n
          • (132) fimp(10) : Iron density fraction relative to electron density\n
          • (133) fimp(11) : Nickel density fraction relative to electron density\n
          • (134) fimp(12) : Krypton density fraction relative to electron density\n
          • (135) fimp(13) : Xenon density fraction relative to electron density\n
          • (136) fimp(14) : Tungsten density fraction relative to electron density\n
          • (137) fplhsep (f-value for equation 73)\n
          • (138) rebco_thickness : thickness of REBCO layer in tape (m)\n
          • (139) copper_thick : thickness of copper layer in tape (m)\n
          • (140) dr_tf_wp : radial thickness of TFC winding pack (m)\n
          • (141) fcqt : TF coil quench temperature < tmax_croco (f-value for equation 74)\n
          • (142) nesep : electron density at separatrix [m-3]\n
          • (143) f_copperA_m2 : TF coil current / copper area < Maximum value\n
          • (144) fnesep : Eich critical electron density at separatrix\n
          • (145) fgwped : fraction of Greenwald density to set as pedestal-top density\n
          • (146) fcpttf : F-value for TF coil current per turn limit (constraint equation 77)\n
          • (147) freinke : F-value for Reinke detachment criterion (constraint equation 78)\n
          • (148) fzactual : fraction of impurity at SOL with Reinke detachment criterion\n
          • (149) fb_cs_limit_max : F-value for max peak CS field (con. 79, itvar 149)\n
          • (152) fb_cs_limit_max : Ratio of separatrix density to Greenwald density\n
          • (153) fpdivlim : F-value for minimum pdivt (con. 80)\n
          • (154) fne0 : F-value for ne(0) > ne(ped) (con. 81)\n
          • (155) pfusife : IFE input fusion power (MW) (ifedrv=3 only)\n
          • (156) rrin : Input IFE repetition rate (Hz) (ifedrv=3 only)\n
          • (157) fvs_cs_pf_total_ramp : F-value for available to required start up flux (con. 51)\n
          • (158) croco_thick : Thickness of CroCo copper tube (m)\n
          • (159) ftoroidalgap : F-value for toroidalgap > tftort constraint (con. 82)\n
          • (160) f_avspace (f-value for equation 83)\n
          • (161) fbeta_min (f-value for equation 84)\n
          • (162) r_cp_top : Top outer radius of the centropost (ST only) (m)\n
          • (163) f_t_turn_tf : f-value for TF coils WP trurn squared dimension constraint\n
          • (164) f_crypmw : f-value for cryogenic plant power\n
          • (165) fstr_wp : f-value for TF coil strain absolute value\n
          • (166) f_copperaoh_m2 : CS coil current /copper area < Maximum value\n
          • (167) fecrh_ignition: f-value for equation 90\n
          • (168) EMPTY : Description\n
          • (169) EMPTY : Description\n
          • (170) EMPTY : Description\n
          • (171) EMPTY : Description\n
          • (172) EMPTY : Description\n
          • (173) EMPTY : Description\n
          • (174) EMPTY : Description\n
          • (175) EMPTY : Description\n\n\n\n", "lambda_EU": "Decay length in EUROFER [cm]", "lambda_He_VV": "Decay length [cm]", "lambda_n_BZ_IB": "Decay length in IB BZ [cm]", @@ -9991,7 +9991,7 @@ "lfn_": "", "lh": "", "lhat": "Connection length factor L|| = lhat qstar R for Reinke criterion, default value from\n Post et al. 1995 J. Nucl. Mat. 220-2 1014", - "li6enrich": "lithium-6 enrichment of breeding material (%)", + "f_blkt_li6_enrichment": "lithium-6 enrichment of breeding material (%)", "life_dpa": "Allowable DPA from DEMO fw/blanket lifetime calculation in availability module", "light_build_cost_per_vol": "Unit cost for unshielded non-active buildings ($/m3)", "line": "", @@ -13593,7 +13593,7 @@ "lb": 1.0, "ub": 15.0 }, - "li6enrich": { + "f_blkt_li6_enrichment": { "lb": 7.4, "ub": 100.0 }, @@ -15562,7 +15562,7 @@ "lb": 0.1, "ub": 3.0 }, - "li6enrich": { + "f_blkt_li6_enrichment": { "lb": 10.0, "ub": 100.0 }, @@ -15816,7 +15816,7 @@ "dr_cs_tf_gap": 0.08, "gapomin": 0.234, "hfact": 1.0, - "li6enrich": 30.0, + "f_blkt_li6_enrichment": 30.0, "neratio": 0.75, "nesep": 3e+19, "oacdcp": 0.0, @@ -16647,7 +16647,7 @@ }, "98": { "lb": 10.0, - "name": "li6enrich", + "name": "f_blkt_li6_enrichment", "ub": 100.0 } }, @@ -16810,7 +16810,7 @@ "95": "fptfnuc", "96": "fvvhe", "97": "fpsepr", - "98": "li6enrich" + "98": "f_blkt_li6_enrichment" }, "DICT_IXC_SIMPLE_REV": { "DUMMY": "175", @@ -16929,7 +16929,7 @@ "dr_cs_tf_gap": "42", "gapomin": "31", "hfact": "10", - "li6enrich": "98", + "f_blkt_li6_enrichment": "98", "neratio": "121", "nesep": "142", "oacdcp": "12", @@ -18034,7 +18034,7 @@ "i_blkt_inboard", "inuclear", "qnuc", - "li6enrich", + "f_blkt_li6_enrichment", "p_blkt_nuclear_heat_total_mw", "pnuc_cp", "pnuc_cp_sh", @@ -20515,7 +20515,7 @@ "layer_ins": "real_variable", "lcon_factor": "real_variable", "lhat": "real_variable", - "li6enrich": "real_variable", + "f_blkt_li6_enrichment": "real_variable", "life_dpa": "real_variable", "llw_storage_h": "real_variable", "llw_storage_l": "real_variable", diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 83b6ed36ec..5237f07e88 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2475,7 +2475,7 @@ inuclear = 0 * DESCRIPTION: Volume of Li4SiO4 / (Volume of Be12Ti + Li4SiO4) * JUSTIFICATION: -*li6enrich = +*f_blkt_li6_enrichment = * DESCRIPTION: Lithium-6 enrichment of breeding material (%) (HCPB) * JUSTIFICATION: Not using HCPB model diff --git a/tests/unit/test_ccfe_hcpb.py b/tests/unit/test_ccfe_hcpb.py index a8c13239f7..0d7d0b2513 100644 --- a/tests/unit/test_ccfe_hcpb.py +++ b/tests/unit/test_ccfe_hcpb.py @@ -1395,7 +1395,7 @@ class TbrShimwellParam(NamedTuple): breeder_f: Any = None - li6enrich: Any = None + f_blkt_li6_enrichment: Any = None expected_tbr: Any = None @@ -1413,7 +1413,7 @@ class TbrShimwellParam(NamedTuple): outfile=11, iblanket_thickness=1, breeder_f=0.56366688384345121, - li6enrich=82.131743925121199, + f_blkt_li6_enrichment=82.131743925121199, expected_tbr=1.1284864235692258, ), ), @@ -1450,7 +1450,7 @@ def test_tbr_shimwell(tbrshimwellparam, monkeypatch, ccfe_hcpb): tbr = ccfe_hcpb.tbr_shimwell( iblanket_thickness=tbrshimwellparam.iblanket_thickness, breeder_f=tbrshimwellparam.breeder_f, - li6enrich=tbrshimwellparam.li6enrich, + f_blkt_li6_enrichment=tbrshimwellparam.f_blkt_li6_enrichment, output=False, ) From 9648f7e3267fcb0d75d8fadf140c76caddeca059 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 19 Feb 2025 09:36:42 +0000 Subject: [PATCH 63/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20pnucfwo=20to=20p?= =?UTF-8?q?=5Ffw=5Foutboard=5Fnuclear=5Fheat=5Fmw=20for=20clarity=20and=20?= =?UTF-8?q?consistency=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/blanket_library.py | 16 ++++++++-------- process/stellarator.py | 8 ++++---- source/fortran/blanket_library.f90 | 4 ++-- tests/integration/ref_dicts.json | 8 ++++---- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/process/blanket_library.py b/process/blanket_library.py index d4d3d515b1..eb4e8ba7f0 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -1590,7 +1590,7 @@ def thermo_hydraulic_model(self, output: bool): * build_variables.a_fw_inboard / build_variables.a_fw_total ) - blanket_library.pnucfwo = ( + blanket_library.p_fw_outboard_nuclear_heat_mw = ( fwbs_variables.p_fw_nuclear_heat_total_mw * build_variables.a_fw_outboard / build_variables.a_fw_total @@ -1661,8 +1661,8 @@ def thermo_hydraulic_model(self, output: bool): f_nuc_fwi = (blanket_library.pnucfwi + fwbs_variables.psurffwi) / ( blanket_library.pnucfwi + fwbs_variables.psurffwi + pnucblkti_struct ) - f_nuc_fwo = (blanket_library.pnucfwo + fwbs_variables.psurffwo) / ( - blanket_library.pnucfwo + fwbs_variables.psurffwo + pnucblkto_struct + f_nuc_fwo = (blanket_library.p_fw_outboard_nuclear_heat_mw + fwbs_variables.psurffwo) / ( + blanket_library.p_fw_outboard_nuclear_heat_mw + fwbs_variables.psurffwo + pnucblkto_struct ) else: f_nuc_fwi = (blanket_library.pnucfwi + fwbs_variables.psurffwi) / ( @@ -1670,8 +1670,8 @@ def thermo_hydraulic_model(self, output: bool): + fwbs_variables.psurffwi + blanket_library.p_blkt_nuclear_heat_inboard_mw ) - f_nuc_fwo = (blanket_library.pnucfwo + fwbs_variables.psurffwo) / ( - blanket_library.pnucfwo + f_nuc_fwo = (blanket_library.p_fw_outboard_nuclear_heat_mw + fwbs_variables.psurffwo) / ( + blanket_library.p_fw_outboard_nuclear_heat_mw + fwbs_variables.psurffwo + blanket_library.p_blkt_nuclear_heat_outboard_mw ) @@ -1730,7 +1730,7 @@ def thermo_hydraulic_model(self, output: bool): build_variables.dr_fw_outboard, build_variables.a_fw_outboard, fwbs_variables.psurffwo, - blanket_library.pnucfwo, + blanket_library.p_fw_outboard_nuclear_heat_mw, "Outboard first wall", ) # (fwbs_variables.tpeakfwo, cf, rhof, fwbs_variables.mffwpo) = fw_module.fw_temp( @@ -1740,7 +1740,7 @@ def thermo_hydraulic_model(self, output: bool): # build_variables.dr_fw_outboard, # build_variables.a_fw_outboard, # fwbs_variables.psurffwo, - # blanket_library.pnucfwo, + # blanket_library.p_fw_outboard_nuclear_heat_mw, # "Outboard first wall", # ) @@ -1758,7 +1758,7 @@ def thermo_hydraulic_model(self, output: bool): # Total mass flow rate to remove outboard FW power (kg/s) blanket_library.mflow_fw_outboard_coolant_total = ( 1.0e6 - * (blanket_library.pnucfwo + fwbs_variables.psurffwo) + * (blanket_library.p_fw_outboard_nuclear_heat_mw + fwbs_variables.psurffwo) / (fwbs_variables.cp_fw * (fwoutleto - fwbs_variables.temp_fw_coolant_in)) ) diff --git a/process/stellarator.py b/process/stellarator.py index a3c7671691..3788f4b1e1 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -1443,12 +1443,12 @@ def stfwbs(self, output: bool): # coolant. pnucfwi = pnucfwbsi * (1.0e0 - np.exp(-2.0e0 * bfwi / decayfwi)) - pnucfwo = pnucfwbso * (1.0e0 - np.exp(-2.0e0 * bfwo / decayfwo)) + p_fw_outboard_nuclear_heat_mw = pnucfwbso * (1.0e0 - np.exp(-2.0e0 * bfwo / decayfwo)) # Neutron power reaching blanket and shield (MW) pnucbsi = pnucfwbsi - pnucfwi - pnucbso = pnucfwbso - pnucfwo + pnucbso = pnucfwbso - p_fw_outboard_nuclear_heat_mw # Blanket decay length (m) - improved calculation required @@ -1480,7 +1480,7 @@ def stfwbs(self, output: bool): heat_transport_variables.fpumpfw * ( pnucfwi - + pnucfwo + + p_fw_outboard_nuclear_heat_mw + psurffwi + psurffwo + current_drive_variables.porbitlossmw @@ -1504,7 +1504,7 @@ def stfwbs(self, output: bool): # Total nuclear heating of first wall (MW) - fwbs_variables.p_fw_nuclear_heat_total_mw = pnucfwi + pnucfwo + fwbs_variables.p_fw_nuclear_heat_total_mw = pnucfwi + p_fw_outboard_nuclear_heat_mw # Total nuclear heating of blanket (MW) diff --git a/source/fortran/blanket_library.f90 b/source/fortran/blanket_library.f90 index a4af6f3206..793c33bf72 100644 --- a/source/fortran/blanket_library.f90 +++ b/source/fortran/blanket_library.f90 @@ -63,7 +63,7 @@ module blanket_library real(dp) :: bzfllengi_liq, bzfllengo_liq !! Inboard/outboard secondary blanket flow lengths (m) - real(dp) :: pnucfwi, pnucfwo + real(dp) :: pnucfwi, p_fw_outboard_nuclear_heat_mw !! Inboard/outboard first wall nuclear heating (MW) real(dp) :: tpeakfwi, tpeakfwo @@ -146,7 +146,7 @@ subroutine init_blanket_library bzfllengo_liq = 0.0D0 len_blkt_outboard_channel_total = 0.0D0 pnucfwi = 0.0D0 - pnucfwo = 0.0D0 + p_fw_outboard_nuclear_heat_mw = 0.0D0 tpeakfwi = 0.0D0 tpeakfwo = 0.0D0 mflow_fw_inboard_coolant_total = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 65c3dd9a70..846d6a6cf9 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3570,7 +3570,7 @@ "p_div_nuclear_heat_total_mw": 0.0, "p_fw_nuclear_heat_total_mw": 0.0, "pnucfwi": 0.0, - "pnucfwo": 0.0, + "p_fw_outboard_nuclear_heat_mw": 0.0, "p_fw_hcd_nuclear_heat_mw": 0.0, "pnucloss": 0.0, "pnucsh": 0.0, @@ -10328,7 +10328,7 @@ "p_div_nuclear_heat_total_mw": "nuclear heating in the divertor (MW)", "p_fw_nuclear_heat_total_mw": "nuclear heating in the first wall (MW)", "pnucfwi": "Inboard/outboard first wall nuclear heating (MW)", - "pnucfwo": "Inboard/outboard first wall nuclear heating (MW)", + "p_fw_outboard_nuclear_heat_mw": "Inboard/outboard first wall nuclear heating (MW)", "p_fw_hcd_nuclear_heat_mw": "nuclear heating in the HCD apparatus and diagnostics (MW)", "pnucloss": "nuclear heating lost via holes (MW)", "pnucsh": "Nuclear power generated in shield/VV [MW]", @@ -17265,7 +17265,7 @@ "len_blkt_inboard_channel_total", "len_blkt_outboard_channel_total", "pnucfwi", - "pnucfwo", + "p_fw_outboard_nuclear_heat_mw", "tpeakfwi", "tpeakfwo", "mflow_fw_inboard_coolant_total", @@ -18649,7 +18649,7 @@ "tpeakfwi", "tpeakfwo", "pnucfwi", - "pnucfwo", + "p_fw_outboard_nuclear_heat_mw", "p_blkt_nuclear_heat_inboard_mw", "p_blkt_nuclear_heat_outboard_mw", "n_fw_inboard_channels", From 9bf3afe684215946d77e46ce7b05167e70f326ef Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 19 Feb 2025 09:37:24 +0000 Subject: [PATCH 64/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20pnucfwi=20to=20p?= =?UTF-8?q?=5Ffw=5Finboard=5Fnuclear=5Fheat=5Fmw=20for=20clarity=20and=20c?= =?UTF-8?q?onsistency=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/blanket_library.py | 38 +++++++++++++++++++++--------- process/stellarator.py | 16 +++++++++---- source/fortran/blanket_library.f90 | 4 ++-- tests/integration/ref_dicts.json | 8 +++---- 4 files changed, 44 insertions(+), 22 deletions(-) diff --git a/process/blanket_library.py b/process/blanket_library.py index eb4e8ba7f0..3e3b300a57 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -1585,7 +1585,7 @@ def thermo_hydraulic_model(self, output: bool): # Pre calculations needed for thermo-hydraulic model # ###################################################### # IB/OB FW (MW) - blanket_library.pnucfwi = ( + blanket_library.p_fw_inboard_nuclear_heat_mw = ( fwbs_variables.p_fw_nuclear_heat_total_mw * build_variables.a_fw_inboard / build_variables.a_fw_total @@ -1658,19 +1658,35 @@ def thermo_hydraulic_model(self, output: bool): if fwbs_variables.i_fw_blkt_shared_coolant == 0: # Fraction of heat to be removed by IB/OB FW if fwbs_variables.icooldual == 2: - f_nuc_fwi = (blanket_library.pnucfwi + fwbs_variables.psurffwi) / ( - blanket_library.pnucfwi + fwbs_variables.psurffwi + pnucblkti_struct + f_nuc_fwi = ( + blanket_library.p_fw_inboard_nuclear_heat_mw + + fwbs_variables.psurffwi + ) / ( + blanket_library.p_fw_inboard_nuclear_heat_mw + + fwbs_variables.psurffwi + + pnucblkti_struct ) - f_nuc_fwo = (blanket_library.p_fw_outboard_nuclear_heat_mw + fwbs_variables.psurffwo) / ( - blanket_library.p_fw_outboard_nuclear_heat_mw + fwbs_variables.psurffwo + pnucblkto_struct + f_nuc_fwo = ( + blanket_library.p_fw_outboard_nuclear_heat_mw + + fwbs_variables.psurffwo + ) / ( + blanket_library.p_fw_outboard_nuclear_heat_mw + + fwbs_variables.psurffwo + + pnucblkto_struct ) else: - f_nuc_fwi = (blanket_library.pnucfwi + fwbs_variables.psurffwi) / ( - blanket_library.pnucfwi + f_nuc_fwi = ( + blanket_library.p_fw_inboard_nuclear_heat_mw + + fwbs_variables.psurffwi + ) / ( + blanket_library.p_fw_inboard_nuclear_heat_mw + fwbs_variables.psurffwi + blanket_library.p_blkt_nuclear_heat_inboard_mw ) - f_nuc_fwo = (blanket_library.p_fw_outboard_nuclear_heat_mw + fwbs_variables.psurffwo) / ( + f_nuc_fwo = ( + blanket_library.p_fw_outboard_nuclear_heat_mw + + fwbs_variables.psurffwo + ) / ( blanket_library.p_fw_outboard_nuclear_heat_mw + fwbs_variables.psurffwo + blanket_library.p_blkt_nuclear_heat_outboard_mw @@ -1706,7 +1722,7 @@ def thermo_hydraulic_model(self, output: bool): build_variables.dr_fw_inboard, build_variables.a_fw_inboard, fwbs_variables.psurffwi, - blanket_library.pnucfwi, + blanket_library.p_fw_inboard_nuclear_heat_mw, "Inboard first wall", ) # ( @@ -1721,7 +1737,7 @@ def thermo_hydraulic_model(self, output: bool): # build_variables.dr_fw_inboard, # build_variables.a_fw_inboard, # fwbs_variables.psurffwi, - # blanket_library.pnucfwi, + # blanket_library.p_fw_inboard_nuclear_heat_mw, # "Inboard first wall", # ) (fwbs_variables.tpeakfwo, cf, rhof, fwbs_variables.mffwpo) = self.fw.fw_temp( @@ -1752,7 +1768,7 @@ def thermo_hydraulic_model(self, output: bool): # Total mass flow rate to remove inboard FW power (kg/s) blanket_library.mflow_fw_inboard_coolant_total = ( 1.0e6 - * (blanket_library.pnucfwi + fwbs_variables.psurffwi) + * (blanket_library.p_fw_inboard_nuclear_heat_mw + fwbs_variables.psurffwi) / (fwbs_variables.cp_fw * (fwoutleti - fwbs_variables.temp_fw_coolant_in)) ) # Total mass flow rate to remove outboard FW power (kg/s) diff --git a/process/stellarator.py b/process/stellarator.py index 3788f4b1e1..c3d8fae4f8 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -1442,12 +1442,16 @@ def stfwbs(self, output: bool): # as a fraction of the total thermal power deposited in the # coolant. - pnucfwi = pnucfwbsi * (1.0e0 - np.exp(-2.0e0 * bfwi / decayfwi)) - p_fw_outboard_nuclear_heat_mw = pnucfwbso * (1.0e0 - np.exp(-2.0e0 * bfwo / decayfwo)) + p_fw_inboard_nuclear_heat_mw = pnucfwbsi * ( + 1.0e0 - np.exp(-2.0e0 * bfwi / decayfwi) + ) + p_fw_outboard_nuclear_heat_mw = pnucfwbso * ( + 1.0e0 - np.exp(-2.0e0 * bfwo / decayfwo) + ) # Neutron power reaching blanket and shield (MW) - pnucbsi = pnucfwbsi - pnucfwi + pnucbsi = pnucfwbsi - p_fw_inboard_nuclear_heat_mw pnucbso = pnucfwbso - p_fw_outboard_nuclear_heat_mw # Blanket decay length (m) - improved calculation required @@ -1479,7 +1483,7 @@ def stfwbs(self, output: bool): heat_transport_variables.htpmw_fw = ( heat_transport_variables.fpumpfw * ( - pnucfwi + p_fw_inboard_nuclear_heat_mw + p_fw_outboard_nuclear_heat_mw + psurffwi + psurffwo @@ -1504,7 +1508,9 @@ def stfwbs(self, output: bool): # Total nuclear heating of first wall (MW) - fwbs_variables.p_fw_nuclear_heat_total_mw = pnucfwi + p_fw_outboard_nuclear_heat_mw + fwbs_variables.p_fw_nuclear_heat_total_mw = ( + p_fw_inboard_nuclear_heat_mw + p_fw_outboard_nuclear_heat_mw + ) # Total nuclear heating of blanket (MW) diff --git a/source/fortran/blanket_library.f90 b/source/fortran/blanket_library.f90 index 793c33bf72..af3a83b32d 100644 --- a/source/fortran/blanket_library.f90 +++ b/source/fortran/blanket_library.f90 @@ -63,7 +63,7 @@ module blanket_library real(dp) :: bzfllengi_liq, bzfllengo_liq !! Inboard/outboard secondary blanket flow lengths (m) - real(dp) :: pnucfwi, p_fw_outboard_nuclear_heat_mw + real(dp) :: p_fw_inboard_nuclear_heat_mw, p_fw_outboard_nuclear_heat_mw !! Inboard/outboard first wall nuclear heating (MW) real(dp) :: tpeakfwi, tpeakfwo @@ -145,7 +145,7 @@ subroutine init_blanket_library bzfllengi_liq = 0.0D0 bzfllengo_liq = 0.0D0 len_blkt_outboard_channel_total = 0.0D0 - pnucfwi = 0.0D0 + p_fw_inboard_nuclear_heat_mw = 0.0D0 p_fw_outboard_nuclear_heat_mw = 0.0D0 tpeakfwi = 0.0D0 tpeakfwo = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 846d6a6cf9..ea759081e4 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3569,7 +3569,7 @@ "p_blkt_nuclear_heat_outboard_mw": 0.0, "p_div_nuclear_heat_total_mw": 0.0, "p_fw_nuclear_heat_total_mw": 0.0, - "pnucfwi": 0.0, + "p_fw_inboard_nuclear_heat_mw": 0.0, "p_fw_outboard_nuclear_heat_mw": 0.0, "p_fw_hcd_nuclear_heat_mw": 0.0, "pnucloss": 0.0, @@ -10327,7 +10327,7 @@ "p_blkt_nuclear_heat_outboard_mw": "Neutron power deposited inboard/outboard blanket blanket (MW)", "p_div_nuclear_heat_total_mw": "nuclear heating in the divertor (MW)", "p_fw_nuclear_heat_total_mw": "nuclear heating in the first wall (MW)", - "pnucfwi": "Inboard/outboard first wall nuclear heating (MW)", + "p_fw_inboard_nuclear_heat_mw": "Inboard/outboard first wall nuclear heating (MW)", "p_fw_outboard_nuclear_heat_mw": "Inboard/outboard first wall nuclear heating (MW)", "p_fw_hcd_nuclear_heat_mw": "nuclear heating in the HCD apparatus and diagnostics (MW)", "pnucloss": "nuclear heating lost via holes (MW)", @@ -17264,7 +17264,7 @@ "bllengo", "len_blkt_inboard_channel_total", "len_blkt_outboard_channel_total", - "pnucfwi", + "p_fw_inboard_nuclear_heat_mw", "p_fw_outboard_nuclear_heat_mw", "tpeakfwi", "tpeakfwo", @@ -18648,7 +18648,7 @@ "vel_blkt_outboard_coolant", "tpeakfwi", "tpeakfwo", - "pnucfwi", + "p_fw_inboard_nuclear_heat_mw", "p_fw_outboard_nuclear_heat_mw", "p_blkt_nuclear_heat_inboard_mw", "p_blkt_nuclear_heat_outboard_mw", From 1fa621bddb36494285041eff589f458474308e5a Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 19 Feb 2025 09:38:32 +0000 Subject: [PATCH 65/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20icooldual=20to=20?= =?UTF-8?q?i=5Fblkt=5Fdual=5Fcoolant=20for=20clarity=20and=20consistency?= =?UTF-8?q?=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proc-pages/eng-models/fw-blanket.md | 2 +- process/blanket_library.py | 36 +++++++++---------- process/dcll.py | 10 +++--- process/power.py | 16 ++++----- source/fortran/dcll.f90 | 2 +- source/fortran/fwbs_variables.f90 | 6 ++-- source/fortran/input.f90 | 6 ++-- .../input_files/st_regression.IN.DAT | 4 +-- tests/unit/test_blanket_library.py | 16 ++++----- tests/unit/test_dcll.py | 8 ++--- 10 files changed, 53 insertions(+), 53 deletions(-) diff --git a/documentation/proc-pages/eng-models/fw-blanket.md b/documentation/proc-pages/eng-models/fw-blanket.md index 6fe4c8930f..e80edb79ef 100644 --- a/documentation/proc-pages/eng-models/fw-blanket.md +++ b/documentation/proc-pages/eng-models/fw-blanket.md @@ -147,7 +147,7 @@ The temperature difference between the channel inner wall (film temperature) and ### Model Switches -There are three blanket model options, chosen by the user to match their selected blanket design using the switch 'icooldual' (default=0): +There are three blanket model options, chosen by the user to match their selected blanket design using the switch 'i_blkt_dual_coolant' (default=0): 0. Solid breeder - nuclear heating in the blanket is exctrated by the primary coolant. 1. Liquid metal breeder, single-coolant - nuclear heating in the blanket is exctrated by the primary coolant. diff --git a/process/blanket_library.py b/process/blanket_library.py index 3e3b300a57..95c5fd8ee3 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -642,7 +642,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): included there. Returns the pressure drops as a list with the number of entries dependent upon - the switches icooldual and i_blkt_inboard. + the switches i_blkt_dual_coolant and i_blkt_inboard. """ npoltoti = 0 npoltoto = 0 @@ -689,7 +689,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): # Calculate poloidal height of blanket modules self.blanket_mod_pol_height() - if fwbs_variables.icooldual > 0: + if fwbs_variables.i_blkt_dual_coolant > 0: # Use smallest space available to pipes for pipe sizes in pumping calculations (worst case) if fwbs_variables.i_blkt_inboard == 1: # Radial direction @@ -760,7 +760,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): no180fw = 0 # N.B. This is for BZ only, does not include MF/BSS. - if fwbs_variables.icooldual == 2 or fwbs_variables.icooldual == 1: + if fwbs_variables.i_blkt_dual_coolant == 2 or fwbs_variables.i_blkt_dual_coolant == 1: no90bz = 4 no180bz = 1 no90bz_liq = 2 @@ -802,7 +802,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): ) # If the blanket is dual-coolant... - if fwbs_variables.icooldual == 2: + if fwbs_variables.i_blkt_dual_coolant == 2: # Calc total num of pipes (in all inboard modules) from # coolant frac and channel dimensions # Assumes up/down flow, two 90 deg bends per length @@ -879,7 +879,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): ) # If the blanket is single-coolant with liquid metal breeder... - elif fwbs_variables.icooldual == 1: + elif fwbs_variables.i_blkt_dual_coolant == 1: # Calc total num of pipes (in all inboard modules) from # coolant frac and channel dimensions # Assumes up/down flow, two 90 deg bends per length @@ -1095,7 +1095,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): ) # If the blanket has a liquid metal breeder... - if fwbs_variables.icooldual > 0: + if fwbs_variables.i_blkt_dual_coolant > 0: deltap_blo_liq = self.deltap_tot( output, icoolpump=2, @@ -1447,12 +1447,12 @@ def liquid_breeder_properties(self, output: bool = False): po.oheadr(self.outfile, "Blanket : Liquid Breeder Properties") - if fwbs_variables.icooldual == 1: + if fwbs_variables.i_blkt_dual_coolant == 1: po.ocmmnt( self.outfile, "Single coolant: liquid metal circulted for tritium extraction.", ) - if fwbs_variables.icooldual == 2: + if fwbs_variables.i_blkt_dual_coolant == 2: po.ocmmnt(self.outfile, "Dual coolant: self-cooled liquid metal breeder.") if fwbs_variables.i_bb_liq == 0: @@ -1618,7 +1618,7 @@ def thermo_hydraulic_model(self, output: bool): # goes into the liquid breeder to be cooled by itself. # If the blanket is dual-coolant... - if fwbs_variables.icooldual == 2: + if fwbs_variables.i_blkt_dual_coolant == 2: f_nuc_pow_bz_liq = 1 - fwbs_variables.f_nuc_pow_bz_struct # Inboard blanket calc. Will return 0 if no inboard dr_shld_inboard thickness @@ -1657,7 +1657,7 @@ def thermo_hydraulic_model(self, output: bool): # If FW and BB have the same coolant... if fwbs_variables.i_fw_blkt_shared_coolant == 0: # Fraction of heat to be removed by IB/OB FW - if fwbs_variables.icooldual == 2: + if fwbs_variables.i_blkt_dual_coolant == 2: f_nuc_fwi = ( blanket_library.p_fw_inboard_nuclear_heat_mw + fwbs_variables.psurffwi @@ -1779,7 +1779,7 @@ def thermo_hydraulic_model(self, output: bool): ) # If the blanket is dual-coolant... - if fwbs_variables.icooldual == 2: + if fwbs_variables.i_blkt_dual_coolant == 2: # Mass flow rates for outboard blanket coolants (kg/s) blanket_library.mflow_blkt_outboard_coolant = ( 1.0e6 @@ -1822,7 +1822,7 @@ def thermo_hydraulic_model(self, output: bool): ) # If the blanket is single-coolant with liquid metal breeder... - elif fwbs_variables.icooldual == 1: + elif fwbs_variables.i_blkt_dual_coolant == 1: # Mass flow rate for outboard blanket coolant (kg/s) blanket_library.mflow_blkt_outboard_coolant = ( 1.0e6 @@ -1892,7 +1892,7 @@ def thermo_hydraulic_model(self, output: bool): deltap_fwi = deltap[0] deltap_fwo = deltap[1] deltap_blo = deltap[2] - if fwbs_variables.icooldual > 0: + if fwbs_variables.i_blkt_dual_coolant > 0: if fwbs_variables.i_blkt_inboard == 1: deltap_bli = deltap[3] deltap_blo_liq = deltap[4] @@ -2000,7 +2000,7 @@ def thermo_hydraulic_model(self, output: bool): ) # If the blanket has a liquid metal breeder... - if fwbs_variables.icooldual > 0: + if fwbs_variables.i_blkt_dual_coolant > 0: # Total pressure drop in the blanket (Pa) if fwbs_variables.i_coolant_pumping == 2: if fwbs_variables.i_blkt_inboard == 1: @@ -2154,7 +2154,7 @@ def thermo_hydraulic_model(self, output: bool): ) # BB Liquid Metal Breeder ! - if fwbs_variables.icooldual > 0: + if fwbs_variables.i_blkt_dual_coolant > 0: po.osubhd(self.outfile, "Breeding Blanket (breeder): ") po.ovarin( @@ -2163,7 +2163,7 @@ def thermo_hydraulic_model(self, output: bool): "(i_bb_liq)", fwbs_variables.i_bb_liq, ) - if fwbs_variables.icooldual == 2: + if fwbs_variables.i_blkt_dual_coolant == 2: po.ocmmnt( self.outfile, "Dual-coolant BB, i.e. self-cooled breeder." ) @@ -2217,7 +2217,7 @@ def thermo_hydraulic_model(self, output: bool): fwbs_variables.htpmw_blkt, "OP ", ) - if fwbs_variables.icooldual > 0: + if fwbs_variables.i_blkt_dual_coolant > 0: po.ovarre( self.outfile, "Mechanical pumping power for blanket liquid breeder (MW)", @@ -2232,7 +2232,7 @@ def thermo_hydraulic_model(self, output: bool): primary_pumping_variables.htpmw_fw_blkt, "OP ", ) - if fwbs_variables.icooldual > 0: + if fwbs_variables.i_blkt_dual_coolant > 0: po.ovarre( self.outfile, "Total mechanical pumping power for FW, blanket and liquid metal breeder(MW)", diff --git a/process/dcll.py b/process/dcll.py index 81352d3bf0..4974e7592d 100644 --- a/process/dcll.py +++ b/process/dcll.py @@ -42,7 +42,7 @@ class DCLL: i_bb_liq = 0 * Liquid Metal Breeder Material = PbLi Specify dual-coolant i.e., get mass flow required from heat extracted from liqid metal breeder - icooldual = 2 + i_blkt_dual_coolant = 2 FIC switch: 0 = no FIC, Eurofer; 1 = FCIs, perfect electrical insulator, 2 = FCIs, with specified conductance ifci = 0, 1, or 2 @@ -365,7 +365,7 @@ def dcll_power_and_heating(self, output: bool): "OP ", ) - if fwbs_variables.icooldual > 0: + if fwbs_variables.i_blkt_dual_coolant > 0: po.ovarre( self.outfile, "Mechanical pumping power for liquid metal breeder (MW)", @@ -413,7 +413,7 @@ def dcll_power_and_heating(self, output: bool): "(pres_blkt_coolant)", fwbs_variables.pres_blkt_coolant, ) - if fwbs_variables.icooldual > 0: + if fwbs_variables.i_blkt_dual_coolant > 0: po.ovarre( self.outfile, "Blanket liquid metal breeder pressure (Pa)", @@ -524,7 +524,7 @@ def dcll_masses(self, output: bool): * (dcll_module.bz_r_ob * (1 - fwbs_variables.r_f_liq_ob)) / build_variables.dr_blkt_outboard ) - if fwbs_variables.icooldual > 0: + if fwbs_variables.i_blkt_dual_coolant > 0: fwbs_variables.vfblkt = ( (1 - dcll_module.f_vol_stl_bz_struct) * dcll_module.vol_bz_struct ) / fwbs_variables.vol_blkt_total @@ -596,7 +596,7 @@ def dcll_masses(self, output: bool): * (1 - fwbs_variables.r_f_liq_ob) / build_variables.dr_blkt_outboard ) - if fwbs_variables.icooldual > 0: + if fwbs_variables.i_blkt_dual_coolant > 0: fwbs_variables.vfblkt = ( (1 - dcll_module.f_vol_stl_bz_struct) * dcll_module.vol_bz_struct ) / fwbs_variables.vol_blkt_total diff --git a/process/power.py b/process/power.py index 9d61f1f517..0c0dba4f14 100644 --- a/process/power.py +++ b/process/power.py @@ -579,12 +579,12 @@ def power1(self): ) self.htpmwe_shld = heat_transport_variables.htpmw_shld / fwbs_variables.etahtp self.htpmwe_div = heat_transport_variables.htpmw_div / fwbs_variables.etahtp - if fwbs_variables.icooldual > 0 and fwbs_variables.i_coolant_pumping == 2: + if fwbs_variables.i_blkt_dual_coolant > 0 and fwbs_variables.i_coolant_pumping == 2: self.htpmwe_blkt_liq = ( heat_transport_variables.htpmw_blkt_liq / fwbs_variables.etahtp ) - if fwbs_variables.icooldual > 0 and fwbs_variables.i_coolant_pumping == 2: + if fwbs_variables.i_blkt_dual_coolant > 0 and fwbs_variables.i_coolant_pumping == 2: # Total mechanical pump power (deposited in coolant) self.htpmw_mech = ( primary_pumping_variables.htpmw_fw_blkt @@ -627,16 +627,16 @@ def power1(self): if fwbs_variables.i_coolant_pumping == 2: # Liquid metal breeder/coolant - if fwbs_variables.icooldual == 2: + if fwbs_variables.i_blkt_dual_coolant == 2: self.pthermblkt_liq = ( fwbs_variables.p_blkt_nuclear_heat_total_mw * fwbs_variables.f_nuc_pow_bz_liq ) + heat_transport_variables.htpmw_blkt_liq - elif fwbs_variables.icooldual == 1: + elif fwbs_variables.i_blkt_dual_coolant == 1: self.pthermblkt_liq = heat_transport_variables.htpmw_blkt_liq # First wall and blanket coolant combined - if fwbs_variables.icooldual == 2: + if fwbs_variables.i_blkt_dual_coolant == 2: self.pthermfw_blkt = ( self.pthermblkt_liq + fwbs_variables.p_fw_nuclear_heat_total_mw @@ -650,7 +650,7 @@ def power1(self): + physics_variables.p_fw_alpha_mw + current_drive_variables.nbshinemw ) - elif fwbs_variables.icooldual == 1: + elif fwbs_variables.i_blkt_dual_coolant == 1: self.pthermfw_blkt = ( self.pthermblkt_liq + fwbs_variables.p_fw_nuclear_heat_total_mw @@ -919,7 +919,7 @@ def power2(self, output: bool): if cost_variables.ireactor == 1: # Gross electric power # pgrossmw = (heat_transport_variables.pthermmw-hthermmw) * heat_transport_variables.etath - if fwbs_variables.icooldual > 0 and fwbs_variables.i_coolant_pumping == 2: + if fwbs_variables.i_blkt_dual_coolant > 0 and fwbs_variables.i_coolant_pumping == 2: heat_transport_variables.pgrossmw = ( (heat_transport_variables.pthermmw - self.pthermblkt_liq) * heat_transport_variables.etath @@ -1865,7 +1865,7 @@ def power2(self, output: bool): ) # Heat rejected by main power conversion circuit - if fwbs_variables.icooldual > 0 and fwbs_variables.i_coolant_pumping == 2: + if fwbs_variables.i_blkt_dual_coolant > 0 and fwbs_variables.i_coolant_pumping == 2: self.rejected_main = ( heat_transport_variables.pthermmw - self.pthermblkt_liq ) * (1 - heat_transport_variables.etath) + self.pthermblkt_liq * ( diff --git a/source/fortran/dcll.f90 b/source/fortran/dcll.f90 index 894dd94f1a..738447c4b8 100644 --- a/source/fortran/dcll.f90 +++ b/source/fortran/dcll.f90 @@ -28,7 +28,7 @@ module dcll_module !! i_bb_liq = 0 * Liquid Metal Breeder Material = PbLi !! !! Specify dual-coolant i.e., get mass flow required from heat extracted from liqid metal breeder - !! icooldual = 2 + !! i_blkt_dual_coolant = 2 !! !! FIC switch: 0 = no FIC, Eurofer; 1 = FCIs, perfect electrical insulator, 2 = FCIs, with specified conductance !! ifci = 0, 1, or 2 diff --git a/source/fortran/fwbs_variables.f90 b/source/fortran/fwbs_variables.f90 index 41b29a7c53..01dc31ad23 100644 --- a/source/fortran/fwbs_variables.f90 +++ b/source/fortran/fwbs_variables.f90 @@ -543,7 +543,7 @@ module fwbs_variables !! - =0 PbLi !! - =1 Li - integer :: icooldual + integer :: i_blkt_dual_coolant !! Switch to specify whether breeding blanket is single-cooled or dual-coolant. !! - =0 Single coolant used for FW and Blanket (H2O or He). Solid Breeder. !! - =1 Single coolant used for FW and Blanket (H2O or He). Liquid metal breeder @@ -563,7 +563,7 @@ module fwbs_variables !! - =1 SMS integer :: n_liq_recirc - !! Number of liquid metal breeder recirculations per day, for use with icooldual=1 + !! Number of liquid metal breeder recirculations per day, for use with i_blkt_dual_coolant=1 real(dp) :: r_f_liq_ib, r_f_liq_ob !! Radial fraction of BZ liquid channels @@ -807,7 +807,7 @@ subroutine init_fwbs_variables neut_flux_cp = 0.0D0 i_fw_blkt_shared_coolant = 0 i_bb_liq = 0 - icooldual = 0 + i_blkt_dual_coolant = 0 ifci = 0 ims = 0 n_liq_recirc = 10 diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index 9152cb4978..4a20e9ce69 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -218,7 +218,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) denstl, declfw, nphcdout, i_blkt_inboard, vfpblkt, temp_fw_coolant_in, wallpf, fblbe, & fhole, i_fw_blkt_vv_shape, coolp, temp_fw_max, irefprop, len_fw_channel, & f_blkt_li6_enrichment, etaiso, n_blkt_outboard_modules_toroidal, fvoldw, i_shield_mat, i_bb_liq, & - icooldual, ifci, inlet_temp_liq, outlet_temp_liq, bz_channel_conduct_liq, i_fw_blkt_shared_coolant, ims, & + i_blkt_dual_coolant, ifci, inlet_temp_liq, outlet_temp_liq, bz_channel_conduct_liq, i_fw_blkt_shared_coolant, ims, & i_blkt_coolant_type, emult use heat_transport_variables, only: htpmw_fw, baseel, fmgdmw, htpmw_div, & pwpm2, etath, vachtmw, iprimshld, fpumpdiv, pinjmax, htpmw_blkt, etatf, & @@ -1957,8 +1957,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('i_bb_liq') call parse_int_variable('i_bb_liq', i_bb_liq, 0, 1, & 'Switch for breeding blaket liquid metal') - case ('icooldual') - call parse_int_variable('icooldual', icooldual, 0, 2, & + case ('i_blkt_dual_coolant') + call parse_int_variable('i_blkt_dual_coolant', i_blkt_dual_coolant, 0, 2, & 'Switch for single or dual-coolant blanket)') case ('ifci') call parse_int_variable('ifci', ifci, 0, 2, & diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 5237f07e88..04615b8d65 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2563,7 +2563,7 @@ inuclear = 0 * =1 Li * JUSTIFICATION: Not yet set assuming default = 0 -*icooldual = +*i_blkt_dual_coolant = * DESCRIPTION: Switch to specify whether breeding blanket is single-cooled or dual-coolant. * =0 Single coolant used for FW and Blanket (H2O or He). Solid Breeder. * =1 Single coolant used for FW and Blanket (H2O or He). Liquid metal breeder @@ -2603,7 +2603,7 @@ outlet_temp_liq = 873.0 * JUSTIFICATION: Not yet set *n_liq_recirc = -* DESCRIPTION: Number of liquid metal breeder recirculations per day, for use with icooldual=1 (default = 10) +* DESCRIPTION: Number of liquid metal breeder recirculations per day, for use with i_blkt_dual_coolant=1 (default = 10) * JUSTIFICATION: Not yet set *pnuc_fw_ratio_dcll = diff --git a/tests/unit/test_blanket_library.py b/tests/unit/test_blanket_library.py index 190feedc38..01102adc61 100644 --- a/tests/unit/test_blanket_library.py +++ b/tests/unit/test_blanket_library.py @@ -51,7 +51,7 @@ class PrimaryCoolantPropertiesParam(NamedTuple): den_blkt_coolant: Any = None - icooldual: Any = None + i_blkt_dual_coolant: Any = None visc_blkt_coolant: Any = None @@ -96,7 +96,7 @@ class PrimaryCoolantPropertiesParam(NamedTuple): temp_blkt_coolant_out=773, pres_blkt_coolant=8000000, den_blkt_coolant=0, - icooldual=2, + i_blkt_dual_coolant=2, visc_blkt_coolant=0, cp_bl=0, cv_bl=0, @@ -124,7 +124,7 @@ class PrimaryCoolantPropertiesParam(NamedTuple): temp_blkt_coolant_out=773, pres_blkt_coolant=8000000, den_blkt_coolant=5.6389735407435868, - icooldual=2, + i_blkt_dual_coolant=2, visc_blkt_coolant=3.5036293160410249e-05, cp_bl=5188.5588430173211, cv_bl=3123.5687263525392, @@ -217,7 +217,7 @@ def test_primary_coolant_properties( ) monkeypatch.setattr( - fwbs_variables, "icooldual", primarycoolantpropertiesparam.icooldual + fwbs_variables, "i_blkt_dual_coolant", primarycoolantpropertiesparam.i_blkt_dual_coolant ) monkeypatch.setattr( @@ -1637,7 +1637,7 @@ class LiquidBreederPropertiesParam(NamedTuple): hartmann_liq: Any = None b_mag_blkt: Any = None i_blkt_inboard: Any = None - icooldual: Any = None + i_blkt_dual_coolant: Any = None bt: Any = None aspect: Any = None rmajor: Any = None @@ -1671,7 +1671,7 @@ class LiquidBreederPropertiesParam(NamedTuple): hartmann_liq=np.array(np.array((0, 0), order="F"), order="F").transpose(), b_mag_blkt=np.array(np.array((5, 5), order="F"), order="F").transpose(), i_blkt_inboard=1, - icooldual=0, + i_blkt_dual_coolant=0, bt=5.7000000000000002, aspect=3, rmajor=8, @@ -1708,7 +1708,7 @@ class LiquidBreederPropertiesParam(NamedTuple): hartmann_liq=np.array(np.array((0, 0), order="F"), order="F").transpose(), b_mag_blkt=np.array(np.array((5, 5), order="F"), order="F").transpose(), i_blkt_inboard=1, - icooldual=0, + i_blkt_dual_coolant=0, bt=5.7000000000000002, aspect=3, rmajor=8, @@ -1791,7 +1791,7 @@ def test_liquid_breeder_properties( fwbs_variables, "i_blkt_inboard", liquidbreederpropertiesparam.i_blkt_inboard ) monkeypatch.setattr( - fwbs_variables, "icooldual", liquidbreederpropertiesparam.icooldual + fwbs_variables, "i_blkt_dual_coolant", liquidbreederpropertiesparam.i_blkt_dual_coolant ) monkeypatch.setattr(physics_variables, "bt", liquidbreederpropertiesparam.bt) monkeypatch.setattr( diff --git a/tests/unit/test_dcll.py b/tests/unit/test_dcll.py index aa1544ac88..93e70083d0 100644 --- a/tests/unit/test_dcll.py +++ b/tests/unit/test_dcll.py @@ -378,7 +378,7 @@ class DcllMassesParam(NamedTuple): vfblkt: Any = None - icooldual: Any = None + i_blkt_dual_coolant: Any = None den_fw_coolant: Any = None @@ -583,7 +583,7 @@ class DcllMassesParam(NamedTuple): w_f_liq_ib=0.5, w_f_liq_ob=0.5, vfblkt=0.25, - icooldual=2, + i_blkt_dual_coolant=2, den_fw_coolant=5.6389735407435868, den_blkt_coolant=5.6389735407435868, n_blkt_inboard_modules_toroidal=32, @@ -702,7 +702,7 @@ class DcllMassesParam(NamedTuple): w_f_liq_ib=0.79000002145767212, w_f_liq_ob=0.79000002145767212, vfblkt=0.082598954955828252, - icooldual=2, + i_blkt_dual_coolant=2, den_fw_coolant=5.6389735407435868, den_blkt_coolant=5.6389735407435868, n_blkt_inboard_modules_toroidal=32, @@ -897,7 +897,7 @@ def test_dcll_masses(dcllmassesparam, monkeypatch, dcll): monkeypatch.setattr(fwbs_variables, "vfblkt", dcllmassesparam.vfblkt) - monkeypatch.setattr(fwbs_variables, "icooldual", dcllmassesparam.icooldual) + monkeypatch.setattr(fwbs_variables, "i_blkt_dual_coolant", dcllmassesparam.i_blkt_dual_coolant) monkeypatch.setattr( fwbs_variables, "den_fw_coolant", dcllmassesparam.den_fw_coolant From 6f7d5bcfde49ae9ab356fb28ed6685445e05f59c Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 19 Feb 2025 09:41:32 +0000 Subject: [PATCH 66/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20vvmass=20to=20m?= =?UTF-8?q?=5Fvv=20for=20clarity=20and=20consistency=20across=20the=20code?= =?UTF-8?q?base?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/csv_output_large_tokamak_MFILE.DAT | 2 +- examples/data/large_tokamak_1_MFILE.DAT | 2 +- examples/data/large_tokamak_2_MFILE.DAT | 2 +- examples/data/large_tokamak_3_MFILE.DAT | 2 +- examples/data/large_tokamak_4_MFILE.DAT | 2 +- examples/data/scan_MFILE.DAT | 18 +++++------ process/blanket_library.py | 7 +++-- process/costs.py | 2 +- process/costs_2015.py | 2 +- process/hcpb.py | 6 ++-- process/power.py | 20 ++++++++++--- process/stellarator.py | 8 ++--- source/fortran/fwbs_variables.f90 | 4 +-- .../data/large_tokamak_1_MFILE.DAT | 2 +- .../data/large_tokamak_2_MFILE.DAT | 2 +- .../data/large_tokamak_3_MFILE.DAT | 2 +- .../data/large_tokamak_4_MFILE.DAT | 2 +- .../integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 30 +++++++++---------- tests/integration/data/scan_MFILE.DAT | 18 +++++------ tests/integration/ref_dicts.json | 6 ++-- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- tests/unit/test_blanket_library.py | 22 +++++++------- tests/unit/test_ccfe_hcpb.py | 8 ++--- tests/unit/test_costs_1990.py | 8 ++--- tests/unit/test_costs_2015.py | 8 ++--- tests/unit/test_dcll.py | 4 ++- 27 files changed, 106 insertions(+), 87 deletions(-) diff --git a/examples/data/csv_output_large_tokamak_MFILE.DAT b/examples/data/csv_output_large_tokamak_MFILE.DAT index 54d71f92d2..4942c2dc0a 100644 --- a/examples/data/csv_output_large_tokamak_MFILE.DAT +++ b/examples/data/csv_output_large_tokamak_MFILE.DAT @@ -972,7 +972,7 @@ ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 + Vacuum_vessel_mass_(kg)_________________________________________________ (m_vv)______________________ 7.9388E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 2.2718E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6038E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2682E+03 OP diff --git a/examples/data/large_tokamak_1_MFILE.DAT b/examples/data/large_tokamak_1_MFILE.DAT index 2438a233ee..1fb37f3690 100644 --- a/examples/data/large_tokamak_1_MFILE.DAT +++ b/examples/data/large_tokamak_1_MFILE.DAT @@ -967,7 +967,7 @@ ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 + Vacuum_vessel_mass_(kg)_________________________________________________ (m_vv)______________________ 7.9388E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 2.5118E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6315E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2901E+03 OP diff --git a/examples/data/large_tokamak_2_MFILE.DAT b/examples/data/large_tokamak_2_MFILE.DAT index b6beed7a3a..91fa5ca477 100644 --- a/examples/data/large_tokamak_2_MFILE.DAT +++ b/examples/data/large_tokamak_2_MFILE.DAT @@ -967,7 +967,7 @@ ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 + Vacuum_vessel_mass_(kg)_________________________________________________ (m_vv)______________________ 7.9388E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 2.5118E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6315E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2901E+03 OP diff --git a/examples/data/large_tokamak_3_MFILE.DAT b/examples/data/large_tokamak_3_MFILE.DAT index e72680b55f..ea0f09bb4b 100644 --- a/examples/data/large_tokamak_3_MFILE.DAT +++ b/examples/data/large_tokamak_3_MFILE.DAT @@ -967,7 +967,7 @@ ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 + Vacuum_vessel_mass_(kg)_________________________________________________ (m_vv)______________________ 7.9388E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 2.5118E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6315E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2901E+03 OP diff --git a/examples/data/large_tokamak_4_MFILE.DAT b/examples/data/large_tokamak_4_MFILE.DAT index e7d4598400..6a58c239e5 100644 --- a/examples/data/large_tokamak_4_MFILE.DAT +++ b/examples/data/large_tokamak_4_MFILE.DAT @@ -967,7 +967,7 @@ ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 + Vacuum_vessel_mass_(kg)_________________________________________________ (m_vv)______________________ 7.9388E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 2.5118E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6315E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2901E+03 OP diff --git a/examples/data/scan_MFILE.DAT b/examples/data/scan_MFILE.DAT index f0749ceaab..eb3564dfa4 100644 --- a/examples/data/scan_MFILE.DAT +++ b/examples/data/scan_MFILE.DAT @@ -796,7 +796,7 @@ ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP - Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP + Vacuum_vessel_mass_(kg)_________________________________________________ (m_vv)______________________ 9.5369E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 5.8227E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 2.4609E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP @@ -1791,7 +1791,7 @@ ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP - Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP + Vacuum_vessel_mass_(kg)_________________________________________________ (m_vv)______________________ 9.5369E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 5.8227E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 2.4609E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP @@ -2786,7 +2786,7 @@ ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP - Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP + Vacuum_vessel_mass_(kg)_________________________________________________ (m_vv)______________________ 9.5369E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 5.8228E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 2.4609E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP @@ -3781,7 +3781,7 @@ ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP - Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP + Vacuum_vessel_mass_(kg)_________________________________________________ (m_vv)______________________ 9.5369E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 5.8228E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 2.4609E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP @@ -4776,7 +4776,7 @@ ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP - Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP + Vacuum_vessel_mass_(kg)_________________________________________________ (m_vv)______________________ 9.5369E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 5.8228E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 2.4609E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP @@ -5771,7 +5771,7 @@ ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP - Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP + Vacuum_vessel_mass_(kg)_________________________________________________ (m_vv)______________________ 9.5369E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 5.8228E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 2.4609E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP @@ -6766,7 +6766,7 @@ ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP - Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP + Vacuum_vessel_mass_(kg)_________________________________________________ (m_vv)______________________ 9.5369E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 5.8228E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 2.4609E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP @@ -7761,7 +7761,7 @@ ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP - Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP + Vacuum_vessel_mass_(kg)_________________________________________________ (m_vv)______________________ 9.5369E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 5.8228E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 2.4609E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP @@ -8756,7 +8756,7 @@ ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP - Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP + Vacuum_vessel_mass_(kg)_________________________________________________ (m_vv)______________________ 9.5369E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 5.8228E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 2.4609E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP diff --git a/process/blanket_library.py b/process/blanket_library.py index 95c5fd8ee3..f6071ce68f 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -429,7 +429,7 @@ def external_cryo_geometry() -> None: ) - (fwbs_variables.vol_cryostat_internal) # Vacuum vessel mass (kg) - fwbs_variables.vvmass = fwbs_variables.vol_vv * fwbs_variables.denstl + fwbs_variables.m_vv = fwbs_variables.vol_vv * fwbs_variables.denstl # Sum of internal vacuum vessel and cryostat masses (kg) fwbs_variables.dewmkg = ( @@ -760,7 +760,10 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): no180fw = 0 # N.B. This is for BZ only, does not include MF/BSS. - if fwbs_variables.i_blkt_dual_coolant == 2 or fwbs_variables.i_blkt_dual_coolant == 1: + if ( + fwbs_variables.i_blkt_dual_coolant == 2 + or fwbs_variables.i_blkt_dual_coolant == 1 + ): no90bz = 4 no180bz = 1 no90bz_liq = 2 diff --git a/process/costs.py b/process/costs.py index 898d560a02..a07850952e 100644 --- a/process/costs.py +++ b/process/costs.py @@ -1779,7 +1779,7 @@ def acc2223(self): """ cmlsa = [0.6900e0, 0.8450e0, 0.9225e0, 1.0000e0] - self.c2223 = 1.0e-6 * fwbs_variables.vvmass * cost_variables.uccryo + self.c2223 = 1.0e-6 * fwbs_variables.m_vv * cost_variables.uccryo self.c2223 = cost_variables.fkind * self.c2223 * cmlsa[cost_variables.lsa - 1] def acc223(self): diff --git a/process/costs_2015.py b/process/costs_2015.py index 6537da91cb..4b1e6ee376 100644 --- a/process/costs_2015.py +++ b/process/costs_2015.py @@ -927,7 +927,7 @@ def calc_remaining_subsystems(self): # Cost of ITER VV in-wall shielding, ports and in-vessel coils self.s_cref[36] = 211.0e6 # Scale with vacuum vessel mass (kg) - self.s_k[36] = fwbs_variables.vvmass + self.s_k[36] = fwbs_variables.m_vv self.s_kref[36] = 5.2360e6 self.s_cost[36] = ( self.s_cost_factor[36] diff --git a/process/hcpb.py b/process/hcpb.py index e16de6cfb3..704387592c 100644 --- a/process/hcpb.py +++ b/process/hcpb.py @@ -429,7 +429,7 @@ def nuclear_heating_magnets(self, output: bool): d_vv_all = build_variables.dr_vv_outboard if d_vv_all > 1.0e-6: - ccfe_hcpb_module.vv_density = fwbs_variables.vvmass / fwbs_variables.vol_vv + ccfe_hcpb_module.vv_density = fwbs_variables.m_vv / fwbs_variables.vol_vv else: ccfe_hcpb_module.vv_density = 0.0 @@ -1373,8 +1373,8 @@ def write_output(self): po.ovarre( self.outfile, "Vacuum vessel mass (kg)", - "(vvmass)", - fwbs_variables.vvmass, + "(m_vv)", + fwbs_variables.m_vv, "OP ", ) diff --git a/process/power.py b/process/power.py index 0c0dba4f14..6cf6b24b04 100644 --- a/process/power.py +++ b/process/power.py @@ -579,12 +579,18 @@ def power1(self): ) self.htpmwe_shld = heat_transport_variables.htpmw_shld / fwbs_variables.etahtp self.htpmwe_div = heat_transport_variables.htpmw_div / fwbs_variables.etahtp - if fwbs_variables.i_blkt_dual_coolant > 0 and fwbs_variables.i_coolant_pumping == 2: + if ( + fwbs_variables.i_blkt_dual_coolant > 0 + and fwbs_variables.i_coolant_pumping == 2 + ): self.htpmwe_blkt_liq = ( heat_transport_variables.htpmw_blkt_liq / fwbs_variables.etahtp ) - if fwbs_variables.i_blkt_dual_coolant > 0 and fwbs_variables.i_coolant_pumping == 2: + if ( + fwbs_variables.i_blkt_dual_coolant > 0 + and fwbs_variables.i_coolant_pumping == 2 + ): # Total mechanical pump power (deposited in coolant) self.htpmw_mech = ( primary_pumping_variables.htpmw_fw_blkt @@ -919,7 +925,10 @@ def power2(self, output: bool): if cost_variables.ireactor == 1: # Gross electric power # pgrossmw = (heat_transport_variables.pthermmw-hthermmw) * heat_transport_variables.etath - if fwbs_variables.i_blkt_dual_coolant > 0 and fwbs_variables.i_coolant_pumping == 2: + if ( + fwbs_variables.i_blkt_dual_coolant > 0 + and fwbs_variables.i_coolant_pumping == 2 + ): heat_transport_variables.pgrossmw = ( (heat_transport_variables.pthermmw - self.pthermblkt_liq) * heat_transport_variables.etath @@ -1865,7 +1874,10 @@ def power2(self, output: bool): ) # Heat rejected by main power conversion circuit - if fwbs_variables.i_blkt_dual_coolant > 0 and fwbs_variables.i_coolant_pumping == 2: + if ( + fwbs_variables.i_blkt_dual_coolant > 0 + and fwbs_variables.i_coolant_pumping == 2 + ): self.rejected_main = ( heat_transport_variables.pthermmw - self.pthermblkt_liq ) * (1 - heat_transport_variables.etath) + self.pthermblkt_liq * ( diff --git a/process/stellarator.py b/process/stellarator.py index c3d8fae4f8..a60957d4b3 100644 --- a/process/stellarator.py +++ b/process/stellarator.py @@ -1891,7 +1891,7 @@ def stfwbs(self, output: bool): # Vacuum vessel mass - fwbs_variables.vvmass = fwbs_variables.vol_vv * fwbs_variables.denstl + fwbs_variables.m_vv = fwbs_variables.vol_vv * fwbs_variables.denstl # Sum of internal vacuum vessel and external cryostat masses @@ -2284,7 +2284,7 @@ def stfwbs(self, output: bool): self.outfile, "External cryostat mass (kg)", "", - fwbs_variables.dewmkg - fwbs_variables.vvmass, + fwbs_variables.dewmkg - fwbs_variables.m_vv, ) po.ovarre( self.outfile, @@ -2295,8 +2295,8 @@ def stfwbs(self, output: bool): po.ovarre( self.outfile, "Vacuum vessel mass (kg)", - "(vvmass)", - fwbs_variables.vvmass, + "(m_vv)", + fwbs_variables.m_vv, ) po.ovarre( self.outfile, diff --git a/source/fortran/fwbs_variables.f90 b/source/fortran/fwbs_variables.f90 index 01dc31ad23..ee455c3757 100644 --- a/source/fortran/fwbs_variables.f90 +++ b/source/fortran/fwbs_variables.f90 @@ -24,7 +24,7 @@ module fwbs_variables real(dp) :: m_fw_blkt_div_coolant_total !! mass of water coolant (in shield, blanket, first wall, divertor) [kg] - real(dp) :: vvmass + real(dp) :: m_vv !! vacuum vessel mass [kg] real(dp) :: denstl @@ -666,7 +666,7 @@ subroutine init_fwbs_variables life_blkt_fpy = 0.0D0 life_blkt = 0.0D0 m_fw_blkt_div_coolant_total = 0.0D0 - vvmass = 0.0D0 + m_vv = 0.0D0 denstl = 7800.0D0 denwc = 15630.0D0 dewmkg = 0.0D0 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 3d814898dc..6dcf14a86a 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -966,7 +966,7 @@ ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 + Vacuum_vessel_mass_(kg)_________________________________________________ (m_vv)______________________ 7.9388E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 2.5118E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6315E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2901E+03 OP diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 31d2a3fa0a..5ec61ea4f0 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -967,7 +967,7 @@ ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 + Vacuum_vessel_mass_(kg)_________________________________________________ (m_vv)______________________ 7.9388E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 2.5118E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6315E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2901E+03 OP diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 611cd5a6c1..32602809ae 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -967,7 +967,7 @@ ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 + Vacuum_vessel_mass_(kg)_________________________________________________ (m_vv)______________________ 7.9388E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 2.5118E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6315E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2901E+03 OP diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index e0810c7488..247974b715 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -967,7 +967,7 @@ ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 + Vacuum_vessel_mass_(kg)_________________________________________________ (m_vv)______________________ 7.9388E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 2.5118E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6315E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2901E+03 OP diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index babaaf0fbd..ed3b8847e3 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -970,7 +970,7 @@ ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 + Vacuum_vessel_mass_(kg)_________________________________________________ (m_vv)______________________ 7.9388E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 2.5460E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6290E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2880E+03 OP diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 3c703192a6..189bd0bd4c 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -968,7 +968,7 @@ ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 + Vacuum_vessel_mass_(kg)_________________________________________________ (m_vv)______________________ 7.9388E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 2.3700E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6103E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2733E+03 OP @@ -2131,7 +2131,7 @@ ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 + Vacuum_vessel_mass_(kg)_________________________________________________ (m_vv)______________________ 7.9388E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 2.3421E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6251E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2850E+03 OP @@ -3294,7 +3294,7 @@ ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 + Vacuum_vessel_mass_(kg)_________________________________________________ (m_vv)______________________ 7.9388E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 2.3152E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6329E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2912E+03 OP @@ -4457,7 +4457,7 @@ ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 + Vacuum_vessel_mass_(kg)_________________________________________________ (m_vv)______________________ 7.9388E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 2.3227E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6357E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2934E+03 OP @@ -5620,7 +5620,7 @@ ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 + Vacuum_vessel_mass_(kg)_________________________________________________ (m_vv)______________________ 7.9388E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 2.3582E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6383E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2955E+03 OP @@ -6783,7 +6783,7 @@ ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 + Vacuum_vessel_mass_(kg)_________________________________________________ (m_vv)______________________ 7.9388E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 2.3988E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6332E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2914E+03 OP @@ -7946,7 +7946,7 @@ ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 + Vacuum_vessel_mass_(kg)_________________________________________________ (m_vv)______________________ 7.9388E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 2.4079E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6364E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2940E+03 OP @@ -9109,7 +9109,7 @@ ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 + Vacuum_vessel_mass_(kg)_________________________________________________ (m_vv)______________________ 7.9388E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 2.3702E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6387E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2958E+03 OP @@ -10272,7 +10272,7 @@ ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 + Vacuum_vessel_mass_(kg)_________________________________________________ (m_vv)______________________ 7.9388E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 2.3232E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6326E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2909E+03 OP @@ -11435,7 +11435,7 @@ ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 + Vacuum_vessel_mass_(kg)_________________________________________________ (m_vv)______________________ 7.9388E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 2.3404E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6432E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2993E+03 OP @@ -12598,7 +12598,7 @@ ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 + Vacuum_vessel_mass_(kg)_________________________________________________ (m_vv)______________________ 7.9388E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 2.3925E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6529E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.3070E+03 OP @@ -13761,7 +13761,7 @@ ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 + Vacuum_vessel_mass_(kg)_________________________________________________ (m_vv)______________________ 7.9388E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 2.4316E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6523E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.3065E+03 OP @@ -14924,7 +14924,7 @@ ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 + Vacuum_vessel_mass_(kg)_________________________________________________ (m_vv)______________________ 7.9388E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 2.4474E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6612E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.3135E+03 OP @@ -16087,7 +16087,7 @@ ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 + Vacuum_vessel_mass_(kg)_________________________________________________ (m_vv)______________________ 7.9388E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 2.4190E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6699E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.3204E+03 OP @@ -17250,7 +17250,7 @@ ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 + Vacuum_vessel_mass_(kg)_________________________________________________ (m_vv)______________________ 7.9388E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 2.3908E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6791E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.3277E+03 OP diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index 62514209c0..bfc24b7742 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -796,7 +796,7 @@ ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP - Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP + Vacuum_vessel_mass_(kg)_________________________________________________ (m_vv)______________________ 9.5369E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 5.8227E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 2.4609E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP @@ -1791,7 +1791,7 @@ ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP - Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP + Vacuum_vessel_mass_(kg)_________________________________________________ (m_vv)______________________ 9.5369E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 5.8227E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 2.4609E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP @@ -2786,7 +2786,7 @@ ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP - Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP + Vacuum_vessel_mass_(kg)_________________________________________________ (m_vv)______________________ 9.5369E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 5.8228E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 2.4609E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP @@ -3781,7 +3781,7 @@ ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP - Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP + Vacuum_vessel_mass_(kg)_________________________________________________ (m_vv)______________________ 9.5369E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 5.8228E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 2.4609E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP @@ -4776,7 +4776,7 @@ ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP - Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP + Vacuum_vessel_mass_(kg)_________________________________________________ (m_vv)______________________ 9.5369E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 5.8228E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 2.4609E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP @@ -5771,7 +5771,7 @@ ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP - Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP + Vacuum_vessel_mass_(kg)_________________________________________________ (m_vv)______________________ 9.5369E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 5.8228E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 2.4609E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP @@ -6766,7 +6766,7 @@ ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP - Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP + Vacuum_vessel_mass_(kg)_________________________________________________ (m_vv)______________________ 9.5369E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 5.8228E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 2.4609E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP @@ -7761,7 +7761,7 @@ ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP - Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP + Vacuum_vessel_mass_(kg)_________________________________________________ (m_vv)______________________ 9.5369E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 5.8228E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 2.4609E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP @@ -8756,7 +8756,7 @@ ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 1.1222E+06 OP Total_mass_of_armour,_first_wall_and_blanket_(kg)_______________________ (armour_fw_bl_mass)___________ 4.0498E+06 OP Shield_Mass_(kg)________________________________________________________ (whtshld)_____________________ 2.4235E+06 OP - Vacuum_vessel_mass_(kg)_________________________________________________ (vvmass)______________________ 9.5369E+06 OP + Vacuum_vessel_mass_(kg)_________________________________________________ (m_vv)______________________ 9.5369E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 5.8228E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 2.4609E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.5585E+03 OP diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index ea759081e4..abf38b0c47 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -8018,7 +8018,7 @@ "vvhemaxo": 0.0, "vvhemini": 0.0, "vvhemino": 0.0, - "vvmass": 0.0, + "m_vv": 0.0, "w_he": 0.0, "wa": null, "walalw": 1.0, @@ -11127,7 +11127,7 @@ "vvhemaxo": "maximum final He. conc in OB VV [appm]", "vvhemini": "minimum final He. conc in IB VV [appm]", "vvhemino": "minimum final He. conc in OB VV [appm]", - "vvmass": "vacuum vessel mass (kg)", + "m_vv": "vacuum vessel mass (kg)", "w_he": "", "wa": "", "walalw": "allowable neutron wall-load (MW/m2) (`constraint equation 8`)", @@ -18014,7 +18014,7 @@ "fwbs_variables": [ "life_blkt_fpy", "m_fw_blkt_div_coolant_total", - "vvmass", + "m_vv", "denstl", "denwc", "dewmkg", diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index 9a8ee17d6d..e1be256272 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -970,7 +970,7 @@ ____Blanket_Mass_-_Steel_(kg)___________________________________________ (m_blkt_steel_total)_____________________ 8.9696E+05 OP 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 + Vacuum_vessel_mass_(kg)_________________________________________________ (m_vv)______________________ 7.9388E+06 OP Total_nuclear_heating_in_TF+PF_coils_(CS_is_negligible)_(MW)____________ (ptfnuc)______________________ 2.5460E-02 OP Total_nuclear_heating_in_FW_(MW)________________________________________ (p_fw_nuclear_heat_total_mw)______________________ 1.6290E+02 OP Total_nuclear_heating_in_the_blanket_(including_emult)_(MW)_____________ (p_blkt_nuclear_heat_total_mw)____________________ 1.2880E+03 OP diff --git a/tests/unit/test_blanket_library.py b/tests/unit/test_blanket_library.py index 01102adc61..ee2406e62b 100644 --- a/tests/unit/test_blanket_library.py +++ b/tests/unit/test_blanket_library.py @@ -217,7 +217,9 @@ def test_primary_coolant_properties( ) monkeypatch.setattr( - fwbs_variables, "i_blkt_dual_coolant", primarycoolantpropertiesparam.i_blkt_dual_coolant + fwbs_variables, + "i_blkt_dual_coolant", + primarycoolantpropertiesparam.i_blkt_dual_coolant, ) monkeypatch.setattr( @@ -1313,7 +1315,7 @@ class ExternalCryoGeometryParam(NamedTuple): dr_pf_cryostat: Any = None z_cryostat_half_inside: Any = None vol_cryostat: Any = None - vvmass: Any = None + m_vv: Any = None vol_vv: Any = None denstl: Any = None dewmkg: Any = None @@ -1324,7 +1326,7 @@ class ExternalCryoGeometryParam(NamedTuple): expected_r_cryostat_inboard: Any = None expected_z_cryostat_half_inside: Any = None expected_vol_cryostat: Any = None - expected_vvmass: Any = None + expected_m_vv: Any = None expected_dewmkg: Any = None expected_dz_tf_cryostat: Any = None expected_dz_pf_cryostat: Any = None @@ -1342,7 +1344,7 @@ class ExternalCryoGeometryParam(NamedTuple): dr_pf_cryostat=0.5, z_cryostat_half_inside=0, vol_cryostat=0, - vvmass=0, + m_vv=0, vol_vv=1016.2876250857248, denstl=7800, dewmkg=0, @@ -1411,7 +1413,7 @@ class ExternalCryoGeometryParam(NamedTuple): expected_r_cryostat_inboard=17.805470903073743, expected_z_cryostat_half_inside=15.259637557000296, expected_vol_cryostat=818.1630389343372, - expected_vvmass=7927043.4756686538, + expected_m_vv=7927043.4756686538, expected_dewmkg=14308715.179356484, expected_dz_tf_cryostat=5.514694530398824, expected_dz_pf_cryostat=5.3441455565624985, @@ -1458,7 +1460,7 @@ def test_external_cryo_geometry( monkeypatch.setattr( fwbs_variables, "vol_cryostat", externalcryogeometryparam.vol_cryostat ) - monkeypatch.setattr(fwbs_variables, "vvmass", externalcryogeometryparam.vvmass) + monkeypatch.setattr(fwbs_variables, "m_vv", externalcryogeometryparam.m_vv) monkeypatch.setattr(fwbs_variables, "vol_vv", externalcryogeometryparam.vol_vv) monkeypatch.setattr(fwbs_variables, "denstl", externalcryogeometryparam.denstl) monkeypatch.setattr(fwbs_variables, "dewmkg", externalcryogeometryparam.dewmkg) @@ -1486,9 +1488,7 @@ def test_external_cryo_geometry( assert fwbs_variables.vol_cryostat == pytest.approx( externalcryogeometryparam.expected_vol_cryostat ) - assert fwbs_variables.vvmass == pytest.approx( - externalcryogeometryparam.expected_vvmass - ) + assert fwbs_variables.m_vv == pytest.approx(externalcryogeometryparam.expected_m_vv) assert fwbs_variables.dewmkg == pytest.approx( externalcryogeometryparam.expected_dewmkg ) @@ -1791,7 +1791,9 @@ def test_liquid_breeder_properties( fwbs_variables, "i_blkt_inboard", liquidbreederpropertiesparam.i_blkt_inboard ) monkeypatch.setattr( - fwbs_variables, "i_blkt_dual_coolant", liquidbreederpropertiesparam.i_blkt_dual_coolant + fwbs_variables, + "i_blkt_dual_coolant", + liquidbreederpropertiesparam.i_blkt_dual_coolant, ) monkeypatch.setattr(physics_variables, "bt", liquidbreederpropertiesparam.bt) monkeypatch.setattr( diff --git a/tests/unit/test_ccfe_hcpb.py b/tests/unit/test_ccfe_hcpb.py index 0d7d0b2513..84a64eea0e 100644 --- a/tests/unit/test_ccfe_hcpb.py +++ b/tests/unit/test_ccfe_hcpb.py @@ -61,7 +61,7 @@ class NuclearHeatingMagnetsParam(NamedTuple): volshld: Any = None - vvmass: Any = None + m_vv: Any = None vol_vv: Any = None @@ -145,7 +145,7 @@ class NuclearHeatingMagnetsParam(NamedTuple): vol_blkt_total=1397.9003011502937, whtshld=2294873.8131476045, volshld=735.53647857295027, - vvmass=9043937.8018644415, + m_vv=9043937.8018644415, vol_vv=1159.4792053672361, fw_armour_thickness=0.0050000000000000001, ptfnuc=0, @@ -194,7 +194,7 @@ class NuclearHeatingMagnetsParam(NamedTuple): vol_blkt_total=1400.4860764869636, whtshld=2297808.3935174854, volshld=736.47704920432227, - vvmass=9056931.558219457, + m_vv=9056931.558219457, vol_vv=1161.1450715665972, fw_armour_thickness=0.0050000000000000001, ptfnuc=0.044184461825198453, @@ -298,7 +298,7 @@ def test_nuclear_heating_magnets(nuclearheatingmagnetsparam, monkeypatch, ccfe_h monkeypatch.setattr(fwbs_variables, "volshld", nuclearheatingmagnetsparam.volshld) - monkeypatch.setattr(fwbs_variables, "vvmass", nuclearheatingmagnetsparam.vvmass) + monkeypatch.setattr(fwbs_variables, "m_vv", nuclearheatingmagnetsparam.m_vv) monkeypatch.setattr(fwbs_variables, "vol_vv", nuclearheatingmagnetsparam.vol_vv) diff --git a/tests/unit/test_costs_1990.py b/tests/unit/test_costs_1990.py index 4c45c1d2d1..ecfb4649ea 100644 --- a/tests/unit/test_costs_1990.py +++ b/tests/unit/test_costs_1990.py @@ -2802,7 +2802,7 @@ class Acc2223Param(NamedTuple): fkind: Any = None - vvmass: Any = None + m_vv: Any = None c22: Any = None @@ -2818,7 +2818,7 @@ class Acc2223Param(NamedTuple): uccryo=32, lsa=2, fkind=1, - vvmass=9043937.8018644415, + m_vv=9043937.8018644415, c22=0, c2223=0, expected_c2223=244.54807816241447, @@ -2827,7 +2827,7 @@ class Acc2223Param(NamedTuple): uccryo=32, lsa=2, fkind=1, - vvmass=9056931.558219457, + m_vv=9056931.558219457, c22=3474.7391916096453, c2223=244.54807816241447, expected_c2223=244.89942933425411, @@ -2853,7 +2853,7 @@ def test_acc2223(acc2223param, monkeypatch, costs): monkeypatch.setattr(cost_variables, "fkind", acc2223param.fkind) - monkeypatch.setattr(fwbs_variables, "vvmass", acc2223param.vvmass) + monkeypatch.setattr(fwbs_variables, "m_vv", acc2223param.m_vv) monkeypatch.setattr(costs, "c22", acc2223param.c22) diff --git a/tests/unit/test_costs_2015.py b/tests/unit/test_costs_2015.py index d7e01d308b..a51cc29b2a 100644 --- a/tests/unit/test_costs_2015.py +++ b/tests/unit/test_costs_2015.py @@ -13751,7 +13751,7 @@ class CalcRemainingSubsystemsParam(NamedTuple): helpow: Any = None - vvmass: Any = None + m_vv: Any = None r_cryostat_inboard: Any = None @@ -13795,7 +13795,7 @@ class CalcRemainingSubsystemsParam(NamedTuple): pthermmw=2112.8165753998965, psechtmw=311.54038043019023, helpow=142703.41458500578, - vvmass=8957118.946216708, + m_vv=8957118.946216708, r_cryostat_inboard=18.314040399601147, z_cryostat_half_inside=15.118436894660423, cost_factor_misc=1, @@ -14891,7 +14891,7 @@ class CalcRemainingSubsystemsParam(NamedTuple): pthermmw=2111.8102173541502, psechtmw=640.27066522894324, helpow=823308.59959198488, - vvmass=8948002.9350915737, + m_vv=8948002.9350915737, r_cryostat_inboard=18.31462428923539, z_cryostat_half_inside=15.165858901796364, cost_factor_misc=1, @@ -16030,7 +16030,7 @@ def test_calc_remaining_subsystems( heat_transport_variables, "helpow", calcremainingsubsystemsparam.helpow ) - monkeypatch.setattr(fwbs_variables, "vvmass", calcremainingsubsystemsparam.vvmass) + monkeypatch.setattr(fwbs_variables, "m_vv", calcremainingsubsystemsparam.m_vv) monkeypatch.setattr( fwbs_variables, diff --git a/tests/unit/test_dcll.py b/tests/unit/test_dcll.py index 93e70083d0..5d46755997 100644 --- a/tests/unit/test_dcll.py +++ b/tests/unit/test_dcll.py @@ -897,7 +897,9 @@ def test_dcll_masses(dcllmassesparam, monkeypatch, dcll): monkeypatch.setattr(fwbs_variables, "vfblkt", dcllmassesparam.vfblkt) - monkeypatch.setattr(fwbs_variables, "i_blkt_dual_coolant", dcllmassesparam.i_blkt_dual_coolant) + monkeypatch.setattr( + fwbs_variables, "i_blkt_dual_coolant", dcllmassesparam.i_blkt_dual_coolant + ) monkeypatch.setattr( fwbs_variables, "den_fw_coolant", dcllmassesparam.den_fw_coolant From 6e69890e5cd8509cdc249ffe2c42df39e22ddf16 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 19 Feb 2025 11:01:26 +0000 Subject: [PATCH 67/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20ifci=20to=20i=5Fb?= =?UTF-8?q?lkt=5Fliquid=5Fbreeder=5Fchannel=5Ftype=20for=20clarity=20and?= =?UTF-8?q?=20consistency=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- documentation/proc-pages/eng-models/fw-blanket.md | 6 +++--- process/blanket_library.py | 14 +++++++------- process/dcll.py | 12 ++++++------ source/fortran/dcll.f90 | 4 ++-- source/fortran/fwbs_variables.f90 | 4 ++-- source/fortran/input.f90 | 6 +++--- tests/regression/input_files/st_regression.IN.DAT | 2 +- tests/unit/test_blanket_library.py | 14 +++++++------- tests/unit/test_dcll.py | 8 ++++---- 9 files changed, 35 insertions(+), 35 deletions(-) diff --git a/documentation/proc-pages/eng-models/fw-blanket.md b/documentation/proc-pages/eng-models/fw-blanket.md index e80edb79ef..c9da3c2614 100644 --- a/documentation/proc-pages/eng-models/fw-blanket.md +++ b/documentation/proc-pages/eng-models/fw-blanket.md @@ -82,7 +82,7 @@ Summary of key variables and switches: | roughness epsilon | `roughness` | --- | --- | | peak FW temp (K) | `temp_fw_peak` | --- | --- | | maximum temp (K) | `temp_fw_max` | --- | --- | -| FCI switch | --- | --- | `ifci` | +| FCI switch | --- | --- | `i_blkt_liquid_breeder_channel_type` | | Coolant | :-----------: | ------------------------ | -------------------------- | | primary coolant switch | `i_fw_coolant_type` | `i_blkt_coolant_type` | --- | | secondary coolant switch | --- | --- | `i_bb_liq` | @@ -195,11 +195,11 @@ The Hartmann number is also calculated (using the magnetic feild strength in the #### Flow Channel Inserts for Liquid Metal Breeder -There are three model options, chosen by the user to match their selected blanket design using the switch 'ifci' (default=0): +There are three model options, chosen by the user to match their selected blanket design using the switch 'i_blkt_liquid_breeder_channel_type' (default=0): 0. No FCIs used. Conductivity of Eurofer steel is assumed for MHD pressure drop calculations in the liquid metal breeder. 1. FCIs used, assumed to be perfectly electrically insulating. 2. FCIs used, with conductivity chosen by the user (`bz_channel_conduct_liq`). | Variable | Units | Itvar. | Usage | Default | Description | | :----------------------: | :-------: | ------ | ----------- | ------- | ------------------------------------------------------------------- | -| `bz_channel_conduct_liq` | A V-1 m-1 | 72 | ifci = 0, 2 | 8.33D5 | Liquid metal coolant/breeder thin conductor or FCI wall conductance | +| `bz_channel_conduct_liq` | A V-1 m-1 | 72 | i_blkt_liquid_breeder_channel_type = 0, 2 | 8.33D5 | Liquid metal coolant/breeder thin conductor or FCI wall conductance | diff --git a/process/blanket_library.py b/process/blanket_library.py index f6071ce68f..0eb97bcc70 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -1574,7 +1574,7 @@ def thermo_hydraulic_model(self, output: bool): roughness epsilon roughness peak FW temp (K) temp_fw_peak maximum temp (K) temp_fw_max - FCI switch --- --- ifci + FCI switch --- --- i_blkt_liquid_breeder_channel_type Coolant FW BB primary BB secondary @@ -2396,7 +2396,7 @@ def liquid_breeder_pressure_drop_mhd( half_wth_b = fwbs_variables.b_bz_liq * 0.5 # If have thin conducting walls... - if fwbs_variables.ifci != 1: + if fwbs_variables.i_blkt_liquid_breeder_channel_type != 1: # Caculate resistances of fluid and walls r_i = half_wth_b / (conduct_liq * half_wth_a) r_w = half_wth_b / ( @@ -2423,9 +2423,9 @@ def liquid_breeder_pressure_drop_mhd( f"Liquid metal breeder/coolant MHD pressure drop for {label}", ) - if fwbs_variables.ifci == 0: + if fwbs_variables.i_blkt_liquid_breeder_channel_type == 0: po.ocmmnt( - self.outfile, "Flow channels have thin conducting walls (ifci==0)" + self.outfile, "Flow channels have thin conducting walls (i_blkt_liquid_breeder_channel_type==0)" ) po.ovarre( self.outfile, @@ -2434,8 +2434,8 @@ def liquid_breeder_pressure_drop_mhd( fwbs_variables.bz_channel_conduct_liq, "OP ", ) - elif fwbs_variables.ifci == 2: - po.ocmmnt(self.outfile, "Flow Channel Inserts (FCIs) used (ifci==2)") + elif fwbs_variables.i_blkt_liquid_breeder_channel_type == 2: + po.ocmmnt(self.outfile, "Flow Channel Inserts (FCIs) used (i_blkt_liquid_breeder_channel_type==2)") po.ovarre( self.outfile, "FCI conductance (A V-1 m-1)", @@ -2446,7 +2446,7 @@ def liquid_breeder_pressure_drop_mhd( else: po.ocmmnt( self.outfile, - "Flow Channel Inserts - assumed perfect insulator (ifci==1)", + "Flow Channel Inserts - assumed perfect insulator (i_blkt_liquid_breeder_channel_type==1)", ) po.ovarre( diff --git a/process/dcll.py b/process/dcll.py index 4974e7592d..cd55184721 100644 --- a/process/dcll.py +++ b/process/dcll.py @@ -45,9 +45,9 @@ class DCLL: i_blkt_dual_coolant = 2 FIC switch: 0 = no FIC, Eurofer; 1 = FCIs, perfect electrical insulator, 2 = FCIs, with specified conductance - ifci = 0, 1, or 2 + i_blkt_liquid_breeder_channel_type = 0, 1, or 2 - Liquid metal duct wall conductance initilized at Eurofer value in fwbs_variables, or can input other value, used for ifci = 0 or 2 + Liquid metal duct wall conductance initilized at Eurofer value in fwbs_variables, or can input other value, used for i_blkt_liquid_breeder_channel_type = 0 or 2 (bz_channel_conduct_liq) Choose if FW and BB structure are on the same pumping system (unless have diffent coolants), default is same coolant with flow IN->FW->BB->OUT @@ -467,7 +467,7 @@ def dcll_masses(self, output: bool): Bottom walls = 2.0D-2 m, 85.54% EUROfer, 14.46% He """ # If there are FCIs then how much of the radial build is FCI? - if fwbs_variables.ifci > 0: + if fwbs_variables.i_blkt_liquid_breeder_channel_type > 0: dcll_module.r_fci = ( 2 * fwbs_variables.nopol * fwbs_variables.th_wall_secondary ) @@ -553,7 +553,7 @@ def dcll_masses(self, output: bool): / build_variables.dr_blkt_outboard ) - if fwbs_variables.ifci > 0: + if fwbs_variables.i_blkt_liquid_breeder_channel_type > 0: dcll_module.vol_fci = ( fwbs_variables.vol_blkt_inboard * dcll_module.r_fci @@ -613,7 +613,7 @@ def dcll_masses(self, output: bool): * fwbs_variables.r_f_liq_ob / build_variables.dr_blkt_outboard ) - if fwbs_variables.ifci > 0: + if fwbs_variables.i_blkt_liquid_breeder_channel_type > 0: dcll_module.vol_fci = ( fwbs_variables.vol_blkt_outboard * dcll_module.r_fci @@ -808,7 +808,7 @@ def dcll_masses(self, output: bool): fwbs_variables.m_blkt_total, "OP ", ) - if fwbs_variables.ifci == 1: + if fwbs_variables.i_blkt_liquid_breeder_channel_type == 1: po.ovarre( self.outfile, "Blanket FCI Mass (kg)", diff --git a/source/fortran/dcll.f90 b/source/fortran/dcll.f90 index 738447c4b8..310f5c72a3 100644 --- a/source/fortran/dcll.f90 +++ b/source/fortran/dcll.f90 @@ -31,9 +31,9 @@ module dcll_module !! i_blkt_dual_coolant = 2 !! !! FIC switch: 0 = no FIC, Eurofer; 1 = FCIs, perfect electrical insulator, 2 = FCIs, with specified conductance - !! ifci = 0, 1, or 2 + !! i_blkt_liquid_breeder_channel_type = 0, 1, or 2 !! - !! Liquid metal duct wall conductance initilized at Eurofer value in fwbs_variables, or can input other value, used for ifci = 0 or 2 + !! Liquid metal duct wall conductance initilized at Eurofer value in fwbs_variables, or can input other value, used for i_blkt_liquid_breeder_channel_type = 0 or 2 !! (bz_channel_conduct_liq) !! !! Choose if FW and BB structure are on the same pumping system (unless have diffent coolants), default is same coolant with flow IN->FW->BB->OUT diff --git a/source/fortran/fwbs_variables.f90 b/source/fortran/fwbs_variables.f90 index ee455c3757..b312e43ad8 100644 --- a/source/fortran/fwbs_variables.f90 +++ b/source/fortran/fwbs_variables.f90 @@ -551,7 +551,7 @@ module fwbs_variables !! - =2 Dual coolant: primary coolant (H2O or He) for FW and blanket structure; !! secondary coolant is self-cooled liquid metal breeder. - integer :: ifci + integer :: i_blkt_liquid_breeder_channel_type !! Switch for Flow Channel Insert (FCI) type if liquid metal breeder blanket. !! - =0 Thin conducting walls, default electrical conductivity (bz_channel_conduct_liq) is Eurofer !! - =1 Insulating Material, assumed perfect electrical insulator, default density (den_ceramic) is for SiC @@ -808,7 +808,7 @@ subroutine init_fwbs_variables i_fw_blkt_shared_coolant = 0 i_bb_liq = 0 i_blkt_dual_coolant = 0 - ifci = 0 + i_blkt_liquid_breeder_channel_type = 0 ims = 0 n_liq_recirc = 10 r_f_liq_ib=0.5 diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index 4a20e9ce69..8b63c10381 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -218,7 +218,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) denstl, declfw, nphcdout, i_blkt_inboard, vfpblkt, temp_fw_coolant_in, wallpf, fblbe, & fhole, i_fw_blkt_vv_shape, coolp, temp_fw_max, irefprop, len_fw_channel, & f_blkt_li6_enrichment, etaiso, n_blkt_outboard_modules_toroidal, fvoldw, i_shield_mat, i_bb_liq, & - i_blkt_dual_coolant, ifci, inlet_temp_liq, outlet_temp_liq, bz_channel_conduct_liq, i_fw_blkt_shared_coolant, ims, & + i_blkt_dual_coolant, i_blkt_liquid_breeder_channel_type, inlet_temp_liq, outlet_temp_liq, bz_channel_conduct_liq, i_fw_blkt_shared_coolant, ims, & i_blkt_coolant_type, emult use heat_transport_variables, only: htpmw_fw, baseel, fmgdmw, htpmw_div, & pwpm2, etath, vachtmw, iprimshld, fpumpdiv, pinjmax, htpmw_blkt, etatf, & @@ -1960,8 +1960,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('i_blkt_dual_coolant') call parse_int_variable('i_blkt_dual_coolant', i_blkt_dual_coolant, 0, 2, & 'Switch for single or dual-coolant blanket)') - case ('ifci') - call parse_int_variable('ifci', ifci, 0, 2, & + case ('i_blkt_liquid_breeder_channel_type') + call parse_int_variable('i_blkt_liquid_breeder_channel_type', i_blkt_liquid_breeder_channel_type, 0, 2, & 'Switch for blanket FCIs)') case ('inlet_temp_liq') call parse_real_variable('inlet_temp_liq', inlet_temp_liq, 508.D0, 1.5D3, & diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 04615b8d65..8faaf16b00 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2572,7 +2572,7 @@ inuclear = 0 * secondary coolant is self-cooled liquid metal breeder. * JUSTIFICATION: Not yet set assuming default = 0 -*ifci = +*i_blkt_liquid_breeder_channel_type = * DESCRIPTION:Switch for Flow Channel Insert (FCI) type if liquid metal breeder blanket. * =0 Thin conducting walls, default electrical conductivity (bz_channel_conduct_liq) is Eurofer * =1 Insulating Material, assumed perfect electrical insulator, default density (den_ceramic) is for SiC diff --git a/tests/unit/test_blanket_library.py b/tests/unit/test_blanket_library.py index ee2406e62b..3ce4d918a2 100644 --- a/tests/unit/test_blanket_library.py +++ b/tests/unit/test_blanket_library.py @@ -306,7 +306,7 @@ def test_deltap_tot_outboard_blanket_breeder_liquid( ): monkeypatch.setattr(fwbs_variables, "radius_fw_channel", 0.006) monkeypatch.setattr(fwbs_variables, "a_bz_liq", 0.22481) - monkeypatch.setattr(fwbs_variables, "ifci", 1) + monkeypatch.setattr(fwbs_variables, "i_blkt_liquid_breeder_channel_type", 1) monkeypatch.setattr(fwbs_variables, "b_bz_liq", 0.11625) monkeypatch.setattr(fwbs_variables, "b_mag_blkt", [8.393, 3.868]) monkeypatch.setattr(fwbs_variables, "bz_channel_conduct_liq", 833000) @@ -1912,7 +1912,7 @@ def test_pressure_drop(pressuredropparam, monkeypatch, blanket_library_fixture): class LiquidBreederPressureDropMhdParam(NamedTuple): - ifci: Any = None + i_blkt_liquid_breeder_channel_type: Any = None a_bz_liq: Any = None b_bz_liq: Any = None b_mag_blkt: Any = None @@ -1933,7 +1933,7 @@ class LiquidBreederPressureDropMhdParam(NamedTuple): "liquidbreederpressuredropmhdparam", ( LiquidBreederPressureDropMhdParam( - ifci=0, + i_blkt_liquid_breeder_channel_type=0, a_bz_liq=0.22481469639955909, b_bz_liq=0.11625000000000001, b_mag_blkt=np.array( @@ -1953,7 +1953,7 @@ class LiquidBreederPressureDropMhdParam(NamedTuple): expected_liquid_breeder_pressure_drop_mhd_out=282697824.60502106, ), LiquidBreederPressureDropMhdParam( - ifci=1, + i_blkt_liquid_breeder_channel_type=1, a_bz_liq=0.22481469639955909, b_bz_liq=0.11625000000000001, b_mag_blkt=np.array( @@ -1973,7 +1973,7 @@ class LiquidBreederPressureDropMhdParam(NamedTuple): expected_liquid_breeder_pressure_drop_mhd_out=160029.28473931071, ), LiquidBreederPressureDropMhdParam( - ifci=2, + i_blkt_liquid_breeder_channel_type=2, a_bz_liq=0.22481469639955909, b_bz_liq=0.11625000000000001, b_mag_blkt=np.array( @@ -1993,7 +1993,7 @@ class LiquidBreederPressureDropMhdParam(NamedTuple): expected_liquid_breeder_pressure_drop_mhd_out=282697824.60502106, ), LiquidBreederPressureDropMhdParam( - ifci=2, + i_blkt_liquid_breeder_channel_type=2, a_bz_liq=0.22481469639955909, b_bz_liq=0.11625000000000001, b_mag_blkt=np.array( @@ -2028,7 +2028,7 @@ def test_liquid_breeder_pressure_drop_mhd( :param monkeypatch: pytest fixture used to mock module/class variables :type monkeypatch: _pytest.monkeypatch.monkeypatch """ - monkeypatch.setattr(fwbs_variables, "ifci", liquidbreederpressuredropmhdparam.ifci) + monkeypatch.setattr(fwbs_variables, "i_blkt_liquid_breeder_channel_type", liquidbreederpressuredropmhdparam.i_blkt_liquid_breeder_channel_type) monkeypatch.setattr( fwbs_variables, "a_bz_liq", liquidbreederpressuredropmhdparam.a_bz_liq ) diff --git a/tests/unit/test_dcll.py b/tests/unit/test_dcll.py index 5d46755997..bb317ece68 100644 --- a/tests/unit/test_dcll.py +++ b/tests/unit/test_dcll.py @@ -360,7 +360,7 @@ class DcllMassesParam(NamedTuple): den_liq: Any = None - ifci: Any = None + i_blkt_liquid_breeder_channel_type: Any = None den_ceramic: Any = None @@ -574,7 +574,7 @@ class DcllMassesParam(NamedTuple): armour_fw_bl_mass=0, denstl=7800, den_liq=9753.2497999999996, - ifci=1, + i_blkt_liquid_breeder_channel_type=1, den_ceramic=3210, th_wall_secondary=0.012500000000000001, nopol=2, @@ -693,7 +693,7 @@ class DcllMassesParam(NamedTuple): armour_fw_bl_mass=10982927.3383231, denstl=7800, den_liq=9753.2497999999996, - ifci=1, + i_blkt_liquid_breeder_channel_type=1, den_ceramic=3210, th_wall_secondary=0.012500000000000001, nopol=2, @@ -877,7 +877,7 @@ def test_dcll_masses(dcllmassesparam, monkeypatch, dcll): monkeypatch.setattr(fwbs_variables, "den_liq", dcllmassesparam.den_liq) - monkeypatch.setattr(fwbs_variables, "ifci", dcllmassesparam.ifci) + monkeypatch.setattr(fwbs_variables, "i_blkt_liquid_breeder_channel_type", dcllmassesparam.i_blkt_liquid_breeder_channel_type) monkeypatch.setattr(fwbs_variables, "den_ceramic", dcllmassesparam.den_ceramic) From dd92a2f4a5fcf688b461347253667cecfbe1dd9e Mon Sep 17 00:00:00 2001 From: mn3981 Date: Wed, 19 Feb 2025 11:02:17 +0000 Subject: [PATCH 68/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20i=5Fbb=5Fliq=20to?= =?UTF-8?q?=20i=5Fblkt=5Fliquid=5Fbreeder=5Ftype=20for=20clarity=20and=20c?= =?UTF-8?q?onsistency=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proc-pages/eng-models/fw-blanket.md | 4 +-- process/blanket_library.py | 31 ++++++++++++------- process/dcll.py | 2 +- source/fortran/dcll.f90 | 2 +- source/fortran/fwbs_variables.f90 | 4 +-- source/fortran/input.f90 | 6 ++-- tests/integration/test_blanket_library_int.py | 10 +++--- .../input_files/st_regression.IN.DAT | 2 +- tests/unit/test_blanket_library.py | 18 +++++++---- tests/unit/test_dcll.py | 6 +++- 10 files changed, 51 insertions(+), 34 deletions(-) diff --git a/documentation/proc-pages/eng-models/fw-blanket.md b/documentation/proc-pages/eng-models/fw-blanket.md index c9da3c2614..98b76fa405 100644 --- a/documentation/proc-pages/eng-models/fw-blanket.md +++ b/documentation/proc-pages/eng-models/fw-blanket.md @@ -85,7 +85,7 @@ Summary of key variables and switches: | FCI switch | --- | --- | `i_blkt_liquid_breeder_channel_type` | | Coolant | :-----------: | ------------------------ | -------------------------- | | primary coolant switch | `i_fw_coolant_type` | `i_blkt_coolant_type` | --- | -| secondary coolant switch | --- | --- | `i_bb_liq` | +| secondary coolant switch | --- | --- | `i_blkt_liquid_breeder_type` | | inlet temp (K) | `temp_fw_coolant_in` | `temp_blkt_coolant_in` | `inlet_temp_liq` | | outlet temp (K) | `temp_fw_coolant_out` | `temp_blkt_coolant_out` | `outlet_temp_liq` | | pressure (Pa) | `pres_fw_coolant` | `pres_blkt_coolant` | `blpressure_liq` | @@ -178,7 +178,7 @@ The user can select the number poloidal and toroidal modules for the IB and OB B #### Liquid Breeder or Dual Coolant -There are two material options for the liquid breeder/coolant, chosen by the user to match their selected blanket design using the switch 'i_bb_liq' (default=0): +There are two material options for the liquid breeder/coolant, chosen by the user to match their selected blanket design using the switch 'i_blkt_liquid_breeder_type' (default=0): 0. Lead-Lithium 1. Lithium (needs testing) Both options use the mid-temperature of the metal to find the following properties: density, specific heat, thermal conductivity, dynamic viscosity and electrical conductivity. diff --git a/process/blanket_library.py b/process/blanket_library.py index 0eb97bcc70..e34592eaaa 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -1292,7 +1292,7 @@ def liquid_breeder_properties(self, output: bool = False): ) * 0.5 # If the liquid metal is PbLi... - if fwbs_variables.i_bb_liq == 0: + if fwbs_variables.i_blkt_liquid_breeder_type == 0: # PbLi from [Mar2019] # Constant pressure ~ 17 atmospheres ~ 1.7D6 Pa # Li content is ~ 17% @@ -1336,7 +1336,7 @@ def liquid_breeder_properties(self, output: bool = False): t_ranges[4, 1] = 800.0 # If the liquid metal is Li... - elif fwbs_variables.i_bb_liq == 1: + elif fwbs_variables.i_blkt_liquid_breeder_type == 1: # Temporary - should be updated with information from Li reviews conducted at CCFE once completed # Li Properties from [Mal1995] at 300 Celcius # den_liq = 505 kg/m3 @@ -1414,7 +1414,7 @@ def liquid_breeder_properties(self, output: bool = False): ) # Error for temperature range of breeder property realtions - if fwbs_variables.i_bb_liq == 0 and ( + if fwbs_variables.i_blkt_liquid_breeder_type == 0 and ( (t_ranges[:, 0] > mid_temp_liq).any() or (t_ranges[:, 1] < mid_temp_liq).any() ): @@ -1458,12 +1458,15 @@ def liquid_breeder_properties(self, output: bool = False): if fwbs_variables.i_blkt_dual_coolant == 2: po.ocmmnt(self.outfile, "Dual coolant: self-cooled liquid metal breeder.") - if fwbs_variables.i_bb_liq == 0: + if fwbs_variables.i_blkt_liquid_breeder_type == 0: po.ocmmnt( - self.outfile, "Blanket breeder type (i_bb_liq=0), PbLi (~ 17% Li)" + self.outfile, + "Blanket breeder type (i_blkt_liquid_breeder_type=0), PbLi (~ 17% Li)", + ) + if fwbs_variables.i_blkt_liquid_breeder_type == 1: + po.ocmmnt( + self.outfile, "Blanket breeder type (i_blkt_liquid_breeder_type=1), Li" ) - if fwbs_variables.i_bb_liq == 1: - po.ocmmnt(self.outfile, "Blanket breeder type (i_bb_liq=1), Li") po.ovarrf( self.outfile, "Density (kg m-3)", "(den_liq)", fwbs_variables.den_liq, "OP " @@ -1579,7 +1582,7 @@ def thermo_hydraulic_model(self, output: bool): Coolant FW BB primary BB secondary primary coolant switch i_fw_coolant_type i_blkt_coolant_type --- - secondary coolant switch --- --- i_bb_liq + secondary coolant switch --- --- i_blkt_liquid_breeder_type inlet temp (K) temp_fw_coolant_in temp_blkt_coolant_in inlet_temp_liq outlet temp (K) temp_fw_coolant_out temp_blkt_coolant_out outlet_temp_liq pressure (Pa) pres_fw_coolant pres_blkt_coolant blpressure_liq @@ -2163,8 +2166,8 @@ def thermo_hydraulic_model(self, output: bool): po.ovarin( self.outfile, "Blanket liquid breeder type (0=PbLi, 1=Li)", - "(i_bb_liq)", - fwbs_variables.i_bb_liq, + "(i_blkt_liquid_breeder_type)", + fwbs_variables.i_blkt_liquid_breeder_type, ) if fwbs_variables.i_blkt_dual_coolant == 2: po.ocmmnt( @@ -2425,7 +2428,8 @@ def liquid_breeder_pressure_drop_mhd( if fwbs_variables.i_blkt_liquid_breeder_channel_type == 0: po.ocmmnt( - self.outfile, "Flow channels have thin conducting walls (i_blkt_liquid_breeder_channel_type==0)" + self.outfile, + "Flow channels have thin conducting walls (i_blkt_liquid_breeder_channel_type==0)", ) po.ovarre( self.outfile, @@ -2435,7 +2439,10 @@ def liquid_breeder_pressure_drop_mhd( "OP ", ) elif fwbs_variables.i_blkt_liquid_breeder_channel_type == 2: - po.ocmmnt(self.outfile, "Flow Channel Inserts (FCIs) used (i_blkt_liquid_breeder_channel_type==2)") + po.ocmmnt( + self.outfile, + "Flow Channel Inserts (FCIs) used (i_blkt_liquid_breeder_channel_type==2)", + ) po.ovarre( self.outfile, "FCI conductance (A V-1 m-1)", diff --git a/process/dcll.py b/process/dcll.py index cd55184721..5e78b87e5f 100644 --- a/process/dcll.py +++ b/process/dcll.py @@ -39,7 +39,7 @@ class DCLL: i_blanket_type = 5 * DCLL Liquid Metal Breeder Material = PbLi - i_bb_liq = 0 * Liquid Metal Breeder Material = PbLi + i_blkt_liquid_breeder_type = 0 * Liquid Metal Breeder Material = PbLi Specify dual-coolant i.e., get mass flow required from heat extracted from liqid metal breeder i_blkt_dual_coolant = 2 diff --git a/source/fortran/dcll.f90 b/source/fortran/dcll.f90 index 310f5c72a3..3ae15a928e 100644 --- a/source/fortran/dcll.f90 +++ b/source/fortran/dcll.f90 @@ -25,7 +25,7 @@ module dcll_module !! i_blanket_type = 5 * DCLL !! !! Liquid Metal Breeder Material = PbLi - !! i_bb_liq = 0 * Liquid Metal Breeder Material = PbLi + !! i_blkt_liquid_breeder_type = 0 * Liquid Metal Breeder Material = PbLi !! !! Specify dual-coolant i.e., get mass flow required from heat extracted from liqid metal breeder !! i_blkt_dual_coolant = 2 diff --git a/source/fortran/fwbs_variables.f90 b/source/fortran/fwbs_variables.f90 index b312e43ad8..1f70227584 100644 --- a/source/fortran/fwbs_variables.f90 +++ b/source/fortran/fwbs_variables.f90 @@ -538,7 +538,7 @@ module fwbs_variables !! - =0 FW and BB have the same primary coolant, flow = FWin->FWout->BBin->BBout !! - =1 FW and BB have the different primary coolant and are on different pump systems - integer :: i_bb_liq + integer :: i_blkt_liquid_breeder_type !! Switch for Liquid Metal Breeder Material !! - =0 PbLi !! - =1 Li @@ -806,7 +806,7 @@ subroutine init_fwbs_variables pnuc_cp_tf = 0.0D0 neut_flux_cp = 0.0D0 i_fw_blkt_shared_coolant = 0 - i_bb_liq = 0 + i_blkt_liquid_breeder_type = 0 i_blkt_dual_coolant = 0 i_blkt_liquid_breeder_channel_type = 0 ims = 0 diff --git a/source/fortran/input.f90 b/source/fortran/input.f90 index 8b63c10381..bf4de94e51 100644 --- a/source/fortran/input.f90 +++ b/source/fortran/input.f90 @@ -217,7 +217,7 @@ subroutine parse_input_file(in_file,out_file,show_changes) npdiv, f_fw_peak, i_coolant_pumping, dr_pf_cryostat, i_thermal_electric_conversion, secondary_cycle_liq, & denstl, declfw, nphcdout, i_blkt_inboard, vfpblkt, temp_fw_coolant_in, wallpf, fblbe, & fhole, i_fw_blkt_vv_shape, coolp, temp_fw_max, irefprop, len_fw_channel, & - f_blkt_li6_enrichment, etaiso, n_blkt_outboard_modules_toroidal, fvoldw, i_shield_mat, i_bb_liq, & + f_blkt_li6_enrichment, etaiso, n_blkt_outboard_modules_toroidal, fvoldw, i_shield_mat, i_blkt_liquid_breeder_type, & i_blkt_dual_coolant, i_blkt_liquid_breeder_channel_type, inlet_temp_liq, outlet_temp_liq, bz_channel_conduct_liq, i_fw_blkt_shared_coolant, ims, & i_blkt_coolant_type, emult use heat_transport_variables, only: htpmw_fw, baseel, fmgdmw, htpmw_div, & @@ -1954,8 +1954,8 @@ subroutine parse_input_file(in_file,out_file,show_changes) case ('i_shield_mat') call parse_int_variable('i_shield_mat', i_shield_mat, 0, 1, & 'Switch for shield material)') - case ('i_bb_liq') - call parse_int_variable('i_bb_liq', i_bb_liq, 0, 1, & + case ('i_blkt_liquid_breeder_type') + call parse_int_variable('i_blkt_liquid_breeder_type', i_blkt_liquid_breeder_type, 0, 1, & 'Switch for breeding blaket liquid metal') case ('i_blkt_dual_coolant') call parse_int_variable('i_blkt_dual_coolant', i_blkt_dual_coolant, 0, 2, & diff --git a/tests/integration/test_blanket_library_int.py b/tests/integration/test_blanket_library_int.py index dce510e868..7df3ed1871 100644 --- a/tests/integration/test_blanket_library_int.py +++ b/tests/integration/test_blanket_library_int.py @@ -101,7 +101,7 @@ def test_liquid_breeder_properties_part_1(monkeypatch, blanket_library_fixture): monkeypatch.setattr(fwbs, "outlet_temp_liq", 1.0) # PbLi - see [Fer2020] for relavent equations - monkeypatch.setattr(fwbs, "i_bb_liq", 0) + monkeypatch.setattr(fwbs, "i_blkt_liquid_breeder_type", 0) blanket_library_fixture.liquid_breeder_properties() @@ -115,7 +115,7 @@ def test_liquid_breeder_properties_part_1(monkeypatch, blanket_library_fixture): assert pytest.approx(fwbs.hartmann_liq, rel=1e-3) == (7.189e3, 3.528e3) # Li - see [Lyublinski et al., 2009] for relavent equations - monkeypatch.setattr(fwbs, "i_bb_liq", 1) + monkeypatch.setattr(fwbs, "i_blkt_liquid_breeder_type", 1) blanket_library_fixture.liquid_breeder_properties() @@ -142,7 +142,7 @@ def test_liquid_breeder_properties_part_2(monkeypatch, blanket_library_fixture): monkeypatch.setattr(bv, "dr_blkt_inboard", 0.0) monkeypatch.setattr(bv, "dr_blkt_outboard", 0.2) monkeypatch.setattr(fwbs, "i_blkt_inboard", 0) - monkeypatch.setattr(fwbs, "i_bb_liq", 0) + monkeypatch.setattr(fwbs, "i_blkt_liquid_breeder_type", 0) monkeypatch.setattr(fwbs, "inlet_temp_liq", 0.0) monkeypatch.setattr(fwbs, "outlet_temp_liq", 0.0) @@ -168,12 +168,12 @@ def test_liquid_breeder_properties_part_3(monkeypatch, blanket_library_fixture): monkeypatch.setattr(fwbs, "outlet_temp_liq", 1.0) # PbLi - see [Fer2020] for relavent equations - monkeypatch.setattr(fwbs, "i_bb_liq", 0) + monkeypatch.setattr(fwbs, "i_blkt_liquid_breeder_type", 0) blanket_library_fixture.liquid_breeder_properties() assert pytest.approx(fwbs.den_liq, rel=1e-3) == 1.052e4 # Li - see [Lyublinski et al., 2009] for relavent equations - monkeypatch.setattr(fwbs, "i_bb_liq", 1) + monkeypatch.setattr(fwbs, "i_blkt_liquid_breeder_type", 1) blanket_library_fixture.liquid_breeder_properties() assert pytest.approx(fwbs.den_liq, rel=1e-3) == 504.0 diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 8faaf16b00..4baff924f7 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2557,7 +2557,7 @@ inuclear = 0 * DCLL * * Set i_blanket_type = 5 * *------* -*i_bb_liq = +*i_blkt_liquid_breeder_type = * DESCRIPTION: Switch for Liquid Metal Breeder Material * =0 PbLi * =1 Li diff --git a/tests/unit/test_blanket_library.py b/tests/unit/test_blanket_library.py index 3ce4d918a2..cc43e77c92 100644 --- a/tests/unit/test_blanket_library.py +++ b/tests/unit/test_blanket_library.py @@ -1633,7 +1633,7 @@ class LiquidBreederPropertiesParam(NamedTuple): thermal_conductivity_liq: Any = None dynamic_viscosity_liq: Any = None electrical_conductivity_liq: Any = None - i_bb_liq: Any = None + i_blkt_liquid_breeder_type: Any = None hartmann_liq: Any = None b_mag_blkt: Any = None i_blkt_inboard: Any = None @@ -1667,7 +1667,7 @@ class LiquidBreederPropertiesParam(NamedTuple): thermal_conductivity_liq=30, dynamic_viscosity_liq=0, electrical_conductivity_liq=0, - i_bb_liq=0, + i_blkt_liquid_breeder_type=0, hartmann_liq=np.array(np.array((0, 0), order="F"), order="F").transpose(), b_mag_blkt=np.array(np.array((5, 5), order="F"), order="F").transpose(), i_blkt_inboard=1, @@ -1701,10 +1701,10 @@ class LiquidBreederPropertiesParam(NamedTuple): den_liq=9500, specific_heat_liq=190, thermal_conductivity_liq=30, - expected_thermal_conductivity_liq=30, # doesn't change when i_bb_liq=1 + expected_thermal_conductivity_liq=30, # doesn't change when i_blkt_liquid_breeder_type=1 dynamic_viscosity_liq=0, electrical_conductivity_liq=0, - i_bb_liq=1, + i_blkt_liquid_breeder_type=1, hartmann_liq=np.array(np.array((0, 0), order="F"), order="F").transpose(), b_mag_blkt=np.array(np.array((5, 5), order="F"), order="F").transpose(), i_blkt_inboard=1, @@ -1779,7 +1779,9 @@ def test_liquid_breeder_properties( liquidbreederpropertiesparam.electrical_conductivity_liq, ) monkeypatch.setattr( - fwbs_variables, "i_bb_liq", liquidbreederpropertiesparam.i_bb_liq + fwbs_variables, + "i_blkt_liquid_breeder_type", + liquidbreederpropertiesparam.i_blkt_liquid_breeder_type, ) monkeypatch.setattr( fwbs_variables, "hartmann_liq", liquidbreederpropertiesparam.hartmann_liq @@ -2028,7 +2030,11 @@ def test_liquid_breeder_pressure_drop_mhd( :param monkeypatch: pytest fixture used to mock module/class variables :type monkeypatch: _pytest.monkeypatch.monkeypatch """ - monkeypatch.setattr(fwbs_variables, "i_blkt_liquid_breeder_channel_type", liquidbreederpressuredropmhdparam.i_blkt_liquid_breeder_channel_type) + monkeypatch.setattr( + fwbs_variables, + "i_blkt_liquid_breeder_channel_type", + liquidbreederpressuredropmhdparam.i_blkt_liquid_breeder_channel_type, + ) monkeypatch.setattr( fwbs_variables, "a_bz_liq", liquidbreederpressuredropmhdparam.a_bz_liq ) diff --git a/tests/unit/test_dcll.py b/tests/unit/test_dcll.py index bb317ece68..3218404d4f 100644 --- a/tests/unit/test_dcll.py +++ b/tests/unit/test_dcll.py @@ -877,7 +877,11 @@ def test_dcll_masses(dcllmassesparam, monkeypatch, dcll): monkeypatch.setattr(fwbs_variables, "den_liq", dcllmassesparam.den_liq) - monkeypatch.setattr(fwbs_variables, "i_blkt_liquid_breeder_channel_type", dcllmassesparam.i_blkt_liquid_breeder_channel_type) + monkeypatch.setattr( + fwbs_variables, + "i_blkt_liquid_breeder_channel_type", + dcllmassesparam.i_blkt_liquid_breeder_channel_type, + ) monkeypatch.setattr(fwbs_variables, "den_ceramic", dcllmassesparam.den_ceramic) From 66121d7b2c61ece7d1b739e6906fa758bbb07669 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 21 Feb 2025 16:06:51 +0000 Subject: [PATCH 69/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20tpeakfwo=20to=20t?= =?UTF-8?q?emp=5Ffw=5Foutboard=5Fpeak=20for=20clarity=20and=20consistency?= =?UTF-8?q?=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/blanket_library.py | 22 ++++++++++++---------- process/io/sankey_funcs.py | 2 -- source/fortran/blanket_library.f90 | 4 ++-- tests/integration/ref_dicts.json | 8 ++++---- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/process/blanket_library.py b/process/blanket_library.py index e34592eaaa..37e094fcb9 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -1746,16 +1746,18 @@ def thermo_hydraulic_model(self, output: bool): # blanket_library.p_fw_inboard_nuclear_heat_mw, # "Inboard first wall", # ) - (fwbs_variables.tpeakfwo, cf, rhof, fwbs_variables.mffwpo) = self.fw.fw_temp( - output, - fwbs_variables.radius_fw_channel, - build_variables.dr_fw_outboard, - build_variables.a_fw_outboard, - fwbs_variables.psurffwo, - blanket_library.p_fw_outboard_nuclear_heat_mw, - "Outboard first wall", + (fwbs_variables.temp_fw_outboard_peak, cf, rhof, fwbs_variables.mffwpo) = ( + self.fw.fw_temp( + output, + fwbs_variables.radius_fw_channel, + build_variables.dr_fw_outboard, + build_variables.a_fw_outboard, + fwbs_variables.psurffwo, + blanket_library.p_fw_outboard_nuclear_heat_mw, + "Outboard first wall", + ) ) - # (fwbs_variables.tpeakfwo, cf, rhof, fwbs_variables.mffwpo) = fw_module.fw_temp( + # (fwbs_variables.temp_fw_outboard_peak, cf, rhof, fwbs_variables.mffwpo) = fw_module.fw_temp( # int(output), # self.outfile, # fwbs_variables.radius_fw_channel, @@ -1768,7 +1770,7 @@ def thermo_hydraulic_model(self, output: bool): # Peak first wall temperature (K) fwbs_variables.temp_fw_peak = max( - blanket_library.tpeakfwi, blanket_library.tpeakfwo + blanket_library.tpeakfwi, blanket_library.temp_fw_outboard_peak ) # Total mass flow rate to remove inboard FW power (kg/s) diff --git a/process/io/sankey_funcs.py b/process/io/sankey_funcs.py index cc313045bc..56fe5c3eff 100644 --- a/process/io/sankey_funcs.py +++ b/process/io/sankey_funcs.py @@ -577,7 +577,6 @@ def plot_sankey(mfilename="MFILE.DAT"): # Plot simplified power flow Sankey Dia totaldivetc = pdivt + p_div_nuclear_heat_total_mw + p_div_rad_total_mw # Power deposited on Blanket (MW) totalblktetc = ( - ( p_fw_nuclear_heat_total_mw + p_blkt @@ -590,7 +589,6 @@ def plot_sankey(mfilename="MFILE.DAT"): # Plot simplified power flow Sankey Dia - emultmw ) - ) if itart == 0: # Power deposited in CP (MW) (None here) diff --git a/source/fortran/blanket_library.f90 b/source/fortran/blanket_library.f90 index af3a83b32d..cd77b3f9d1 100644 --- a/source/fortran/blanket_library.f90 +++ b/source/fortran/blanket_library.f90 @@ -66,7 +66,7 @@ module blanket_library real(dp) :: p_fw_inboard_nuclear_heat_mw, p_fw_outboard_nuclear_heat_mw !! Inboard/outboard first wall nuclear heating (MW) - real(dp) :: tpeakfwi, tpeakfwo + real(dp) :: tpeakfwi, temp_fw_outboard_peak !! Inboard/outboard first wall peak temperature (K) real(dp) :: mflow_fw_inboard_coolant_total, mflow_fw_outboard_coolant_total, mflow_fw_coolant_total @@ -148,7 +148,7 @@ subroutine init_blanket_library p_fw_inboard_nuclear_heat_mw = 0.0D0 p_fw_outboard_nuclear_heat_mw = 0.0D0 tpeakfwi = 0.0D0 - tpeakfwo = 0.0D0 + temp_fw_outboard_peak = 0.0D0 mflow_fw_inboard_coolant_total = 0.0D0 mflow_fw_outboard_coolant_total = 0.0D0 mflow_fw_coolant_total = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index abf38b0c47..7cc31346e5 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -7629,7 +7629,7 @@ "totalpowerlost": null, "temp_fw_peak": 873.0, "tpeakfwi": 0.0, - "tpeakfwo": 0.0, + "temp_fw_outboard_peak": 0.0, "t_pulse_repetition": 0.0, "t_ramp_down": 15.0, "t_precharge": 15.0, @@ -10860,7 +10860,7 @@ "totalpowerlost": "Total power lost due to radiation, ionisation and recombination [W]", "temp_fw_peak": "peak first wall temperature (K)", "tpeakfwi": "Inboard/outboard first wall peak temperature (K)", - "tpeakfwo": "Inboard/outboard first wall peak temperature (K)", + "temp_fw_outboard_peak": "Inboard/outboard first wall peak temperature (K)", "t_pulse_repetition": "pulse length = t_current_ramp_up + t_fusion_ramp + t_burn + t_ramp_down", "t_ramp_down": "shut down time for PF coils (s); if pulsed, = t_current_ramp_up", "t_precharge": "initial PF coil charge time (s); if pulsed, = t_current_ramp_up", @@ -17267,7 +17267,7 @@ "p_fw_inboard_nuclear_heat_mw", "p_fw_outboard_nuclear_heat_mw", "tpeakfwi", - "tpeakfwo", + "temp_fw_outboard_peak", "mflow_fw_inboard_coolant_total", "mflow_fw_outboard_coolant_total", "mflow_fw_coolant_total", @@ -18647,7 +18647,7 @@ "vel_blkt_inboard_coolant", "vel_blkt_outboard_coolant", "tpeakfwi", - "tpeakfwo", + "temp_fw_outboard_peak", "p_fw_inboard_nuclear_heat_mw", "p_fw_outboard_nuclear_heat_mw", "p_blkt_nuclear_heat_inboard_mw", From 3ec657006e63f6e8cd032fe2cd7fae379ab8590f Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 21 Feb 2025 16:07:39 +0000 Subject: [PATCH 70/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20tpeakfwi=20to=20t?= =?UTF-8?q?emp=5Ffw=5Finboard=5Fpeak=20for=20clarity=20and=20consistency?= =?UTF-8?q?=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/blanket_library.py | 22 ++++++++++++---------- source/fortran/blanket_library.f90 | 4 ++-- tests/integration/ref_dicts.json | 8 ++++---- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/process/blanket_library.py b/process/blanket_library.py index 37e094fcb9..38ee3fe92f 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -1722,17 +1722,19 @@ def thermo_hydraulic_model(self, output: bool): # First wall flow is just along the first wall, with no allowance for radial # pipes, manifolds etc. The outputs are mid quantities of inlet and outlet. # This subroutine recalculates cp and rhof. - (blanket_library.tpeakfwi, _, _, blanket_library.mffwpi) = self.fw.fw_temp( - output, - fwbs_variables.radius_fw_channel, - build_variables.dr_fw_inboard, - build_variables.a_fw_inboard, - fwbs_variables.psurffwi, - blanket_library.p_fw_inboard_nuclear_heat_mw, - "Inboard first wall", + (blanket_library.temp_fw_inboard_peak, _, _, blanket_library.mffwpi) = ( + self.fw.fw_temp( + output, + fwbs_variables.radius_fw_channel, + build_variables.dr_fw_inboard, + build_variables.a_fw_inboard, + fwbs_variables.psurffwi, + blanket_library.p_fw_inboard_nuclear_heat_mw, + "Inboard first wall", + ) ) # ( - # blanket_library.tpeakfwi, + # blanket_library.temp_fw_inboard_peak, # cf, # rhof, # blanket_library.mffwpi, @@ -1770,7 +1772,7 @@ def thermo_hydraulic_model(self, output: bool): # Peak first wall temperature (K) fwbs_variables.temp_fw_peak = max( - blanket_library.tpeakfwi, blanket_library.temp_fw_outboard_peak + blanket_library.temp_fw_inboard_peak, blanket_library.temp_fw_outboard_peak ) # Total mass flow rate to remove inboard FW power (kg/s) diff --git a/source/fortran/blanket_library.f90 b/source/fortran/blanket_library.f90 index cd77b3f9d1..be1b015e1d 100644 --- a/source/fortran/blanket_library.f90 +++ b/source/fortran/blanket_library.f90 @@ -66,7 +66,7 @@ module blanket_library real(dp) :: p_fw_inboard_nuclear_heat_mw, p_fw_outboard_nuclear_heat_mw !! Inboard/outboard first wall nuclear heating (MW) - real(dp) :: tpeakfwi, temp_fw_outboard_peak + real(dp) :: temp_fw_inboard_peak, temp_fw_outboard_peak !! Inboard/outboard first wall peak temperature (K) real(dp) :: mflow_fw_inboard_coolant_total, mflow_fw_outboard_coolant_total, mflow_fw_coolant_total @@ -147,7 +147,7 @@ subroutine init_blanket_library len_blkt_outboard_channel_total = 0.0D0 p_fw_inboard_nuclear_heat_mw = 0.0D0 p_fw_outboard_nuclear_heat_mw = 0.0D0 - tpeakfwi = 0.0D0 + temp_fw_inboard_peak = 0.0D0 temp_fw_outboard_peak = 0.0D0 mflow_fw_inboard_coolant_total = 0.0D0 mflow_fw_outboard_coolant_total = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 7cc31346e5..82ef92e507 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -7628,7 +7628,7 @@ "e_plasma_beta": 0.0, "totalpowerlost": null, "temp_fw_peak": 873.0, - "tpeakfwi": 0.0, + "temp_fw_inboard_peak": 0.0, "temp_fw_outboard_peak": 0.0, "t_pulse_repetition": 0.0, "t_ramp_down": 15.0, @@ -10859,7 +10859,7 @@ "e_plasma_beta": "", "totalpowerlost": "Total power lost due to radiation, ionisation and recombination [W]", "temp_fw_peak": "peak first wall temperature (K)", - "tpeakfwi": "Inboard/outboard first wall peak temperature (K)", + "temp_fw_inboard_peak": "Inboard/outboard first wall peak temperature (K)", "temp_fw_outboard_peak": "Inboard/outboard first wall peak temperature (K)", "t_pulse_repetition": "pulse length = t_current_ramp_up + t_fusion_ramp + t_burn + t_ramp_down", "t_ramp_down": "shut down time for PF coils (s); if pulsed, = t_current_ramp_up", @@ -17266,7 +17266,7 @@ "len_blkt_outboard_channel_total", "p_fw_inboard_nuclear_heat_mw", "p_fw_outboard_nuclear_heat_mw", - "tpeakfwi", + "temp_fw_inboard_peak", "temp_fw_outboard_peak", "mflow_fw_inboard_coolant_total", "mflow_fw_outboard_coolant_total", @@ -18646,7 +18646,7 @@ "len_blkt_outboard_channel_total", "vel_blkt_inboard_coolant", "vel_blkt_outboard_coolant", - "tpeakfwi", + "temp_fw_inboard_peak", "temp_fw_outboard_peak", "p_fw_inboard_nuclear_heat_mw", "p_fw_outboard_nuclear_heat_mw", From d5140cb9a16ccb75cd80093073e3e10ab910034d Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 21 Feb 2025 16:12:31 +0000 Subject: [PATCH 71/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20mffwpi=20to=20mfl?= =?UTF-8?q?ow=5Ffw=5Finboard=5Fcoolant=5Fchannel=20for=20clarity=20and=20c?= =?UTF-8?q?onsistency=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/blanket_library.py | 29 ++++++++++++++++------------- source/fortran/blanket_library.f90 | 4 ++-- tests/integration/ref_dicts.json | 8 ++++---- 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/process/blanket_library.py b/process/blanket_library.py index 38ee3fe92f..89a215899d 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -783,7 +783,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): ) # Mass flow rate per FW coolant pipe (kg/s): - blanket_library.mffwpi = ( + blanket_library.mflow_fw_inboard_coolant_channel = ( blanket_library.mflow_fw_inboard_coolant_total / blanket_library.n_fw_inboard_channels ) @@ -795,7 +795,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): # Coolant velocite in FW (m/s) velfwi = self.flow_velocity( i_channel_shape=1, - mass_flow_rate=blanket_library.mffwpi, + mass_flow_rate=blanket_library.mflow_fw_inboard_coolant_channel, flow_density=fwbs_variables.den_fw_coolant, ) velfwo = self.flow_velocity( @@ -1722,22 +1722,25 @@ def thermo_hydraulic_model(self, output: bool): # First wall flow is just along the first wall, with no allowance for radial # pipes, manifolds etc. The outputs are mid quantities of inlet and outlet. # This subroutine recalculates cp and rhof. - (blanket_library.temp_fw_inboard_peak, _, _, blanket_library.mffwpi) = ( - self.fw.fw_temp( - output, - fwbs_variables.radius_fw_channel, - build_variables.dr_fw_inboard, - build_variables.a_fw_inboard, - fwbs_variables.psurffwi, - blanket_library.p_fw_inboard_nuclear_heat_mw, - "Inboard first wall", - ) + ( + blanket_library.temp_fw_inboard_peak, + _, + _, + blanket_library.mflow_fw_inboard_coolant_channel, + ) = self.fw.fw_temp( + output, + fwbs_variables.radius_fw_channel, + build_variables.dr_fw_inboard, + build_variables.a_fw_inboard, + fwbs_variables.psurffwi, + blanket_library.p_fw_inboard_nuclear_heat_mw, + "Inboard first wall", ) # ( # blanket_library.temp_fw_inboard_peak, # cf, # rhof, - # blanket_library.mffwpi, + # blanket_library.mflow_fw_inboard_coolant_channel, # ) = fw_module.fw_temp( # int(output), # self.outfile, diff --git a/source/fortran/blanket_library.f90 b/source/fortran/blanket_library.f90 index be1b015e1d..7c6429b260 100644 --- a/source/fortran/blanket_library.f90 +++ b/source/fortran/blanket_library.f90 @@ -75,7 +75,7 @@ module blanket_library real(dp) :: n_fw_inboard_channels, n_fw_outboard_channels !! Inboard / outboard total number of first wall coolant channels - real(dp) :: mffwpi, mffwpo + real(dp) :: mflow_fw_inboard_coolant_channel, mffwpo !! Inboard/outboard mass flow rate per coolant pipe (kg/s) real(dp) :: p_blkt_nuclear_heat_inboard_mw, p_blkt_nuclear_heat_outboard_mw @@ -154,7 +154,7 @@ subroutine init_blanket_library mflow_fw_coolant_total = 0.0D0 n_fw_inboard_channels = 0.0D0 n_fw_outboard_channels = 0.0D0 - mffwpi = 0.0D0 + mflow_fw_inboard_coolant_channel = 0.0D0 mffwpo = 0.0D0 p_blkt_nuclear_heat_inboard_mw = 0.0D0 p_blkt_nuclear_heat_outboard_mw = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index 82ef92e507..ed6312b1c9 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3301,7 +3301,7 @@ "mflow_fw_coolant_total": 0.0, "mflow_fw_inboard_coolant_total": 0.0, "mflow_fw_outboard_coolant_total": 0.0, - "mffwpi": 0.0, + "mflow_fw_inboard_coolant_channel": 0.0, "mffwpo": 0.0, "mfile": 13.0, "mflibe": 0.0, @@ -10075,7 +10075,7 @@ "mflow_fw_coolant_total": "Inboard/outboard total mass flow rate to remove inboard FW power (kg/s)", "mflow_fw_inboard_coolant_total": "Inboard/outboard total mass flow rate to remove inboard FW power (kg/s)", "mflow_fw_outboard_coolant_total": "Inboard/outboard total mass flow rate to remove inboard FW power (kg/s)", - "mffwpi": "Inboard/outboard mass flow rate per coolant pipe (kg/s)", + "mflow_fw_inboard_coolant_channel": "Inboard/outboard mass flow rate per coolant pipe (kg/s)", "mffwpo": "Inboard/outboard mass flow rate per coolant pipe (kg/s)", "mfile": "Machine-optimised output file unit", "mflibe": "total mass of FLiBe (kg)", @@ -17273,7 +17273,7 @@ "mflow_fw_coolant_total", "n_fw_inboard_channels", "n_fw_outboard_channels", - "mffwpi", + "mflow_fw_inboard_coolant_channel", "mffwpo", "p_blkt_nuclear_heat_inboard_mw", "p_blkt_nuclear_heat_outboard_mw", @@ -18657,7 +18657,7 @@ "n_blkt_inboard_channels", "n_blkt_outboard_channels", "mftotal", - "mffwpi", + "mflow_fw_inboard_coolant_channel", "mffwpo", "mflow_fw_inboard_coolant_total", "mflow_fw_outboard_coolant_total", From 8f23bb055c628e8098b56abf08a0aab60696645a Mon Sep 17 00:00:00 2001 From: mn3981 Date: Fri, 21 Feb 2025 16:13:25 +0000 Subject: [PATCH 72/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20mffwpo=20to=20mfl?= =?UTF-8?q?ow=5Ffw=5Foutboard=5Fcoolant=5Fchannel=20for=20clarity=20and=20?= =?UTF-8?q?consistency=20across=20the=20codebase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/blanket_library.py | 29 ++++++++++++++++------------- source/fortran/blanket_library.f90 | 4 ++-- tests/integration/ref_dicts.json | 8 ++++---- 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/process/blanket_library.py b/process/blanket_library.py index 89a215899d..1cbf3c42d6 100644 --- a/process/blanket_library.py +++ b/process/blanket_library.py @@ -787,7 +787,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): blanket_library.mflow_fw_inboard_coolant_total / blanket_library.n_fw_inboard_channels ) - blanket_library.mffwpo = ( + blanket_library.mflow_fw_outboard_coolant_channel = ( blanket_library.mflow_fw_outboard_coolant_total / blanket_library.n_fw_outboard_channels ) @@ -800,7 +800,7 @@ def thermo_hydraulic_model_pressure_drop_calculations(self, output: bool): ) velfwo = self.flow_velocity( i_channel_shape=1, - mass_flow_rate=blanket_library.mffwpo, + mass_flow_rate=blanket_library.mflow_fw_outboard_coolant_channel, flow_density=fwbs_variables.den_fw_coolant, ) @@ -1751,18 +1751,21 @@ def thermo_hydraulic_model(self, output: bool): # blanket_library.p_fw_inboard_nuclear_heat_mw, # "Inboard first wall", # ) - (fwbs_variables.temp_fw_outboard_peak, cf, rhof, fwbs_variables.mffwpo) = ( - self.fw.fw_temp( - output, - fwbs_variables.radius_fw_channel, - build_variables.dr_fw_outboard, - build_variables.a_fw_outboard, - fwbs_variables.psurffwo, - blanket_library.p_fw_outboard_nuclear_heat_mw, - "Outboard first wall", - ) + ( + fwbs_variables.temp_fw_outboard_peak, + cf, + rhof, + fwbs_variables.mflow_fw_outboard_coolant_channel, + ) = self.fw.fw_temp( + output, + fwbs_variables.radius_fw_channel, + build_variables.dr_fw_outboard, + build_variables.a_fw_outboard, + fwbs_variables.psurffwo, + blanket_library.p_fw_outboard_nuclear_heat_mw, + "Outboard first wall", ) - # (fwbs_variables.temp_fw_outboard_peak, cf, rhof, fwbs_variables.mffwpo) = fw_module.fw_temp( + # (fwbs_variables.temp_fw_outboard_peak, cf, rhof, fwbs_variables.mflow_fw_outboard_coolant_channel) = fw_module.fw_temp( # int(output), # self.outfile, # fwbs_variables.radius_fw_channel, diff --git a/source/fortran/blanket_library.f90 b/source/fortran/blanket_library.f90 index 7c6429b260..7b1cd4bb33 100644 --- a/source/fortran/blanket_library.f90 +++ b/source/fortran/blanket_library.f90 @@ -75,7 +75,7 @@ module blanket_library real(dp) :: n_fw_inboard_channels, n_fw_outboard_channels !! Inboard / outboard total number of first wall coolant channels - real(dp) :: mflow_fw_inboard_coolant_channel, mffwpo + real(dp) :: mflow_fw_inboard_coolant_channel, mflow_fw_outboard_coolant_channel !! Inboard/outboard mass flow rate per coolant pipe (kg/s) real(dp) :: p_blkt_nuclear_heat_inboard_mw, p_blkt_nuclear_heat_outboard_mw @@ -155,7 +155,7 @@ subroutine init_blanket_library n_fw_inboard_channels = 0.0D0 n_fw_outboard_channels = 0.0D0 mflow_fw_inboard_coolant_channel = 0.0D0 - mffwpo = 0.0D0 + mflow_fw_outboard_coolant_channel = 0.0D0 p_blkt_nuclear_heat_inboard_mw = 0.0D0 p_blkt_nuclear_heat_outboard_mw = 0.0D0 mflow_blkt_inboard_coolant = 0.0D0 diff --git a/tests/integration/ref_dicts.json b/tests/integration/ref_dicts.json index ed6312b1c9..985b05bacc 100644 --- a/tests/integration/ref_dicts.json +++ b/tests/integration/ref_dicts.json @@ -3302,7 +3302,7 @@ "mflow_fw_inboard_coolant_total": 0.0, "mflow_fw_outboard_coolant_total": 0.0, "mflow_fw_inboard_coolant_channel": 0.0, - "mffwpo": 0.0, + "mflow_fw_outboard_coolant_channel": 0.0, "mfile": 13.0, "mflibe": 0.0, "mftotal": 0.0, @@ -10076,7 +10076,7 @@ "mflow_fw_inboard_coolant_total": "Inboard/outboard total mass flow rate to remove inboard FW power (kg/s)", "mflow_fw_outboard_coolant_total": "Inboard/outboard total mass flow rate to remove inboard FW power (kg/s)", "mflow_fw_inboard_coolant_channel": "Inboard/outboard mass flow rate per coolant pipe (kg/s)", - "mffwpo": "Inboard/outboard mass flow rate per coolant pipe (kg/s)", + "mflow_fw_outboard_coolant_channel": "Inboard/outboard mass flow rate per coolant pipe (kg/s)", "mfile": "Machine-optimised output file unit", "mflibe": "total mass of FLiBe (kg)", "mftotal": "Total mass flow rate for coolant (kg/s)", @@ -17274,7 +17274,7 @@ "n_fw_inboard_channels", "n_fw_outboard_channels", "mflow_fw_inboard_coolant_channel", - "mffwpo", + "mflow_fw_outboard_coolant_channel", "p_blkt_nuclear_heat_inboard_mw", "p_blkt_nuclear_heat_outboard_mw", "mflow_blkt_inboard_coolant", @@ -18658,7 +18658,7 @@ "n_blkt_outboard_channels", "mftotal", "mflow_fw_inboard_coolant_channel", - "mffwpo", + "mflow_fw_outboard_coolant_channel", "mflow_fw_inboard_coolant_total", "mflow_fw_outboard_coolant_total", "mflow_fw_coolant_total", From 2f7a0f66dc94facd99abd740d599d908c4faf7a0 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 20 Mar 2025 08:59:00 +0000 Subject: [PATCH 73/74] Add variables to obsolete_vars.py --- process/availability.py | 4 +++- process/io/obsolete_vars.py | 18 ++++++++++++++++++ process/io/sankey_funcs.py | 13 +------------ 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/process/availability.py b/process/availability.py index 57e9a0332a..6abf39b40f 100644 --- a/process/availability.py +++ b/process/availability.py @@ -101,7 +101,9 @@ def avail(self, output: bool): # Calculate blanket lifetime using neutron fluence model (ibkt_life=0) # or DEMO fusion power model (ibkt_life=1) if cv.ibkt_life == 0: - fwbsv.life_blkt_fpy = min(cv.abktflnc / pv.pflux_fw_neutron_mw, cv.tlife) + fwbsv.life_blkt_fpy = min( + cv.abktflnc / pv.pflux_fw_neutron_mw, cv.tlife + ) else: fwbsv.life_blkt_fpy = min(cv.life_dpa / dpa_fpy, cv.tlife) # DEMO else: diff --git a/process/io/obsolete_vars.py b/process/io/obsolete_vars.py index 448cce5608..fad8eae216 100644 --- a/process/io/obsolete_vars.py +++ b/process/io/obsolete_vars.py @@ -254,6 +254,24 @@ "divfix": "dz_divertor", "coreradius": "radius_plasma_core_norm", "maxradwallload": "pflux_fw_rad_max", + "fdiv": "f_ster_div_single", + "fhcd": "f_a_fw_hcd", + "nblktmodti": "n_blkt_inboard_modules_toroidal", + "nblktmodpo": "n_blkt_outboard_modules_poloidal", + "nblktmodpi": "n_blkt_inboard_modules_poloidal", + "inlet_temp": "temp_blkt_coolant_in", + "outlet_temp": "temp_blkt_coolant_out", + "blpressure": "pres_blkt_coolant", + "primary_pumping": "i_coolant_pumping", + "secondary_cycle": "i_thermal_electric_conversion", + "fwbsshape": "i_fw_blkt_vv_shape", + "li6enrich": "f_blkt_li6_enrichment", + "nblktmodto": "n_blkt_outboard_modules_toroidal", + "i_bb_liq": "i_blkt_liquid_breeder_type", + "icooldual": "i_blkt_coolant_dual", + "ifci": "i_blkt_liquid_breeder_channel_type", + "ipump": "i_fw_blkt_shared_coolant", + "coolwh": "i_blkt_coolant_type", } OBS_VARS_HELP = { diff --git a/process/io/sankey_funcs.py b/process/io/sankey_funcs.py index 56fe5c3eff..e3acb6b415 100644 --- a/process/io/sankey_funcs.py +++ b/process/io/sankey_funcs.py @@ -309,17 +309,11 @@ def plot_full_sankey( # Alphas, Neutrons, Photons, Coolant Pumping, Total 1st Wall first_wall = [ - p_fw_alpha_mw, - p_fw_nuclear_heat_total_mw, - p_fw_rad_total_mw, - htpmwfw, - -pthermfw, - , ] sankey.add( flows=first_wall, @@ -578,15 +572,10 @@ def plot_sankey(mfilename="MFILE.DAT"): # Plot simplified power flow Sankey Dia # Power deposited on Blanket (MW) totalblktetc = ( p_fw_nuclear_heat_total_mw - - + p_blkt - _nuclear_heat_total_mw + + p_blkt_nuclear_heat_total_mw + pnucshld - + p_fw_rad_total_mw - + p_fw_alpha_mw - - emultmw ) From 5fb7504634a42c6449915ba92055750f12baa097 Mon Sep 17 00:00:00 2001 From: mn3981 Date: Thu, 20 Mar 2025 10:07:55 +0000 Subject: [PATCH 74/74] =?UTF-8?q?=F0=9F=94=84=20Rename=20input=20variables?= =?UTF-8?q?=20for=20input.py?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/input.py | 60 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 42 insertions(+), 18 deletions(-) diff --git a/process/input.py b/process/input.py index d2026b500d..ddd2277b75 100644 --- a/process/input.py +++ b/process/input.py @@ -216,7 +216,7 @@ def __post_init__(self): "bldrc": InputVariable(fortran.ife_variables, float, range=(0.0, 10.0)), "bldzl": InputVariable(fortran.ife_variables, float, range=(0.0, 10.0)), "bldzu": InputVariable(fortran.ife_variables, float, range=(0.0, 10.0)), - "blpressure": InputVariable( + "pres_blkt_coolant": InputVariable( fortran.fwbs_variables, float, range=(100000.0, 100000000.0) ), "blpressure_liq": InputVariable( @@ -590,7 +590,7 @@ def __post_init__(self): "fcutfsu": InputVariable(fortran.tfcoil_variables, float, range=(0.0, 1.0)), "fdene": InputVariable(fortran.constraint_variables, float, range=(0.001, 10.0)), "fdfs": InputVariable(fortran.divertor_variables, float, range=(0.0, 20.0)), - "fdiv": InputVariable(fortran.fwbs_variables, float, range=(0.0, 1.0)), + "f_ster_div_single": InputVariable(fortran.fwbs_variables, float, range=(0.0, 1.0)), "fdiva": InputVariable(fortran.divertor_variables, float, range=(0.1, 2.0)), "fdivcol": InputVariable(fortran.constraint_variables, float, range=(0.001, 10.0)), "fdivwet": InputVariable(fortran.stellarator_variables, float, range=(0.01, 1.0)), @@ -602,7 +602,7 @@ def __post_init__(self): "fflutf": InputVariable(fortran.constraint_variables, float, range=(0.001, 10.0)), "ffuspow": InputVariable(fortran.constraint_variables, float, range=(0.001, 10.0)), "fgamcd": InputVariable(fortran.constraint_variables, float, range=(0.001, 10.0)), - "fhcd": InputVariable(fortran.fwbs_variables, float, range=(0.0, 1.0)), + "f_a_fw_hcd": InputVariable(fortran.fwbs_variables, float, range=(0.0, 1.0)), "fhldiv": InputVariable(fortran.constraint_variables, float, range=(0.001, 10.0)), "fhole": InputVariable(fortran.fwbs_variables, float, range=(0.0, 1.0)), "fhts": InputVariable(fortran.tfcoil_variables, float, range=(0.01, 1.0)), @@ -828,7 +828,9 @@ def __post_init__(self): "initialpressure": InputVariable( fortran.vacuum_variables, float, range=(1e-06, 10000.0) ), - "inlet_temp": InputVariable(fortran.fwbs_variables, float, range=(200.0, 600.0)), + "temp_blkt_coolant_in": InputVariable( + fortran.fwbs_variables, float, range=(200.0, 600.0) + ), "inlet_temp_liq": InputVariable( fortran.fwbs_variables, float, range=(508.0, 1500.0) ), @@ -846,7 +848,9 @@ def __post_init__(self): ), "len_tf_bus": InputVariable(fortran.tfcoil_variables, float, range=(0.01, 1000.0)), "lhat": InputVariable(fortran.reinke_variables, float, range=(1.0, 15.0)), - "li6enrich": InputVariable(fortran.fwbs_variables, float, range=(7.4, 100.0)), + "f_blkt_li6_enrichment": InputVariable( + fortran.fwbs_variables, float, range=(7.4, 100.0) + ), "life_dpa": InputVariable(fortran.cost_variables, float, range=(10.0, 100.0)), "llw_storage_h": InputVariable( fortran.buildings_variables, float, range=(1.0, 100.0) @@ -938,7 +942,9 @@ def __post_init__(self): "outgasindex": InputVariable( fortran.vacuum_variables, float, range=(1e-06, 1000.0) ), - "outlet_temp": InputVariable(fortran.fwbs_variables, float, range=(450.0, 900.0)), + "temp_blkt_coolant_out": InputVariable( + fortran.fwbs_variables, float, range=(450.0, 900.0) + ), "outlet_temp_liq": InputVariable( fortran.fwbs_variables, float, range=(508.0, 1500.0) ), @@ -1431,16 +1437,18 @@ def __post_init__(self): "ccl0_ma": InputVariable(fortran.pfcoil_variables, float, array=True), "ccls_ma": InputVariable(fortran.pfcoil_variables, float, array=True), "cfind": InputVariable(fortran.cost_variables, float, array=True), - "coolwh": InputVariable(fortran.fwbs_variables, int, choices=[1, 2]), + "i_blkt_coolant_type": InputVariable(fortran.fwbs_variables, int, choices=[1, 2]), "coppera_m2_max": InputVariable( fortran.rebco_variables, float, range=(1.0e6, 1.0e10) ), "cost_model": InputVariable(fortran.cost_variables, int, choices=[0, 1]), "divdum": InputVariable(fortran.divertor_variables, int, choices=[0, 1]), "dwell_pump": InputVariable(fortran.vacuum_variables, int, choices=[0, 1, 2]), - "fwbsshape": InputVariable(fortran.fwbs_variables, int, range=(1, 2)), + "i_fw_blkt_vv_shape": InputVariable(fortran.fwbs_variables, int, range=(1, 2)), "hcdportsize": InputVariable(fortran.fwbs_variables, int, range=(1, 2)), - "i_bb_liq": InputVariable(fortran.fwbs_variables, int, choices=[0, 1]), + "i_blkt_liquid_breeder_type": InputVariable( + fortran.fwbs_variables, int, choices=[0, 1] + ), "i_beta_component": InputVariable(fortran.physics_variables, int, range=(0, 3)), "i_beta_fast_alpha": InputVariable(fortran.physics_variables, int, choices=[0, 1]), "i_blanket_type": InputVariable(fortran.fwbs_variables, int, choices=[1, 3, 5]), @@ -1493,10 +1501,14 @@ def __post_init__(self): "iavail": InputVariable(fortran.cost_variables, int, range=(0, 3)), "ibkt_life": InputVariable(fortran.cost_variables, int, choices=[0, 1, 2]), "iblanket_thickness": InputVariable(fortran.fwbs_variables, int, choices=[1, 2, 3]), - "icooldual": InputVariable(fortran.fwbs_variables, int, choices=[0, 1, 2]), + "i_blkt_dual_coolant": InputVariable( + fortran.fwbs_variables, int, choices=[0, 1, 2] + ), "iefrf": InputVariable(fortran.current_drive_variables, int, range=(1, 13)), "iefrffix": InputVariable(fortran.current_drive_variables, int, range=(0, 13)), - "ifci": InputVariable(fortran.fwbs_variables, int, choices=[0, 1, 2]), + "i_blkt_liquid_breeder_channel_type": InputVariable( + fortran.fwbs_variables, int, choices=[0, 1, 2] + ), "ife": InputVariable(fortran.ife_variables, int, choices=[0, 1]), "ifedrv": InputVariable(fortran.ife_variables, int, range=(-1, 3)), "ifetyp": InputVariable(fortran.ife_variables, int, range=(0, 4)), @@ -1511,7 +1523,9 @@ def __post_init__(self): "ipowerflow": InputVariable(fortran.heat_transport_variables, int, choices=[0, 1]), "iprimshld": InputVariable(fortran.heat_transport_variables, int, choices=[0, 1]), "iprofile": InputVariable(fortran.physics_variables, int, range=(0, 6)), - "ipump": InputVariable(fortran.fwbs_variables, int, choices=[0, 1, 2]), + "i_fw_blkt_shared_coolant": InputVariable( + fortran.fwbs_variables, int, choices=[0, 1, 2] + ), "ireactor": InputVariable(fortran.cost_variables, int, choices=[0, 1]), "irefprop": InputVariable(fortran.fwbs_variables, int, choices=[0, 1]), "irfcd": InputVariable(fortran.current_drive_variables, int, choices=[0, 1]), @@ -1535,20 +1549,30 @@ def __post_init__(self): "n_tf_graded_layers": InputVariable(fortran.tfcoil_variables, int, range=(1, 20)), "n_tf_joints": InputVariable(fortran.tfcoil_variables, int, range=(1, 50)), "n_tf_joints_contact": InputVariable(fortran.tfcoil_variables, int, range=(1, 50)), - "nblktmodpi": InputVariable(fortran.fwbs_variables, int, range=(1, 16)), - "nblktmodpo": InputVariable(fortran.fwbs_variables, int, range=(1, 16)), - "nblktmodti": InputVariable(fortran.fwbs_variables, int, range=(8, 96)), - "nblktmodto": InputVariable(fortran.fwbs_variables, int, range=(8, 96)), + "n_blkt_inboard_modules_poloidal": InputVariable( + fortran.fwbs_variables, int, range=(1, 16) + ), + "n_blkt_outboard_modules_poloidal": InputVariable( + fortran.fwbs_variables, int, range=(1, 16) + ), + "n_blkt_inboard_modules_toroidal": InputVariable( + fortran.fwbs_variables, int, range=(8, 96) + ), + "n_blkt_outboard_modules_toroidal": InputVariable( + fortran.fwbs_variables, int, range=(8, 96) + ), "npdiv": InputVariable(fortran.fwbs_variables, int, range=(0, 4)), "nphcdin": InputVariable(fortran.fwbs_variables, int, range=(0, 4)), "nphcdout": InputVariable(fortran.fwbs_variables, int, range=(0, 4)), "ntype": InputVariable(fortran.vacuum_variables, int, choices=[0, 1]), "num_rh_systems": InputVariable(fortran.cost_variables, int, range=(1, 10)), "output_costs": InputVariable(fortran.cost_variables, int, choices=[0, 1]), - "primary_pumping": InputVariable(fortran.fwbs_variables, int, range=(0, 3)), + "i_coolant_pumping": InputVariable(fortran.fwbs_variables, int, range=(0, 3)), "reinke_mode": InputVariable(fortran.reinke_variables, int, choices=[0, 1]), "scan_dim": InputVariable(fortran.scan_module, int, range=(1, 2)), - "secondary_cycle": InputVariable(fortran.fwbs_variables, int, range=(0, 4)), + "i_thermal_electric_conversion": InputVariable( + fortran.fwbs_variables, int, range=(0, 4) + ), "secondary_cycle_liq": InputVariable(fortran.fwbs_variables, int, range=(2, 4)), "supercond_cost_model": InputVariable(fortran.cost_variables, int, choices=[0, 1]), "i_tf_inside_cs": InputVariable(fortran.build_variables, int, choices=[0, 1]),