Merge pull request #247 from gafusion/mhdin_update

Updating the mhdin.dat files to new EFIT/EFUND format
gafusion · Jul 6, 2023 · c9aa108 · c9aa108
2 parents c42c171 + 1c42ddd
commit c9aa108
Show file tree

Hide file tree

Showing 19 changed files with 2,526 additions and 3,638 deletions.
diff --git a/omas/machine_mappings/support_files/cmod/mhdin.dat b/omas/machine_mappings/support_files/cmod/mhdin.dat
@@ -1,4 +1,4 @@
- &IN3
+ &IN5
  imds = 2
  mdsshot = 2008
  nofile = 0
@@ -13,8 +13,8 @@
  IECOIL = 1
  IVESEL = 1
  IACOIL = 0
- NW = 65
- NH = 65
+ /
+ &IN3
  RSISVS = 6.2207528e-06 9.0367002e-06 1.9982401e-05 2.3677505e-05 4.24846e-05 
  5.3486699e-05 7.5995798e-05 2*7.5990203e-05 7.5995798e-05 9.0367002e-06 
  6.2207528e-06 1.9982401e-05 4.24846e-05 2.3677505e-05 5.3486699e-05 

diff --git a/omas/machine_mappings/support_files/d3d/000001/mhdin.dat b/omas/machine_mappings/support_files/d3d/000001/mhdin.dat
diff --git a/omas/machine_mappings/support_files/d3d/112001/mhdin.dat b/omas/machine_mappings/support_files/d3d/112001/mhdin.dat
diff --git a/omas/machine_mappings/support_files/d3d/156001/mhdin.dat b/omas/machine_mappings/support_files/d3d/156001/mhdin.dat
diff --git a/omas/machine_mappings/support_files/d3d/168191/mhdin.dat b/omas/machine_mappings/support_files/d3d/168191/mhdin.dat
diff --git a/omas/machine_mappings/support_files/d3d/181292/mhdin.dat b/omas/machine_mappings/support_files/d3d/181292/mhdin.dat
@@ -1,3 +1,37 @@
+ &MACHINEIN
+ magpri=76
+ nmselp=69
+ nsilop=44
+ /
+ &INCHECK
+ li_max=2.5
+ li_min=0.05
+ betap_max=6.0
+ betat_max=25.
+ plasma_diff=0.08
+ aminor_max=75.0
+ aminor_min=30.
+ elong_max=4.0
+ elong_min=0.8
+ rout_max=240.
+ rout_min=90.0
+ zout_max=100.
+ zout_min=-100.
+ rcurrt_max=240.
+ rcurrt_min=90.0
+ zcurrt_max=100.
+ zcurrt_min=-100.
+ qstar_max=200.
+ qstar_min=1.
+ gapin_min=-0.2
+ gapout_min=-0.2
+ gaptop_min=-0.2
+ sepin_check=-90.0
+ qout_min=1.
+ qout_max=200.
+ dbpli_diff=0.05
+ delbp_diff=0.08
+ /
  *** 04/06/2020
  &IN3
  RSISVS = 3*0.0019209 0.0036784 0.0037424 0.0046093 0.0048872 0.0055595 
@@ -77,29 +111,15 @@
  0.2300735 0.2691039 0.2465 0.275952 0.1962927 0.2346333 0.2421203 0.2582166 
  0.245521 0.2451018 0.2224015 0.2393365 0.2123904 0.2517095 0.3233501 0.3336 
  0.25495 0.18435 0.25695 0.3343 0.3246499 0.2469479 0.2170768
- IGRID = 1
- RLEFT = 0.84
- RRIGHT = 2.54
- ZBOTTO = -1.6
- ZTOP = 1.6
- IFCOIL = 1
- ISLPFC = 1
- NSMP2 = 25
- IECOIL = 1
- IVESEL = 1
- NW = 65
- NH = 65
- IACOIL = 1
  RACOIL = 1.736
  ZACOIL = -1.32
  WACOIL = 0.096
  HACOIL = 0.02
- FCID = 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 10.0 11.0 12.0 13.0 14.0 15.0 
- 16.0 17.0 18.0
+ FCID = 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18
  FCTURN = 18*1.0
  ECTURN = 122*1.0
