From 19e5e6327f835a7b2025bd467de72f53e59e8a2d Mon Sep 17 00:00:00 2001 From: Jack Date: Thu, 24 Oct 2024 14:50:31 +0100 Subject: [PATCH] Added else to account for divlife_cal not being set correctly --- process/costs.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/process/costs.py b/process/costs.py index bf83620a06..0efb525a84 100644 --- a/process/costs.py +++ b/process/costs.py @@ -2885,14 +2885,20 @@ def convert_fpy_to_calendar() -> None: fwbs_variables.bktlife_cal = fwbs_variables.bktlife * 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 # Divertor if cost_variables.divlife < cost_variables.tlife: cost_variables.divlife_cal = cost_variables.divlife * cost_variables.cfactr + else: + cost_variables.divlife_cal = cost_variables.divlife # Centrepost - if ( - physics_variables.itart == 1 - and cost_variables.cplife < cost_variables.tlife - ): - cost_variables.cplife_cal = cost_variables.cplife * cost_variables.cfactr + if physics_variables.itart == 1: + if cost_variables.cplife < cost_variables.tlife: + cost_variables.cplife_cal = ( + cost_variables.cplife * cost_variables.cfactr + ) + else: + cost_variables.cplife_cal = cost_variables.cplife