From f5f6ba58aea51ca4aad959b4fe1e5cbb4a6f55fc Mon Sep 17 00:00:00 2001 From: chris-ashe Date: Sat, 25 Jul 2026 23:18:06 +0100 Subject: [PATCH 1/4] Add CostModels enum for cost model selection --- process/data_structure/cost_variables.py | 14 ++++++++++++++ process/main.py | 7 ++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/process/data_structure/cost_variables.py b/process/data_structure/cost_variables.py index cc285feb60..328aacb243 100644 --- a/process/data_structure/cost_variables.py +++ b/process/data_structure/cost_variables.py @@ -1,4 +1,18 @@ from dataclasses import dataclass, field +from enum import IntEnum + + +class CostModels(IntEnum): + """Enum for cost model selection""" + + PROCESS_1990 = 0 + """Use $ 1990 PROCESS model""" + + KOVARI_2014 = 1 + """Use $ 2014 Kovari model""" + + USER_PROVIDED = 2 + """Use user-provided model""" @dataclass(slots=True) diff --git a/process/main.py b/process/main.py index 551fe9f852..58acf247a7 100644 --- a/process/main.py +++ b/process/main.py @@ -55,6 +55,7 @@ from process.core.model import DataStructure, Model from process.core.process_output import OutputFileManager, oheadr from process.core.scan import Scan +from process.data_structure.cost_variables import CostModels from process.data_structure.numerics import PROCESSRunMode from process.models.availability import Availability from process.models.blankets.blanket_library import BlanketLibrary @@ -718,11 +719,11 @@ def __init__(self, data: DataStructure): @property def costs(self) -> Model: - if self.data.costs.cost_model == 0: + if CostModels(self.data.costs.cost_model) == CostModels.PROCESS_1990: return self._costs_1990 - if self.data.costs.cost_model == 1: + if CostModels(self.data.costs.cost_model) == CostModels.KOVARI_2014: return self._costs_2015 - if self.data.costs.cost_model == 2: + if CostModels(self.data.costs.cost_model) == CostModels.USER_PROVIDED: if self._costs_custom is not None: self._costs_custom.data = self.data return self._costs_custom From f687e363689d41ab1baad552650acd6f548e39ef Mon Sep 17 00:00:00 2001 From: chris-ashe Date: Sat, 25 Jul 2026 23:19:00 +0100 Subject: [PATCH 2/4] Rename cost_model to i_cost_model for consistency across input variables and data structures --- process/core/input.py | 2 +- process/core/io/obsolete_vars.py | 1 + process/data_structure/cost_variables.py | 2 +- process/data_structure/fwbs_variables.py | 2 +- process/main.py | 6 +++--- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/process/core/input.py b/process/core/input.py index f9466abda4..1d7c132b6a 100644 --- a/process/core/input.py +++ b/process/core/input.py @@ -990,7 +990,7 @@ def bounds(self) -> tuple[NumberType | None, NumberType | None]: "tf_coppera_m2_max": InputVariable( "superconducting_tfcoil", float, range=(1.0e6, 1.0e10) ), - "cost_model": InputVariable("costs", int, choices=[0, 1, 2]), + "i_cost_model": InputVariable("costs", int, choices=[0, 1, 2]), "i_vac_pump_dwell": InputVariable("vacuum", int, choices=[0, 1, 2]), "i_fw_blkt_vv_shape": InputVariable("fwbs", int, range=(1, 2)), "hcdportsize": InputVariable("fwbs", int, range=(1, 2)), diff --git a/process/core/io/obsolete_vars.py b/process/core/io/obsolete_vars.py index 82aa8ed33f..2b34765c7e 100644 --- a/process/core/io/obsolete_vars.py +++ b/process/core/io/obsolete_vars.py @@ -472,6 +472,7 @@ "alstroh": "stress_cs_steel_max", "i_cs_stress": None, "f_nd_alpha_electron": "f_nd_alpha_thermal_electron", + "cost_model": "i_cost_model", } OBS_VARS_HELP = { diff --git a/process/data_structure/cost_variables.py b/process/data_structure/cost_variables.py index 328aacb243..0b8de86c33 100644 --- a/process/data_structure/cost_variables.py +++ b/process/data_structure/cost_variables.py @@ -320,7 +320,7 @@ class CostData: amortization: float = 13.6 """amortization factor (fixed charge factor) "A" (years)""" - cost_model: int = 1 + i_cost_model: int = 1 """Switch for cost model: - =0 use $ 1990 PROCESS model - =1 use $ 2014 Kovari model diff --git a/process/data_structure/fwbs_variables.py b/process/data_structure/fwbs_variables.py index 838c717c2b..eed0c7be87 100644 --- a/process/data_structure/fwbs_variables.py +++ b/process/data_structure/fwbs_variables.py @@ -259,7 +259,7 @@ class FWBSData: """ i_shield_mat: int = 0 - """Switch for shield material - *currently only applied in costing routines* `cost_model = 2` + """Switch for shield material - *currently only applied in costing routines* `i_cost_model = 2` - =0 Tungsten (default) - =1 Tungsten carbide """ diff --git a/process/main.py b/process/main.py index 58acf247a7..7d2715c2c9 100644 --- a/process/main.py +++ b/process/main.py @@ -719,11 +719,11 @@ def __init__(self, data: DataStructure): @property def costs(self) -> Model: - if CostModels(self.data.costs.cost_model) == CostModels.PROCESS_1990: + if CostModels(self.data.costs.i_cost_model) == CostModels.PROCESS_1990: return self._costs_1990 - if CostModels(self.data.costs.cost_model) == CostModels.KOVARI_2014: + if CostModels(self.data.costs.i_cost_model) == CostModels.KOVARI_2014: return self._costs_2015 - if CostModels(self.data.costs.cost_model) == CostModels.USER_PROVIDED: + if CostModels(self.data.costs.i_cost_model) == CostModels.USER_PROVIDED: if self._costs_custom is not None: self._costs_custom.data = self.data return self._costs_custom From 4e988e310c1f839b8169a3eeca31724d488af76e Mon Sep 17 00:00:00 2001 From: chris-ashe Date: Sat, 25 Jul 2026 23:38:27 +0100 Subject: [PATCH 3/4] Update cost model references to use i_cost_model for consistency --- documentation/source/cost-models/cost-models.md | 6 +++--- examples/data/large_tokamak_IN.DAT | 2 +- examples/data/large_tokamak_eval_IN.DAT | 2 +- examples/data/large_tokamak_varied_min_net_electric_IN.DAT | 2 +- examples/data/large_tokamak_varyrun_IN.DAT | 2 +- examples/data/scan_example_file_IN.DAT | 2 +- tests/integration/data/large_tokamak_1_MFILE.DAT | 2 +- tests/integration/data/large_tokamak_2_MFILE.DAT | 2 +- tests/integration/data/large_tokamak_3_MFILE.DAT | 2 +- tests/integration/data/large_tokamak_4_MFILE.DAT | 2 +- tests/integration/data/large_tokamak_IN.DAT | 2 +- tests/integration/data/large_tokamak_MFILE.DAT | 2 +- tests/integration/data/large_tokamak_eval.IN.DAT | 2 +- tests/integration/data/ref_IN.DAT | 2 +- tests/integration/data/scan_2D_MFILE.DAT | 2 +- tests/integration/data/scan_MFILE.DAT | 2 +- tests/regression/input_files/IFE.IN.DAT | 2 +- tests/regression/input_files/helias_5b.IN.DAT | 2 +- tests/regression/input_files/large_tokamak_eval.IN.DAT | 2 +- tests/regression/input_files/large_tokamak_nof.IN.DAT | 2 +- tests/regression/input_files/low_aspect_ratio_DEMO.IN.DAT | 2 +- tests/regression/input_files/spherical_tokamak_eval.IN.DAT | 2 +- tests/regression/input_files/st_regression.IN.DAT | 2 +- tests/regression/input_files/stellarator_helias.IN.DAT | 2 +- tests/unit/data/large_tokamak_IN.DAT | 2 +- tests/unit/data/large_tokamak_MFILE.DAT | 2 +- 26 files changed, 28 insertions(+), 28 deletions(-) diff --git a/documentation/source/cost-models/cost-models.md b/documentation/source/cost-models/cost-models.md index 4b3f0221fa..53e710b846 100644 --- a/documentation/source/cost-models/cost-models.md +++ b/documentation/source/cost-models/cost-models.md @@ -1,8 +1,8 @@ # Cost Models -Two cost models are available, determined by the switch `cost_model`. +Two cost models are available, determined by the switch `i_cost_model`. -## 1990 cost model (`cost_model = 0`) +## 1990 cost model (`i_cost_model = 0`) This combines methods[^1] used in the TETRA code [^2] and the Generomak[^3] scheme. The costs are split into accounting categories[^4]. The best references for the algorithms used are[^5], and source file `costs.f90` in the code itself. The majority of the costed items have a unit cost associated with them. These values scale with (for example) power output, volume, component mass etc., and many are available to be changed via the input file. All costs and their algorithms correspond to 1990 dollars. @@ -16,7 +16,7 @@ If the switch `ireactor = 0`, no cost of electricity calculation is performed. I The net electric power is calculated in routine `POWER` It is possible that the net electric power can become negative due to a high recirculating power. Switch `ipnet` determines whether the net electric power is scaled to always remain positive (`ipnet = 0`, or whether it is allowed to become negative (`ipnet = 1`), in which case no cost of electricity calculation is performed. -## 2015 Kovari model (`cost_model = 1`) +## 2015 Kovari model (`i_cost_model = 1`) This model[^8] provides only capital cost, and it is not currently suitable for estimating the cost of electricity. *Nth*-of-a-kind factors, level of safety assurance factors, and blanket replacement costs are not included. The mean electric output is calculated using the capacity factor, which takes account of the availability and the dwell time for a pulsed reactor. The capital cost divided by the mean electric output is a useful comparison parameter. diff --git a/examples/data/large_tokamak_IN.DAT b/examples/data/large_tokamak_IN.DAT index 963dcf10e5..33ca94ec74 100644 --- a/examples/data/large_tokamak_IN.DAT +++ b/examples/data/large_tokamak_IN.DAT @@ -491,7 +491,7 @@ qnuc = 1.3E4 output_costs = 1 * Costs model switch -cost_model = 0 +i_cost_model = 0 * Total plant availability fraction; f_t_plant_available = 0.80 diff --git a/examples/data/large_tokamak_eval_IN.DAT b/examples/data/large_tokamak_eval_IN.DAT index ba138ff26b..dca21148e6 100644 --- a/examples/data/large_tokamak_eval_IN.DAT +++ b/examples/data/large_tokamak_eval_IN.DAT @@ -109,7 +109,7 @@ f_t_alpha_energy_confinement_min = 5.0 * Lower limit on f_t_alpha_energy_confine *------------------Cost Variables------------------* f_t_plant_available = 0.80 * Total plant availability fraction; input if `i_plant_availability=0` -cost_model = 0 * Switch for cost model; +i_cost_modelel = 0 * Switch for cost model; i_plant_availability = 0 * Switch for plant availability model; output_costs = 1 * Switch for costs output; diff --git a/examples/data/large_tokamak_varied_min_net_electric_IN.DAT b/examples/data/large_tokamak_varied_min_net_electric_IN.DAT index be0f9d527a..16299bb735 100644 --- a/examples/data/large_tokamak_varied_min_net_electric_IN.DAT +++ b/examples/data/large_tokamak_varied_min_net_electric_IN.DAT @@ -491,7 +491,7 @@ qnuc = 1.3E4 output_costs = 1 * Costs model switch -cost_model = 0 +i_cost_modelel = 0 * Total plant availability fraction; f_t_plant_available = 0.80 diff --git a/examples/data/large_tokamak_varyrun_IN.DAT b/examples/data/large_tokamak_varyrun_IN.DAT index 318780644e..d211675e98 100644 --- a/examples/data/large_tokamak_varyrun_IN.DAT +++ b/examples/data/large_tokamak_varyrun_IN.DAT @@ -491,7 +491,7 @@ qnuc = 1.3E4 output_costs = 1 * Costs model switch -cost_model = 0 +i_cost_modelel = 0 * Total plant availability fraction; f_t_plant_available = 0.80 diff --git a/examples/data/scan_example_file_IN.DAT b/examples/data/scan_example_file_IN.DAT index 0c7a651044..e34e1708c3 100644 --- a/examples/data/scan_example_file_IN.DAT +++ b/examples/data/scan_example_file_IN.DAT @@ -501,7 +501,7 @@ qnuc = 1.3E4 output_costs = 1 * Costs model switch -cost_model = 0 +i_cost_model = 0 * Total plant availability fraction; f_t_plant_available = 0.80 diff --git a/tests/integration/data/large_tokamak_1_MFILE.DAT b/tests/integration/data/large_tokamak_1_MFILE.DAT index 3babd45f3b..f1b4616e02 100644 --- a/tests/integration/data/large_tokamak_1_MFILE.DAT +++ b/tests/integration/data/large_tokamak_1_MFILE.DAT @@ -1714,7 +1714,7 @@ qnuc = 1.3E4 output_costs = 1 * Costs model switch -cost_model = 0 +i_cost_model = 0 * Total plant availability fraction; f_t_plant_available = 0.80 diff --git a/tests/integration/data/large_tokamak_2_MFILE.DAT b/tests/integration/data/large_tokamak_2_MFILE.DAT index 644d0240e9..a1879daf19 100644 --- a/tests/integration/data/large_tokamak_2_MFILE.DAT +++ b/tests/integration/data/large_tokamak_2_MFILE.DAT @@ -1715,7 +1715,7 @@ qnuc = 1.3E4 output_costs = 1 * Costs model switch -cost_model = 0 +i_cost_model = 0 * Total plant availability fraction; f_t_plant_available = 0.80 diff --git a/tests/integration/data/large_tokamak_3_MFILE.DAT b/tests/integration/data/large_tokamak_3_MFILE.DAT index 9386776ba6..8bc333636b 100644 --- a/tests/integration/data/large_tokamak_3_MFILE.DAT +++ b/tests/integration/data/large_tokamak_3_MFILE.DAT @@ -1715,7 +1715,7 @@ qnuc = 1.3E4 output_costs = 1 * Costs model switch -cost_model = 0 +i_cost_model = 0 * Total plant availability fraction; f_t_plant_available = 0.80 diff --git a/tests/integration/data/large_tokamak_4_MFILE.DAT b/tests/integration/data/large_tokamak_4_MFILE.DAT index 721cbbf3b5..1a79c5e241 100644 --- a/tests/integration/data/large_tokamak_4_MFILE.DAT +++ b/tests/integration/data/large_tokamak_4_MFILE.DAT @@ -1715,7 +1715,7 @@ qnuc = 1.3E4 output_costs = 1 * Costs model switch -cost_model = 0 +i_cost_model = 0 * Total plant availability fraction; f_t_plant_available = 0.80 diff --git a/tests/integration/data/large_tokamak_IN.DAT b/tests/integration/data/large_tokamak_IN.DAT index 43a5032a8a..1bc89e20e7 100644 --- a/tests/integration/data/large_tokamak_IN.DAT +++ b/tests/integration/data/large_tokamak_IN.DAT @@ -495,7 +495,7 @@ qnuc = 1.3E4 output_costs = 1 * Costs model switch -cost_model = 0 +i_cost_model = 0 * Total plant availability fraction; f_t_plant_available = 0.80 diff --git a/tests/integration/data/large_tokamak_MFILE.DAT b/tests/integration/data/large_tokamak_MFILE.DAT index ffbb49f5c8..780f62eba2 100644 --- a/tests/integration/data/large_tokamak_MFILE.DAT +++ b/tests/integration/data/large_tokamak_MFILE.DAT @@ -36399,7 +36399,7 @@ qnuc = 1.3E4 output_costs = 1 * Costs model switch -cost_model = 0 +i_cost_model = 0 * Total plant availability fraction; f_t_plant_available = 0.80 diff --git a/tests/integration/data/large_tokamak_eval.IN.DAT b/tests/integration/data/large_tokamak_eval.IN.DAT index 35c8764f8f..f988e4f446 100644 --- a/tests/integration/data/large_tokamak_eval.IN.DAT +++ b/tests/integration/data/large_tokamak_eval.IN.DAT @@ -109,7 +109,7 @@ f_t_alpha_energy_confinement_min = 5.0 * Lower limit on f_t_alpha_energy_confine *------------------Cost Variables------------------* f_t_plant_available = 0.80 * Total plant availability fraction; input if `i_plant_availability=0` -cost_model = 0 * Switch for cost model; +i_cost_model = 0 * Switch for cost model; i_plant_availability = 0 * Switch for plant availability model; output_costs = 1 * Switch for costs output; diff --git a/tests/integration/data/ref_IN.DAT b/tests/integration/data/ref_IN.DAT index 563588ff8f..cc82c1f316 100644 --- a/tests/integration/data/ref_IN.DAT +++ b/tests/integration/data/ref_IN.DAT @@ -122,7 +122,7 @@ p_div_bt_q_aspect_rmajor_max_mw = 9.2 * maximum ratio of Psep*Bt/qAR (MWT/m) *------------------Cost Variables------------------* output_costs = 0 -cost_model = 0 +i_cost_model = 0 abktflnc = 15 * Allowable first wall/blanket neutron adivflnc = 20.0 * Allowable divertor heat fluence (mw-yr/m2) f_t_plant_available = 0.75 * Total plant availability fraction; diff --git a/tests/integration/data/scan_2D_MFILE.DAT b/tests/integration/data/scan_2D_MFILE.DAT index 5f0d62e260..de279072f9 100644 --- a/tests/integration/data/scan_2D_MFILE.DAT +++ b/tests/integration/data/scan_2D_MFILE.DAT @@ -18000,7 +18000,7 @@ qnuc = 1.3E4 output_costs = 1 * Costs model switch -cost_model = 0 +i_cost_model = 0 * Total plant availability fraction; f_t_plant_available = 0.80 diff --git a/tests/integration/data/scan_MFILE.DAT b/tests/integration/data/scan_MFILE.DAT index f841245acc..2b573c476a 100644 --- a/tests/integration/data/scan_MFILE.DAT +++ b/tests/integration/data/scan_MFILE.DAT @@ -9123,7 +9123,7 @@ p_div_bt_q_aspect_rmajor_max_mw = 9.2 * maximum ratio of Psep*Bt/qAR (MWT/m) *------------------Cost Variables------------------* output_costs = 0 -cost_model = 0 +i_cost_model = 0 abktflnc = 15 * Allowable first wall/blanket neutron adivflnc = 20.0 * Allowable divertor heat fluence (mw-yr/m2) f_t_plant_available = 0.75 * Total plant availability fraction; diff --git a/tests/regression/input_files/IFE.IN.DAT b/tests/regression/input_files/IFE.IN.DAT index 06493b2de5..3531124839 100644 --- a/tests/regression/input_files/IFE.IN.DAT +++ b/tests/regression/input_files/IFE.IN.DAT @@ -236,7 +236,7 @@ f_p_blkt_multiplication = 1.26 *Energy multiplication in blanket and s fhole = 0.0 *Area fraction taken up by other holes *-----------------Cost Variables-------------------* -cost_model = 0 *1990 cost model +i_cost_model = 0 *1990 cost model abktflnc = 20.0 *Allowable first wall/blanket neutron fluence (MW-yr/m2) f_t_plant_available = 0.75 *Total plant availability fraction fcdfuel = 0.0 *Fraction of current drive cost treated as fuel (if ifueltyp = 1) diff --git a/tests/regression/input_files/helias_5b.IN.DAT b/tests/regression/input_files/helias_5b.IN.DAT index 2e73b03f55..88ef010ff0 100644 --- a/tests/regression/input_files/helias_5b.IN.DAT +++ b/tests/regression/input_files/helias_5b.IN.DAT @@ -170,7 +170,7 @@ dr_tf_nose_case = 0.06 * Case thickness *------------------Cost Variables------------------* -cost_model = 0 *0: 1990 cost module, the 2015 does not work yet for stellarators +i_cost_model = 0 *0: 1990 cost module, the 2015 does not work yet for stellarators abktflnc = 15.0 *Allowable first wall/blanket neutron (MW-yr/m2) adivflnc = 25.0 *Allowable divertor heat fluence (MW-yr/m2) f_t_plant_available = 0.75 *Total plant capacity fraction diff --git a/tests/regression/input_files/large_tokamak_eval.IN.DAT b/tests/regression/input_files/large_tokamak_eval.IN.DAT index 67d680dfab..31cc811a25 100644 --- a/tests/regression/input_files/large_tokamak_eval.IN.DAT +++ b/tests/regression/input_files/large_tokamak_eval.IN.DAT @@ -109,7 +109,7 @@ f_t_alpha_energy_confinement_min = 5.0 * Lower limit on f_t_alpha_energy_confine *------------------Cost Variables------------------* f_t_plant_available = 0.80 * Total plant availability fraction; input if `i_plant_availability=0` -cost_model = 0 * Switch for cost model; +i_cost_model = 0 * Switch for cost model; i_plant_availability = 0 * Switch for plant availability model; output_costs = 1 * Switch for costs output; diff --git a/tests/regression/input_files/large_tokamak_nof.IN.DAT b/tests/regression/input_files/large_tokamak_nof.IN.DAT index d96deb0b70..bf16597a38 100644 --- a/tests/regression/input_files/large_tokamak_nof.IN.DAT +++ b/tests/regression/input_files/large_tokamak_nof.IN.DAT @@ -502,7 +502,7 @@ qnuc = 1.3E4 output_costs = 1 * Costs model switch -cost_model = 0 +i_cost_model = 0 * Total plant availability fraction; f_t_plant_available = 0.80 diff --git a/tests/regression/input_files/low_aspect_ratio_DEMO.IN.DAT b/tests/regression/input_files/low_aspect_ratio_DEMO.IN.DAT index d9f8409059..53c1f25fc1 100644 --- a/tests/regression/input_files/low_aspect_ratio_DEMO.IN.DAT +++ b/tests/regression/input_files/low_aspect_ratio_DEMO.IN.DAT @@ -579,7 +579,7 @@ output_costs = 0 * DESCRIPTION: Switch for costs output * JUSTIFICATION: Do not print to OUT.DAT all accounts -cost_model = 0 +i_cost_model = 0 * DESCRIPTION: Switch for Cost Model * JUSTIFICATION: Use $ 1990 PROCESS model diff --git a/tests/regression/input_files/spherical_tokamak_eval.IN.DAT b/tests/regression/input_files/spherical_tokamak_eval.IN.DAT index 3080174c51..e2b04aa2e9 100644 --- a/tests/regression/input_files/spherical_tokamak_eval.IN.DAT +++ b/tests/regression/input_files/spherical_tokamak_eval.IN.DAT @@ -109,7 +109,7 @@ p_plant_electric_net_required_mw = 100.0 * minimum net electric *------------------Cost Variables------------------* -cost_model = 0 * Switch for cost model; +i_cost_model = 0 * Switch for cost model; i_plant_availability = 0 * Switch for plant availability model; ifueltyp = 0 * Switch for fuel type; lsa = 2 * Level of safety assurance switch (generally; use 3 or 4); diff --git a/tests/regression/input_files/st_regression.IN.DAT b/tests/regression/input_files/st_regression.IN.DAT index 9020c4d997..78f4028107 100644 --- a/tests/regression/input_files/st_regression.IN.DAT +++ b/tests/regression/input_files/st_regression.IN.DAT @@ -2850,7 +2850,7 @@ output_costs = 1 * DESCRIPTION: Switch for Costs Output (1: Write Cost-Related Outputs to File) * JUSTIFICATION: Want to see costs -cost_model = 0 +i_cost_model = 0 * DESCRIPTION: Switch for Cost Model * JUSTIFICATION: diff --git a/tests/regression/input_files/stellarator_helias.IN.DAT b/tests/regression/input_files/stellarator_helias.IN.DAT index cad981be7d..b5d0f1f8bb 100644 --- a/tests/regression/input_files/stellarator_helias.IN.DAT +++ b/tests/regression/input_files/stellarator_helias.IN.DAT @@ -245,7 +245,7 @@ dx_tf_wp_insulation = 0.01 * Insulation on top of winding pack t_tf_quench_detection = 0.5 * Quench detection+activation time (or dump delay) (s) *------------------Cost Variables------------------* -cost_model = 0 *0: 1990 cost module, the 2015 does not work yet for stellarators +i_cost_model = 0 *0: 1990 cost module, the 2015 does not work yet for stellarators abktflnc = 15.0 *Allowable first wall/blanket neutron (MW-yr/m2) adivflnc = 25.0 *Allowable divertor heat fluence (MW-yr/m2) f_t_plant_available = 0.75 *Total plant capacity fraction diff --git a/tests/unit/data/large_tokamak_IN.DAT b/tests/unit/data/large_tokamak_IN.DAT index 43a5032a8a..1bc89e20e7 100644 --- a/tests/unit/data/large_tokamak_IN.DAT +++ b/tests/unit/data/large_tokamak_IN.DAT @@ -495,7 +495,7 @@ qnuc = 1.3E4 output_costs = 1 * Costs model switch -cost_model = 0 +i_cost_model = 0 * Total plant availability fraction; f_t_plant_available = 0.80 diff --git a/tests/unit/data/large_tokamak_MFILE.DAT b/tests/unit/data/large_tokamak_MFILE.DAT index dd5be49ff8..3683214ef7 100644 --- a/tests/unit/data/large_tokamak_MFILE.DAT +++ b/tests/unit/data/large_tokamak_MFILE.DAT @@ -8128,7 +8128,7 @@ qnuc = 1.3E4 output_costs = 1 * Costs model switch -cost_model = 0 +i_cost_model = 0 * Total plant availability fraction; f_t_plant_available = 0.80 From 2771a30b7ec12be4974234db2bfaba2da9bc3381 Mon Sep 17 00:00:00 2001 From: Christopher Ashe <91618944+chris-ashe@users.noreply.github.com> Date: Mon, 27 Jul 2026 15:18:24 +0100 Subject: [PATCH 4/4] Apply suggestions from code review Co-authored-by: Timothy <75321887+timothy-nunn@users.noreply.github.com> --- examples/data/large_tokamak_eval_IN.DAT | 2 +- examples/data/large_tokamak_varied_min_net_electric_IN.DAT | 2 +- examples/data/large_tokamak_varyrun_IN.DAT | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/data/large_tokamak_eval_IN.DAT b/examples/data/large_tokamak_eval_IN.DAT index dca21148e6..80b3369813 100644 --- a/examples/data/large_tokamak_eval_IN.DAT +++ b/examples/data/large_tokamak_eval_IN.DAT @@ -109,7 +109,7 @@ f_t_alpha_energy_confinement_min = 5.0 * Lower limit on f_t_alpha_energy_confine *------------------Cost Variables------------------* f_t_plant_available = 0.80 * Total plant availability fraction; input if `i_plant_availability=0` -i_cost_modelel = 0 * Switch for cost model; +i_cost_model = 0 * Switch for cost model; i_plant_availability = 0 * Switch for plant availability model; output_costs = 1 * Switch for costs output; diff --git a/examples/data/large_tokamak_varied_min_net_electric_IN.DAT b/examples/data/large_tokamak_varied_min_net_electric_IN.DAT index 16299bb735..1242997d88 100644 --- a/examples/data/large_tokamak_varied_min_net_electric_IN.DAT +++ b/examples/data/large_tokamak_varied_min_net_electric_IN.DAT @@ -491,7 +491,7 @@ qnuc = 1.3E4 output_costs = 1 * Costs model switch -i_cost_modelel = 0 +i_cost_model = 0 * Total plant availability fraction; f_t_plant_available = 0.80 diff --git a/examples/data/large_tokamak_varyrun_IN.DAT b/examples/data/large_tokamak_varyrun_IN.DAT index d211675e98..1e93cb8cd7 100644 --- a/examples/data/large_tokamak_varyrun_IN.DAT +++ b/examples/data/large_tokamak_varyrun_IN.DAT @@ -491,7 +491,7 @@ qnuc = 1.3E4 output_costs = 1 * Costs model switch -i_cost_modelel = 0 +i_cost_model = 0 * Total plant availability fraction; f_t_plant_available = 0.80