Merge branch 'master' into omas_plot_w_new_EFIT_mapping

gafusion · Aug 21, 2024 · 082da5b · 082da5b
2 parents a291dde + 2c9824e
commit 082da5b
Show file tree

Hide file tree

Showing 7 changed files with 490 additions and 10 deletions.
diff --git a/omas/machine_mappings/support_files/d3d/181292/ranges.dat b/omas/machine_mappings/support_files/d3d/181292/ranges.dat
@@ -1 +1 @@
-181291 999999
+181291 197554
diff --git a/omas/machine_mappings/support_files/d3d/197555/mhdin.dat b/omas/machine_mappings/support_files/d3d/197555/mhdin.dat
@@ -0,0 +1,238 @@
+ *** 4/3/2024
+ &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
+ rcntr_max=240.
+ rcntr_min=90.0
+ zcntr_max=100.
+ zcntr_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
+ /
+ &IN3
+ FCID = 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18
+ FCTURN = 18*1.0
+ TURNFC = 5*58.0 2*55.0 58.0 55.0 5*58.0 2*55.0 58.0 55.0
+ 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 
+ -0.5135 -0.8543 -1.1957 -1.5169 -0.4376 -1.1171 -1.6027 -1.578
+ WF = 4*0.0508 0.1392 0.1732 0.188 0.2349 0.1694 4*0.0508 0.1392 0.1732 0.188 
+ 0.2349 0.1694
+ HF = 4*0.32106 0.1194 0.1946 0.1692 0.0851 0.1331 4*0.32106 0.1194 0.1946 
+ 0.1692 0.0851 0.1331
+ AF = 4*0.0 45.0 8*0.0 -45.0 4*0.0
+ AF2 = 5*0.0 92.4 108.06 7*0.0 -92.4 -108.06 2*0.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
+ ECTURN = 122*1.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 
+ 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 0.7575 0.69 
+ 0.7599 0.695 0.7625 0.7025 0.7625 4*0.8792 0.9525 1.0124 1.0991 1.1641 
+ 2*1.3512 1.786 2.3464 2.6087 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 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 0.7575 0.69 0.7599 0.695 0.7625 0.7025 0.7625 4*0.879 0.9533 
+ 1.0132 1.0998 1.1648 2*1.3533 1.7876 2.3565 2.6087
+ ZE = 2*0.0382 2*0.1147 2*0.1912 2*0.2677 2*0.3442 2*0.4207 2*0.4972 2*0.5737 
+ 2*0.6502 2*0.7267 2*0.8032 2*0.8797 2*0.9562 2*1.0326 2*1.1091 2*1.1853 
+ 2*1.2615 2*1.3351 2*1.4095 2*1.4801 2*1.5482 2*1.6108 2*1.6684 2*1.7255 
+ 1.7123 1.7437 1.7751 1.8064 1.9458 1.9585 2*1.9855 1.8745 1.9515 1.7479 
+ 1.2286 0.5603 2*-0.0382 2*-0.1147 2*-0.1912 2*-0.2677 2*-0.3442 2*-0.4207 
+ 2*-0.4972 2*-0.5737 2*-0.6502 2*-0.7267 2*-0.8032 2*-0.8797 2*-0.9562 
+ 2*-1.0326 2*-1.1091 2*-1.1853 2*-1.2615 2*-1.3351 2*-1.4095 2*-1.4801 
+ 2*-1.5482 2*-1.6108 2*-1.6684 2*-1.7255 -1.7128 -1.7441 -1.7755 -1.8069 
+ -1.9454 -1.9581 2*-1.9851 -1.8735 -1.9505 -1.7477 -1.2286 -0.5603
+ WE = 42*0.05867 6*0.04953 4*0.1138 4*0.0587 2*0.0888 0.1793 2*0.1692 
+ 42*0.05867 6*0.04953 4*0.1138 4*0.0587 2*0.0888 0.1793 2*0.1692
+ HE = 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 
+ 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
+ RSI = 0.8929 0.8936 0.895 0.8932 1.0106 2.511 2.285 1.2517 1.6885 0.8929 
+ 0.8928 0.8933 0.8952 1.0152 2.509 2.297 1.2491 1.6882 4*0.9247 0.9621 1.1212 
+ 1.6978 2.209 2.1933 2.501 2.4347 3*0.9247 0.9611 1.1199 1.8559 2.215 2.1933 
+ 2.501 2.4328 1.3828 1.5771 1.3929 1.5983 1.7759
+ ZSI = 0.1683 0.5092 0.85 1.1909 1.4475 0.332 1.018 1.5517 1.5169 -0.1726 
+ -0.5135 -0.8543 -1.1953 -1.4536 -0.335 -1.01 -1.5527 -1.5075 0.0 0.3429 
+ 0.6858 1.0287 1.3208 2*1.4646 1.213 1.0629 0.527 0.4902 -0.3429 -0.6858 
+ -1.0287 -1.3198 2*-1.4625 -1.214 -1.0602 -0.524 -0.4909 2*-1.4625 2*-1.3057 
+ -1.3053
+MPNAM2=
+ 'MPI11M067 ','MPI1A139  ','MPI2A067  ','MPI2A139  ','MPI3A139  ',
+ 'MPI4A139  ','MPI5A139  ','MPI66M247 ','MPI79A147 ','MPI67A142 ',
+ 'MPI67A3   ','MPI67A067 ','MPI6NA132 ','MPI6NA157 ','MPI66M067 ',
+ 'MPI1B139  ','MPI2B067  ','MPI2B139  ','MPI3B139  ','MPI4B139  ',
+ 'MPI5B139  ','MPI66M157 ','MPI1B157  ','MPI79B142 ','MPI7NB142 ',
+ 'MPI67B3   ','MPI67B067 ','MPI6FB142 ','MPI6NB157 ',
+ 'MPI8A322  ','MPI89A322 ','MPI9A322  ','MPI79FA322','MPI79NA322',
+ 'MPI7FA322 ','MPI7NA322 ','MPI67A322 ','MPI6FA322 ','MPI6NA322 ',
+ 'MPI66M322 ','MPI6NB322 ','MPI6FB322 ','MPI67B322 ','MPI7NB322 ',
+ 'MPI7FB322 ','MPI79B322 ','MPI9B322  ','MPI89B322 ','MPI8B322  ',
+ 'MPI5B322  ','MPI4B322  ','MPI3B322  ','MPI2B322  ','MPI1B322  ',
+ 'MPI11M322 ','MPI1A322  ','MPI2A322  ','MPI3A322  ','MPI4A322  ',
+ 'MPI5A322  ',
+ 'MPI1U157',  'MPI2U157',  'MPI3U157',  'MPI4U157',
+ 'DSL1U180',  'DSL2U180',  'DSL3U180',  'DSL4U157',
+ 'MPI5U157',  'MPI6U157',  'MPI7U157',  'DSL5U157',  'DSL6U157',
+ 'MPI1L180',  'MPI2L180',  'MPI3L180'
+ XMP2=
+  0.9729,  0.9787,  0.9726,  0.9767,  0.9793,	
+  0.9764,  0.9785,  2.4130,  1.7617,  2.2665,	
+  2.2641,  2.2655,  2.4088,  2.4066,  2.4133,	
+  0.9771,  0.9722,  0.9792,  0.9769,  0.9801,	
+  0.9774,  2.4129,  0.9719,  2.0436,  2.2089,	
+  2.2596,  2.2624,  2.3119,  2.4140,   
+  1.2194,  1.4017,  1.5841,  1.7825,  1.9243,
+  2.0673,  2.2193,  2.2702,  2.3189,  2.4159,
+  2.4182,  2.4162,  2.3154,  2.2631,  2.212,  
+  2.0848,  1.8940,  1.6989,  1.4769,  1.2541,
+  1.0479,  0.9724,  0.9740,  0.9748,  0.9737,
+  0.9732,  0.9741,  0.9742,  0.9745,  0.9722,  
+  1.0511,
+  1.436,   1.560,   1.723,   1.873,
+  1.506,   1.590,   1.730,   1.877,
+  1.205,   1.045,   0.976,   1.040,   1.086,
+  1.5104,  1.6103,  1.7103
+ YMP2=
+ -0.0037,  0.0699,  0.5180,  0.2094,  0.3471,
+  0.4851,  0.7591, -0.0025,  1.3123,  0.7572,
+  0.7598,  0.7578,  0.2766,  0.2544,  0.0029,
+ -0.0691, -0.5165, -0.2070, -0.3428, -0.4818,
+ -0.7570, -0.0010, -0.1831, -1.1098, -0.8669,
+ -0.7538, -0.7510, -0.6202, -0.2441,
+  1.4055,  1.4070,  1.4084,  1.3230,  1.2064,
+  1.0904,  0.8698,  0.7462,  0.6228,  0.2492,
+ -0.0009, -0.2438, -0.6240, -0.7487, -0.8725,  
+ -1.1020, -1.3327, -1.4063, -1.4055, -1.4047,
+ -1.3302, -1.1589, -0.8542, -0.5122, -0.1870,
+ -0.0023,  0.1817,  0.5116,  0.8503,  1.1609,
+  1.3304,
+  1.270,   1.187,   1.112,   1.116,
+  1.270,   1.198,   1.142,   1.133
+  1.398,   1.313,   0.979,   1.342,   1.228,
+ -1.2915, -1.2915, -1.2918
+ AMP2=
+   90.00,   90.26,   89.80,   89.87,   90.07,
+   90.01,   89.74,  -90.5,   -39.50,  -67.3,
+  -67.80,  -67.60,  -89,  -89.39,  -89.90,
+   90.01,   90.30,   89.59,   90.05,   89.86,
+   89.79,  -89.78,   89.55, -129.10, -112.57,
+ -112.80, -112.60, -113.00,  -89.58,
+    0.3000,    0.6670,    0.6170, -39.2830,  -39.1670,
+  -39.4170,  -68.1000,  -67.9000, -68.0000,  -89.3330,
+  -89.9000,  269.2500,  -113.400, -112.800,  -113.500,  
+  230.8170,  230.4670,  179.8670, 180.0830,  180.0330,
+  136.3830,   89.5670,   89.7500,  90.2670,   90.1170,
+   89.9330,   90.0170,   89.7000,  90.1500,   90.4830,
+   44.6170,
+  -41.665,    -40.77,     -3.30,    -2.75,
+   49.53,     49.53,     92.30,    90.50
+  -0.748,     45.832,    90.259,  134.819,    90.400,
+  180.01,    180.25,    181.03
+ SMP2=
+ 0.1408,  0.1419,  0.1404,  0.1408,  0.1412,   
+ 0.1409,  0.1414,  0.1402,  0.1534,  0.1534,   
+ 0.1561,  0.1550,  0.1381,  0.1406,  0.1409,   
+ 0.1418,  0.1392,  0.1414,  0.1411,  0.1407,   
+ 0.1420,  0.1375,  0.1408,  0.1537,  0.1422,   
+ 0.1549,  0.1557,  0.1398,  0.1407,    
+ 0.1394,  0.1145,  0.1403,  0.1409,  0.1141,
+ 0.1398,  0.1403,  0.1407,  0.1402,  0.1407,
+ 0.1399,  0.1399,  0.1403,  0.1400,  0.1407,  
+ 0.1403,  0.1406,  0.1415,  0.1403,  0.1403,
+ 0.1403,  0.1405,  0.1402,  0.1404,  0.1400,
+ 0.1153,  0.1400,  0.1403,  0.1404,  0.1404,
+ 0.1407,
+ 0.027,   0.027,   0.027,   0.054,
+ -0.094,  -0.088,  -0.106,  -0.1955
+  0.027,   0.027,   0.027,  -0.2184,   -0.107,
+  0.0271,  0.0277,  0.0273
+ PATMP2  =  0.1845500    ,  0.2566500    ,  0.3446000    ,  0.3173500    ,
+  0.2413664    ,  0.2202499    ,  0.2728091    ,  0.2806501    ,  0.3106111    ,
+  0.3109208    ,  0.2295793    ,  0.2129159    ,  0.2292131    ,  0.2710449    ,
+  0.2478000    ,  0.2586500    ,  0.3361500    ,  0.3154000    ,  0.2556976    ,
+  0.2131110    ,  0.2341576    ,  0.2228506    ,  0.2486520    ,  0.2551194    ,
+  0.2669137    ,  0.2292701    ,  0.2133847    ,  0.2214800    ,  0.2718855    ,
+  0.1838351    ,  0.1823557    ,  0.1839847    ,  0.2282504    ,  0.1838572    ,
+  0.2136775    ,  0.2273982    ,  0.2127223    ,  0.2300735    ,  0.2691039    ,
+  0.2465000    ,  0.2759520    ,  0.1962927    ,  0.2346333    ,  0.2421203    ,
+  0.2582166    ,  0.2455210    ,  0.2451018    ,  0.2224015    ,  0.2393365    ,
+  0.2123904    ,  0.2517095    ,  0.3233501    ,  0.3336000    ,  0.2549500    ,
+  0.1843500    ,  0.2569500    ,  0.3343000    ,  0.3246499    ,  0.2469479    ,
+  0.2170768    
+ RACOIL = 1.736
+ ZACOIL = -1.32
+ WACOIL = 0.096
+ HACOIL = 0.02
+ 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
+ VSNAME = 'V-1A ' 'V-2A ' 'V-3A ' 'V-4A ' 'V-5A ' 'V-6A ' 'V-7A ' 'V-8A ' 
+ 'V-9A ' 'V-10A' 'V-11A' 'V-12A' 'V-1B ' 'V-2B ' 'V-3B ' 'V-4B ' 'V-5B ' 
+ 'V-6B ' 'V-7B ' 'V-8B ' 'V-9B ' 'V-10B' 'V-11B' 'V-12B'
+ LPNAME = 'PSF1A     ' 'PSF2A     ' 'PSF3A     ' 'PSF4A     ' 'PSF5A     ' 
+ 'PSF6NA    ' 'PSF7NA    ' 'PSF8A     ' 'PSF9A     ' 'PSF1B     ' 
+ 'PSF2B     ' 'PSF3B     ' 'PSF4B     ' 'PSF5B     ' 'PSF6NB    ' 
+ 'PSF7NB    ' 'PSF8B     ' 'PSF9B     ' 'PSI11M    ' 'PSI12A    ' 
+ 'PSI23A    ' 'PSI34A    ' 'PSI45A    ' 'PSI58A    ' 'PSI9A     ' 
+ 'PSF7FA    ' 'PSI7A     ' 'PSF6FA    ' 'PSI6A     ' 'PSI12B    ' 
+ 'PSI23B    ' 'PSI34B    ' 'PSI45B    ' 'PSI58B    ' 'PSI9B     ' 
+ 'PSF7FB    ' 'PSI7B     ' 'PSF6FB    ' 'PSI6B     ' 'PSI89FB   ' 
+ 'PSI89NB   ' 'PSI1L     ' 'PSI2L     ' 'PSI3L     '
+ RVS = 3*0.943 1.0281 1.2578 1.5468 1.8158 2.0649 2.2533 2.3809 2*2.4448 
+ 3*0.943 1.0281 1.2974 1.6655 1.9346 2.1045 2.2533 2.3809 2*2.4448
+ ZVS = 0.212 0.636 1.0599 1.3571 2*1.4422 1.3415 1.14 0.8842 0.5742 0.3538 
+ 0.1442 -0.212 -0.636 -1.0599 -1.3571 2*-1.4422 -1.3415 -1.14 -0.8842 -0.5742 
+ -0.3538 -0.1442
+ WVS = 3*0.0318 0.1703 2*0.289 2*0.2491 2*0.0412 2*0.0254 3*0.0318 0.1703 
+ 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 = 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
+ RSISVS = 3*0.0019209 0.0036784 0.0037424 0.0046093 0.0048872 0.0055595 
+ 0.0058032 0.0061324 0.0055482 0.00503212 3*0.0019209 0.0036784 0.0030229 
+ 0.0038912 0.0063351 0.0068921 0.0058032 0.0061324 0.0055482 0.00503212
+ /
+ &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/d3d/197555/ranges.dat b/omas/machine_mappings/support_files/d3d/197555/ranges.dat
@@ -0,0 +1 @@
+197555 999999