Commit 75c849a
committed
Revised version of the globals and mappings for pf_active. MAJOR overhaul since Gabor and I realised that potentially the P1C coil is actually not being fed with the same current (total) as the P3M. For historical reasons we had a P1C_P3M as a coil which means all those element get the same current. However, looking at Gerasimov pages and EFIT xml files we find that the central P1C elements actually receive current from both the PRIMARY and PFX circuits whereas the uppers/lower P1 actually get the same current as P3M. We thus decided to remove the 2+2 turns of P3M from the P1C_P3M coil and add them up to the P1El/u. This of course prompted a name change to the coils whihc we did but note (sorry Adam) that the COMMENT still is there in the json files so of course it will break things up. The mappings file now contains pseudo-code to guide us (Adam also) on how to code the arithmetics later on to the coil currents. ACHTUNG: Gabor still needs to confirm these findings and changes with Gerasimov since Rui got the original coils content without much to say about it and cannot know what drove the gents midn to code them as they did...
2 files changed
Lines changed: 16 additions & 20 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | | - | |
3 | | - | |
4 | | - | |
5 | | - | |
6 | 2 | | |
| 3 | + | |
7 | 4 | | |
8 | 5 | | |
9 | 6 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
53 | 53 | | |
54 | 54 | | |
55 | 55 | | |
56 | | - | |
57 | | - | |
58 | | - | |
59 | | - | |
60 | | - | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
61 | 62 | | |
62 | 63 | | |
63 | 64 | | |
64 | 65 | | |
65 | 66 | | |
66 | 67 | | |
67 | | - | |
| 68 | + | |
| 69 | + | |
68 | 70 | | |
69 | 71 | | |
70 | | - | |
71 | | - | |
| 72 | + | |
| 73 | + | |
72 | 74 | | |
73 | 75 | | |
74 | 76 | | |
75 | 77 | | |
76 | 78 | | |
77 | 79 | | |
78 | 80 | | |
79 | | - | |
| 81 | + | |
80 | 82 | | |
81 | 83 | | |
82 | 84 | | |
83 | 85 | | |
84 | 86 | | |
85 | 87 | | |
86 | | - | |
87 | | - | |
88 | | - | |
89 | 88 | | |
90 | 89 | | |
91 | | - | |
| 90 | + | |
92 | 91 | | |
93 | 92 | | |
94 | 93 | | |
95 | | - | |
| 94 | + | |
96 | 95 | | |
97 | 96 | | |
98 | 97 | | |
99 | | - | |
| 98 | + | |
100 | 99 | | |
101 | 100 | | |
102 | 101 | | |
103 | | - | |
| 102 | + | |
104 | 103 | | |
105 | 104 | | |
106 | 105 | | |
| |||
0 commit comments