- VSID = 1.0 2.0 3.0 4.0 5.0 6.0 7.0 8.0 9.0 10.0 11.0 12.0 13.0 14.0 15.0 
- 16.0 17.0 18.0 19.0 20.0 21.0 22.0 23.0 24.0
+ VSID=1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18
+ 19 20 21 22 23 24
  RF = 0.8608 0.8614 0.8628 0.8611 1.0041 2.6124 2.3733 1.2518 1.689 0.8608 
  0.8607 0.8611 0.863 1.0025 2.6124 2.3834 1.2524 1.6889
  ZF = 0.1683 0.5081 0.8491 1.1899 1.5169 0.4376 1.1171 1.6019 1.5874 -0.1737 
@@ -119,7 +139,7 @@
  2*0.3682 2*0.1699 2*0.0412 2*0.0254
  HVS = 3*0.424 0.0539 2*0.0381 2*0.049 2*0.31 0.1308 0.2884 3*0.424 0.0539 
  2*0.0381 2*0.0591 2*0.31 0.1308 0.2884
- AVS = 8*0.0 2*112.38 10*0.0 2*67.62 2*0.0
+ AVS = 3*0.0 45.0 2*0.0 2*-38.97 7*0.0 -45.0 2*0.0 2*49.86 4*0.0
  AVS2 = 8*0.0 2*112.38 10*0.0 2*67.62 2*0.0
  RE = 0.6875 0.7575 0.6875 0.7575 0.6875 0.7575 0.6875 0.7575 0.6875 0.7575 
  0.6875 0.7575 0.6875 0.7575 0.6875 0.7575 0.6875 0.7575 0.6875 0.7575 0.6875 
@@ -147,11 +167,22 @@
  2*0.0555 2*0.05474 4*0.0293 2*0.0559 2*0.0744 2*0.0749 0.0279 2*0.0254 
  32*0.07442 2*0.07341 2*0.07135 2*0.07021 2*0.06622 2*0.0621 2*0.05796 
  2*0.0555 2*0.05474 4*0.0293 2*0.0559 2*0.0744 2*0.0749 0.0279 2*0.0254
- ECID = 1.0 2*2.0 2*1.0 2*2.0 2*1.0 2*2.0 2*1.0 2*2.0 2*1.0 2*2.0 2*1.0 2*2.0 
- 2*1.0 2*2.0 2*1.0 2*2.0 2*1.0 2*2.0 2*1.0 2*2.0 2*1.0 2*2.0 2*1.0 2*2.0 1.0 
- 4*3.0 7*6.0 2*3.0 2.0 2*1.0 2*2.0 2*1.0 2*2.0 2*1.0 2*2.0 2*1.0 2*2.0 2*1.0 
- 2*2.0 2*1.0 2*2.0 2*1.0 2*2.0 2*1.0 2*2.0 2*1.0 2*2.0 2*1.0 2*2.0 2*1.0 
- 2*2.0 2*1.0 2.0 4*4.0 7*5.0 2*4.0
+ ECID = 1 2*2 2*1 2*2 2*1 2*2 2*1 2*2 2*1 2*2 2*1 2*2 
+ 2*1 2*2 2*1 2*2 2*1 2*2 2*1 2*2 2*1 2*2 2*1 2*2 1 
+ 4*3 7*6 2*3 2 2*1 2*2 2*1 2*2 2*1 2*2 2*1 2*2 2*1 
+ 2*2 2*1 2*2 2*1 2*2 2*1 2*2 2*1 2*2 2*1 2*2 2*1 
+ 2*2 2*1 2 4*4 7*5 2*4
  /
- &MACHINEIN
+ &IN5
+ IGRID = 1
+ RLEFT = 0.84
+ RRIGHT = 2.54
+ ZBOTTO = -1.6
+ ZTOP = 1.6
+ IFCOIL = 1
+ ISLPFC = 1
+ NSMP2 = 25
+ IECOIL = 1
+ IVESEL = 1
+ IACOIL = 1
  /
diff --git a/omas/machine_mappings/support_files/east/mhdin.dat b/omas/machine_mappings/support_files/east/mhdin.dat
@@ -2,17 +2,15 @@
  nfcoil = 14
  nfsum = 12
  nsilop = 35
- magpr2 = 76
+ magpri = 76
  necoil = 1
  nesum = 1
  nvesel = 40
  nvsum = 40
  nrogow = 1
  nacoil = 1
