diff --git a/process/costs_2015.py b/process/costs_2015.py index ce62516a..ccb1a5d4 100644 --- a/process/costs_2015.py +++ b/process/costs_2015.py @@ -173,7 +173,7 @@ def run(self): if (abs(cost_variables.concost) > 9.99e99) or ( cost_variables.concost != cost_variables.concost ): - self.write_costs_to_output() + self.output() for i in range(100): # noqa: E741 diff --git a/process/main.py b/process/main.py index f1423dcc..235e13c6 100644 --- a/process/main.py +++ b/process/main.py @@ -583,7 +583,7 @@ def __init__(self): This also initialises module variables in the Fortran for that module. """ self._costs_custom = None - self._costs_old = Costs() + self._costs_1990 = Costs() self._costs_2015 = Costs2015() self.cs_fatigue = CsFatigue() self.pfcoil = PFCoil(cs_fatigue=self.cs_fatigue) @@ -623,7 +623,7 @@ def __init__(self): @property def costs(self) -> CostsProtocol: if fortran.cost_variables.cost_model == 0: - return self._costs_old + return self._costs_1990 if fortran.cost_variables.cost_model == 1: return self._costs_2015 if fortran.cost_variables.cost_model == 2: diff --git a/process/output.py b/process/output.py index 8214e7cc..71f60f9d 100644 --- a/process/output.py +++ b/process/output.py @@ -34,6 +34,7 @@ def write(models, outfile): # 0 | 1990 costs model # 1 | 2015 Kovari model # 2 | Custom model + models.costs.run() models.costs.output() # Availability model