From 93dcf7a5f61cb7bb4505cacecf5eb9f35f4d1d7f Mon Sep 17 00:00:00 2001 From: YOANN AUDOUIN Date: Wed, 28 Mar 2018 16:21:28 +0200 Subject: [PATCH] Nettoyage des menus Suppression de la partie mascaret. Renommage de pytel en run_study. telemac2d en param_study. Pour param_study utilisation du catalogue en local. Ajout des bouttons/menu pour Liquid boundaries, breaches et generate interpolks.py Changement des icones en passant aussi. --- resources/CMakeLists.txt | 21 +- resources/create_case2d.png | Bin 762 -> 0 bytes resources/create_param_study.png | Bin 0 -> 470 bytes ...create_case_pytel.png => create_study.png} | Bin resources/create_telma_cas.png | Bin 0 -> 509 bytes resources/edit_breaches_file.png | Bin 0 -> 7696 bytes .../edit_liquid_boundary_conditions_file.png | Bin 0 -> 7696 bytes resources/english.png | Bin 1098 -> 0 bytes resources/francais.png | Bin 253 -> 0 bytes resources/generate_interpolks_py.png | Bin 0 -> 7696 bytes resources/param_study_file.png | Bin 0 -> 470 bytes resources/{case_pytel.png => study_file.png} | Bin resources/telma_file.png | Bin 0 -> 509 bytes src/HYDROGUI/HYDROSOLVERGUI.py | 465 +++++++++--------- src/salome_hydro/CMakeLists.txt | 6 +- src/salome_hydro/mascaret/__init__.py | 16 - .../mascaret/eficas/mascaret_V7_cata.py | 107 ---- .../{mascaret => param_study}/CMakeLists.txt | 8 +- .../eficas => param_study}/__init__.py | 0 .../eficas/CMakeLists.txt | 3 +- .../{pytel => param_study/eficas}/__init__.py | 0 .../eficas/appli.py | 23 +- .../eficas/configuration_telemac2d.py} | 4 +- .../eficas/param_study_cata.py} | 1 + .../eficas/prefs.py | 0 .../eficas/prefs_telemac2d.py | 0 .../{pytel => run_study}/CMakeLists.txt | 4 +- .../{pytel/eficas => run_study}/__init__.py | 0 .../eficas/CMakeLists.txt | 10 +- .../eficas}/__init__.py | 0 .../{pytel => run_study}/eficas/appli.py | 24 +- .../eficas/configuration_run_study.py} | 2 +- .../{mascaret => run_study}/eficas/prefs.py | 2 +- .../eficas/prefs_run_study.py} | 0 .../eficas/run_study_cata.py} | 14 +- .../{pytel => run_study}/genjob.py | 8 +- .../{pytel => run_study}/genjobwindow.py | 14 +- .../{pytel => run_study}/genjobwindow.ui | 0 src/salome_hydro/{pytel => run_study}/gui.py | 26 +- .../{pytel => run_study}/launcher.py | 6 +- src/salome_hydro/study.py | 103 ++-- .../{telemac2d => telma}/CMakeLists.txt | 2 +- .../{telemac2d/eficas => telma}/__init__.py | 0 .../{pytel => telma}/eficas/CMakeLists.txt | 7 +- src/salome_hydro/telma/eficas/__init__.py | 0 .../{mascaret => telma}/eficas/appli.py | 33 +- .../eficas/configuration_telma.py} | 2 - .../{pytel => telma}/eficas/prefs.py | 2 +- .../eficas/prefs_telma.py} | 0 49 files changed, 394 insertions(+), 519 deletions(-) delete mode 100644 resources/create_case2d.png create mode 100644 resources/create_param_study.png rename resources/{create_case_pytel.png => create_study.png} (100%) create mode 100644 resources/create_telma_cas.png create mode 100644 resources/edit_breaches_file.png create mode 100644 resources/edit_liquid_boundary_conditions_file.png delete mode 100644 resources/english.png delete mode 100644 resources/francais.png create mode 100644 resources/generate_interpolks_py.png create mode 100644 resources/param_study_file.png rename resources/{case_pytel.png => study_file.png} (100%) create mode 100644 resources/telma_file.png delete mode 100644 src/salome_hydro/mascaret/__init__.py delete mode 100644 src/salome_hydro/mascaret/eficas/mascaret_V7_cata.py rename src/salome_hydro/{mascaret => param_study}/CMakeLists.txt (87%) rename src/salome_hydro/{mascaret/eficas => param_study}/__init__.py (100%) rename src/salome_hydro/{telemac2d => param_study}/eficas/CMakeLists.txt (94%) rename src/salome_hydro/{pytel => param_study/eficas}/__init__.py (100%) rename src/salome_hydro/{telemac2d => param_study}/eficas/appli.py (81%) rename src/salome_hydro/{mascaret/eficas/configuration_mascaret.py => param_study/eficas/configuration_telemac2d.py} (93%) rename src/salome_hydro/{telemac2d/eficas/telemac2d_V6_cata.py => param_study/eficas/param_study_cata.py} (99%) rename src/salome_hydro/{telemac2d => param_study}/eficas/prefs.py (100%) rename src/salome_hydro/{telemac2d => param_study}/eficas/prefs_telemac2d.py (100%) rename src/salome_hydro/{pytel => run_study}/CMakeLists.txt (95%) rename src/salome_hydro/{pytel/eficas => run_study}/__init__.py (100%) rename src/salome_hydro/{mascaret => run_study}/eficas/CMakeLists.txt (90%) rename src/salome_hydro/{telemac2d => run_study/eficas}/__init__.py (100%) rename src/salome_hydro/{pytel => run_study}/eficas/appli.py (77%) rename src/salome_hydro/{pytel/eficas/configuration_pytel.py => run_study/eficas/configuration_run_study.py} (93%) rename src/salome_hydro/{mascaret => run_study}/eficas/prefs.py (97%) rename src/salome_hydro/{mascaret/eficas/prefs_mascaret.py => run_study/eficas/prefs_run_study.py} (100%) rename src/salome_hydro/{pytel/eficas/pytel_cata.py => run_study/eficas/run_study_cata.py} (79%) rename src/salome_hydro/{pytel => run_study}/genjob.py (92%) rename src/salome_hydro/{pytel => run_study}/genjobwindow.py (87%) rename src/salome_hydro/{pytel => run_study}/genjobwindow.ui (100%) rename src/salome_hydro/{pytel => run_study}/gui.py (72%) rename src/salome_hydro/{pytel => run_study}/launcher.py (94%) rename src/salome_hydro/{telemac2d => telma}/CMakeLists.txt (93%) mode change 100644 => 100755 rename src/salome_hydro/{telemac2d/eficas => telma}/__init__.py (100%) mode change 100644 => 100755 rename src/salome_hydro/{pytel => telma}/eficas/CMakeLists.txt (91%) create mode 100755 src/salome_hydro/telma/eficas/__init__.py rename src/salome_hydro/{mascaret => telma}/eficas/appli.py (70%) mode change 100644 => 100755 rename src/salome_hydro/{telemac2d/eficas/configuration_telemac2d.py => telma/eficas/configuration_telma.py} (89%) mode change 100644 => 100755 rename src/salome_hydro/{pytel => telma}/eficas/prefs.py (97%) mode change 100644 => 100755 rename src/salome_hydro/{pytel/eficas/prefs_pytel.py => telma/eficas/prefs_telma.py} (100%) mode change 100644 => 100755 diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt index 0ca50f5..3acdb95 100644 --- a/resources/CMakeLists.txt +++ b/resources/CMakeLists.txt @@ -16,24 +16,29 @@ # along with SALOME HYDRO module. If not, see . SET(HYDROSOLVER_RESOURCES_FILES - HYDROSOLVERCatalog.xml - icon_variables.png HYDRO.png + HYDROSOLVERCatalog.xml HYDRO_small.png + SalomeApp.xml.in case1d.png case2d.png case_couplage.png create_case1d.png - create_case2d.png create_case_couplage.png - log.png - create_case_pytel.png - case_pytel.png + create_study.png + create_param_study.png + create_telma_cas.png define_boundary_conditions.png edit_boundary_conditions_file.png + edit_breaches_file.png + edit_liquid_boundary_conditions_file.png + generate_interpolks_py.png generate_interpolz_py.png - english.png - francais.png + icon_variables.png + log.png + study_file.png + telma_file.png + param_study_file.png ) INSTALL(FILES ${HYDROSOLVER_RESOURCES_FILES} DESTINATION ${SALOME_HYDROSOLVER_INSTALL_RES_DATA}) diff --git a/resources/create_case2d.png b/resources/create_case2d.png deleted file mode 100644 index 76df23a5386307259e52c4c85702e76bed3b5769..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 762 zcmV0oZk~Wtpciui5`InMCk@K;(CZRbscJP!@a!<)Wrc35!=9PQe z*<=GqxVTEWR4oWI>of3hF-fonPA#3a4Iv5U~UeMV2boaXjfg zRBOqC{6=h;_Kmz4HA{P}Uvu8FGIU=srXEArG_dy8n3M(iF@%qH(a@N;q1L*3L$$Z~ zMiS%g=G}Md{R}>9@GftmU@lS*g}D3GzMj(zo@eFI)}$aOT87k#agUXhwg#L=5yP5l1^L`T{T79Ae1d7 z66VuEbiWbd2t|L3_MjQ+Rn@UzF^YM)Ri>{$;yn+ke^~tdmRTeLp~K?=GpZ_iW?-p0 z7M#U*{>QICs7+~WmRkgcv#sX6Zgm(d@c^XFTMW|xQq;3;y+d`4n~~3-AD> zv4plJtEtYa-(l^qCV13qW6DD!iDV$z6-Q!a9soTXoIlbWjVw-2@Z=ZFKIefH76B#* sFSOO{zWj9H!KH;e22>W%;l=;dAMZx{NusyDumAu607*qoM6N<$f+Xrw1poj5 diff --git a/resources/create_param_study.png b/resources/create_param_study.png new file mode 100644 index 0000000000000000000000000000000000000000..502dd922323c0216d207ec457b7eaa5b7f980756 GIT binary patch literal 470 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 literal 0 HcmV?d00001 diff --git a/resources/edit_liquid_boundary_conditions_file.png b/resources/edit_liquid_boundary_conditions_file.png new file mode 100644 index 0000000000000000000000000000000000000000..332cee480152ce4f3d20e1f63aa0d94fcdf3df45 GIT binary patch literal 7696 zcmbt(c|4Ts|Mzu|u}qPP7E5KEj;uvl(!vaN>X1;@B9xGwB9z=CNs`nlM+^-)2xUoG zQf5k)Qw<7H$e<>PEMuE7Gxu{%-`DqfJiaX>~2{>?^r@!_9x#2>B^4xzpgQO8gF0E?5MCwxd&!N>i44*MKG8591m z&u#$LKeF0u;TZjCe1LJz!759d-54Q#D|MH{IsY316VY#{he@@ZtNmhsDErz{$|b4+~D{2AG7Urk>A>sruRkCyxM&HjbjP)f5>rh z=pv87zgH*U{aa#!l8m{>G6hSV46u*ArIu6^9xxNtNk8B}RliJTQvcveOB2@z=~8&0 z^yzBD!PJK5j~{(IXPy+l;D3U+=Y{1F3ZSmbx z;g`dW+h4YOA2zVNb+JwxkpUH@t3}5H78O^olz}I=sfu0{Tt-hNdfJd`|BPq9p4kYl%h2Pn=Xnf%k zf(Kf)-__g$_{~c}Z+vi&-%}%L`NEcBUSsg9VrCx^?`s_oK#Ykn-1}9#=vBS+2^rJv zt09fuD%kJF7fLTY-DYROw$z4>_^ZOn~dT{;(Bd^MB%sCnTJWh;7fC8zx;MXyH0ANc=(tT8b$8+$d-C$ z4~=*E(HOegBdG-0wXz7b6hcFMX&6gm4Q?VE$WZ{ZM6Gwoh}~*+5zcoAG>0ZqoyZZ* zh@}jeZ5XR*RO1^4W~)*GrG-WQ+@rQ%^e})@9z@&=a;rF#M&#C%1JHZMpG^0SO2^O= ziD3_9;qVbpmDgzS>Hv~9zMKNQ*0Rt~LAJAoGfBr?O=xbC6L6B<%p#k_)eDYC593K8 zE1uae!-KNU#gPE==RWcwIi<(mG>Mg=xd5O>SnU|S1TO={?RvL3F)OW3k%4xo;4uQT z$E7W)L=wp5NmxQ{W|2vF`zs8scuqM_!ZXgyi1zJ*7mmu2cWgawA-QBlFhZ%N4O{l* zzk3nzgfCxUfKa&7V+ksi+p{|{64-yGu(llK*arRz13zO-2NzNVfnU@nGLaVv8EC}@{|}BS#((B z7M2sVK)8_k)G6LA!myGe;HdzCM@K=RI5yNcZu?rBYs$r7^LycbX1ki}?; z!d+0_{?l|DlAFO%D_=rSxi3ibzkZ-7f}QhFlGBS@PCHfrN>nKpJutYHL0NHviCo;C|Z{muIV1mkZ5pu-)@FJEEPbfZ4`~ z7?^RXi3ykrmt?%1-WkYO4(|Mi9e1wA@R{w}A-~x_mGR&#_bdNi<(um2%W5w3T=mcr zYgK1We`|JG`qN&b7O2SAKU6Pzv!g-Ab`~6qs$SrA*BlcO( z>`LDG4!ca>%I`gAuYM{pnEI!(uHt0Nkl*=2Xyoln_hxhHGkT3bcAKE`hj`u&L!DDu zCiAkZ7OFPHHBV|M04B@XiorXq*Zk~b|8K@FS9Q_PMcT60oL;R0NG?bJmCN_#D^nTO zbm8I|%$=xZnSFY|aN>1~o%IdjTK4bHa*AK&HucSmjAN&B%A89JP6z3C1#VSI^++O% zsy>dRywVa`XTi8g+1vqv#@j4GO+_0$rn8mK{~V7}_fWaAqYH2D3hKpcv zxqjTc9S-O342OukN7|kXJZugViPw_;^#BNUv-2)nfhwm2tF7+io#U^Md1tyR@Jj#6 z8w5Lvw>^d|G>pUYy>*K-7(bhvDb1p*MeG$d`#()40G9`%f%)xvetGIST6;nn`twq< zTNs-+K!;`ac%IrYw@a_gpEG^l@Sp`HY=cxg486tS13}r&*q6|phF8~exjbRAs>C1x zNnl&Wn^j4Z$R@`AqJDe+?qMlI`T^03&Wq9rb@q*c6M;o{OQhP-(})H#4U>5AKxB-b zRmHvERFxTUaw1t_7P|E_XRJ*4t-ZNmNEj0H_rA~9`*#N7yyonFUN^=pY$dKA#MvMQ zNNZ%`a04dDDNOJ)Ab2grg$Gp=C=c)Yi;mFzMNKxi@qyOPJOvr>oTklbxroye%yWPP1k1q1wmORa24K4@%H@ls}=qG z#`MmEE!#g?zRjU}W*VFSGhvzZ%D9FZ9u?{$g9nmQcfoRvP;&%Ep?59Jos;$4|LGiL zpZCzUC?CvJbRq)lp`?#v^y3E+UzTsamaxK00bCuLXY78Pz1U*xt`!eRzzb(DRTCY) z-b7-)B?sV`Q+2|2c*L592;bfTGSD_|LWjIMXjvG+k)DJHBIO4))*bTuam!(rbQOBz z>@_oNC8-vgy^9jNoe8DrW$pEAC*lv8T}af42W)AjQdF!AB9QXAhj+$gKcCkaZ5q5y z0ZNbRtvhsE>K-lMg3LDJoxqgD+tjx?yms5C3~dD*#gh@+!pSav0JGXXAQgpanx?|*F`4+5!~?LdKR;8BZ}~4{9(QmdCU8u%@qfJinSIP zf{Z6klUKdu0z5TOMb~1X^zp2WORnsuVjPsBGqlzb>ayDS&_&y(AEFSUH+f*NK>-h1 z|7M|3^3~f!(y#!&ea|67qeO)qtK`G+*q0CKA+VM-?0G)u5BI+9A36H{Hwi5Z{h;yH zfNfo#4ql%OO#@)iTVS`=9Y+Dw>@3E4?E94iP_s8~)>u>aiwf~D(b&7Dw>cf3{E*jX z=)=V4x*pIV0=Ap`(taok5zMT^YrXJz?t|N ze|UXDyQH7G7W(E;?FNopknywuEaJO8R7~ylI)(8++wO09nAHfnfGsrMwgXDB7mt~2 zkr;npr_hmCtT4MUSB%F|3!A>Keqp0LdSjXaJu0kJoB3dC+b0-kqc(lj;oL!2jdLTi z0Aa48lCyP?^)N$h0vh%C_?(BEhIb4zjN23$#YbF)YPu5Zg$=eZ`*x*|RxatU;ol-q zwvyil>bjPqQX_Q=vjOmB6n}O0Tlx7^7i?@_Mk$tTJsVI4XOpj0mTTJD+TKP=u@XUv zc*cQxC#c==MBulxqRyc)G+-_iXTO}L$LIZ(tcsA0Lbmd6Mvo1e`Q$bZ9#D;3s#(EU zU}z-}D8&xc+Ix}O?3S)8Tg-X{4@HvTsSGlm)c<6nG-n5wzQP5Yeunw!+)P}6$)Jmf z8}^`PTE`yCY7Rytexxg$Y?SE2Qv?z7bC+s|deTIr z6}%QgpK5w*n;UehOVo3gOm}XPbR}=sl%{_80)s$liF3Xfw1*OORsLmwM#$l;HH$70 zEV{WfHvJUatMMqGM*~x-BqHskf0Ru2DbZ|)!28D80kYjU>khLhME2X8!2Y0+BPugv zKFS{Ze{zeG2IUUjA9$7Ozc7)EPx9AzTuQ0BB1t} z#MSVR2sZ)u^7#)lm;Dw?-!3@n*i7zBC7n(crTD{QN*^*Rw)39 z08#i?G*`tLyCXgubLLBE;Wz?Lhl-N2Ft5#xZ_32v1Gi)TRdt+pgY_}L*Zv}`VZI(> zxEUWs(hYBJ)Z@vDrduN0+b{5d!Yxlx#PERnP!;X}vX+MB1;}Qd7fHX=0Hh4gWCUX< zB_CZ7&;SVP7UcYNS&@$-!0QKRas#$aNhp6Ufl6)2!uE3Y_pKAwe{F{iW)kd0YFik; zuMn&RAg)(HPprw%IdrY6LomSA2OzeFSKq?WOPM;i3dcOE4c{DU9JjET;g^$zS&E0H zF#8GKoLP4cvw@%!uA*@D-$?jcc0Fq_IPPn*11A02Ahrzw^X~*jS?EpkV+$_Of&O!H zd9cVtNPy`yKor8&%{YkS0MjLve4XzZAZpqv$HEdJXak-mXbmqta7`9tzX0AtpaG(h zsrh|e{l7H@tH=E`KuE7(fa6kK`>|b7WCMT^_BxAU2!otTHpcu%Oc;OF4cGx_Cu0;3 za_2c}q1^L@3Rz?vu(#tzG1E9OpF4IfuAj>1K^w0&L8S$!L^99;ey!a8Bxp(P6dH-o zmT)Gi^qI|#KmO$I7r*D6>5x3~U&0&?IoPCz?=SjA`4BW*xtQ`P(W;YcJT%3VxjdIH z!JZMaGi*aC+#Z1ipjy+gl&N`l4I>mb+jlvW$#GwItze;rux+Hm1`Ik{7C8&%@?4%_ z#PobabQ$Ij+j8iozxMt=n+mQTBwrV1Si{EtlxWTf{l*vjD}y7C16}@8g zNqiEVMUSxt-!+I2duBjO+ucUQLi`wtAVZHR<&X)Xla7{LX#|YNV=SRd;MUzC7^)WC!y71Np_wN-8AUvA9Ec5^o4n09O=ENliO?xv$38Ss zV7*E+WOmmF=xESQFsqTX422y7P<^m%O>68+YQB!L)aKcK8q}cY?*u6$R5cqwoh%cL z7{kn*C)UKA5!U#aUnCoTYw*x1(U}4Y0A(=3zF=i7LhB zcCX>}Ep8u&A%|XNYk7@+hHb+QP8N9+U>F0=(``@p3TqSd2}-f2wJmCj zfH~&Lh18j2496c`0{z<;|JorV^FYKqBbIFwpmsxZ`aF_`nE#z%D+2#Y6=`v?_uCI^ z-%mCJ6`l?ntqr_g1M-T%tEd$969tNHY(5XX&=tl|wKgEPfk1H=raArBw6~__ZK30} zrXK(mYIe6_8?OlN2hPEc7b}C|aR**Btw<;79$=~A!RSj!d|wcMe-=5Gr2%@?H8Gza z!TQPNn?MI)1d_*t`!@!#7}Ixxp(S@5b$#U$S+yl^q5U>Qin+SYm=HDboyxGddv$4o`(w=X0uw=u3leeo*9fJcSU{t(SA*92#4_?}`; zA*Nni3PY3v5#!r2NUwF@PTU<~6<7TDI$mLXpuY_+lj_x}@HtQeAixHUJz7zUWx@^x z)YX;Z&liY&_=t+`3lC)sJ~{d-(|M(`P$$CLCYLEe4Z;jsNH5kkS zI7;F*%mRRtAEJ~dcX+!8#_owZaBQ7}oB~BC3%L4?5B;8!DD)(V*S+Upwy;-M1r~s6 z;i?l)fS4Adzm%g})}%ZU%i$`NfE#K((*e9x#4kLc0XP|U<_EDb8-eV*);aGJr;W=s z=bSFOoxvb&15=aoO!2O)wE;3XaLPmQ=WcMS7>doTc#0Lqe3TA5b4IK#qe^}+fIDPA zKu~iRa&z$7gq}Mlrq~}0n``gAL4t?=HW?z>g$}5$b}+O6`p=PEK|Ei zQ4!`)rEk_1>CquCZIpA-sN3LdesEvZQ1Cs4L1Q<)H7&1UhhzVjgNFS^0|Yq02zmiK z=&+4P@>l|>cR{3JoI1UTOzH8hc6 z9ea9}GuCDWc`qR#?JxV@ynYk5G7Gy&mugLe(WqJ4Jx1Q2|IXAm-ugg=Y&lAZTvQ{= zLC-d}#d##w`1_y}(F52`L$Q(6bIXYAr(#?9sIyItuuQvkGrsa5;^dQ~&)28!+ZthK zghF&OM#I0-raarl&dp_f*lCPimz0s^u4LdhNx03?mBgOVZ!WX0kYv!d=xJCs+fHLOUUe%oQNqGAO7_)C%&lfV9$xz^N(~#a!?Tu+bKBy5qFIeUE>y+bNb5F- z0&F_YCM8mpq<$8CXMT~wicaLG$%%TVuGUO7?c)8d10kM4f7sN)ycg|Gu<-vcepJ<` z`FI1p;Jyv7YG$9(K9e!OKG#brgLaaI=5<$0{5rPK5%fN3-B9sr#f~mA+RY zj4Ucg9}lDPl*khNj{)U6i~MsQ%T?%^Azh*-ibHx&uxO-9An!PG^n*5DFJ1h#;3zlk zAo=sR!II|GR|MupO({z1iv-~K zm`^vcUFzFjgoh*7yppXXK*36}O6&0f({2@*)Rx<&Qy%91J`b2_F4(Q+Hms~}Bh0V4 zQLt#SU_!adZXqgwIpP{sG#j}l_n zkO0+5Q%pD)rv~4RzyumOTt&Ute+ajDw6A(vd6rSSS84#QoHCPyW%fwt5x1D5LMT>b zmTr7IeC_@A^BPlP-ks@-vXK1yf(u}+&O2JltTGfN;^#w!`(}`tAst6T*9N%VM#ZAt z@!lE35tue|L(9`CtUM#z-iwc;hofid@FJ0LJ&OMR*~lMM}ZJfV60<=9{)qho6ZoP?ME zXx*v`MZbMmhdi9%3>QFG?eD!;IW2!~L;>_$_EnEetw|%8+ouL5_XyQ4bz_IMq4;^1 zsV0e_dM%CdoiN+F0n`>a8K|V1UnXxTX?DK8XA+AN3!vqrU?3M-?l=rvpI^~JgdaZO z=S&2C_yE-Z3}p52uj(a+J0$|2|6%ZXY@szotg&XIL5RtIshV_Qw|6J`G@bnAO)#}$ ze`$AsnM$f?rD(CI@UC}4dlst~{i+H5lWF9|1$njlxm^cvKe`spdZi(}P9YL$72p^F>n~b{0~HsDcVKSb(97U&GZtmqt%OIF)&K&*~4`y=9hO7yl2Z%;ALq literal 0 HcmV?d00001 diff --git a/resources/english.png b/resources/english.png deleted file mode 100644 index 3ffa659cab00b7de9ebe720a12eb8ddfeccbbed3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1098 zcmV-Q1hxB#P)kUPmTA7!{#gi{{wRSsW-?|aH0aB2) zxrULQyV+3t3BP!TL5g_S(MixC&Y84p00=z+VI(7T9U%omvm*ouyM#n-A+Q3X7CND5 z?9kBWHK-dpV~;|BQmFYr*WaNCMoJ>(6$Qvo-&;>{;WF@tz_j>J6)_=dQMG;zU+t^l zK)Mfo%d@L_x-_4bwqI#D=*H(81-t(508Is<2#=QJvG=tS?(S$~YTsd|JYHnT>%+Mu zh1%*O`p)j+!@X;9B-v(_xEaZ)MZvvJS{t`=a#IdjuWn=Pt#>h8IplXX!+BS+`u&{` zRCwqwb-hf}R7a0@DK+j_S2xzFuJnA>y|h4eJMUM%oo}mw@vu7cgGUA1JC*0D=T(oh zP+ck8q$bXE%wXubUmQXOfOx}}7~m1f||zXN}Vm(2P) z?o4-(w5o7!+`=9&0O7$u3H)?nHVr~x1%ib724djTNeN!O#NS66QIQD3nD(OIN8sFf zlu|Rv6+PKSw^UO_qs$RpN`$5@>Z`6Ik=u)wWudIaW2rA{zlbxIi`@Zq`-S4e~cHIkn>=9JHbQIkt7w9Pk^!g^)^7?U3 zeeapxgmxSiPmocwj^NK%=-;{vy>Igl67E^f^3OlwyYLcr*Sql!`6*c8jG@f)P5_pI z_8uQczV4#rkzC$yC};J9%W#yJ;wUd=^jH&m@|*Q|9)67H4z|#J&K+AoH(A~b%8;Dy z?B}7ihp4V7prNjW`|`5L*iebSz1K#|{=;C?Aknz}m8nV4;G3okoM^pFZPf$3SY3qP z;_iiH8~?i!4NPV6*_S_ZqV*CwmV!`pLElu^jLkwgf)xxQ3=<(GDjG#8#Z)*7Q_+R8 zX@argN%V$SO5ze&nwbKcj^mjpv9DYn+YbU#ii;3wc6MxB!^p_BxPuAs4>)CvHuIKe QCIA2c07*qoM6N<$g3<~E!vFvP diff --git a/resources/francais.png b/resources/francais.png deleted file mode 100644 index 1bc2fcb09b5f740f263af28bc7f1631a639f1bbe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 253 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H3?x5i&EW)6nE^f_t{(zp{{R2apgi@hrX_>y zWEyFMsYm zcq6IHATZI)WAU%U$3NV8ym!y_s^&cppML)P?8WD{9&4YaH?KVX5T5ks+RgI&hb93n zWh@Eu3ubV5b|VeQ;VkfoEM{Qf76xHPhFNnYfP(BLp1!W^57`;TSa|Xj`{jW`Ql2i3 vArhC96BZ~YG%>hwB&4@B1SWR1u4H7`tikjkF65&nP!)rxtDnm{r-UW|DnnvS diff --git a/resources/generate_interpolks_py.png b/resources/generate_interpolks_py.png new file mode 100644 index 0000000000000000000000000000000000000000..332cee480152ce4f3d20e1f63aa0d94fcdf3df45 GIT binary patch literal 7696 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 literal 0 HcmV?d00001 diff --git a/resources/param_study_file.png b/resources/param_study_file.png new file mode 100644 index 0000000000000000000000000000000000000000..502dd922323c0216d207ec457b7eaa5b7f980756 GIT binary patch literal 470 zcmV;{0V)28P)WFU8GbZ8({Xk{QrNlj4iWF>9@00BBlL_t(I%Z<~`D{WyE z$MKJS9C?|b?oD1oimPNqjLiH6%1EYClCg>5o!*g|sWS36D3hDQMJ`5&2_-L`Gw?oH zvO8_g`PI{2`)NJj^;^%{JLgkr*;3AbckM@$oFBl8^Fo1r% zB^i}EW29;QLl>segqd)Bl?6DBh-%ed_u+-3pZ0S-n!>_b?m&j0`b M07*qoM6N<$f^r6f6|Qa2g1LpoLb}w)Xlr*jTxRe}MnMSqLgd zD@BAu1Pevsj^m=nZy^Cc68Gb^(A_8ux<43Zn3?x^ABNF*%M>ue*Et0?L?o{|{3Tz+ zc3e3-zj#ii)9dezbiXk2J{z6~hB2dTeSJ4eI+cvBuH|z>xoo6dF5AEs;Q4o!tG38f zMLiCVi&C*g9xJYF@BDr+O>-0Y3Fy9o=6Dc`sttDbr*Q;qPp7-DH@39Ani(4%o)D2k zAAs$`RmoBU{-0g5u$brOwnRr;3)#M|M$ob#%>lr1AsJU29G}iHkm=#+xk7!kj#xtj zB4Pr`0Py0%$%Ta{plbxPpJXBt>_trgF@PTdpz1(pYKAZ=+*<$|5c%{5yMNvczDw1q zt!n@e2HV3K99>!pfD0=JRw#h&q6UojgfrMH)EfEkT>Mv(RPkP2pnv?cK)MN9<60S* z^bO`). -ADD_SUBDIRECTORY(mascaret) -ADD_SUBDIRECTORY(telemac2d) -ADD_SUBDIRECTORY(pytel) +ADD_SUBDIRECTORY(telma) +ADD_SUBDIRECTORY(param_study) +ADD_SUBDIRECTORY(run_study) ADD_SUBDIRECTORY(boundary_conditions) # --- Python files --- diff --git a/src/salome_hydro/mascaret/__init__.py b/src/salome_hydro/mascaret/__init__.py deleted file mode 100644 index e4b3bfd..0000000 --- a/src/salome_hydro/mascaret/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (C) 2012-2013 EDF -# -# This file is part of SALOME HYDRO module. -# -# SALOME HYDRO module is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# SALOME HYDRO module is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with SALOME HYDRO module. If not, see . diff --git a/src/salome_hydro/mascaret/eficas/mascaret_V7_cata.py b/src/salome_hydro/mascaret/eficas/mascaret_V7_cata.py deleted file mode 100644 index c3a97a3..0000000 --- a/src/salome_hydro/mascaret/eficas/mascaret_V7_cata.py +++ /dev/null @@ -1,107 +0,0 @@ -# -*- coding: utf-8 -*- -# -# Copyright (C) 2012-2013 EDF -# -# This file is part of SALOME HYDRO module. -# -# SALOME HYDRO module is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# SALOME HYDRO module is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with SALOME HYDRO module. If not, see . - -from Accas import * - -JdC = JDC_CATA(regles = (UN_PARMI('MASCARET',)), - ) - -MASCARET = PROC( - nom = "MASCARET", op = None, - fr = u"Définition d'un cas d'étude Mascaret", - ang = u"Definition of a Mascaret study case", - FICHIER_DICO = SIMP(statut = "o", typ = 'Fichier', - fr = u"Fichier Dictionnaire", - ang = u"Dictionary file"), - FICHIER_MOT_CLE = SIMP(statut = "o", - typ = ('Fichier', 'Fichiers CAS (*.cas);;Tous les fichiers (*)',), - fr = u"Fichier Mot Clé", - ang = u"Keyword file"), - FICHIER_GEOMETRIE = SIMP(statut = "f", - typ = ('Fichier', 'Fichiers GEO (*.geo);;Tous les fichiers (*)',), - fr = u"Fichier de géométrie", - ang = u"Geometry file"), - FICHIER_LOI = FACT(statut = 'f', max = '**', - NOM = SIMP(statut = "o", - typ = ('Fichier', 'Fichiers LOI (*.loi);;Tous les fichiers (*)',), - fr = u"Fichier de lois", - ang = u"Laws file"), - ), - FICHIER_ABAQUES = SIMP(statut = "f", - typ = ('Fichier', 'Tous les fichiers (*)',), - fr = u"Fichier abaques", - ang = u"Abacus file"), - FICHIER_CASIER = SIMP(statut = "f", - typ = ('Fichier', 'Tous les fichiers (*)',), - fr = u"Fichier casier", - ang = u"Compartment file"), - FICHIER_DAMOCLE = SIMP(statut = "f", - typ = ('Fichier', 'Tous les fichiers (*)',), - fr = u"Fichier damocle", - ang = u"Damocle file"), - FICHIER_LIG = SIMP(statut = "o", - typ = ('Fichier', 'Fichiers LIG (*.lig);;Tous les fichiers (*)',), - fr = u"Fichier LIG", - ang = u"LIG file"), - LISTING = SIMP(statut = "f", - typ = ('Fichier', 'Tous les fichiers (*)', "Sauvegarde"), - fr = u"Fichier de listing", - ang = u"Listing file"), - LISTING_CASIER = SIMP(statut = "f", - typ = ('Fichier', 'Tous les fichiers (*)', "Sauvegarde"), - fr = u"Fichier de listing casier", - ang = u"Compartment listing file"), - LISTING_LIAISON = SIMP(statut = "f", - typ = ('Fichier', 'Tous les fichiers (*)', "Sauvegarde"), - fr = u"Fichier de listing liaison", - ang = u"Link listing file"), - RESULTAT = SIMP(statut = "f", - typ = ('Fichier', 'Tous les fichiers (*)', "Sauvegarde"), - fr = u"Fichier de résultat", - ang = u"Result file"), - RESULTAT_CASIER = SIMP(statut = "f", - typ = ('Fichier', 'Tous les fichiers (*)', "Sauvegarde"), - fr = u"Fichier de résultat casier", - ang = u"Compartment result file"), - RESULTAT_LIAISON = SIMP(statut = "f", - typ = ('Fichier', 'Tous les fichiers (*)', "Sauvegarde"), - fr = u"Fichier de résultat liaison", - ang = u"Link result file"), - VARIABLE_SORTIE = FACT(statut = 'f', max = '**', - fr = u"Variable de sortie du calcul", - ang = u"Computation output variable", - NOM = SIMP(statut = "o", typ = 'TXM', - fr = u"Nom de la variable", - ang = u"Variable name"), - VARIABLE_MASCARET = SIMP(statut = "o", typ = 'TXM', - fr = u'Variable Mascaret (ex : "Etat.Z(1,0,0)")', - ang = u'Mascaret variable (ex : "Etat.Z(1,0,0)")'), - ), - VARIABLE_ENTREE = FACT(statut = 'f', max = '**', - fr = u"Variable d'entrée du calcul", - ang = u"Computation input variable", - NOM = SIMP(statut = "o", typ = 'TXM', - fr = u"Nom de la variable", - ang = u"Variable name"), - VARIABLE_MASCARET = SIMP(statut = "o", typ = 'TXM', - fr = u'Variable Mascaret (ex : "Modele.Lois.Debit(1,1-2,0)")', - ang = u'Mascaret variable (ex : "Modele.Lois.Debit(1,1-2,0)")'), - ), -) -TEXTE_NEW_JDC="MASCARET()" diff --git a/src/salome_hydro/mascaret/CMakeLists.txt b/src/salome_hydro/param_study/CMakeLists.txt similarity index 87% rename from src/salome_hydro/mascaret/CMakeLists.txt rename to src/salome_hydro/param_study/CMakeLists.txt index 91f7cd3..51fa92a 100644 --- a/src/salome_hydro/mascaret/CMakeLists.txt +++ b/src/salome_hydro/param_study/CMakeLists.txt @@ -15,14 +15,16 @@ # You should have received a copy of the GNU General Public License # along with SALOME HYDRO module. If not, see . -ADD_SUBDIRECTORY(eficas) - # --- Python files --- SET(PYFILES __init__.py ) +SET(INSTALL_DIR ${SALOME_INSTALL_PYTHON}/salome/hydro/param_study) + # --- rules --- -SALOME_INSTALL_SCRIPTS("${PYFILES}" ${SALOME_INSTALL_PYTHON}/salome/hydro/mascaret) +SALOME_INSTALL_SCRIPTS("${PYFILES}" ${INSTALL_DIR}) + +ADD_SUBDIRECTORY(eficas) diff --git a/src/salome_hydro/mascaret/eficas/__init__.py b/src/salome_hydro/param_study/__init__.py similarity index 100% rename from src/salome_hydro/mascaret/eficas/__init__.py rename to src/salome_hydro/param_study/__init__.py diff --git a/src/salome_hydro/telemac2d/eficas/CMakeLists.txt b/src/salome_hydro/param_study/eficas/CMakeLists.txt similarity index 94% rename from src/salome_hydro/telemac2d/eficas/CMakeLists.txt rename to src/salome_hydro/param_study/eficas/CMakeLists.txt index ade8037..ac8e894 100644 --- a/src/salome_hydro/telemac2d/eficas/CMakeLists.txt +++ b/src/salome_hydro/param_study/eficas/CMakeLists.txt @@ -23,8 +23,9 @@ SET(PYFILES prefs_telemac2d.py prefs.py appli.py + param_study_cata.py ) # --- rules --- -SALOME_INSTALL_SCRIPTS("${PYFILES}" ${SALOME_INSTALL_PYTHON}/salome/hydro/telemac2d/eficas) +SALOME_INSTALL_SCRIPTS("${PYFILES}" ${SALOME_INSTALL_PYTHON}/salome/hydro/param_study/eficas) diff --git a/src/salome_hydro/pytel/__init__.py b/src/salome_hydro/param_study/eficas/__init__.py similarity index 100% rename from src/salome_hydro/pytel/__init__.py rename to src/salome_hydro/param_study/eficas/__init__.py diff --git a/src/salome_hydro/telemac2d/eficas/appli.py b/src/salome_hydro/param_study/eficas/appli.py similarity index 81% rename from src/salome_hydro/telemac2d/eficas/appli.py rename to src/salome_hydro/param_study/eficas/appli.py index 7356867..a4411d4 100644 --- a/src/salome_hydro/telemac2d/eficas/appli.py +++ b/src/salome_hydro/param_study/eficas/appli.py @@ -30,7 +30,7 @@ sgPyQt = SalomePyQt.SalomePyQt() from salome.kernel.logger import Logger from salome.kernel import termcolor -logger = Logger("salome.hydro.telemac2d.eficas.appli", +logger = Logger("salome.hydro.param_study.eficas.appli", color = termcolor.GREEN_FG) import eficasSalome @@ -49,7 +49,7 @@ def importFirst(): importFirst() -class EficasForTelemac2DAppli(eficasSalome.MyEficas): +class EficasForParamStudyAppli(eficasSalome.MyEficas): """ This class launches Eficas and adds entries for the created files in HYDRO component in the study tree. The messages in this class are in @@ -59,32 +59,29 @@ class EficasForTelemac2DAppli(eficasSalome.MyEficas): :param fichier: path of an Eficas file to open """ - def __init__(self, code = "telemac2d", fichier = None, version = None, lang = None): + def __init__(self, code="telemac2d", fichier=None, version=None, lang=None): self.ed = HydroStudyEditor() self.codedir = os.path.dirname(__file__) sys.path[:0] = [self.codedir] - #eficasSalome.MyEficas.__init__(self, sgPyQt.getDesktop(), - # code = code, fichier = fichier, - # version = version, lang = lang) - #area = QScrollArea(SalomePyQt.SalomePyQt().getDesktop()); area = QScrollArea(SalomePyQt.SalomePyQt().getDesktop()); eficasSalome.MyEficas.__init__(self, area, - code = code, fichier = fichier, - version = version, lang = lang) + code=code, fichier=fichier, + version=version, lang=lang) gridLayout = QGridLayout(area) gridLayout.addWidget(self) area.setWidgetResizable(1) sgPyQt.createView("Eficas Telemac2D", self) - - - + if fichier == None: + self.fileNew() + else: + self.addJdcInSalome(fichier) def addJdcInSalome(self, jdcPath): """ Add the newly created file in Salome study """ try: - self.ed.find_or_create_telemac2d_case(jdcPath) + self.ed.find_or_create_param_study(jdcPath) except Exception, exc: msgError = "Can't add file to Salome study tree" logger.exception(msgError) diff --git a/src/salome_hydro/mascaret/eficas/configuration_mascaret.py b/src/salome_hydro/param_study/eficas/configuration_telemac2d.py similarity index 93% rename from src/salome_hydro/mascaret/eficas/configuration_mascaret.py rename to src/salome_hydro/param_study/eficas/configuration_telemac2d.py index ac321f2..1e9468f 100644 --- a/src/salome_hydro/mascaret/eficas/configuration_mascaret.py +++ b/src/salome_hydro/param_study/eficas/configuration_telemac2d.py @@ -32,8 +32,8 @@ class CONFIG(configBase): # Configuration parameters self.savedir = os.getenv("HOME") - self.catalogues = (CatalogDescription("mascaret_V7", - os.path.join(repIni, "mascaret_V7_cata.py")),) + self.catalogues = (CatalogDescription("param_study", + os.path.join(repIni, "param_study_cata.py")),) self.lang = 'fr' def save_params(self): diff --git a/src/salome_hydro/telemac2d/eficas/telemac2d_V6_cata.py b/src/salome_hydro/param_study/eficas/param_study_cata.py similarity index 99% rename from src/salome_hydro/telemac2d/eficas/telemac2d_V6_cata.py rename to src/salome_hydro/param_study/eficas/param_study_cata.py index 9822a5b..c95ea1c 100644 --- a/src/salome_hydro/telemac2d/eficas/telemac2d_V6_cata.py +++ b/src/salome_hydro/param_study/eficas/param_study_cata.py @@ -119,6 +119,7 @@ TELEMAC2D = PROC( TYPE = SIMP(statut = "o", typ = 'TXM', into = ['INDEX', 'RANGE', 'POLYGON', 'POLYGON_FILE'], + fenetreIhm="menuDeroulant", fr = u'Type de definition de la variable', ang = u'Type of definition for the variable', ), diff --git a/src/salome_hydro/telemac2d/eficas/prefs.py b/src/salome_hydro/param_study/eficas/prefs.py similarity index 100% rename from src/salome_hydro/telemac2d/eficas/prefs.py rename to src/salome_hydro/param_study/eficas/prefs.py diff --git a/src/salome_hydro/telemac2d/eficas/prefs_telemac2d.py b/src/salome_hydro/param_study/eficas/prefs_telemac2d.py similarity index 100% rename from src/salome_hydro/telemac2d/eficas/prefs_telemac2d.py rename to src/salome_hydro/param_study/eficas/prefs_telemac2d.py diff --git a/src/salome_hydro/pytel/CMakeLists.txt b/src/salome_hydro/run_study/CMakeLists.txt similarity index 95% rename from src/salome_hydro/pytel/CMakeLists.txt rename to src/salome_hydro/run_study/CMakeLists.txt index 1c5645d..1157be5 100755 --- a/src/salome_hydro/pytel/CMakeLists.txt +++ b/src/salome_hydro/run_study/CMakeLists.txt @@ -41,7 +41,7 @@ PYQT_WRAP_UIC(_pyuic_SCRIPTS ${UIFILES}) # scripts / pyuic wrappings -SALOME_INSTALL_SCRIPTS("${PYFILES}" ${SALOME_INSTALL_PYTHON}/salome/hydro/pytel) -INSTALL( FILES ${_pyuic_SCRIPTS} DESTINATION ${SALOME_INSTALL_PYTHON}/salome/hydro/pytel) +SALOME_INSTALL_SCRIPTS("${PYFILES}" ${SALOME_INSTALL_PYTHON}/salome/hydro/run_study) +INSTALL( FILES ${_pyuic_SCRIPTS} DESTINATION ${SALOME_INSTALL_PYTHON}/salome/hydro/run_study) diff --git a/src/salome_hydro/pytel/eficas/__init__.py b/src/salome_hydro/run_study/__init__.py similarity index 100% rename from src/salome_hydro/pytel/eficas/__init__.py rename to src/salome_hydro/run_study/__init__.py diff --git a/src/salome_hydro/mascaret/eficas/CMakeLists.txt b/src/salome_hydro/run_study/eficas/CMakeLists.txt similarity index 90% rename from src/salome_hydro/mascaret/eficas/CMakeLists.txt rename to src/salome_hydro/run_study/eficas/CMakeLists.txt index deb3c65..65f0998 100644 --- a/src/salome_hydro/mascaret/eficas/CMakeLists.txt +++ b/src/salome_hydro/run_study/eficas/CMakeLists.txt @@ -19,13 +19,13 @@ SET(PYFILES __init__.py - appli.py - configuration_mascaret.py - prefs_mascaret.py + configuration_run_study.py + prefs_run_study.py prefs.py - mascaret_V7_cata.py + run_study_cata.py + appli.py ) # --- rules --- -SALOME_INSTALL_SCRIPTS("${PYFILES}" ${SALOME_INSTALL_PYTHON}/salome/hydro/mascaret/eficas) +SALOME_INSTALL_SCRIPTS("${PYFILES}" ${SALOME_INSTALL_PYTHON}/salome/hydro/run_study/eficas) diff --git a/src/salome_hydro/telemac2d/__init__.py b/src/salome_hydro/run_study/eficas/__init__.py similarity index 100% rename from src/salome_hydro/telemac2d/__init__.py rename to src/salome_hydro/run_study/eficas/__init__.py diff --git a/src/salome_hydro/pytel/eficas/appli.py b/src/salome_hydro/run_study/eficas/appli.py similarity index 77% rename from src/salome_hydro/pytel/eficas/appli.py rename to src/salome_hydro/run_study/eficas/appli.py index f1eb3ec..874cc99 100755 --- a/src/salome_hydro/pytel/eficas/appli.py +++ b/src/salome_hydro/run_study/eficas/appli.py @@ -18,7 +18,7 @@ import os import sys -from PyQt5.QtWidgets import QMessageBox , QScrollArea, QGridLayout +from PyQt5.QtWidgets import QMessageBox, QScrollArea, QGridLayout import salome @@ -27,14 +27,14 @@ sgPyQt = SalomePyQt.SalomePyQt() from salome.kernel.logger import Logger from salome.kernel import termcolor -logger = Logger("salome.hydro.pytel.eficas.appli", - color = termcolor.GREEN_FG) +logger = Logger("salome.hydro.run_study.eficas.appli", + color=termcolor.GREEN_FG) import eficasSalome from salome.hydro.study import HydroStudyEditor -class EficasForPytelAppli(eficasSalome.MyEficas): +class EficasForRunStudyAppli(eficasSalome.MyEficas): """ This class launches Eficas and adds entries for the created files in HYDRO component in the study tree. @@ -43,26 +43,28 @@ class EficasForPytelAppli(eficasSalome.MyEficas): :param fichier: path of an Eficas file to open """ - def __init__(self, fichier = None, version = None): + def __init__(self, fichier=None, version=None): self.ed = HydroStudyEditor() self.codedir = os.path.dirname(__file__) sys.path[:0] = [self.codedir] area = QScrollArea(SalomePyQt.SalomePyQt().getDesktop()); - eficasSalome.MyEficas.__init__(self, area, "pytel", - fichier, version = version) + eficasSalome.MyEficas.__init__(self, area, code="run_study", + fichier=fichier, version=version) gridLayout = QGridLayout(area) gridLayout.addWidget(self) area.setWidgetResizable(1) - sgPyQt.createView("Eficas Pytel", self) - if fichier == None : self.fileNew() - else : self.addJdcInSalome(fichier) + sgPyQt.createView("Eficas Run_Study", self) + if fichier == None: + self.fileNew() + else: + self.addJdcInSalome(fichier) def addJdcInSalome(self, jdcPath): """ Add the newly created file in Salome study """ try: - self.ed.find_or_create_pytel_case(jdcPath) + self.ed.find_or_create_run_study(jdcPath) except Exception, exc: msgError = "Can't add file to Salome study tree" logger.exception(msgError) diff --git a/src/salome_hydro/pytel/eficas/configuration_pytel.py b/src/salome_hydro/run_study/eficas/configuration_run_study.py similarity index 93% rename from src/salome_hydro/pytel/eficas/configuration_pytel.py rename to src/salome_hydro/run_study/eficas/configuration_run_study.py index b25ad32..017eb90 100644 --- a/src/salome_hydro/pytel/eficas/configuration_pytel.py +++ b/src/salome_hydro/run_study/eficas/configuration_run_study.py @@ -30,7 +30,7 @@ class CONFIG(configBase): # Configuration parameters self.savedir = os.getenv("HOME") - self.catalogues = (CatalogDescription("pytel", os.path.join(repIni, "pytel_cata.py")),) + self.catalogues = (CatalogDescription("run_study", os.path.join(repIni, "run_study_cata.py")),) self.labels_eficas=['lang','rep_cata','catalogues','closeAutreCommande','closeFrameRechercheCommande','closeEntete','closeArbre'] self.lang = 'fr' diff --git a/src/salome_hydro/mascaret/eficas/prefs.py b/src/salome_hydro/run_study/eficas/prefs.py similarity index 97% rename from src/salome_hydro/mascaret/eficas/prefs.py rename to src/salome_hydro/run_study/eficas/prefs.py index d0e8113..0ab9a94 100644 --- a/src/salome_hydro/mascaret/eficas/prefs.py +++ b/src/salome_hydro/run_study/eficas/prefs.py @@ -15,4 +15,4 @@ # You should have received a copy of the GNU General Public License # along with SALOME HYDRO module. If not, see . -code = "mascaret" +code = "run_study" diff --git a/src/salome_hydro/mascaret/eficas/prefs_mascaret.py b/src/salome_hydro/run_study/eficas/prefs_run_study.py similarity index 100% rename from src/salome_hydro/mascaret/eficas/prefs_mascaret.py rename to src/salome_hydro/run_study/eficas/prefs_run_study.py diff --git a/src/salome_hydro/pytel/eficas/pytel_cata.py b/src/salome_hydro/run_study/eficas/run_study_cata.py similarity index 79% rename from src/salome_hydro/pytel/eficas/pytel_cata.py rename to src/salome_hydro/run_study/eficas/run_study_cata.py index 50f0c43..8c1e9f8 100644 --- a/src/salome_hydro/pytel/eficas/pytel_cata.py +++ b/src/salome_hydro/run_study/eficas/run_study_cata.py @@ -19,14 +19,14 @@ from Accas import * -codelist = ("artemis", "estel3d", "postel3d", "sisyphe", "stbtel", "telemac2d", "telemac3d", "tomawac", "mascaret") +codelist = ("artemis", "postel3d", "sisyphe", "stbtel", "telemac2d", "telemac3d", "tomawac", "mascaret") -JdC = JDC_CATA(regles = (UN_PARMI('PYTEL',)), +JdC = JDC_CATA(regles = (UN_PARMI('RUN_STUDY',)), ) -PYTEL = PROC( - nom = "PYTEL", op = None, - fr = u"Définition d'un cas pour le lanceur Pytel", - ang = u"Definition of a case for the Pytel launcher", +RUN_STUDY = PROC( + nom = "RUN_STUDY", op = None, + fr = u"Définition d'un cas pour le lanceur Python", + ang = u"Definition of a case for the Python launcher", CODE = SIMP(statut = "o", typ = "TXM", into = codelist, defaut = "telemac2d", fr = u"Code à exécuter", ang = u"Code to run"), @@ -38,4 +38,4 @@ PYTEL = PROC( ang = u"Working directory"), ) -TEXTE_NEW_JDC="PYTEL()" +TEXTE_NEW_JDC="RUN_STUDY()" diff --git a/src/salome_hydro/pytel/genjob.py b/src/salome_hydro/run_study/genjob.py similarity index 92% rename from src/salome_hydro/pytel/genjob.py rename to src/salome_hydro/run_study/genjob.py index a265a90..1781aa5 100644 --- a/src/salome_hydro/pytel/genjob.py +++ b/src/salome_hydro/run_study/genjob.py @@ -28,15 +28,15 @@ job_script_template = """#!/bin/sh runcode.py %(code)s %(cas)s --ncsize %(nbcore)d """ -def generate_job(pytel_params, resource, telemac_root_dir, telemac_env_file, +def generate_job(study_params, resource, telemac_root_dir, telemac_env_file, nbcore, input_data_dir, result_dir): """ Create a Launcher job using the parameters specified by the user. """ # Generate job script - basename = os.path.basename(pytel_params["FICHIER_CAS"]) + basename = os.path.basename(study_params["FICHIER_CAS"]) job_script = job_script_template % {"env_file": telemac_env_file, - "code": pytel_params["CODE"], + "code": study_params["CODE"], "cas": basename, "nbcore": nbcore} @@ -52,7 +52,7 @@ def generate_job(pytel_params, resource, telemac_root_dir, telemac_env_file, job_params.job_name = basename job_params.job_type = "command" job_params.job_file = job_script_file - input_files = glob.glob(os.path.join(input_data_dir, "*")) + [pytel_params["FICHIER_CAS"]] + input_files = glob.glob(os.path.join(input_data_dir, "*")) + [study_params["FICHIER_CAS"]] input_files = list(set(input_files)) # Remove duplicates job_params.in_files = input_files job_params.out_files = [] diff --git a/src/salome_hydro/pytel/genjobwindow.py b/src/salome_hydro/run_study/genjobwindow.py similarity index 87% rename from src/salome_hydro/pytel/genjobwindow.py rename to src/salome_hydro/run_study/genjobwindow.py index ee665f1..685a9a1 100644 --- a/src/salome_hydro/pytel/genjobwindow.py +++ b/src/salome_hydro/run_study/genjobwindow.py @@ -19,13 +19,13 @@ import os from PyQt5.QtWidgets import QDialog , QFileDialog import salome -from salome.hydro.pytel.genjob import generate_job +from salome.hydro.run_study.genjob import generate_job from genjobwindow_ui import Ui_GenJobDialog class GenJobDialog(QDialog, Ui_GenJobDialog): - def __init__(self, parent, pytel_params): + def __init__(self, parent, study_params): QDialog.__init__(self, parent) self.setupUi(self) self.dialogButtonBox.accepted.connect(self.validate) @@ -33,9 +33,9 @@ class GenJobDialog(QDialog, Ui_GenJobDialog): self.chooseInputDataDirectoryButton.clicked.connect( self.choose_input_dir) self.chooseResultDirectoryButton.clicked.connect(self.choose_result_dir) - self.telemacRootDirLE.setText("/projets/systel/V7P2") - self.telemacEnvFileLE.setText("/projets/systel/V7P2/config/pysource.eole.intel.sh") - casedir = os.path.dirname(pytel_params["FICHIER_CAS"]) + self.telemacRootDirLE.setText("/projets/systel/V8P0") + self.telemacEnvFileLE.setText("/projets/systel/V8P0/config/pysource.eole.intel.sh") + casedir = os.path.dirname(study_params["FICHIER_CAS"]) self.inputDataDirectoryLE.setText(casedir) self.resultDirectoryLE.setText(casedir) @@ -45,7 +45,7 @@ class GenJobDialog(QDialog, Ui_GenJobDialog): res_list = res_manager.GetFittingResources(res_params) self.resourceCB.addItems(res_list) - self.pytel_params = pytel_params + self.study_params = study_params def choose_input_dir(self): directory = QFileDialog.getExistingDirectory(self, @@ -62,7 +62,7 @@ class GenJobDialog(QDialog, Ui_GenJobDialog): self.resultDirectoryLE.setText(directory) def validate(self): - generate_job(self.pytel_params, + generate_job(self.study_params, str(self.resourceCB.currentText()), str(self.telemacRootDirLE.text()), str(self.telemacEnvFileLE.text()), diff --git a/src/salome_hydro/pytel/genjobwindow.ui b/src/salome_hydro/run_study/genjobwindow.ui similarity index 100% rename from src/salome_hydro/pytel/genjobwindow.ui rename to src/salome_hydro/run_study/genjobwindow.ui diff --git a/src/salome_hydro/pytel/gui.py b/src/salome_hydro/run_study/gui.py similarity index 72% rename from src/salome_hydro/pytel/gui.py rename to src/salome_hydro/run_study/gui.py index 0e371c2..0a3e9f2 100755 --- a/src/salome_hydro/pytel/gui.py +++ b/src/salome_hydro/run_study/gui.py @@ -21,20 +21,20 @@ sgPyQt = SalomePyQt.SalomePyQt() from salome.hydro.gui_utils import get_and_check_selected_file_path from salome.hydro.study import jdc_to_dict -from salome.hydro.pytel.eficas.appli import EficasForPytelAppli -from launcher import run_pytel +from salome.hydro.run_study.eficas.appli import EficasForRunStudyAppli +from launcher import run_study from genjobwindow import GenJobDialog from PyQt5.QtWidgets import QFileDialog -def create_case_pytel(): - EficasForPytelAppli() +def create_case_study(): + EficasForRunStudyAppli() -def edit_selected_case_pytel(): - file=get_and_check_selected_file_path() - if file == None : - file, filt = QFileDialog.getOpenFileName(sgPyQt.getDesktop(), "Open Pytel file", "", ) - EficasForPytelAppli(fichier=file) +def edit_selected_case_study(): + file=get_and_check_selected_file_path() + if file == None: + file, filt = QFileDialog.getOpenFileName(sgPyQt.getDesktop(), "Open study file", "", ) + EficasForRunStudyAppli(fichier=file) def get_params_from_selected_case(): """ @@ -43,14 +43,14 @@ def get_params_from_selected_case(): jdcpath = get_and_check_selected_file_path() with open(jdcpath) as jdcfile: jdc = jdcfile.read() - param_dict = jdc_to_dict(jdc, ["PYTEL", "_F"]) + param_dict = jdc_to_dict(jdc, ["RUN_STUDY", "_F"]) return param_dict -def run_selected_case_pytel(): +def run_selected_case_study(): param_dict = get_params_from_selected_case() - run_pytel(param_dict) + run_study(param_dict) -def generate_job_for_selected_case_pytel(): +def generate_job_for_selected_case_study(): param_dict = get_params_from_selected_case() dialog = GenJobDialog(sgPyQt.getDesktop(), param_dict) dialog.exec_() diff --git a/src/salome_hydro/pytel/launcher.py b/src/salome_hydro/run_study/launcher.py similarity index 94% rename from src/salome_hydro/pytel/launcher.py rename to src/salome_hydro/run_study/launcher.py index 0c27934..3702551 100644 --- a/src/salome_hydro/pytel/launcher.py +++ b/src/salome_hydro/run_study/launcher.py @@ -21,12 +21,12 @@ import tempfile from salome.kernel.logger import Logger from salome.kernel import termcolor -logger = Logger("salome.hydro.pytel.launcher", color = termcolor.BLUE) +logger = Logger("salome.hydro.run_study.launcher", color = termcolor.BLUE) #logger.setLevel(logging.ERROR) -def run_pytel(param_dict): +def run_study(param_dict): """ - Run the Python Telemac launching script (pytel), eventually preceded and + Run the Python Telemac launching script, eventually preceded and followed by data conversion scripts. """ interm_files = [] # Intermediate files that can eventually be deleted in the end diff --git a/src/salome_hydro/study.py b/src/salome_hydro/study.py index 550a189..f4983b7 100644 --- a/src/salome_hydro/study.py +++ b/src/salome_hydro/study.py @@ -29,38 +29,19 @@ MODULE_NAME = "HYDROSOLVER" COMPONENT_NAME = "HydroSolver" COMPONENT_ICON = "HYDRO_small.png" -MASCARET_FILE_TYPE = "MASCARET_EFICAS_FILE" -MASCARET_ICON = "case1d.png" -MASCARET_CASE_TYPE_ID = 1 - VARS_ICON = "icon_variables.png" -LOG_ICON = "log.png" -LOG_TYPE_ID = 2 - -TELEMAC2D_FILE_TYPE = "TELEMAC2D_EFICAS_FILE" -TELEMAC2D_ICON = "case2d.png" -TELEMAC2D_CASE_TYPE_ID = 3 - -PYTEL_FILE_TYPE = "PYTEL_EFICAS_FILE" -PYTEL_ICON = "case_pytel.png" -PYTEL_CASE_TYPE_ID = 5 - -# Dictionary used to map Eficas parameters to Mascaret file types -mascaretFileTypeDict = {"FICHIER_ABAQUES" : "abaques", - "FICHIER_DICO" : "dico", - "FICHIER_CASIER" : "casier", - "FICHIER_GEOMETRIE" : "geo", - "FICHIER_LOI" : "loi", - "FICHIER_MOT_CLE" : "cas", - "LISTING" : "listing", - "FICHIER_DAMOCLE" : "damocle", - "RESULTAT" : "res", - "LISTING_CASIER" : "listing_casier", - "LISTING_LIAISON" : "listing_liaison", - "RESULTAT_CASIER" : "res_casier", - "RESULTAT_LIAISON" : "res_liaison" - } +TELMA_FILE_TYPE = "TELMA_EFICAS_FILE" +TELMA_ICON = "telma_file.png" +TELMA_TYPE_ID = 1 + +STUDY_FILE_TYPE = "STUDY_EFICAS_FILE" +STUDY_ICON = "study_file.png" +STUDY_TYPE_ID = 2 + +PARAM_STUDY_FILE_TYPE = "PARAM_STUDY_EFICAS_FILE" +PARAM_STUDY_ICON = "param_study_file.png" +PARAM_STUDY_TYPE_ID = 3 def jdc_to_dict(jdc, command_list): """ @@ -106,27 +87,38 @@ class HydroStudyEditor: COMPONENT_ICON) return self.hydroComp - def find_or_create_mascaret_case(self, filePath): + def find_or_create_telma(self, filePath): + self.find_or_create_hydro_component() + itemName = os.path.splitext(os.path.basename(filePath))[0] + sobj = self.editor.findOrCreateItem(self.hydroComp, + name=itemName, + fileType=TELMA_FILE_TYPE, + fileName=filePath, + icon=TELMA_ICON, + comment=str(filePath), + typeId=TELMA_TYPE_ID) + + def find_or_create_param_study(self, filePath): self.find_or_create_hydro_component() itemName = os.path.splitext(os.path.basename(filePath))[0] sobj = self.editor.findOrCreateItem(self.hydroComp, - name = itemName, - fileType = MASCARET_FILE_TYPE, - fileName = filePath, - icon = MASCARET_ICON, - comment = str(filePath), - typeId = MASCARET_CASE_TYPE_ID) - - def find_or_create_telemac2d_case(self, filePath): + name=itemName, + fileType=PARAM_STUDY_FILE_TYPE, + fileName=filePath, + icon=PARAM_STUDY_ICON, + comment=str(filePath), + typeId=PARAM_STUDY_TYPE_ID) + + def find_or_create_run_study(self, filePath): self.find_or_create_hydro_component() itemName = os.path.splitext(os.path.basename(filePath))[0] sobj = self.editor.findOrCreateItem(self.hydroComp, - name = itemName, - fileType = TELEMAC2D_FILE_TYPE, - fileName = filePath, - icon = TELEMAC2D_ICON, - comment = str(filePath), - typeId = TELEMAC2D_CASE_TYPE_ID) + name=itemName, + fileType=STUDY_FILE_TYPE, + fileName=filePath, + icon=STUDY_ICON, + comment=str(filePath), + typeId=STUDY_TYPE_ID) def generate_study_script(self, filePath): """ @@ -143,11 +135,11 @@ class HydroStudyEditor: # Computing name of the file (same as filePath) file_dir, filename = os.path.split(filePath) - root, sfx = os.path.splitext(filename) - python_file = os.path.join(file_dir,root+".py") + root, _ = os.path.splitext(filename) + python_file = os.path.join(file_dir, root+".py") # Writting to file - with open(python_file,'w') as pfile: + with open(python_file, 'w') as pfile: pfile.write(python_script) def generate_study_yacs(self, filePath): @@ -165,19 +157,8 @@ class HydroStudyEditor: # Computing name of the file (same as filePath) file_dir, filename = os.path.split(filePath) - root, sfx = os.path.splitext(filename) - yacs_file = os.path.join(file_dir,root+".xml") + root, _ = os.path.splitext(filename) + yacs_file = os.path.join(file_dir, root+".xml") # Writting to file yacs_scheme.saveSchema(yacs_file) - - def find_or_create_pytel_case(self, filePath): - self.find_or_create_hydro_component() - itemName = os.path.splitext(os.path.basename(filePath))[0] - sobj = self.editor.findOrCreateItem(self.hydroComp, - name = itemName, - fileType = PYTEL_FILE_TYPE, - fileName = filePath, - icon = PYTEL_ICON, - comment = str(filePath), - typeId = PYTEL_CASE_TYPE_ID) diff --git a/src/salome_hydro/telemac2d/CMakeLists.txt b/src/salome_hydro/telma/CMakeLists.txt old mode 100644 new mode 100755 similarity index 93% rename from src/salome_hydro/telemac2d/CMakeLists.txt rename to src/salome_hydro/telma/CMakeLists.txt index 4d6aedc..b783842 --- a/src/salome_hydro/telemac2d/CMakeLists.txt +++ b/src/salome_hydro/telma/CMakeLists.txt @@ -21,7 +21,7 @@ SET(PYFILES __init__.py ) -SET(INSTALL_DIR ${SALOME_INSTALL_PYTHON}/salome/hydro/telemac2d) +SET(INSTALL_DIR ${SALOME_INSTALL_PYTHON}/salome/hydro/telma) # --- rules --- diff --git a/src/salome_hydro/telemac2d/eficas/__init__.py b/src/salome_hydro/telma/__init__.py old mode 100644 new mode 100755 similarity index 100% rename from src/salome_hydro/telemac2d/eficas/__init__.py rename to src/salome_hydro/telma/__init__.py diff --git a/src/salome_hydro/pytel/eficas/CMakeLists.txt b/src/salome_hydro/telma/eficas/CMakeLists.txt similarity index 91% rename from src/salome_hydro/pytel/eficas/CMakeLists.txt rename to src/salome_hydro/telma/eficas/CMakeLists.txt index 083540a..d7bab39 100644 --- a/src/salome_hydro/pytel/eficas/CMakeLists.txt +++ b/src/salome_hydro/telma/eficas/CMakeLists.txt @@ -19,13 +19,12 @@ SET(PYFILES __init__.py - configuration_pytel.py - prefs_pytel.py + configuration_telma.py + prefs_telma.py prefs.py - pytel_cata.py appli.py ) # --- rules --- -SALOME_INSTALL_SCRIPTS("${PYFILES}" ${SALOME_INSTALL_PYTHON}/salome/hydro/pytel/eficas) +SALOME_INSTALL_SCRIPTS("${PYFILES}" ${SALOME_INSTALL_PYTHON}/salome/hydro/telma/eficas) diff --git a/src/salome_hydro/telma/eficas/__init__.py b/src/salome_hydro/telma/eficas/__init__.py new file mode 100755 index 0000000..e69de29 diff --git a/src/salome_hydro/mascaret/eficas/appli.py b/src/salome_hydro/telma/eficas/appli.py old mode 100644 new mode 100755 similarity index 70% rename from src/salome_hydro/mascaret/eficas/appli.py rename to src/salome_hydro/telma/eficas/appli.py index ed5e4e4..b4a9461 --- a/src/salome_hydro/mascaret/eficas/appli.py +++ b/src/salome_hydro/telma/eficas/appli.py @@ -21,7 +21,7 @@ import os import sys import re -from PyQt5.QtWidgets import QMessageBox , QScrollArea, QGridLayout +from PyQt5.QtWidgets import QMessageBox, QScrollArea, QGridLayout import salome @@ -30,42 +30,57 @@ sgPyQt = SalomePyQt.SalomePyQt() from salome.kernel.logger import Logger from salome.kernel import termcolor -logger = Logger("salome.hydro.mascaret.eficas.appli", +logger = Logger("salome.hydro.telma.eficas.appli", color = termcolor.GREEN_FG) import eficasSalome from salome.hydro.study import HydroStudyEditor -class EficasForMascaretAppli(eficasSalome.MyEficas): +def importFirst(): + """ + Horrible hack to allow a correct load of a Telemac case file when done after + some other edition, such as create case for Pytel execution. + """ + eficasTelemacPath = os.path.join(eficasSalome.eficasConfig.eficasPath,'Telemac') + sys.path.insert(0, eficasTelemacPath) + from telemac2d_enum_auto import TelemacdicoEn + sys.path.pop(0) + +importFirst() + +class EficasForTelmaAppli(eficasSalome.MyEficas): """ This class launches Eficas and adds entries for the created files in - MASCARET component in the study tree. The messages in this class are in + HYDRO component in the study tree. The messages in this class are in french because they are displayed in Eficas interface. :type fichier: string :param fichier: path of an Eficas file to open """ - def __init__(self, fichier = None, version = None): + def __init__(self, code="telemac", fichier=None, version=None, lang=None): self.ed = HydroStudyEditor() self.codedir = os.path.dirname(__file__) sys.path[:0] = [self.codedir] area = QScrollArea(SalomePyQt.SalomePyQt().getDesktop()); eficasSalome.MyEficas.__init__(self, area, - "mascaret", - fichier, version = version) + code=code, fichier=fichier, + version=version, lang=lang) gridLayout = QGridLayout(area) gridLayout.addWidget(self) area.setWidgetResizable(1) - sgPyQt.createView("Eficas Mascaret", self) + sgPyQt.createView("Eficas Telemac", self) + + + def addJdcInSalome(self, jdcPath): """ Add the newly created file in Salome study """ try: - self.ed.find_or_create_mascaret_case(jdcPath) + self.ed.find_or_create_telma(jdcPath) except Exception, exc: msgError = "Can't add file to Salome study tree" logger.exception(msgError) diff --git a/src/salome_hydro/telemac2d/eficas/configuration_telemac2d.py b/src/salome_hydro/telma/eficas/configuration_telma.py old mode 100644 new mode 100755 similarity index 89% rename from src/salome_hydro/telemac2d/eficas/configuration_telemac2d.py rename to src/salome_hydro/telma/eficas/configuration_telma.py index 29051ae..54eb78f --- a/src/salome_hydro/telemac2d/eficas/configuration_telemac2d.py +++ b/src/salome_hydro/telma/eficas/configuration_telma.py @@ -32,8 +32,6 @@ class CONFIG(configBase): # Configuration parameters self.savedir = os.getenv("HOME") - self.catalogues = (CatalogDescription("telemac2d_V6", - os.path.join(repIni, "telemac2d_V6_cata.py")),) self.lang = 'fr' def save_params(self): diff --git a/src/salome_hydro/pytel/eficas/prefs.py b/src/salome_hydro/telma/eficas/prefs.py old mode 100644 new mode 100755 similarity index 97% rename from src/salome_hydro/pytel/eficas/prefs.py rename to src/salome_hydro/telma/eficas/prefs.py index 44cf4d7..031a12f --- a/src/salome_hydro/pytel/eficas/prefs.py +++ b/src/salome_hydro/telma/eficas/prefs.py @@ -15,4 +15,4 @@ # You should have received a copy of the GNU General Public License # along with SALOME HYDRO module. If not, see . -code = "pytel" +code = "TELEMAC" diff --git a/src/salome_hydro/pytel/eficas/prefs_pytel.py b/src/salome_hydro/telma/eficas/prefs_telma.py old mode 100644 new mode 100755 similarity index 100% rename from src/salome_hydro/pytel/eficas/prefs_pytel.py rename to src/salome_hydro/telma/eficas/prefs_telma.py -- 2.30.2