From 8fe3bb9ecff41573a6c69acb4b7449aaa1a5833b Mon Sep 17 00:00:00 2001 From: VEZINET Didier Date: Tue, 26 Nov 2019 15:05:35 +0100 Subject: [PATCH 1/3] [Issue281] Added backup npz files containing first wall approximate geometry for AUG, COMPASS, JET, KSTAR, TCV and TS --- tofu/geom/inputs/AUG-V0_backup.npz | Bin 0 -> 2434 bytes tofu/geom/inputs/COMPASS-V0_backup.npz | Bin 0 -> 1410 bytes tofu/geom/inputs/COMPASS-V1_backup.npz | Bin 0 -> 1426 bytes tofu/geom/inputs/COMPASS-V2_backup.npz | Bin 0 -> 4626 bytes tofu/geom/inputs/JET-V0_backup.npz | Bin 0 -> 4418 bytes tofu/geom/inputs/KSTAR-V0_backup.npz | Bin 0 -> 882 bytes tofu/geom/inputs/MAST-V0_backup.npz | Bin 0 -> 610 bytes tofu/geom/inputs/TCV-V0_backup.npz | Bin 0 -> 738 bytes tofu/geom/inputs/TCV-V1_backup.npz | Bin 0 -> 738 bytes tofu/geom/inputs/TS-V0_backup.npz | Bin 0 -> 3602 bytes tofu/geom/inputs/TS-V1_backup.npz | Bin 0 -> 3202 bytes tofu/geom/inputs/TS-V2_backup.npz | Bin 0 -> 3602 bytes tofu/version.py | 2 +- 13 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 tofu/geom/inputs/AUG-V0_backup.npz create mode 100644 tofu/geom/inputs/COMPASS-V0_backup.npz create mode 100644 tofu/geom/inputs/COMPASS-V1_backup.npz create mode 100644 tofu/geom/inputs/COMPASS-V2_backup.npz create mode 100644 tofu/geom/inputs/JET-V0_backup.npz create mode 100644 tofu/geom/inputs/KSTAR-V0_backup.npz create mode 100644 tofu/geom/inputs/MAST-V0_backup.npz create mode 100644 tofu/geom/inputs/TCV-V0_backup.npz create mode 100644 tofu/geom/inputs/TCV-V1_backup.npz create mode 100644 tofu/geom/inputs/TS-V0_backup.npz create mode 100644 tofu/geom/inputs/TS-V1_backup.npz create mode 100644 tofu/geom/inputs/TS-V2_backup.npz diff --git a/tofu/geom/inputs/AUG-V0_backup.npz b/tofu/geom/inputs/AUG-V0_backup.npz new file mode 100644 index 0000000000000000000000000000000000000000..0bd0addbbc43a228b824f74858df9379d93574a8 GIT binary patch literal 2434 zcmd5;dov*RkBIK1lA$J@^@>UHeO#_ zuUDm_2a$x3F=obNe!m%v8IP-T?pob@*1G@PzwX{^ug`aX*53c@wZ5PAak3K@ktO^Y zDunT3I>kqXK=@uOmPu!wuw$n(_qsYbc@hc739*`f{*i|xG)#@zwUspk!Xu(0 ze8VW=5q|#Pc^luOk^akkWT5Xc|K)zOp1y(h7H#D-%KvkS6SE#_##IqX2Li3-Z^jcz z`ASxv$b?Ax+PyoQHc23@Cc70=I|!uhJB8P|N-P2?Vvlb%Z2>Cw=GqTL%>%pMyw-~AcmcIXJ^ZS>UhP~hAbS;J2pz2 zKE#1jap6#OAr2Z_6;DlT;J|p_G?CeiL7rOMIgLvgtQR7VZn422;UXnWj);NK^;1sm z{cJcE6gpGh!UhF?`uNJnY`7LQxSEXEuzCb4j6Sk~vB}wJWR4A`?=2hC)i98vCqK9L z!60!#wotJhgOeM32kr|nXgm|WMaKXKim-=|pCb;zSr@2IL=HF)ch4y=;LzLD?Ejd+ zff#2K&tPc|c<{bSwR3*pi+w7_TrLORv96qqmf`|opP6EuITxJhztggVxNxlN!@Zg1 zyPUW8NxqxSg~JM019Ee?U=V5OJDkFW-<%5^OX9g;j|@kWlDTl#+b!B>`EF@x)K2v$ z92ijFmS;A~0lhCL0<;+%ShX^tkG?#Yt#ov9{1O*xABZ}(aJj&LxrBMjPQy+2XquGT zG#JyFJ&k(PQ29_Tkhx_V?qJ_Eu9!_jW}ih6`N%A|u2)87k7uFcLGsqN%2~)bRVUh1 zJqwhov?ZN)v(Rs=C*F3P2f9Ns=L=yTfm+ z)8+%E=(cdF5g+LN0Z|t$`0%&G-{ga>e(;~wH1#(-@gdGZBH-W&K8OYpyS(o6p|I!f z3xi=kq^Zg*Q56KxSDXCuHCX_*=Q^mYNCCvq&Uo;O1W?ylGe8{@K*HzRE}PBskX>c@ zf#EO@T1@^(tLi-1D!dZwRGtS0oF@OB-zCWF|3QK_4@^eO1~)@rqO!N;nof{yFWDWQ z(hGwHHYZwT2SM#nj?sGKA#l68$sk^40tR;UbFNiPz+-CIP65USmv%dsF;xtz&+b?e z+=)Yx6;>-bhl5p4-}UwZ97frRZrT4R-m77~s+s}Z`Fu#`H_cGwUzrxaxnCNcKXZR@o{MoI<4$umwYQ#>whVp0I z$b#y6NRO6nGU!c)x8)h}r&XRHLPEoafw5QU?4APds<{r-;Qo&aUHT^^Hz;R&^>{y$ ze)HyjK;ZYFm zfeQZPNoP!$$bA1Q`!60$bPTf#FO6lQo%V|_SOrYfZtUpd@5n-nS=ODkM&pQ^c1xV6 zGJ#ZeteLa)31pG(u4ZmHg{C88Z?^qBg^cK*+7m;kkQQ@v>#qeFd3Gmd%_UKZ6^jwAnznLPzm7P`z6CQuHtP~zEu#u|AR>UW7tjpH!U z#+skHu1_(My=Q|Xy_tzJYaL95Q<;dF79{%CpNT4dkttlWVHB}i%Er`XM^V$~gYRnQ zX=vXYnyLIJ8Yx#x1Du6 z)dC062l4UPyy^k;Q8ZQ}NvaPqDy)rv>-da<`13QfLER|AwY5g5qyrUG69qLQZD?`g zQR=nQMpRw&^lWNj74q>+qMDsN2}boXDO!RWaIzx`$qN5>AM`JSL^wzM{`$ie{dMK9 ey7gn_!m^qAL&cozR)~J5g_bj58AVrp@BRt!v4&#+ literal 0 HcmV?d00001 diff --git a/tofu/geom/inputs/COMPASS-V0_backup.npz b/tofu/geom/inputs/COMPASS-V0_backup.npz new file mode 100644 index 0000000000000000000000000000000000000000..afae21df6a51dbab6c7467d9947bd9fe6fe1f29a GIT binary patch literal 1410 zcmd6nYfuwc6vsD#L;)-6#QG{juu7oA(?=>Pdd6Y_1sMcEYdb}z0&zqV6JKDdVOm=s zR4po_prU3hI$D*Yqg3FE7|KJ43A-D4rGyX?6cia9+tP=3H(P9->6d=;?(Cf1Gkee8 z^FP0H;$vJ~MTB$t5Yh?BrEB>F!Q2AuObE(SW*>@6S|0x)kJw7=kgQ8nf2xwm#FFsz z1(E=QRlx%lfWEd_xQ zZ$0dh(y(eE_@>0u1f|(O`O6ASFtn>-WzD(!aJH&uif>{Y6h`dJw2!pGgdFLGMXNfX zVQY2C^x!U#mp@QnoBT8Q557?ya;zI>1b596=2<|QGNxtPiXJF+Ls|^dbZdB-cK`=b1yj{>}owei32J(ADZf#>;ToTp8eM^+hP7EKQ0}|w?lEC7d}EC z#MF<$O4&y3nr9X5d;hR<`dFd)F0*>zgD56~1*(~}1s0HoS0xnsbc5P7X?U^T3}g`# zuoHSkUJW+r1T_Bm+%s1@;MTy&@Bp$MWCcw-qfr}Rkv=Lz_eb^oTi;Goo;va{4XVBS zdxyPg=(_ghXZOk}V8f?V;P-ic#RfMD;{SzUQk=&8PXyPz4hTlMZ1K355jO0vT^PiKel&Yemiy8qokl+>Ta+e~uY7AT5t! zOOI0LB!#?lz6ssD@r`ik&3eQVQ&NkZ2v?yM8;Z6aKU0ocb{oyz9$N1EL};vK5e@$doO+ zY0w=A-4^I$f-qXQah~R-bs|S|tw3|FMFW>Vhad@@e!zBQdn*X$O~h0i!CgKxb9;^f zrXC^Prf NKEBei6*421cmXPXIaUAw literal 0 HcmV?d00001 diff --git a/tofu/geom/inputs/COMPASS-V1_backup.npz b/tofu/geom/inputs/COMPASS-V1_backup.npz new file mode 100644 index 0000000000000000000000000000000000000000..68084c66b21cad568aaa480cc1e790398fb8b406 GIT binary patch literal 1426 zcmd6nYfuwc6vsD#pn#RuiB{WEg0%!X;St4DBKC~M0tz}j#8*2aQ-L@FiHTK#QemdF zDpW02rUfl(#-gKDDLR4zSHw^rg_y9r;ax%q2?8x;?5L%$yPFkTXZod|ygNH*_s-tC z_x%6Ab7G>LoP~sAcoQg38m!0 z-v*__p7;pE5Y;pTD`uUJTYjzXKJre^V4f3Ma{gJ2(ut@J#pw4MMAM4v| z%F~2@L4*3x;h{+{8v3q%{Nde73fS#aDDeHLuzIH}1u_3ZF?%ds@=p}EJPRmBIPG&^ zZ{rP!Rr0V7ola$#(V?2+qaInZ zR%D&@GAa}GsQUL$@AsGt$p5>OKbJRlAj~O-ibR)aA~|m@i59RPb|8n9Ml{Bd zm)(Kz&oQe8q~$S;=~2?+grGOhx1yU>pSeuTYeFnJWev!IaxIG8S+e)UnM%}tz}P?F zuI0Xuhn5CLfYac}qXJlmjR0e74g zzl7x0QLukXu4+F(gYJlQufMkmLTFujaPE`nK#%51g62w$1}=XNMG`pufUV5#4iE&t zfax}Zn_^+wzAOXGKTf(T7T$#*R@gRR?K3xH6nT81(|`BH$A0JXm?ySNKE32=exEEU Yz|EDVIVMWr!c6n=m4f3ursWcU1I9!?asU7T literal 0 HcmV?d00001 diff --git a/tofu/geom/inputs/COMPASS-V2_backup.npz b/tofu/geom/inputs/COMPASS-V2_backup.npz new file mode 100644 index 0000000000000000000000000000000000000000..6dbba5ba99ec4bdc952da9034e8cabfd6a91cb96 GIT binary patch literal 4626 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
fk%2DWuGNx z12*6VHQ)eG=r$KF`AP&!LZjd@>z_pBShZ=AarFA$|8@bMg)Ikp8d3BJA z3T4ayiMIg3ugQTJ^&b{vUvyT{zgvva{|^>}ON3fQc8$Jma-l9G>+598<6TtL^T>;=g2OHoLCvR#khT-# zi%sm+sg9Uw|P#+ma7L z3vYrL{}zb#-i6}}np2S|1o6IN2&IBD>U=S93d${!RQUiHBjrYvfq-TiP`wQP@OT9< z1GT>YW8exJTm?hU8v1_uMip?WK5PYH*{qO}#JoZ^SjS&{JK}6Li2U0ifeKXRQoEEE zJBWPSLFB^$oWgoLfI~ISA*tB`Q;xk)N!SVXxYjx0-HGgQLMn5BQ=L+JoFJ^D6Q1XX zOOERTkxv)2QSCGDZgzq2#cpWCd(;gNJbP#}yFpk|576XNvhYZWQz4PA{`^-e2+Qe( zbm}zQ>V1&JwbCco>jTj$K45nb$nt@xd+j-MhU+tZFp#1tf3^=EGG?6SV?s|W>Vvi1 z19;_pybw;EZ&42~aO=}vm6D>uc8acoZ8cE8IU~6m5LUMaxHL4ck?ZvUhfAtQ*2@Ee zvOLg^bDA53m2}Je*5>0hb)E@pTvBpfa=k9dKEXVq3+6HBJl6@_G0b+tBc`Nf4w$!t zd3A@Bd@r_AV8XmV%LXkuXWM`~qT|&P?^fVc)!hnq ziuN2^rOZPmi2kbphn|_I3gAwEeHqky$T+za^4c)7Kyl42MG0^#OS^?j^4elq=OXA% zcLsx!3ZWrYis*Z{fjg{~zsb550QF&1HLt^~eD9DaadKJSe;T;8?RXMCXO1B}6P7YX zvh4vr+>S3v);MP7c1u1Wgww*-93tv*k(^%Dg}Ri>MC3Q0L@;M{`WoR|h^;qCQ|5fD zZjl-W*Kv1=s7E0YR^c8Q%xIy(L&;AMNh%et63;`)M`a{uH}m3UL|Cs!gl}!0c_jI$ zoHR}@2)6bsC!!xJ2%m0Dg&hAeS;d@T;$!j>C%8%?_@t5u>qmK%IjGB(gjn04P;}*H)JUm43j)zFzASW3e=XfM?Q)&ZX$Tk zCFkRkI^-gvuUw=fgM9}#iC_+{hnv*n1mh-b1DcrPmg{qq=A4K;WE!8ShX@PqA;L0y zh~RY(VIWO=TpL-I4wSkjeq1EQk0J7}_c}=>YY&%$Oem=b!xyp-4h}#Ry9dsJDgF~Qm?B?RD?zwqWkaPW5_Q!l*JnMAOBY4 hpO5_0m()Hoo_-m^T}o7hzn)#z(w~Vm=GJ9re*#Ji&;kGe literal 0 HcmV?d00001 diff --git a/tofu/geom/inputs/KSTAR-V0_backup.npz b/tofu/geom/inputs/KSTAR-V0_backup.npz new file mode 100644 index 0000000000000000000000000000000000000000..b99ea1939b9e2311d5c02d49223081fe99845364 GIT binary patch literal 882 zcmWIWW@Zs#fB;2?*cis=5sVBBAj}FB4ARRhsGRH<>KhQr$WX>mt)7xvoLr=CrJ!z; zW}&X5pq`drR8o|f7oT60k_r-cOUx-w1&SAEBo?Fs`5H#%I+{8PwF=||E?chaiwkVO z*u&^|HTI@)yMEd$ZYau_`1Y55eb%0m$r8Wpi-Eiv`=9n;;hLZJU}2VD_8`@sJPZ!y z`{qmO-(_@oSS7N~{UM{nmJ?+_5hjN}D?eWHO=5BYDq_-ZN6;{Fm^zp~m^m*jpFf;)30W=q&YeA1MgqCWcCUEQpc(byBgqeUa4M=}u G0`UO+`YZJS literal 0 HcmV?d00001 diff --git a/tofu/geom/inputs/MAST-V0_backup.npz b/tofu/geom/inputs/MAST-V0_backup.npz new file mode 100644 index 0000000000000000000000000000000000000000..58e608e46a86b4ca117a74c9b6a96f3bec253595 GIT binary patch literal 610 zcmWIWW@Zs#fB;2?pob?OTmW)Fm=%bF^zsTSC;Nr^21GJ4lrdDRr=%7q7pYq*sN1Aj zsOu=Gr{x!w6eZ@x=NF}8(>1*t&3hM|FurjA0b0{MXJ(G2Eyk#axm zt=6Sp*j4t`o@>dBi(672+n*Cyv-s@qOZF@l(yMQ0AZVC4OdU)g%$xueFF$-n;Y zQG>zD3?U$pv){!P2>!mcck=*(FF)+}?FE9&ul7)R7`-1Vz8|U%rf)yYoB(e|CJ|=b q@eGN728ISk5DOgZ=vvUj38CdPkO>a80B=?{kT4SvrUB_^VABBDx~FLX literal 0 HcmV?d00001 diff --git a/tofu/geom/inputs/TCV-V0_backup.npz b/tofu/geom/inputs/TCV-V0_backup.npz new file mode 100644 index 0000000000000000000000000000000000000000..5e2ca91d5d68cb09a4866198b8e0b45bbbb412ca GIT binary patch literal 738 zcmWIWW@Zs#fB;2?&;@oe0*nj{Aj}FB4ARRhsGRH<>KhQr$WX>mt)7xvoLr=CrJ!z; zW}&X5pq`drR8o|f7oT60k_r-cOUx-w1&SAEBo?Fs`5J~6I+{8PwF=||E}%OS_;fGX zBhe2sw88uZZUW~);tVPe&w=O#Ty;l5bVEQOm}V&ddlb1y07BxtM4Crexc(6P6ASehN=FR}q3tXNY2l0X61TuZ# z!!5A5gLwNfu=;3UFx?RAd2ByW@dEP}FrBdc_i+#(2u>i=Aag-{kUbz8WG_^nfg!+~ zkx7IZcRB-^1_BMhbO%j!=vvUj8Ke*d8W@d%n!uqR;LXYg5@G_vG$5VE1mXbzqwbxs literal 0 HcmV?d00001 diff --git a/tofu/geom/inputs/TCV-V1_backup.npz b/tofu/geom/inputs/TCV-V1_backup.npz new file mode 100644 index 0000000000000000000000000000000000000000..d5babbd4f3dbbad9da6c91938799eb2563bbca81 GIT binary patch literal 738 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 literal 0 HcmV?d00001 diff --git a/tofu/geom/inputs/TS-V1_backup.npz b/tofu/geom/inputs/TS-V1_backup.npz new file mode 100644 index 0000000000000000000000000000000000000000..f11de961443d159634339c6fac62e7a1d1baa3a5 GIT binary patch literal 3202 zcmd6qX;f257RQqSNuJ<>fQ<{Xh$4!Nf+LH_EonwJ5kwJL6p+UeSmHiEJ0BmRwXtdC~JTaWK*$O0)y0h?M$CDU*^+Pl2fU?SM}=t@BRPk#NI|q zT9HMXI!i|~s@EvPVtxILzgZ5tyZ3}#T<2(O@62W$V1;RU`|R@y)G}7nGVwLk(oxg$ z4G7#H=(*cHAkf?A>+fqkckS~T|9zjo=N_N&@xo;WdOF%VYT;`CbDLDQ_TB}{FBCe| z{%3is0Sf8;Bf8%DBZWS{NNQQvO`*2RBiWnUDJ0W%Hq84yg|cTZlnSe&5I^utR{V1c z9rfvnuKbxoWm{C1Dko9smWEnYNGydyf?~~wk5I_Lx4t7`JB6P1sr_zQWAQ%J>emKQ|O+HF+5~a zf~M~XYS4*R3uW#m*T1%tnt^FCR z<)zU&=>Wss)lz5<&)CsBUJ99K?NeXjC55!z&K7=ND21kS?|bERbC5x1>z__$bC7g) z`r7bN4vMZ?EVzd_=#214#atc-#pD|;>n>v>v>>NK`w|;DB%XF}abu&H(kZ)j=Cjf1 zymHqW-7F-?&~?iCnT4F^QBLxaEHv5DN6Fllh14QolIu(sDlh%o#z22={hTiUF;JXy zV6i@L3_Nez?t79n3guDZ4>GMsA@>bPYxYW@QnvBD{#6MaH|VMuHj{u(Q=-F_-Vq3X zlUJ&Gdjt|JR`b#}jzD5Xf336Z2wYArnP*%y42?fFJoSzohG_|ZyU=Ym422$I7cqAj z>OVgb{Iz@thHay6p1d{$He2Kjt^9{z*W<;K0^{-CMMIq>KLl`9K6#pW5Zr?Lca0Sf zf}o_8s!kq+YhCXreDO54d;@h~6zW#*1pPA3B$E?ph&y{{Yvma)EJL&ye)B7Ky<6+`s;$`A*p!Hz% zxkKx9o7RuflhHSl)|=6v$p@1k4?17d>HO)@`7ELHt4ilvj?O<*4^?!1MA7xKTVUIL zXbBscCZ}$nvV)DTk9D=IOk$%$W0scvt!(7?+S+OEJPvXRElx@CWv$np>I~8!A;xGCT z`3n4kkI$FYtpe06oxP+=00M)OuvdG3h2q3q?I5ZKu1&OBc<0$9DNwJ26S~K^`)}97 z(nT6PL*@5S7xkl2)cz*8UvTT*E~92pEZ_Ru-+yZc*&SPtb!4`He%QqbIiFTANO~cq zyGRJWJWbbmuY^#&c~!3U-Zn5wJFXr$sU1p;*Vk;1YlppxuG@@dJ0MCw;aW~i2h1K^ zyx|mI1PXV*L(yR(kfilQ#J7n+rN1`gx>YCiE#UNe-|2){_R0?p1D!BMzpA?riNW>Y zjkm`l#c)$^_Nt?g#L)L;XcJGf6K=HpKxvH63-{~qrF=VK?FJJnH?$MNV#^y;Pjt)Ok?<^V+L2g&S&yE5SEU;T6;vN@)O?brYG*b~+JKm2E z>g#}=n+bo*e1d`fMQ!Y6*f_L`Sw|2`LV7-~kw1?^Mz}|77uSvZgG$-PH3&~Z9 zWm~#xz`}bjC+jcO5I1Wr@7a|%V5Xq?d1gx$WVky?RxW%EZ%);sY`;pFu7AZ!#k>rL zP_}Jm`b$ubHrQsS@Eo@89eLXuPzWnLR(U;+$%mqIg^pf&xp3lwa<{>)RA_&H#i#mC zJos(TtaBp#eZ;=@`bUc8RPk8Oz_*pujk2Z>&I7SRu{A$sBgqAwN_y|Ee5ANP@bV1JSy ze2C-=-zWLQh9sZ(G|4YsM)Hkcll)`49`FuQAJ~f23#RKC)Afw$dd74;W6st-yBe_= zYrJqD3sLC$z4x7HZJ6nq>;1$hnDz~(eS~RWVHM&tO#2SgKEx|trn|$@cB~ryba05pZj^Iwh z6?}_u2GiWZ<%C0+<`UjTIEBv=ZedlzG5nBl4d)QfVFBSD?jan+L4=F=A>kzE5N=`> z!ciRfe1n);m6B&~!{#VT{rCR?41XioU%yTKEBND-Kb{-krbuyFtcg>^-bQBpD~rV$ NfBBC0T)D5Ke*uMZswe;e literal 0 HcmV?d00001 diff --git a/tofu/geom/inputs/TS-V2_backup.npz b/tofu/geom/inputs/TS-V2_backup.npz new file mode 100644 index 0000000000000000000000000000000000000000..c5f86dfe6d47c22d63a9d119147ccff102c4bf17 GIT binary patch literal 3602 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 literal 0 HcmV?d00001 diff --git a/tofu/version.py b/tofu/version.py index 7ac6f1128..8bc17ef2e 100644 --- a/tofu/version.py +++ b/tofu/version.py @@ -1,2 +1,2 @@ # Do not edit, pipeline versioning governed by git tags! -__version__ = '1.4.2-alpha2-20-gb97c0f0' +__version__ = '1.4.2-alpha2-26-g52a3af1' From b8322fe3db134f93470dc1afebe3ec3119a73df2 Mon Sep 17 00:00:00 2001 From: VEZINET Didier Date: Tue, 26 Nov 2019 15:21:51 +0100 Subject: [PATCH 2/3] [Issue281] Added JET default config with only vessel saved as txt --- tofu/geom/inputs/TFG_Ves_ExpJET_V0.txt | 252 +++++++++++++++++++++++++ tofu/geom/utils.py | 4 + tofu/version.py | 2 +- 3 files changed, 257 insertions(+), 1 deletion(-) create mode 100644 tofu/geom/inputs/TFG_Ves_ExpJET_V0.txt diff --git a/tofu/geom/inputs/TFG_Ves_ExpJET_V0.txt b/tofu/geom/inputs/TFG_Ves_ExpJET_V0.txt new file mode 100644 index 000000000..6773d18ab --- /dev/null +++ b/tofu/geom/inputs/TFG_Ves_ExpJET_V0.txt @@ -0,0 +1,252 @@ +# Cls = Ves +# Exp = JET +# Name = V0 +2.480000000000000000e+02 0.000000000000000000e+00 +3.283199999999999896e+00 -1.124400000000000066e+00 +3.311900000000000066e+00 -1.082999999999999963e+00 +3.328400000000000247e+00 -1.063099999999999934e+00 +3.352400000000000269e+00 -1.038000000000000034e+00 +3.373199999999999754e+00 -1.017200000000000104e+00 +3.423300000000000232e+00 -9.590000000000000746e-01 +3.447300000000000253e+00 -9.323000000000000176e-01 +3.494300000000000406e+00 -8.709999999999999964e-01 +3.516800000000000370e+00 -8.427999999999999936e-01 +3.559099999999999930e+00 -7.810000000000000275e-01 +3.580500000000000238e+00 -7.500999999999999890e-01 +3.619300000000000406e+00 -6.860000000000000542e-01 +3.639000000000000234e+00 -6.539000000000000368e-01 +3.673599999999999977e+00 -5.869999999999999662e-01 +3.688000000000000167e+00 -5.608999999999999542e-01 +3.722300000000000164e+00 -4.849999999999999867e-01 +3.734999999999999876e+00 -4.576000000000000068e-01 +3.768199999999999772e+00 -3.709999999999999964e-01 +3.775800000000000267e+00 -3.523999999999999910e-01 +3.802599999999999980e+00 -2.690000000000000169e-01 +3.810800000000000409e+00 -2.446000000000000119e-01 +3.833300000000000374e+00 -1.580000000000000016e-01 +3.839599999999999902e+00 -1.348000000000000032e-01 +3.856500000000000039e+00 -5.000000000000000278e-02 +3.862099999999999866e+00 -2.430000000000000215e-02 +3.875199999999999978e+00 6.800000000000000488e-02 +3.878300000000000303e+00 8.880000000000000393e-02 +3.885699999999999932e+00 1.759999999999999898e-01 +3.887900000000000134e+00 1.963000000000000023e-01 +3.890500000000000291e+00 2.899999999999999800e-01 +3.891399999999999970e+00 3.133999999999999564e-01 +3.888599999999999834e+00 4.070000000000000284e-01 +3.888400000000000301e+00 4.267000000000000237e-01 +3.880300000000000082e+00 5.190000000000000169e-01 +3.878900000000000237e+00 5.396000000000000796e-01 +3.865600000000000147e+00 6.320000000000000062e-01 +3.863500000000000156e+00 6.497000000000000552e-01 +3.844500000000000028e+00 7.429999999999999938e-01 +3.840899999999999981e+00 7.627000000000000446e-01 +3.817199999999999704e+00 8.529999999999999805e-01 +3.813000000000000167e+00 8.705000000000000515e-01 +3.783700000000000063e+00 9.609999999999999654e-01 +3.778999999999999915e+00 9.769999999999999796e-01 +3.744099999999999984e+00 1.066999999999999948e+00 +3.738199999999999967e+00 1.083400000000000141e+00 +3.698700000000000099e+00 1.169999999999999929e+00 +3.691800000000000193e+00 1.186599999999999877e+00 +3.674900000000000055e+00 1.217999999999999972e+00 +3.667400000000000215e+00 1.236400000000000166e+00 +3.637300000000000200e+00 1.332999999999999963e+00 +3.642100000000000115e+00 1.407700000000000173e+00 +3.621399999999999952e+00 1.425999999999999934e+00 +3.620800000000000463e+00 1.427100000000000035e+00 +3.594100000000000072e+00 1.451000000000000068e+00 +3.593500000000000139e+00 1.451900000000000190e+00 +3.566800000000000193e+00 1.475999999999999979e+00 +3.566199999999999815e+00 1.476700000000000124e+00 +3.539499999999999869e+00 1.501000000000000112e+00 +3.538900000000000379e+00 1.501600000000000046e+00 +3.512199999999999989e+00 1.525000000000000133e+00 +3.511600000000000055e+00 1.526400000000000201e+00 +3.484900000000000109e+00 1.550000000000000044e+00 +3.484399999999999942e+00 1.551200000000000134e+00 +3.457699999999999996e+00 1.574999999999999956e+00 +3.457100000000000062e+00 1.576000000000000068e+00 +3.430400000000000116e+00 1.600000000000000089e+00 +3.429800000000000182e+00 1.600800000000000001e+00 +3.403099999999999792e+00 1.625000000000000000e+00 +3.402499999999999858e+00 1.625700000000000145e+00 +3.381800000000000139e+00 1.644000000000000128e+00 +3.331500000000000128e+00 1.704099999999999948e+00 +3.281800000000000050e+00 1.737999999999999989e+00 +3.186300000000000132e+00 1.817500000000000115e+00 +3.136699999999999822e+00 1.852000000000000091e+00 +3.000999999999999890e+00 1.883400000000000185e+00 +2.868800000000000239e+00 1.939000000000000057e+00 +2.852500000000000036e+00 1.945300000000000029e+00 +2.775599999999999845e+00 1.967999999999999972e+00 +2.757600000000000051e+00 1.971999999999999975e+00 +2.679000000000000270e+00 1.981999999999999984e+00 +2.658900000000000041e+00 1.983999999999999986e+00 +2.577900000000000080e+00 1.981999999999999984e+00 +2.560599999999999987e+00 1.981099999999999861e+00 +2.480099999999999749e+00 1.967000000000000082e+00 +2.466000000000000192e+00 1.964200000000000168e+00 +2.388400000000000301e+00 1.937999999999999945e+00 +2.374200000000000088e+00 1.933100000000000041e+00 +2.298099999999999810e+00 1.894000000000000128e+00 +2.287599999999999856e+00 1.888400000000000079e+00 +2.195400000000000240e+00 1.822000000000000064e+00 +2.182400000000000340e+00 1.823700000000000099e+00 +2.165699999999999736e+00 1.790000000000000036e+00 +2.165300000000000225e+00 1.790100000000000025e+00 +2.149000000000000021e+00 1.757000000000000117e+00 +2.148600000000000065e+00 1.757200000000000095e+00 +2.132300000000000306e+00 1.725000000000000089e+00 +2.131900000000000350e+00 1.724299999999999944e+00 +2.115600000000000147e+00 1.691999999999999948e+00 +2.115199999999999747e+00 1.691500000000000004e+00 +2.098899999999999988e+00 1.659000000000000030e+00 +2.098500000000000032e+00 1.658599999999999852e+00 +2.082199999999999829e+00 1.626000000000000112e+00 +2.081800000000000317e+00 1.625700000000000145e+00 +2.068200000000000038e+00 1.598000000000000087e+00 +2.067600000000000104e+00 1.598200000000000065e+00 +2.054699999999999971e+00 1.564000000000000057e+00 +2.054400000000000226e+00 1.563800000000000079e+00 +2.041500000000000092e+00 1.530000000000000027e+00 +2.041199999999999903e+00 1.529299999999999882e+00 +2.028300000000000214e+00 1.495000000000000107e+00 +2.028000000000000025e+00 1.494900000000000118e+00 +2.015099999999999891e+00 1.461000000000000076e+00 +2.014800000000000146e+00 1.460400000000000142e+00 +2.001900000000000013e+00 1.425999999999999934e+00 +2.001599999999999824e+00 1.425999999999999934e+00 +1.988799999999999901e+00 1.392000000000000126e+00 +1.988499999999999934e+00 1.391499999999999959e+00 +1.975600000000000023e+00 1.356999999999999984e+00 +1.975300000000000056e+00 1.357099999999999973e+00 +1.961300000000000043e+00 1.320000000000000062e+00 +1.942500000000000115e+00 1.234599999999999920e+00 +1.927300000000000013e+00 1.157999999999999918e+00 +1.925000000000000044e+00 1.138000000000000123e+00 +1.912400000000000100e+00 1.060000000000000053e+00 +1.909700000000000175e+00 1.040000000000000036e+00 +1.898500000000000076e+00 9.619999999999999662e-01 +1.895700000000000163e+00 9.401000000000000467e-01 +1.885799999999999921e+00 8.619999999999999885e-01 +1.883000000000000007e+00 8.407000000000001139e-01 +1.873099999999999987e+00 7.630000000000000115e-01 +1.870400000000000063e+00 7.417000000000000259e-01 +1.860500000000000043e+00 6.640000000000000346e-01 +1.858400000000000052e+00 6.429000000000000270e-01 +1.849900000000000100e+00 5.650000000000000577e-01 +1.848200000000000065e+00 5.452000000000000179e-01 +1.841800000000000104e+00 4.670000000000000262e-01 +1.840999999999999970e+00 4.461999999999999855e-01 +1.837200000000000166e+00 3.679999999999999938e-01 +1.836999999999999966e+00 3.473999999999999866e-01 +1.835900000000000087e+00 2.700000000000000178e-01 +1.836400000000000032e+00 2.484999999999999987e-01 +1.837900000000000089e+00 1.710000000000000131e-01 +1.839099999999999957e+00 1.496999999999999997e-01 +1.843099999999999961e+00 7.100000000000000755e-02 +1.844999999999999973e+00 5.070000000000000201e-02 +1.851700000000000124e+00 -2.699999999999999969e-02 +1.854200000000000070e+00 -4.779999999999999527e-02 +1.863400000000000167e+00 -1.239999999999999991e-01 +1.866700000000000026e+00 -1.454999999999999905e-01 +1.878500000000000059e+00 -2.230000000000000038e-01 +1.882300000000000084e+00 -2.431999999999999995e-01 +1.896700000000000053e+00 -3.200000000000000067e-01 +1.901299999999999990e+00 -3.402000000000000024e-01 +1.918200000000000127e+00 -4.160000000000000364e-01 +1.923400000000000221e+00 -4.366000000000000436e-01 +1.942800000000000082e+00 -5.120000000000000107e-01 +1.948700000000000099e+00 -5.319000000000000394e-01 +1.970599999999999907e+00 -6.059999999999999831e-01 +2.009100000000000108e+00 -7.840000000000000302e-01 +2.020399999999999974e+00 -8.110000000000000542e-01 +2.020700000000000163e+00 -8.120000000000000551e-01 +2.034499999999999975e+00 -8.449999999999999734e-01 +2.034800000000000164e+00 -8.461000000000000743e-01 +2.048699999999999743e+00 -8.790000000000000036e-01 +2.048999999999999932e+00 -8.802000000000000934e-01 +2.062800000000000189e+00 -9.130000000000000338e-01 +2.063099999999999934e+00 -9.143000000000000016e-01 +2.076900000000000190e+00 -9.470000000000000639e-01 +2.077199999999999935e+00 -9.482999999999999208e-01 +2.091000000000000192e+00 -9.809999999999999831e-01 +2.091300000000000381e+00 -9.824000000000000510e-01 +2.105099999999999749e+00 -1.015000000000000124e+00 +2.105500000000000149e+00 -1.016700000000000159e+00 +2.119300000000000406e+00 -1.050000000000000044e+00 +2.119600000000000151e+00 -1.050699999999999967e+00 +2.133399999999999963e+00 -1.084000000000000075e+00 +2.133699999999999708e+00 -1.084799999999999986e+00 +2.147499999999999964e+00 -1.118000000000000105e+00 +2.147800000000000153e+00 -1.118900000000000006e+00 +2.161599999999999966e+00 -1.152000000000000135e+00 +2.161900000000000155e+00 -1.153000000000000025e+00 +2.175800000000000178e+00 -1.185999999999999943e+00 +2.176099999999999923e+00 -1.187000000000000055e+00 +2.189900000000000180e+00 -1.219999999999999973e+00 +2.190199999999999925e+00 -1.221099999999999852e+00 +2.201500000000000234e+00 -1.247999999999999998e+00 +2.144600000000000062e+00 -1.274900000000000144e+00 +2.293600000000000083e+00 -1.314000000000000057e+00 +2.293600000000000083e+00 -1.330999999999999961e+00 +2.295400000000000329e+00 -1.334400000000000031e+00 +2.359900000000000109e+00 -1.334000000000000075e+00 +2.359900000000000109e+00 -1.334400000000000031e+00 +2.396199999999999886e+00 -1.372999999999999998e+00 +2.409199999999999786e+00 -1.400299999999999878e+00 +2.412199999999999900e+00 -1.421999999999999931e+00 +2.412900000000000045e+00 -1.431499999999999995e+00 +2.412900000000000045e+00 -1.467999999999999972e+00 +2.412199999999999900e+00 -1.476799999999999891e+00 +2.407599999999999962e+00 -1.504000000000000004e+00 +2.398000000000000131e+00 -1.516400000000000192e+00 +2.419200000000000017e+00 -1.592000000000000082e+00 +2.421199999999999797e+00 -1.610200000000000076e+00 +2.418800000000000061e+00 -1.642000000000000126e+00 +2.416300000000000114e+00 -1.656099999999999905e+00 +2.405699999999999950e+00 -1.689000000000000057e+00 +2.314999999999999947e+00 -1.738700000000000134e+00 +2.353499999999999925e+00 -1.737999999999999989e+00 +2.374300000000000299e+00 -1.735000000000000098e+00 +2.427400000000000002e+00 -1.713000000000000078e+00 +2.446199999999999708e+00 -1.709799999999999986e+00 +2.523699999999999832e+00 -1.709000000000000075e+00 +2.524599999999999955e+00 -1.699999999999999956e+00 +2.559099999999999930e+00 -1.655000000000000027e+00 +2.552999999999999936e+00 -1.638000000000000123e+00 +2.573900000000000077e+00 -1.600999999999999979e+00 +2.573900000000000077e+00 -1.601799999999999891e+00 +2.633000000000000007e+00 -1.616999999999999993e+00 +2.633699999999999708e+00 -1.619900000000000118e+00 +2.693800000000000416e+00 -1.635000000000000009e+00 +2.694300000000000139e+00 -1.638200000000000101e+00 +2.754399999999999959e+00 -1.654000000000000137e+00 +2.755199999999999871e+00 -1.656599999999999850e+00 +2.814699999999999758e+00 -1.671999999999999931e+00 +2.814699999999999758e+00 -1.707000000000000073e+00 +2.804199999999999804e+00 -1.711600000000000010e+00 +2.857000000000000206e+00 -1.711000000000000076e+00 +2.878500000000000281e+00 -1.715999999999999970e+00 +2.936400000000000343e+00 -1.741000000000000103e+00 +2.957300000000000040e+00 -1.745999999999999996e+00 +2.987000000000000099e+00 -1.745999999999999996e+00 +2.897699999999999942e+00 -1.682299999999999907e+00 +2.882000000000000117e+00 -1.622000000000000108e+00 +2.881600000000000161e+00 -1.591599999999999904e+00 +2.900400000000000311e+00 -1.510000000000000009e+00 +2.890499999999999847e+00 -1.498400000000000176e+00 +2.887900000000000134e+00 -1.489000000000000101e+00 +2.885900000000000354e+00 -1.473999999999999977e+00 +2.885900000000000354e+00 -1.435000000000000053e+00 +2.889499999999999957e+00 -1.417100000000000026e+00 +2.900800000000000267e+00 -1.392000000000000126e+00 +2.913300000000000445e+00 -1.376200000000000090e+00 +2.963500000000000245e+00 -1.334000000000000075e+00 +2.963500000000000245e+00 -1.334799999999999986e+00 +3.009800000000000253e+00 -1.334000000000000075e+00 +3.060099999999999820e+00 -1.297800000000000065e+00 +3.193999999999999950e+00 -1.213999999999999968e+00 +3.202199999999999935e+00 -1.208900000000000086e+00 +3.306300000000000239e+00 -1.207999999999999963e+00 diff --git a/tofu/geom/utils.py b/tofu/geom/utils.py index 943f9485f..e1bea4af6 100644 --- a/tofu/geom/utils.py +++ b/tofu/geom/utils.py @@ -640,6 +640,7 @@ def _compute_CamLOS2D_pinhole(P=None, F=0.1, D12=0.1, N12=100, ########################################################### _ExpWest = 'WEST' +_ExpJET = 'JET' _ExpITER = 'ITER' # Dictionnary of unique config names @@ -664,6 +665,8 @@ def _compute_CamLOS2D_pinhole(P=None, F=0.1, D12=0.1, N12=100, 'IC1V1', 'IC2V1', 'IC3V1', 'LH1V1', 'LH2V1', 'RippleV1', 'VDEV0']}, + 'JET-V0': {'Exp': _ExpJET, + 'Ves': ['V0']}, 'ITER-V2': {'Exp': _ExpITER, 'Ves': ['V1'], 'PFC': ['BLK01', 'BLK02', 'BLK03', 'BLK04', 'BLK05', @@ -678,6 +681,7 @@ def _compute_CamLOS2D_pinhole(P=None, F=0.1, D12=0.1, N12=100, # retro-compatibility), this table stores the available names for each unique # config in _DCONFIG _DCONFIG_TABLE = {'ITER': 'ITER-V2', + 'JET': 'JET-V0', 'WEST': 'WEST-V4', 'A1': 'WEST-V1', 'A2': 'ITER-V1', diff --git a/tofu/version.py b/tofu/version.py index 8bc17ef2e..56bfa3520 100644 --- a/tofu/version.py +++ b/tofu/version.py @@ -1,2 +1,2 @@ # Do not edit, pipeline versioning governed by git tags! -__version__ = '1.4.2-alpha2-26-g52a3af1' +__version__ = '1.4.2-alpha2-27-g8fe3bb9' From 0ce1000f808f3a2e8b59821cd14a2d566a98820d Mon Sep 17 00:00:00 2001 From: VEZINET Didier Date: Tue, 26 Nov 2019 15:22:39 +0100 Subject: [PATCH 3/3] [Issue281] Removed JET backup npz --- tofu/geom/inputs/JET-V0_backup.npz | Bin 4418 -> 0 bytes tofu/version.py | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 tofu/geom/inputs/JET-V0_backup.npz diff --git a/tofu/geom/inputs/JET-V0_backup.npz b/tofu/geom/inputs/JET-V0_backup.npz deleted file mode 100644 index 0b9c766f05b92a99cbbacd99e3c45de8fe1d0514..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4418 zcmd5=d0bW17C!f0xL3FXN;uD^q9K;%lxb_3sU@N$reK4jVmM-uK4+!0(#$bYOO$dp zGeRX(V=F4oDT!j5DTtvU2p8|nxwkzP@Adn=f8Jm3@PoxU_ndw9Uh7-m_w5@Mq4Nt- z#L-$AzxjXx>nIBQ^`{qycb-0D&bpy*L`KDGlv&EW&eV01>nwfFfcb~_9GTw|$pS|5ypJK*> zZjXBnIAg}bxgq-p6`JwcAv*&HwzHtKIPRXEl1lixzaH zzk8sx+KkqImnU8;G2_w0pXn=8&A7>F;c``Cm%m-QQaKgxvn zKiqO@?=TbcvNbYcTD=`VooHynJ==%kQ-wxkt2N&>;um$AZh2>q5eMmJ8{6(SVst7? zgb|fB3+W7vXk-O=!H9=jEG>Jzml6F+R&*#g8}W&nKl|a%K$I$w&e=~ z@LI{_FnhxQ?EcP?*G$?v7}cV|G7jpta5rhyYXo1>L5M#xijpu4b%Pc z<~|C%0sg4@T^q1`s~_^R%=g2fxjnvlsX&Jn^MMYjlXcQz9}ZY8(rn-d9)yt@Oef3g3QXy)Zeka_PAdUZCKnBY9!Oy&Yek zYUPE^&wqWer&EOt9V@g7&S>_53Ynd!Z_^x8<#;OWqVVs%R)q;{nzL272Ip{xI+xfk-o;u{ymctP-l7jnIs^Q;+O z_{l#wgq}dcfzsqd^?fjl!9CmuqECF#h_=_ZU%1;aDb9`72c2wobb zAVtsBW8)PR>rrs;2d}@Dwpc;>^xEDj3SM0FDp`=G;7l#+Bt_y>!HvGv3q3~^iC+b+ zztDo;P$VBJ7;@#6889Qq*=6u&v-_yu%8?3>(EZq?r z6#3I2Tm7yC4Mx_dBP`J%Z~vtl!Lyq+qMtixZ~%SF;8^Y75gz_4aOF9&F*5bzve*M{TRf{v*Zt$)4YViQATGSMs$io^Pa$0@P4>`QM z`bk~!Lw(Bn{+~|u!%nR18*1a;Dwbe>nMZ#t{oy-`V1L0^pZOz0k2XM$Y*jl0^+-h` zF=a_@?Ka>L-iQX|u
fk%2DWuGNx z12*6VHQ)eG=r$KF`AP&!LZjd@>z_pBShZ=AarFA$|8@bMg)Ikp8d3BJA z3T4ayiMIg3ugQTJ^&b{vUvyT{zgvva{|^>}ON3fQc8$Jma-l9G>+598<6TtL^T>;=g2OHoLCvR#khT-# zi%sm+sg9Uw|P#+ma7L z3vYrL{}zb#-i6}}np2S|1o6IN2&IBD>U=S93d${!RQUiHBjrYvfq-TiP`wQP@OT9< z1GT>YW8exJTm?hU8v1_uMip?WK5PYH*{qO}#JoZ^SjS&{JK}6Li2U0ifeKXRQoEEE zJBWPSLFB^$oWgoLfI~ISA*tB`Q;xk)N!SVXxYjx0-HGgQLMn5BQ=L+JoFJ^D6Q1XX zOOERTkxv)2QSCGDZgzq2#cpWCd(;gNJbP#}yFpk|576XNvhYZWQz4PA{`^-e2+Qe( zbm}zQ>V1&JwbCco>jTj$K45nb$nt@xd+j-MhU+tZFp#1tf3^=EGG?6SV?s|W>Vvi1 z19;_pybw;EZ&42~aO=}vm6D>uc8acoZ8cE8IU~6m5LUMaxHL4ck?ZvUhfAtQ*2@Ee zvOLg^bDA53m2}Je*5>0hb)E@pTvBpfa=k9dKEXVq3+6HBJl6@_G0b+tBc`Nf4w$!t zd3A@Bd@r_AV8XmV%LXkuXWM`~qT|&P?^fVc)!hnq ziuN2^rOZPmi2kbphn|_I3gAwEeHqky$T+za^4c)7Kyl42MG0^#OS^?j^4elq=OXA% zcLsx!3ZWrYis*Z{fjg{~zsb550QF&1HLt^~eD9DaadKJSe;T;8?RXMCXO1B}6P7YX zvh4vr+>S3v);MP7c1u1Wgww*-93tv*k(^%Dg}Ri>MC3Q0L@;M{`WoR|h^;qCQ|5fD zZjl-W*Kv1=s7E0YR^c8Q%xIy(L&;AMNh%et63;`)M`a{uH}m3UL|Cs!gl}!0c_jI$ zoHR}@2)6bsC!!xJ2%m0Dg&hAeS;d@T;$!j>C%8%?_@t5u>qmK%IjGB(gjn04P;}*H)JUm43j)zFzASW3e=XfM?Q)&ZX$Tk zCFkRkI^-gvuUw=fgM9}#iC_+{hnv*n1mh-b1DcrPmg{qq=A4K;WE!8ShX@PqA;L0y zh~RY(VIWO=TpL-I4wSkjeq1EQk0J7}_c}=>YY&%$Oem=b!xyp-4h}#Ry9dsJDgF~Qm?B?RD?zwqWkaPW5_Q!l*JnMAOBY4 hpO5_0m()Hoo_-m^T}o7hzn)#z(w~Vm=GJ9re*#Ji&;kGe diff --git a/tofu/version.py b/tofu/version.py index 56bfa3520..d300cef4c 100644 --- a/tofu/version.py +++ b/tofu/version.py @@ -1,2 +1,2 @@ # Do not edit, pipeline versioning governed by git tags! -__version__ = '1.4.2-alpha2-27-g8fe3bb9' +__version__ = '1.4.2-alpha2-28-gb8322fe'