- mgaus1 = 8
- mgaus2 = 10
  /
- &IN3
+ &IN5
  IGRID = 1
  RLEFT = 1.2
  RRIGHT = 2.8
@@ -23,11 +21,14 @@
  NSMP2 = 5
  IECOIL = 0
  IVESEL = 1
+ mgaus1 = 8
+ mgaus2 = 10
+ /
+ &IN3
  vsid = 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 
  27 28 29 30 31 32 33 34 35 36 37 38 39 40
- FCID = 1.0 2.0 3.0 2*4.0 5.0 6.0 7.0 8.0 9.0 2*10.0 11.0 12.0
+ FCID = 1 2 3 2*4 5 6 7 8 9 2*10 11 12
  FCTURN = 3*1.0 0.17741935 0.822580645 5*1.0 0.17741935 0.822580645 2*1.0
- ECTURN = 1.0
  TURNFC = 3*140.0 248.0 60.0 32.0 3*140.0 248.0 60.0 32.0
  XMP2 = 1.2905 1.2918 1.2904 1.2897 1.2941 1.5724 1.719 1.8248 2.3116 2.4271 
  2.5175 2.5895 2.6375 2.6584 1.2911 1.2922 2*1.2905 1.3323 1.6192 1.9185 
@@ -62,12 +63,6 @@
  110.1427 45.63 -78.8 216.0 -13.1 -18.08 2*-45.63
  SMP2 = 3*0.0497 5*0.0491 18*0.0497 2*0.0491 2*0.0698 0.0255 7*0.0497 
  3*0.0243 5*0.024 18*0.0243 3*0.024 2*0.032 7*0.0243
- NW = 129
- NH = 129
- RE = 0.8
- ZE = 0.0
- WE = 0.0
- HE = 0.0
  RF = 3*0.6287 1.0722 1.1368 2.9456 3.2698 3*0.6287 1.0722 1.1368 2.9456 
  3.2698
  ZF = 0.2513 0.754 1.2566 1.7537 1.9409 1.5907 0.9042 -0.2513 -0.754 -1.2566 

diff --git a/omas/machine_mappings/support_files/iter/000000/mhdin.dat b/omas/machine_mappings/support_files/iter/000000/mhdin.dat
@@ -1,4 +1,17 @@
- &IN3
+ &machinein
+ device='ITER'
+ nfcoil = 12
+ nfsum = 12
+ nsilop = 110
+ magpri = 29
+ necoil = 1
+ nesum = 1
+ nvesel = 24
+ nvsum = 24
+ nrogow = 1
+ nacoil = 1
+ /
+ &IN5
  IGRID = 1
  RLEFT = 3.6
  RRIGHT = 8.9
@@ -9,9 +22,11 @@
  NSMP2 = 25
  IECOIL = 0
  IVESEL = 0
- NW = 65
- NH = 65
  IACOIL = 0
+ mgaus1 = 8
+ mgaus2 = 10
+ /
+ &IN3
  RACOIL = 1.736
  ZACOIL = -1.32
  WACOIL = 0.096
@@ -81,42 +96,23 @@
  1.15317 1.15432 0.85233 0.790466 0.850971 1.00627 0.919976 0.960257 1.24798 
  1.17095 0.949296 0.791191 0.869328 0.82735 0.923139 0.94715 0.684413 
  0.953946 1.24111 1.20529 0.916813
