From cbe3ad00840dd73794c36f16dced0071e9af6936 Mon Sep 17 00:00:00 2001 From: Theophile Terraz <theophile.terraz@inrae.fr> Date: Thu, 6 Feb 2025 14:46:34 +0100 Subject: [PATCH] debug adists windows --- doc/users/TP_Hydraulique_Hogneau/step1.pamhyr | Bin 163840 -> 229376 bytes src/Solver/AdisTS.py | 10 +++++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/users/TP_Hydraulique_Hogneau/step1.pamhyr b/doc/users/TP_Hydraulique_Hogneau/step1.pamhyr index 687fe288533a1d0520500ba6ff1698b69310201e..38912b00003c856878ed7bc61913bb0537eddc49 100644 GIT binary patch delta 3175 zcma)8Yiu0V6`q-0@67CLVu!GC>ha$7b0@YpYdeYUgeENRCNelqNgNRYVLYCl*we0e zmz{A^7mB^X4}xTfxdnvy1EoS0RfWwGMHLkiQmKUU1O8O1K>TpxU=$@%9NMZ4iPL*$ zcJ|@KX-4+ld(S=Rp7VX@+%q#V;hdQ8p7DD+iNaGm*Zh#z#;st9!2QVmn_J12hhN}m z-j5_39?bs8rMdc!8rmjoi%Xg=YSIZsj7hrE+R@(Gv9oh~S6gU%M`y>5*6eHkv4_dd ztb1Ud>+U%HJhI<;dJ`IVyc9y?_L+TXY@dD-jcrpYG`3FBXbewcPupH>Lu2UFel)gZ zo<U=C_I7fXBipjG<4qfOIT(Vp*+`PK5vTVOvma76TLo>&C}R43B&H~eV;F)(dMrzv znnO~`%Vw{?$_)h2flg|c@b2?G<Bqz<*w>i_`dHZs`$lS(%n&oqKg>m{?9L%_dM>k{ zq8tkuipuV}HbZ95-R!Yt|GM%X^D$}PFx<ve5Zu>XmV1LsaJ`(sIlLFVXT7g_2fYt_ z175pl$@4eQTb|>db`RnHhkM?A#(m7);=1KJ@A|+s=IV1bxa`iqJAdy?JNukLXBqnq z`yo5cKF#i8Ip$mDW9AiRn29hI3z_%n@s>6RK}O4YR*I>bu8C?w)m14j%E^SRB=oeT ztI5R9u(^9uu5U%^JIZ+`r>?6bil!?maYPzY3Tky>q}E=}(`(ga?L?8*HpjT3=2)vX zs22Hb457oi%K5UjTAG|zlp@7&3sUUa$lG&@>PRZC%BpT)5K~fG8c}p59S-d<6;8@R ze={<PczBx>$CyV(q(n@Ns|iJv(nF&ohyl&g1x-k`-p5l|)xzB#4u|sO1h+Z}R;cIS z{KQXgX|?Pc1qZ=2*7Mj5vuoIf!{J@lpQU*2qe}9LGCn{fKif9>9GKF)BN0*3zB7ET z)=w^;$=c^{aeikd!IA@n=hyBDwwuvduVatBnjG*>qYaUGVlK0bWl%{H&PtM;%iP*C zwY!@3?cPnk?9rvcxKfnq7|MAvp@~{bk=GH|z{UUgSwkb}1ON{Fv&#*DDvL4YxHKBq zVc@bKesZ-2(pMU205n}n>+qdrKYV++jsu{ioZ!mEDmwtmkTn^xCNVrI0|1pBeD^vJ z&#wldYsuSL@FRdj(S6ZF(Z25JVQ`mNO)`UOOlZbowtn9QpSt0S0w7HCJnh@Nmz?QY z558%;?x6upLAjXofKE3bOhvi1NG0R(QC&)ye4M=+++^+C!9e~1lZV36V56`!IDwz9 zhG5y!1LJuIB}Dw(a;stFd0WdjM&DLN`yvr?CTXBA7>M#Px)?IL7wG=0vbO#X=spy! zjr2!Bf8>$gC|Fk!KD+vmT^~y+xF+bBif>&SrL&qEPU8GBsbo5-srnd<{EK(QWHGIt zu%@!4VHKN{GGJ4ZjF;4)@x!Jpm`1gY-**2ZFS$QDgv{nGv@Z}KGtaG|p@60u!MqDf zgsN{G9O>(M{7AHjV4?jd4&VL&NvMgK@+<AxxT>SxF{&qxwOBY-Y%R?FnZuQ|PY}pc zk`cziQ9U)PA9^fe^x)D}RZ%$QQBb-Wgn^3ye!9H55u|^KZbqaR^d0O6eMfqGn}M$C zaRu~8k0OC3ge^BhWdcD^Lkk(1%Ff@QDfXn_xEGVZfd`j11GBsblcR~4lpe$H0kb>g z>b@3!d&%!G7dX*ta*{yd{PBkd@c;4xS1wn>zkJv9Thfl2*-eggX32RQc+Wmx@?SyQ z7YXn0+}B;u`5H4x2keUrne+DDlRs^seLPRTbim**rXDvsll9wF#90(rQrx%9&V?Eh zFvLa8%h*JfI-HEbxr<e>>`IWuYK2br)-vvFh9NG>Af68zq~lgo`p89c_}OY3WS2HH z<3MsAOUf0?b6q9Zw+fx>QGBj&YM|aI+bLHbuW3*)-FgS++>!a%aHE2#C3&q-3us-I z2%U$qZMW9z;lumI81Wk6tb-ribo~r3@FPsR>Wnnapm#8O<HWkcW}0%p!P1Z|sSz*^ z)=U!;7o`dQ`D)$0a?=&Y@xw1xx0;j}tV=0J@_SRBd7;*z{KftG*mIQUO&jlse?7_z z{O02Od=+4-Hkw4?3_o2%`wko+C!65W#cDbi96YvI$>in@@XTUE;pT;4%YUn2#id7} zeBo%cB|!VSyU8iDpTyCpbK3lf)6?qUD1N)=PPxZcJ#tWEeq`O{X8-A;8w!_waBO)W zM4k8kZg}NV3;PtHeLX$oWGiYfRe4}vjr%NMb-1Ot@b|uC28p~|=w|W;*KR+6yTdvA JJbClW{{dT@6x;v+ delta 442 zcmZo@;A?2$njp`s!GHi_6LoC382NvLL<IPMZx%G@;otm^Kc8RKP>G#cQ$HuMxFo(f zu`D${C9x#c(A>zv*wW0@!a&c+#MsElc=IIrN(V-b%{&Pk_?^`|Yk;Pxb&3K>)eb!% zsnYHSB$eBufTU7u0gzN|We1W9E%HE8zS#&!$~CzIN!i9YAStu?e||4N(7fJyZ2>C= z4hBYMW=2LvW`<6ChTio|%*;ZJFfk^Ewq-zJCMG6+CJqKppgK-YhNg)?Q6@g-&7b=D z6Xdzl8F(1%7&z9lA7xv^`hfWlvjpQ2K1rT!40hbBxHe35l-u0<shx3i-1kKsEI`{m zCpNlnZ#cuq&a_$Nizo9IMizk(4bDvr{I~cw^H1Z?<M-j$<mcpj%D01W5??BxGoK0{ zJMVMele}|yGkMK;nR#yWZ04EFlfYxZ!@zxxdo6bjcObVWH#^r2uH{^%T!CELTpXPD zI5%x<jN;tBUXn4KRZ5PXje$|0Uz{yBF+DZDBr`X)xFoe8J}EPAyRtmv!wK72HZc7; F4**ZMY-s=h diff --git a/src/Solver/AdisTS.py b/src/Solver/AdisTS.py index 75f4d7b0..5f325902 100644 --- a/src/Solver/AdisTS.py +++ b/src/Solver/AdisTS.py @@ -128,9 +128,9 @@ class AdisTS(CommandLineSolver): repertory, f"{name}.REP" ), "w+" ) as f: - - f.write(f"NET ../{mage_rep}/{name}.NET\n") - f.write(f"REP ../{mage_rep}/{name}.REP\n") + path = os.path.join("..",mage_rep,name) + f.write(f"NET {path}.NET\n") + f.write(f"REP {path}.REP\n") for file in files: EXT = file.split('.')[1] @@ -140,7 +140,7 @@ class AdisTS(CommandLineSolver): path_mage_net = os.path.join(os.path.abspath( os.path.join(repertory, os.pardir) - ), f"{mage_rep}/net") + ), os.path.join(mage_rep,"net")) path_adists_net = os.path.join(repertory, "net") if os.path.exists(path_mage_net): @@ -729,7 +729,7 @@ class AdisTSwc(AdisTS): data_tmp = {} for file_bin in path_files: - key_pol = file_bin.split("/")[-1][0:-4] + key_pol = os.path.basename(file_bin)[0:-4] data_tmp[key_pol] = {} with open(file_bin, 'rb') as f: # header -- GitLab