From fe75590824a84da0a8bfa7c79d9eac796c0e9c12 Mon Sep 17 00:00:00 2001 From: TimSlendebroek <32385057+TimSlendebroek@users.noreply.github.com> Date: Fri, 8 Mar 2024 15:23:39 -0800 Subject: [PATCH 1/2] combine coils torrin's pf_active file --- sample/ITER_pf_active_ods.json | 2455 +++----------------------------- 1 file changed, 232 insertions(+), 2223 deletions(-) diff --git a/sample/ITER_pf_active_ods.json b/sample/ITER_pf_active_ods.json index 0c022a207..cdb9df07a 100644 --- a/sample/ITER_pf_active_ods.json +++ b/sample/ITER_pf_active_ods.json @@ -1,2019 +1,45 @@ { "pf_active": { - "ids_properties": { - "provider": "M. Hosokawa (ITER Organization), E-mail:Masanari.Hosokawa@iter.org", - "version_put": { - "access_layer_language": "python", - "data_dictionary": "3.39.0", - "access_layer": "4.11.7" - }, - "homogeneous_time": 2, - "source": "ITER_D_33NHXN, ITER_D_28B6XQ", - "creation_date": "05/10/2023 17:01", - "comment": "ITER Machine Description for PF/CS Coil System, TF busbars (equivalent) and Virtual Coils with PBS.41 Coil Power Supply (CPS) System", - "occurrence": 0 - }, - "supply": [ - { - "voltage_limit_max": 2100.0, - "name": "CPS 41C3CU, CS3U-1-2", - "voltage_limit_min": -2100.0, - "current_limit_min": -45000.0, - "current_limit_max": 45000.0, - "identifier": "CS3U-1-2" - }, - { - "voltage_limit_max": 2100.0, - "name": "CPS 41C2CU, CS2U-1-2", - "voltage_limit_min": -2100.0, - "current_limit_min": -45000.0, - "current_limit_max": 45000.0, - "identifier": "CS2U-1-2" - }, - { - "voltage_limit_max": 2100.0, - "name": "CPS 41C1CU, CS1U-1-2", - "voltage_limit_min": -2100.0, - "current_limit_min": -45000.0, - "current_limit_max": 45000.0, - "identifier": "CS1U-1-2" - }, - { - "voltage_limit_max": 2100.0, - "name": "CPS 41C1CL, CS1L-1-2", - "voltage_limit_min": -2100.0, - "current_limit_min": -45000.0, - "current_limit_max": 45000.0, - "identifier": "CS1L-1-2" - }, - { - "voltage_limit_max": 2100.0, - "name": "CPS 41C2CL, CS2L-1-2", - "voltage_limit_min": -2100.0, - "current_limit_min": -45000.0, - "current_limit_max": 45000.0, - "identifier": "CS2L-1-2" - }, - { - "voltage_limit_max": 2100.0, - "name": "CPS 41C3CL, CS3L-1-2", - "voltage_limit_min": -2100.0, - "current_limit_min": -45000.0, - "current_limit_max": 45000.0, - "identifier": "CS3L-1-2" - }, - { - "voltage_limit_max": 2100.0, - "name": "CPS 41P1CU, PF1-1-2", - "voltage_limit_min": -2100.0, - "current_limit_min": -48000.0, - "current_limit_max": 48000.0, - "identifier": "PF1-1-2" - }, - { - "voltage_limit_max": 3150.0, - "name": "CPS 41V1C2, PF2-1-2-3", - "voltage_limit_min": -3150.0, - "current_limit_min": -55000.0, - "current_limit_max": 55000.0, - "identifier": "PF2-1-2-3" - }, - { - "voltage_limit_max": 3150.0, - "name": "CPS 41V1C3, PF3-1-2-3", - "voltage_limit_min": -3150.0, - "current_limit_min": -55000.0, - "current_limit_max": 55000.0, - "identifier": "PF3-1-2-3" - }, - { - "voltage_limit_max": 3150.0, - "name": "CPS 41V1C4, PF4-1-2-3", - "voltage_limit_min": -3150.0, - "current_limit_min": -55000.0, - "current_limit_max": 55000.0, - "identifier": "PF4-1-2-3" - }, - { - "voltage_limit_max": 3150.0, - "name": "CPS 41V1C5, PF5-1-2-3", - "voltage_limit_min": -3150.0, - "current_limit_min": -55000.0, - "current_limit_max": 55000.0, - "identifier": "PF5-1-2-3" - }, - { - "voltage_limit_max": 6300.0, - "name": "CPS 41V1VC, VS1-1-2-3-4-5-6", - "voltage_limit_min": -6300.0, - "current_limit_min": -22500.0, - "current_limit_max": 22500.0, - "identifier": "VS1-1-2-3-4-5-6" - }, - { - "voltage_limit_max": 2100.0, - "name": "CPS 41P6CU, PF6-1-2", - "voltage_limit_min": -2100.0, - "current_limit_min": -48000.0, - "current_limit_max": 48000.0, - "identifier": "PF6-1-2" - }, - { - "voltage_limit_max": 2400.0, - "name": "CPS 41V3 (TBD), VS3-1", - "voltage_limit_min": -2400.0, - "current_limit_min": -60000.0, - "current_limit_max": 60000.0, - "identifier": "VS3-1" - } - ], - "vertical_force": [ - { - "name": "VF1=(|MAX(VF3..8)|+|MIN(VF8..13)|)/2", - "combination": [ - 1.0, - 1.0, - 1.0, - 1.0, - 1.0, - 1.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0 - ], - "limit_max": 1.2e8 - }, - { - "name": "VF2=|VF8|", - "combination": [ - 1.0, - 1.0, - 1.0, - 1.0, - 1.0, - 1.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0 - ], - "limit_max": 6.0e7 - }, - { - "name": "VF3=CS3U", - "combination": [ - 1.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0 - ] - }, - { - "name": "VF4=CS3U+CS2U", - "combination": [ - 1.0, - 1.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0 - ] - }, - { - "name": "VF5=CS3U+CS2U+CS1U", - "combination": [ - 1.0, - 1.0, - 1.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0 - ] - }, - { - "name": "VF6=CS3U+CS2U+CS1U+CS1L", - "combination": [ - 1.0, - 1.0, - 1.0, - 1.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0 - ] - }, - { - "name": "VF7=CS3U+CS2U+CS1U+CS1L+CS2L", - "combination": [ - 1.0, - 1.0, - 1.0, - 1.0, - 1.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0 - ] - }, - { - "name": "VF8=CS3U+CS2U+CS1U+CS1L+CS2L+CS3L", - "combination": [ - 1.0, - 1.0, - 1.0, - 1.0, - 1.0, - 1.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0 - ] - }, - { - "name": "VF9=CS3L", - "combination": [ - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 1.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0 - ] - }, - { - "name": "VF10=CS3L+CS2L", - "combination": [ - 0.0, - 0.0, - 0.0, - 0.0, - 1.0, - 1.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0 - ] - }, - { - "name": "VF11=CS3L+CS2L+CS1L", - "combination": [ - 0.0, - 0.0, - 0.0, - 1.0, - 1.0, - 1.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0 - ] - }, - { - "name": "VF12=CS3L+CS2L+CS1L+CS1U", - "combination": [ - 0.0, - 0.0, - 1.0, - 1.0, - 1.0, - 1.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0 - ] - }, - { - "name": "VF13=CS3L+CS2L+CS1L+CS1U+CS2U", - "combination": [ - 0.0, - 1.0, - 1.0, - 1.0, - 1.0, - 1.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0 - ] - }, - { - "limit_min": -1.5e8, - "combination": [ - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 1.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0 - ], - "name": "VF14=PF1", - "limit_max": 1.1e8 - }, - { - "limit_min": -7.5e7, - "combination": [ - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 1.0, - 0.0, - 0.0, - 0.0, - 0.0 - ], - "name": "VF15=PF2", - "limit_max": 1.5e7 - }, - { - "limit_min": -9.0e7, - "combination": [ - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 1.0, - 0.0, - 0.0, - 0.0 - ], - "name": "VF16=PF3", - "limit_max": 4.0e7 - }, - { - "limit_min": -4.0e7, - "combination": [ - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 1.0, - 0.0, - 0.0 - ], - "name": "VF17=PF4", - "limit_max": 9.0e7 - }, - { - "limit_min": -1.0e7, - "combination": [ - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 1.0, - 0.0 - ], - "name": "VF18=PF5", - "limit_max": 1.6e8 - }, - { - "limit_min": -1.9e8, - "combination": [ - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 1.0 - ], - "name": "VF19=PF6", - "limit_max": 1.7e8 - }, - { - "limit_min": -6.0e7, - "combination": [ - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 0.0, - 1.0, - 1.0, - 0.0, - 0.0 - ], - "name": "VF20=PF3+PF4", - "limit_max": 1.0e7 - } - ], - "circuit": [ - { - "name": "Circuit Connection: CS3U", - "connections": [ - [ - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ], - [ - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ] - ], - "identifier": "CS3U" - }, - { - "name": "Circuit Connection: CS2U", - "connections": [ - [ - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ], - [ - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ] - ], - "identifier": "CS2U" - }, - { - "name": "Circuit Connection: CS1", - "connections": [ - [ - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ], - [ - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ], - [ - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ], - [ - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ] - ], - "identifier": "CS1" - }, - { - "name": "Circuit Connection: CS2L", - "connections": [ - [ - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ], - [ - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ] - ], - "identifier": "CS2L" - }, - { - "name": "Circuit Connection: CS3L", - "connections": [ - [ - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ], - [ - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ] - ], - "identifier": "CS3L" - }, - { - "name": "Circuit Connection: PF1", - "connections": [ - [ - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ], - [ - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ] - ], - "identifier": "PF1" - }, - { - "name": "Circuit Connection: PF6", - "connections": [ - [ - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 0 - ], - [ - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0 - ] - ], - "identifier": "PF6" - }, + "coil": [ { - "name": "Circuit Connection: VS1", - "connections": [ - [ - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 1, - 1, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ], - [ - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ], - [ - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 1, - 0, - 0, - 1, - 0, - 1, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ], - [ - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 0 - ], - [ - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ], - [ - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ] + "b_field_max": [ + 12.6, + 13.0 ], - "identifier": "VS1" - }, - { - "name": "Circuit Connection: VS3", - "connections": [ - [ - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1 - ], + "current_limit_max": [ [ - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 0 + 45000.0 ], [ - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 0, - 1, - 0 + 40000.0 ] ], - "identifier": "VS3" - } - ], - "coil": [ - { - "name": "Central Solenoid 3U (CS3U)", "element": [ { - "turns_with_sign": 554.0, "geometry": { + "geometry_type": 2, "rectangle": { "height": 2.093, "r": 1.687, "width": 0.74, "z": 5.464 - }, - "geometry_type": 2 - } + } + }, + "turns_with_sign": 554.0 } ], + "identifier": "CS3U", + "name": "Central Solenoid 3U (CS3U)", + "resistance": 0.0, + "temperature": [ + 4.3 + ] + }, + { "b_field_max": [ 12.6, 13.0 ], - "resistance": 0.0, - "identifier": "CS3U", "current_limit_max": [ [ 45000.0 @@ -2022,32 +48,32 @@ 40000.0 ] ], - "temperature": [ - 4.3 - ] - }, - { - "name": "Central Solenoid 2U (CS2U)", "element": [ { - "turns_with_sign": 554.0, "geometry": { + "geometry_type": 2, "rectangle": { "height": 2.093, "r": 1.687, "width": 0.74, "z": 3.278 - }, - "geometry_type": 2 - } + } + }, + "turns_with_sign": 554.0 } ], + "identifier": "CS2U", + "name": "Central Solenoid 2U (CS2U)", + "resistance": 0.0, + "temperature": [ + 4.3 + ] + }, + { "b_field_max": [ 12.6, 13.0 ], - "resistance": 0.0, - "identifier": "CS2U", "current_limit_max": [ [ 45000.0 @@ -2056,66 +82,44 @@ 40000.0 ] ], - "temperature": [ - 4.3 - ] - }, - { - "name": "Central Solenoid 1U (CS1U)", "element": [ { - "turns_with_sign": 554.0, "geometry": { + "geometry_type": 2, "rectangle": { "height": 2.093, "r": 1.687, "width": 0.74, "z": 1.092 - }, - "geometry_type": 2 - } - } - ], - "b_field_max": [ - 12.6, - 13.0 - ], - "resistance": 0.0, - "identifier": "CS1U", - "current_limit_max": [ - [ - 45000.0 - ], - [ - 40000.0 - ] - ], - "temperature": [ - 4.3 - ] - }, - { - "name": "Central Solenoid 1L (CS1L)", - "element": [ + } + }, + "turns_with_sign": 554.0 + }, { - "turns_with_sign": 554.0, "geometry": { + "geometry_type": 2, "rectangle": { "height": 2.093, "r": 1.687, "width": 0.74, "z": -1.072 - }, - "geometry_type": 2 - } + } + }, + "turns_with_sign": 554.0 } ], + "identifier": "CS1", + "name": "Central Solenoid 1 (CS1)", + "resistance": 0.0, + "temperature": [ + 4.3 + ] + }, + { "b_field_max": [ 12.6, 13.0 ], - "resistance": 0.0, - "identifier": "CS1L", "current_limit_max": [ [ 45000.0 @@ -2124,32 +128,32 @@ 40000.0 ] ], - "temperature": [ - 4.3 - ] - }, - { - "name": "Central Solenoid 2L (CS2L)", "element": [ { - "turns_with_sign": 554.0, "geometry": { + "geometry_type": 2, "rectangle": { "height": 2.093, "r": 1.687, "width": 0.74, "z": -3.258 - }, - "geometry_type": 2 - } + } + }, + "turns_with_sign": 554.0 } ], + "identifier": "CS2L", + "name": "Central Solenoid 2L (CS2L)", + "resistance": 0.0, + "temperature": [ + 4.3 + ] + }, + { "b_field_max": [ 12.6, 13.0 ], - "resistance": 0.0, - "identifier": "CS2L", "current_limit_max": [ [ 45000.0 @@ -2158,100 +162,100 @@ 40000.0 ] ], - "temperature": [ - 4.3 - ] - }, - { - "name": "Central Solenoid 3L (CS3L)", "element": [ { - "turns_with_sign": 554.0, "geometry": { + "geometry_type": 2, "rectangle": { "height": 2.093, "r": 1.687, "width": 0.74, "z": -5.444 - }, - "geometry_type": 2 - } + } + }, + "turns_with_sign": 554.0 } ], + "identifier": "CS3L", + "name": "Central Solenoid 3L (CS3L)", + "resistance": 0.0, + "temperature": [ + 4.3 + ] + }, + { "b_field_max": [ - 12.6, - 13.0 + 6.4, + 6.5 ], - "resistance": 0.0, - "identifier": "CS3L", "current_limit_max": [ [ - 45000.0 + 48000.0 ], [ - 40000.0 + 41000.0 ] ], - "temperature": [ - 4.3 - ] - }, - { - "name": "Poloidal Field Coil 1 (PF1)", "element": [ { - "turns_with_sign": 248.6, "geometry": { + "geometry_type": 2, "rectangle": { "height": 0.9841, "r": 3.9431, "width": 0.959, "z": 7.5741 - }, - "geometry_type": 2 - } + } + }, + "turns_with_sign": 248.6 } ], + "identifier": "PF1", + "name": "Poloidal Field Coil 1 (PF1)", + "resistance": 0.0, + "temperature": [ + 4.3 + ] + }, + { "b_field_max": [ - 6.4, - 6.5 + 4.8, + 5.0 ], - "resistance": 0.0, - "identifier": "PF1", "current_limit_max": [ [ - 48000.0 + 55000.0 ], [ - 41000.0 + 50000.0 ] ], - "temperature": [ - 4.3 - ] - }, - { - "name": "Poloidal Field Coil 2 (PF2)", "element": [ { - "turns_with_sign": 115.2, "geometry": { + "geometry_type": 2, "rectangle": { "height": 0.7146, "r": 8.2851, "width": 0.5801, "z": 6.5398 - }, - "geometry_type": 2 - } + } + }, + "turns_with_sign": 115.2 } ], + "identifier": "PF2", + "name": "Poloidal Field Coil 2 (PF2)", + "resistance": 0.0, + "temperature": [ + 4.3 + ] + }, + { "b_field_max": [ 4.8, 5.0 ], - "resistance": 0.0, - "identifier": "PF2", "current_limit_max": [ [ 55000.0 @@ -2260,32 +264,32 @@ 50000.0 ] ], - "temperature": [ - 4.3 - ] - }, - { - "name": "Poloidal Field Coil 3 (PF3)", "element": [ { - "turns_with_sign": 185.9, "geometry": { + "geometry_type": 2, "rectangle": { "height": 0.9538, "r": 11.9919, "width": 0.6963, "z": 3.2752 - }, - "geometry_type": 2 - } + } + }, + "turns_with_sign": 185.9 } ], + "identifier": "PF3", + "name": "Poloidal Field Coil 3 (PF3)", + "resistance": 0.0, + "temperature": [ + 4.3 + ] + }, + { "b_field_max": [ 4.8, 5.0 ], - "resistance": 0.0, - "identifier": "PF3", "current_limit_max": [ [ 55000.0 @@ -2294,66 +298,32 @@ 50000.0 ] ], - "temperature": [ - 4.3 - ] - }, - { - "name": "Poloidal Field Coil 4 (PF4)", "element": [ { - "turns_with_sign": 169.9, "geometry": { + "geometry_type": 2, "rectangle": { "height": 0.9538, "r": 11.963, "width": 0.6382, "z": -2.2336 - }, - "geometry_type": 2 - } + } + }, + "turns_with_sign": 169.9 } ], - "b_field_max": [ - 4.8, - 5.0 - ], - "resistance": 0.0, "identifier": "PF4", - "current_limit_max": [ - [ - 55000.0 - ], - [ - 50000.0 - ] - ], + "name": "Poloidal Field Coil 4 (PF4)", + "resistance": 0.0, "temperature": [ 4.3 ] }, { - "name": "Poloidal Field Coil 5 (PF5)", - "element": [ - { - "turns_with_sign": 216.8, - "geometry": { - "rectangle": { - "height": 0.9538, - "r": 8.3908, - "width": 0.8125, - "z": -6.7269000000000005 - }, - "geometry_type": 2 - } - } - ], "b_field_max": [ 5.7, 6.0 ], - "resistance": 0.0, - "identifier": "PF5", "current_limit_max": [ [ 52000.0 @@ -2362,34 +332,34 @@ 33000.0 ] ], - "temperature": [ - 4.3 - ] - }, - { - "name": "Poloidal Field Coil 6 (PF6)", "element": [ { - "turns_with_sign": 459.4, "geometry": { + "geometry_type": 2, "rectangle": { - "height": 1.1075, - "r": 4.334, - "width": 1.559, - "z": -7.4665 - }, - "geometry_type": 2 - } + "height": 0.9538, + "r": 8.3908, + "width": 0.8125, + "z": -6.7269000000000005 + } + }, + "turns_with_sign": 216.8 } ], + "identifier": "PF5", + "name": "Poloidal Field Coil 5 (PF5)", + "resistance": 0.0, + "temperature": [ + 4.3 + ] + }, + { "b_field_max": [ 6.4, 6.5, 6.8, 7.0 ], - "resistance": 0.0, - "identifier": "PF6", "current_limit_max": [ [ 52000.0, @@ -2408,137 +378,176 @@ 0.0 ] ], + "element": [ + { + "geometry": { + "geometry_type": 2, + "rectangle": { + "height": 1.1075, + "r": 4.334, + "width": 1.559, + "z": -7.4665 + } + }, + "turns_with_sign": 459.4 + } + ], + "identifier": "PF6", + "name": "Poloidal Field Coil 6 (PF6)", + "resistance": 0.0, "temperature": [ 3.9, 4.3 ] }, { - "name": "Upper Vertical Stabilization Coil (VSU)", + "current_limit_max": [ + [ + 10000.0 + ] + ], "element": [ { - "name": "SSMIC Conductor - OFE Copper", - "turns_with_sign": 1.0, "geometry": { "annulus": { - "radius_outer": 0.023, "r": 5.8066590721356866, - "z": 4.939807656847789, - "radius_inner": 0.01695 + "radius_inner": 0.01695, + "radius_outer": 0.023, + "z": 4.939807656847789 }, "geometry_type": 5 }, - "identifier": "VS3U1" + "identifier": "VS3U1", + "name": "SSMIC Conductor - OFE Copper", + "turns_with_sign": 1.0 }, { - "name": "SSMIC Conductor - OFE Copper", - "turns_with_sign": 1.0, "geometry": { "annulus": { - "radius_outer": 0.023, "r": 5.863304737380546, - "z": 4.911285763010901, - "radius_inner": 0.01695 + "radius_inner": 0.01695, + "radius_outer": 0.023, + "z": 4.911285763010901 }, "geometry_type": 5 }, - "identifier": "VS3U2" + "identifier": "VS3U2", + "name": "SSMIC Conductor - OFE Copper", + "turns_with_sign": 1.0 }, { - "name": "SSMIC Conductor - OFE Copper", - "turns_with_sign": 1.0, "geometry": { "annulus": { - "radius_outer": 0.023, "r": 5.780323700354279, - "z": 4.88598875451418, - "radius_inner": 0.01695 + "radius_inner": 0.01695, + "radius_outer": 0.023, + "z": 4.88598875451418 }, "geometry_type": 5 }, - "identifier": "VS3U3" + "identifier": "VS3U3", + "name": "SSMIC Conductor - OFE Copper", + "turns_with_sign": 1.0 }, { - "name": "SSMIC Conductor - OFE Copper", - "turns_with_sign": 1.0, "geometry": { "annulus": { - "radius_outer": 0.023, "r": 5.836434301823918, - "z": 4.8565391046873545, - "radius_inner": 0.01695 + "radius_inner": 0.01695, + "radius_outer": 0.023, + "z": 4.8565391046873545 }, "geometry_type": 5 }, - "identifier": "VS3U4" + "identifier": "VS3U4", + "name": "SSMIC Conductor - OFE Copper", + "turns_with_sign": 1.0 } ], - "resistance": 0.0057, - "identifier": "VS3U" + "identifier": "VS3U", + "name": "Upper Vertical Stabilization Coil (VSU)", + "resistance": 0.0057 }, { - "name": "Lower Vertical Stabilization Coil (VSL)", + "current_limit_max": [ + [ + 10000.0 + ] + ], "element": [ { - "name": "SSMIC Conductor - OFE Copper", - "turns_with_sign": 1.0, "geometry": { "annulus": { - "radius_outer": 0.023, "r": 7.5505580644830905, - "z": -2.500017876541186, - "radius_inner": 0.01695 + "radius_inner": 0.01695, + "radius_outer": 0.023, + "z": -2.500017876541186 }, "geometry_type": 5 }, - "identifier": "VS3L1" + "identifier": "VS3L1", + "name": "SSMIC Conductor - OFE Copper", + "turns_with_sign": 1.0 }, { - "name": "SSMIC Conductor - OFE Copper", - "turns_with_sign": 1.0, "geometry": { "annulus": { - "radius_outer": 0.023, "r": 7.496332809419729, - "z": -2.541098411866157, - "radius_inner": 0.01695 + "radius_inner": 0.01695, + "radius_outer": 0.023, + "z": -2.541098411866157 }, "geometry_type": 5 }, - "identifier": "VS3L2" + "identifier": "VS3L2", + "name": "SSMIC Conductor - OFE Copper", + "turns_with_sign": 1.0 }, { - "name": "SSMIC Conductor - OFE Copper", - "turns_with_sign": 1.0, "geometry": { "annulus": { - "radius_outer": 0.023, "r": 7.511397459955538, - "z": -2.4493172573717077, - "radius_inner": 0.01695 + "radius_inner": 0.01695, + "radius_outer": 0.023, + "z": -2.4493172573717077 }, "geometry_type": 5 }, - "identifier": "VS3L3" + "identifier": "VS3L3", + "name": "SSMIC Conductor - OFE Copper", + "turns_with_sign": 1.0 }, { - "name": "SSMIC Conductor - OFE Copper", - "turns_with_sign": 1.0, "geometry": { "annulus": { - "radius_outer": 0.023, "r": 7.456657713145448, - "z": -2.490061122639074, - "radius_inner": 0.01695 + "radius_inner": 0.01695, + "radius_outer": 0.023, + "z": -2.490061122639074 }, "geometry_type": 5 }, - "identifier": "VS3L4" + "identifier": "VS3L4", + "name": "SSMIC Conductor - OFE Copper", + "turns_with_sign": 1.0 } ], - "resistance": 0.00791, - "identifier": "VS3L" + "identifier": "VS3L", + "name": "Lower Vertical Stabilization Coil (VSL)", + "resistance": 0.00791 + } + ], + "ids_properties": { + "comment": "ITER Machine Description for PF/CS Coil System, TF busbars (equivalent) and Virtual Coils with PBS.41 Coil Power Supply (CPS) System", + "creation_date": "2024-03-06 13:02:15.261504", + "homogeneous_time": 2, + "occurrence": 0, + "provider": "bechtelt", + "version_put": { + "access_layer": "4.11.7", + "access_layer_language": "python", + "data_dictionary": "3.39.0" } - ] + } } } \ No newline at end of file From 9c3c092214530b1c3bd32f716d0427a3081cac95 Mon Sep 17 00:00:00 2001 From: TimSlendebroek <32385057+TimSlendebroek@users.noreply.github.com> Date: Fri, 8 Mar 2024 16:33:26 -0800 Subject: [PATCH 2/2] union -> intersect --- test/check_init_primary_quanties.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/check_init_primary_quanties.jl b/test/check_init_primary_quanties.jl index 402d8b8e9..86373b9f4 100644 --- a/test/check_init_primary_quanties.jl +++ b/test/check_init_primary_quanties.jl @@ -2,7 +2,7 @@ using FUSE using Test @testset "check_init_expressions" begin - data_fields_all = union(FUSE.init_expressions()...) + data_fields_all = intersect(FUSE.init_expressions()...) data_fields_from_file = FUSE.load_init_expressions() @assert isempty(symdiff(data_fields_from_file, data_fields_all)) "data fields after init have changed! run `make init_expressions`" end