- /
-      1.6880      1.0140      0.7490      1.9790                        
-      1.6880     -1.0140      0.7490      1.9790                        
-      1.6880      3.0430      0.7490      1.9790                        
-      1.6880     -3.0430      0.7490      1.9790                        
-      1.6880      5.0710      0.7490      1.9790                        
-      1.6880     -5.0710      0.7490      1.9790                        
-      3.9540      7.5570      0.9680      0.9760                        
-      8.3090      6.5300      0.6490      0.5950                        
-     11.9350      3.2650      0.7080      1.1250                        
-     11.9050     -2.2430      0.6490      1.1250                        
-      8.3950     -6.7300      0.8200      0.9450                        
-      4.2870     -7.5570      1.6330      0.9760                        
-      3.5010      0.7871      0.1181      1.5741                        
-      3.5010      2.3612      0.1181      1.5741                        
-      3.5010      3.9350      0.1181      1.5741                        
-      3.8169      5.0383      0.6323      0.2001        45.0            
-      4.6697      5.3543      1.0729      0.1414                        
-      5.7426      5.3543      1.0729      0.1414                        
-      6.7413      4.9804      0.9248      0.1819      -38.97            
-      7.6661      4.2323      0.9248      0.1819      -38.97            
-      8.3655      3.2827      0.1530      1.1509                  112.38
-      8.8393      2.1318      0.1530      1.1509                  112.38
-      9.0765      1.3135      0.0943      0.4856                        
-      9.0765      0.5354      0.0943      1.0707                        
-      3.5010     -0.7871      0.1181      1.5741                        
-      3.5010     -2.3612      0.1181      1.5741                        
-      3.5010     -3.9350      0.1181      1.5741                        
-      3.8169     -5.0383      0.6323      0.2001       -45.0            
-      4.8167     -5.3543      1.3670      0.1414                        
-      6.1833     -5.3543      1.3670      0.1414                        
-      7.1823     -4.9804      0.6308      0.2194       49.86            
-      7.8131     -4.2323      0.6308      0.2194       49.86            
-      8.3655     -3.2827      0.1530      1.1509                   67.62
-      8.8393     -2.1318      0.1530      1.1509                   67.62
-      9.0765     -1.3135      0.0943      0.4856                        
-      9.0765     -0.5354      0.0943      1.0707                        
-comment
-
+ RF = 6*1.688 3.954 8.309 11.935 11.905 8.395 4.287
+ ZF = 1.014 -1.014 3.043 -3.043 5.071 -5.071 7.557 6.53 3.265 -2.243 -6.73 
+ -7.557
+ WF = 6*0.749 0.968 0.649 0.708 0.649 0.82 1.633
+ HF = 6*1.979 0.976 0.595 2*1.125 0.945 0.976
+ AF = 12*0.0
+ AF2 = 12*0.0
+ RVS = 3*3.50096 3.8169 4.66968 5.74261 6.74129 7.6661 8.36554 8.83927 
+ 2*9.0765 3*3.50096 3.8169 4.81669 6.18329 7.18235 7.81311 8.36554 8.83927 
+ 2*9.0765
+ ZVS = 0.787066 2.3612 3.93496 5.03834 2*5.35428 4.98042 4.23234 3.28266 
+ 2.13176 1.31351 0.535353 -0.787066 -2.3612 -3.93496 -5.03834 2*-5.35428 
+ -4.98042 -4.23234 -3.28266 -2.13176 -1.31351 -0.535353
+ WVS = 3*0.11806 0.632252 2*1.07293 2*0.924802 2*0.152958 2*0.0942994 
+ 3*0.11806 0.632252 2*1.36697 2*0.630766 2*0.152958 2*0.0942994
+ HVS = 3*1.57413 0.200108 2*0.141449 2*0.181916 2*1.1509 0.485605 1.07071 
+ 3*1.57413 0.200108 2*0.141449 2*0.219413 2*1.1509 0.485605 1.07071
+ AVS = 3*0.0 45.0 2*0.0 2*-38.97 7*0.0 -45.0 2*0.0 2*49.86 4*0.0
+ AVS2 = 8*0.0 2*112.38 10*0.0 2*67.62 2*0.0
+/
diff --git a/omas/machine_mappings/support_files/iter/000000/ranges.dat b/omas/machine_mappings/support_files/iter/000000/ranges.dat
@@ -0,0 +1 @@
+000000 000001
diff --git a/omas/machine_mappings/support_files/iter/000001/mhdin.dat b/omas/machine_mappings/support_files/iter/000001/mhdin.dat
@@ -3,16 +3,14 @@
  nfcoil = 14
  nfsum = 14
  nsilop = 261
- magpr2 = 795
+ magpri = 795
  necoil = 0
  nesum = 0
  nvesel = 309
  nvsum = 309
  nacoil = 1
- mgaus1 = 8
- mgaus2 = 12
  /
- &IN3
+ &IN5
  IGRID = 1
  RLEFT = 3.6
  RRIGHT = 8.9
@@ -24,8 +22,10 @@
  IECOIL = 0
  IVESEL = 1
  IACOIL = 1
