From e345e37ce06addafa89d10e0a142a89b60a01f7e Mon Sep 17 00:00:00 2001 From: apearce Date: Wed, 13 Nov 2024 17:24:25 +0000 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20add=20check=20of=20incorrect=20P?= =?UTF-8?q?F=20coil=20position=20if=20no=20CS=20coil?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- process/pfcoil.py | 5 ++++- process/utilities/errorlist.json | 7 ++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/process/pfcoil.py b/process/pfcoil.py index c52299e1c7..60d9a5c4e2 100644 --- a/process/pfcoil.py +++ b/process/pfcoil.py @@ -166,7 +166,7 @@ def pfcoil(self): for j in range(pfv.ngrp): if pfv.ipfloc[j] == 1: # PF coil is stacked on top of the Central Solenoid - for k in pfv.ncls[j]: + for k in range(pfv.ncls[j]): pf.rcls[j, k] = pfv.rohc + pfv.rpf1 # Z coordinate of coil enforced so as not @@ -327,6 +327,9 @@ def pfcoil(self): nocoil = 0 for i in range(pfv.ngrp): if pfv.ipfloc[i] == 1: + # Do not allow if no central solenoid + if bv.iohcl == 0: + eh.report_error(288) # PF coil is stacked on top of the Central Solenoid # This coil is to balance Central Solenoid flux and should not be involved # in equilibrium calculation -- RK 07/12 diff --git a/process/utilities/errorlist.json b/process/utilities/errorlist.json index e76a09dac6..3e166a4c95 100644 --- a/process/utilities/errorlist.json +++ b/process/utilities/errorlist.json @@ -8,7 +8,7 @@ "comment2": [ "Increment n_errortypes if an error is added to this list" ], - "n_errortypes": 287, + "n_errortypes": 288, "errors": [ { "no": 1, @@ -1444,6 +1444,11 @@ "no": 287, "level": 2, "message": "[pfcoil][cntrpost]: fjohc0 shouldn't be above 0.7 for engineering reliability." + }, + { + "no": 288, + "level": 3, + "message": "PFCOIL: ipfloc(i) should not be 1 if iohcl=0" } ] }