- NW = 129
- NH = 129
+ mgaus1 = 8
+ mgaus2 = 12
+ /
+ &IN3
  RF = 6*1.687 3.9431 8.2851 11.9919 11.963 8.3908 4.334 5.8066590721356866 
  7.5505580644830905
  ZF = 5.464 3.278 1.092 -1.072 -3.258 -5.444 7.5741 6.5398 3.2752 -2.2336 
@@ -517,6 +517,7 @@
  5.0689850000000005 4.219325 2.637675 0.598905 -1.5545300000000002 -3.33295 
  -0.5691899999999999 2.504995 4.33749 5.0689850000000005 4.219325 2.637675 
  0.598905 -1.5545300000000002 -3.33295
+ MPNAM2 = 795*'5'
  XMP2 = 15*3.21481 3.2354000000000003 3.3714899999999997 3.6253800000000003 
  3.97883 4.40733 4.88126 5.3703 5.8554200000000005 6.31801 6.75762 7.17708 
  7.5733500000000005 7.943510000000001 8.284889999999999 8.595 8.87157 9.11293 
@@ -920,10 +921,7 @@
  -314.9999999999997 -239.99999999999977 -149.99999999999986 
  -201.4999999999998 -111.4999999999999 -149.99999999999986 -59.99999999999993 
  -252.54999999999976 -162.54999999999984
- MPNAM2 = 180*'55.A3 Tang' 180*'55.A4 Norm' 144*'55.AA Tang' 72*'55.AB Norm' 
- 207*'55.AJ HF S' 12*'55.AL Dive'
- VSNAME = 135*'Inner SS s' 151*'Outer SS s' 'Triangular' 'Divertor i' 
- 15*'Cryostat a' 4*'Cryostat t' 2*'Upper CTS'
  /
- LPNAME = 131*'55.AD Part' 40*'55.AE Cont' 3*'55.AF Diam' 6*'55.AH Diam' 
- 81*'55.AI MHD'
+ LPNAME = 131*'55.AD Partial Flux Loops' 
+ 40*'55.AE Continuous Flux Loops (Inner)' 3*'55.AF Diamagnetic Loop (Main)' 
+ 6*'55.AH Diamagnetic Saddles (Inner)' 81*'55.AI MHD Saddles'
diff --git a/omas/machine_mappings/support_files/iter/000001/ranges.dat b/omas/machine_mappings/support_files/iter/000001/ranges.dat
@@ -0,0 +1 @@
+000001 999999
diff --git a/omas/machine_mappings/support_files/jet/mhdin.dat b/omas/machine_mappings/support_files/jet/mhdin.dat
@@ -1,4 +1,4 @@
- &IN3
+ &IN5
  IGRID = 1
  RLEFT = 1.65
  RRIGHT = 4.05
@@ -9,10 +9,11 @@
  NSMP2 = 25
  IECOIL = 0
  IVESEL = 0
- vsid = 1
  IACOIL = 0
- NW = 65
- NH = 65
+ mgaus1 = 8
+ mgaus2 = 12
+ /
+ &IN3
  RF = 2*0.897 2.024 2.318 2.024 2.318 2*2.024 4*3.9935 2*3.8455 2*5.302 2.098 
  2.508 2.841 3.39575
  ZF = 2*0.0 3.9429999999999996 3.8455 -3.9429999999999996 -3.8455 3.6995 
@@ -30,35 +31,21 @@
  21.000000000000004
  FCTURN = 20*1.0
  FCID = 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
- RE = 1.7622790592724384
- ZE = 0
- WE = 0
- HE = 0
- ECTURN = 0
- ECID = 1
- RVS = -1
- ZVS = 0
- WVS = 0
- HVS = 0
  RSI = 1.7622790592724384
  ZSI = 0.0
  MPNAM2 = 'MP_A'
  LPNAME = 'LP_A'
  AF2 = 20*0.0
- AVS(1) = 0
- AVS2(1) = 0.0
  /
  &MACHINEIN
  device = 'device'
  nfcoil = 20
  nfsum = 20
  nsilop = 1
- magpr2 = 1
+ magpri = 1
  necoil = 1
  nesum = 1
  nvesel = 1
  nvsum = 1
  nacoil = 1
- mgaus1 = 8
- mgaus2 = 12
  /