From 35c54c4edd721a432942ab086a4479fd3e0ad6ff Mon Sep 17 00:00:00 2001 From: gdd Date: Tue, 3 May 2011 16:30:50 +0000 Subject: [PATCH] =?utf8?q?Fixes=20by=20G=C3=83=C2=A9rald=20NICOLAS=20Fix?= =?utf8?q?=20by=20Gilles=20DAVID=20(Python=20Dump)?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/HOMARD/HomardDriver.cxx | 50 ++++++++++++--- src/HOMARD/HomardDriver.hxx | 6 +- src/HOMARD_I/HOMARD_Gen_i.cxx | 111 ++++++++++++++++++++++++++++++++-- src/HOMARD_I/HOMARD_Gen_i.hxx | 1 + tests/test_1.00.med | Bin 86312 -> 133056 bytes tests/test_1.01.med | Bin 91328 -> 141280 bytes tests/test_1.02.med | Bin 99552 -> 154112 bytes tests/test_2.00.med | Bin 123409 -> 201065 bytes tests/test_2.fr.med | Bin 537154 -> 549250 bytes tests/test_3.00.med | Bin 86021 -> 127925 bytes tests/test_3.fr.med | Bin 1198536 -> 1226872 bytes 11 files changed, 150 insertions(+), 18 deletions(-) diff --git a/src/HOMARD/HomardDriver.cxx b/src/HOMARD/HomardDriver.cxx index da930133..caaa95b3 100644 --- a/src/HOMARD/HomardDriver.cxx +++ b/src/HOMARD/HomardDriver.cxx @@ -342,27 +342,34 @@ void HomardDriver::TexteBoundaryOption( int BoundaryOption ) // } ////============================================================================= -void HomardDriver::TexteBoundaryDi( const std::string MeshName, const std::string MeshFile, const std::string GroupName ) +void HomardDriver::TexteBoundaryDi( const std::string MeshName, const std::string MeshFile ) { MESSAGE("Dans HomardDriver::TexteBoundaryDi, MeshName = "< 0 ) _Texte += "CCGroFro " + GroupName + "\n" ; // } ////============================================================================= -void HomardDriver::TexteBoundaryAn( int NumeBoundary, int BoundaryType, const std::string Group, double x0, double x1, double x2, double x3, double x4, double x5, double x6 ) +void HomardDriver::TexteBoundaryDiGr( const std::string GroupName ) { + MESSAGE("Dans HomardDriver::TexteBoundaryDiGr, GroupName = "< ListeBoundaryTraitees ; HOMARD::ListBoundaryGroupType* ListBoundaryGroupType = myCase->GetBoundaryGroup(); int numberOfitems = ListBoundaryGroupType->length(); MESSAGE ( "... number of string for Boundary+Group = " << numberOfitems); int BoundaryOption = 1 ; int NumBoundaryAnalytical = 0 ; for (int NumBoundary = 0; NumBoundary< numberOfitems; NumBoundary=NumBoundary+2) + { + std::string BoundaryName = std::string((*ListBoundaryGroupType)[NumBoundary]); + MESSAGE ( "... BoundaryName = " << BoundaryName); + int A_faire = 1 ; + std::list::const_iterator it = ListeBoundaryTraitees.begin(); + while (it != ListeBoundaryTraitees.end()) + { + MESSAGE ( "... BoundaryNameTraitee = " << *it); + if ( BoundaryName == *it ) { A_faire = 0 ; } + it++; + } + if ( A_faire == 1 ) + { +// Caracteristiques de la frontiere + HOMARD::HOMARD_Boundary_var myBoundary = myContextMap[GetCurrentStudyID()]._mesBoundarys[BoundaryName]; + ASSERT(!CORBA::is_nil(myBoundary)); + int BoundaryType = myBoundary->GetBoundaryType(); + MESSAGE ( "... BoundaryType = " << BoundaryType ); +// Ecriture selon le type + if (BoundaryType == 0) // Cas d une frontiere discrete + { + const char* MeshName = myBoundary->GetMeshName() ; + const char* MeshFile = myBoundary->GetMeshFile() ; + myDriver->TexteBoundaryDi( MeshName, MeshFile); + BoundaryOption = BoundaryOption*2 ; + } + else if (BoundaryType == 1) // Cas d un cylindre + { + NumBoundaryAnalytical++ ; + HOMARD::double_array* coor = myBoundary->GetCylinder(); + myDriver->TexteBoundaryAn(BoundaryName, NumBoundaryAnalytical, BoundaryType, (*coor)[0], (*coor)[1], (*coor)[2], (*coor)[3], (*coor)[4], (*coor)[5], (*coor)[6]); + BoundaryOption = BoundaryOption*3 ; + } + else if (BoundaryType == 2) // Cas d une sphere + { + NumBoundaryAnalytical++ ; + HOMARD::double_array* coor = myBoundary->GetSphere(); + myDriver->TexteBoundaryAn(BoundaryName, NumBoundaryAnalytical, BoundaryType, (*coor)[0], (*coor)[1], (*coor)[2], (*coor)[3], 0., 0., 0.); + BoundaryOption = BoundaryOption*3 ; + } +// Memorisation du traitement + ListeBoundaryTraitees.push_back( BoundaryName ); + } + } + NumBoundaryAnalytical = 0 ; + for (int NumBoundary = 0; NumBoundary< numberOfitems; NumBoundary=NumBoundary+2) + { + std::string BoundaryName = std::string((*ListBoundaryGroupType)[NumBoundary]); + MESSAGE ( "... BoundaryName = " << BoundaryName); + HOMARD::HOMARD_Boundary_var myBoundary = myContextMap[GetCurrentStudyID()]._mesBoundarys[BoundaryName]; + ASSERT(!CORBA::is_nil(myBoundary)); + int BoundaryType = myBoundary->GetBoundaryType(); + MESSAGE ( "... BoundaryType = " << BoundaryType ); +// Recuperation du nom du groupe + std::string GroupName = std::string((*ListBoundaryGroupType)[NumBoundary+1]); + MESSAGE ( "... GroupName = " << GroupName); + if (BoundaryType == 0) // Cas d une frontiere discrete + { + if ( GroupName.size() > 0 ) { myDriver->TexteBoundaryDiGr ( GroupName ) ; } + } + else // Cas d une frontiere analytique + { + NumBoundaryAnalytical++ ; + myDriver->TexteBoundaryAnGr ( BoundaryName, NumBoundaryAnalytical, GroupName ) ; + } + } +/* for (int NumBoundary = 0; NumBoundary< numberOfitems; NumBoundary=NumBoundary+2) { std::string BoundaryName = std::string((*ListBoundaryGroupType)[NumBoundary]); MESSAGE ( "... BoundaryName = " << BoundaryName); @@ -1234,7 +1321,7 @@ CORBA::Boolean HOMARD_Gen_i::Compute(const char* nomIteration, CORBA::Long etatM myDriver->TexteBoundaryAn(NumBoundaryAnalytical, BoundaryType, GroupName, (*coor)[0], (*coor)[1], (*coor)[2], (*coor)[3], 0., 0., 0.); BoundaryOption = BoundaryOption*3 ; } - } + }*/ myDriver->TexteBoundaryOption(BoundaryOption); // E.6. Ajout des informations liees a l'eventuelle interpolation des champs @@ -2352,6 +2439,7 @@ HOMARD::HOMARD_Zone_ptr HOMARD_Gen_i::newZone() //========================================================================== Engines::TMPFile* HOMARD_Gen_i::DumpPython(CORBA::Object_ptr theStudy, CORBA::Boolean isPublished, + CORBA::Boolean isMultiFile, CORBA::Boolean& isValidScript) { MESSAGE ("Entree dans DumpPython"); @@ -2370,10 +2458,15 @@ Engines::TMPFile* HOMARD_Gen_i::DumpPython(CORBA::Object_ptr theStudy, aScript += "\"\"\"\n"; aScript += "__revision__ = \"V1.2\"\n"; aScript += "import HOMARD\n"; - aScript += "import salome\n"; + if( isMultiFile ) + aScript += "import salome\n"; aScript += "homard = salome.lcc.FindOrLoadComponent('FactoryServer','HOMARD')\n"; - aScript += "def RebuildData(theStudy):\n"; - aScript += "\thomard.SetCurrentStudy(theStudy)\n"; + if( isMultiFile ) { + aScript += "def RebuildData(theStudy):\n"; + aScript += "\thomard.SetCurrentStudy(theStudy)\n"; + } + else + aScript += "\thomard.SetCurrentStudy(salome.myStudy)\n"; if (myContextMap[GetCurrentStudyID()]._mesBoundarys.size() > 0) @@ -2461,8 +2554,14 @@ Engines::TMPFile* HOMARD_Gen_i::DumpPython(CORBA::Object_ptr theStudy, std::string dumpIter = dumpCorbaIter.in(); aScript+=dumpIter; } - - + + if( isMultiFile ) + aScript += "\n\tpass"; + aScript += "\n"; + + if( !isMultiFile ) // remove unnecessary tabulation + aScript = RemoveTabulation( aScript ); + const size_t aLen = strlen(aScript.c_str()); char* aBuffer = new char[aLen+1]; strcpy(aBuffer, aScript.c_str()); diff --git a/src/HOMARD_I/HOMARD_Gen_i.hxx b/src/HOMARD_I/HOMARD_Gen_i.hxx index 6f44d12b..cac1cefe 100644 --- a/src/HOMARD_I/HOMARD_Gen_i.hxx +++ b/src/HOMARD_I/HOMARD_Gen_i.hxx @@ -164,6 +164,7 @@ private: virtual Engines::TMPFile* DumpPython(CORBA::Object_ptr theStudy, CORBA::Boolean isPublished, + CORBA::Boolean isMultiFile, CORBA::Boolean& isValidScript); diff --git a/tests/test_1.00.med b/tests/test_1.00.med index 767d4f62247468d3c7f1d2cfd52c5e96e66a6089..316e14050d754d42c8730519febf8b27a25e4c31 100644 GIT binary patch delta 10532 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 Ja!_<}?!WjWJmvrZ diff --git a/tests/test_1.02.med b/tests/test_1.02.med index 4e94dcdd0af04c636bac25ccb2aac39ffc334dbd..1a9688c14bf74071b709a0673dd5c67b875cfb2a 100644 GIT binary patch delta 10720 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 WWX8IJ!Gv^RMm98SA3D(eNcR7eF7s3X delta 3728 zcma)8eQaA-6@TZsv7epBdv;0eWY9bZXib~6FDy#kw8@-OC#GL^)=jl4B3uC?TGn81 zW29r?mzAlhI#7};^>!4AR2ot!|71KQm;W*eDG^A;{cD9vD12>c3dPl=&MQc8?>qPT z*_{&cqWFHD`@6q$&hMW0j9+-B>l>e> z_Sc;>JEK5_+zLf_>V3I>ggC#GtT*kDGyj^swcXB*c_4bq;zU=yvTEMg^$ajVjh*Le z0u+DfBNtLCQ^OE3MpP2*O0pp3yF`#6LPk16-oOq)l$?1xgpp+%!SbF(or8{&(%w&R z1gxu!wRuH9gmhvZvf7A<+;O)3DTh;xypakze0nTCJvN_!#pkr(6R`Qj>|6*o2|C}z z{K$4Hq}1!ss=*eN_6bUp{f|@Xb13PA<)EI{0gKiFPV3IeQL=QfJ*@=N`$!@6p_Q!!xsmRv32Z%;4D<32 zBetYB5*i#4`TKu`W`*(2$&EsgeJ5gipY!->H~{=Gi<09TRNvcfXcuBMd4yDQ0>+LdPK@)98*sYwaw_ErQj&q`2;KRf0KY9rl?1Pny zI4(_NYnK^4UT>#=1IHCIb*jMgW4<#s?50K^^Zg~U)hd@}TmDCGRz4%jYqis)Egyo1 zc5>k(E9tLB-L%xmLiNVursnMH4|wHh>`aiA+1k__!Kw-!NnOSL%O^-*eg~|O{H1oY zGWXk*g)mCAzt$?V=DL6Krs#ijOsh9VC}EVu|L&~TNxW*2et!dtUw%-MiMBUP*6wPg zbT>@2b&aaiOuFfH2IW)DnRNxI<^zRhWC&N^b1H?iu$PqYjX{7!JOx%3VnqFCrp6!u zux#xl@%skJ-p{iCLv4xYc)}CM62}v)9U46TM%Yda(7X%ce0)i^d#vKEv4i-dvOoT0nh`Te zu5E25e+v4ZUl6C*`kQ8v<4;<&wxFXEIB(l2FJP}Uj;(!>lD+kI(H}j4Nj{wX;m@17B z_a+0lAifp;xWC044&hXWIo;ltY{C)#vJ2RVy|S;0B|ETuLJ{3I-ITJ7QLE>UiKB^ zqt^>?ifAbh)oz1Ev|b-w9|k{7UWKjnHwEY^W;@_7TcDx%rJXS9rtC8^O0q$X#6MPw zKtG*V|WFI0jRm!oXMb84P9I6G};Es+Z z(a2I)Yff;$Id(4xuoo^49+%qz#dYO&jkwB3(c(WYM_g-zoX`MVUIv|JmO-QGWmea8 z-pjoQTb|%soU01-&IRbFlW#&_@zFB7URVY<5?i;o>UULZlwN!boOV@^(?5d*SXGP4iz6MN%nc{<^5YnjeBzr66(6LRml73AXajnqo1f*Sy zFFT^3D!*8n2}=>Jivkh1NYacba+zWz$%AVopq1t);AyWhS$no6h0^zMic3LjeHjNf zQuamcMPGE35G|k*cx`_bmp64KQxF(dnMn%<_6hnc*sFXSPq36gv}eQK(s^9zpi{fy zr$if9<&|@oe_mXoRylF%H+}STc({3jb)Vx;HN$&c+QKEQCX4^LR98&~XK&RO6PAB( cl`j2p9`@1s0-V{bayTL|bN*o{GM`lVAB8eAKmY&$ diff --git a/tests/test_2.00.med b/tests/test_2.00.med index 05e3849b89285c6543707c81a6a77dc8e0eafe19..b4ada0fe318f08b18780453432dd5aa8d98f47f1 100644 GIT binary patch delta 12333 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 KP4mz?Oa23Mqh*r- diff --git a/tests/test_2.fr.med b/tests/test_2.fr.med index 48ceb7d05a5c08266f5f816c948a4adc0883851f..33315ed5eff5506f08d214ee1c407ce653200950 100644 GIT binary patch delta 3280 zcmcInUrbw77(eIUUbqz2-IfgttlOm>v#Va&D_t3cO$@L^CB_F?V&e7! z78|#SuPVJ}9G~MF;x6xC%`fWvFJF41Yps&P3F=z65-U_%dWQpJeo)>V^to#hd!|tW-hB&Yp=&hXq2SFm6HL zI4V%6LCFdUsf}m;bS~@O-|N_F3q-YLP`H>d6S&`svbgJgI<=|gS!tD$hvX&4ck0&b z4;{UBX7Rj)ucGYY`QpSoW_@S5)56*yL3%Ib?~l-Y72--{*~G2wpjq$db_k63^s*kWZgoE4S~r?DlA+t8m9`H7u4-mzZ5(xN zVTFeZteHpk4GdNqMN41(MQBWE-Expr;2T(GAq5-wWX(UvKJ5KN{>oj zdU0&x-&#^k5$OK$YjzU)YTZAh(95Qrk z`T#6ggA8Iu4hI0dLLQSJp2kNLMSLxocO)T#Z-=-b>qTy8mIQLK%Tu)t%#Ss zm>OHDzKtym(D&OQEtm@@^71F18rYl%t)GP+#d^b9M`|H1sp9oe9)zKLXbTF2L55); zViY)4>mx|L7W{9i&wa-(cnKMpGx8mKe#>2gDL?2DH<_-X+?~>?PA=_5zcr~PytF_| zGTn#|4~kgjp=2uD@AAkhnMKHCsLEsGYtbrR9U=c1Yz6xv_6$qY0@lNgh5tLqtccvJ GMf5KlaqV9K delta 633 zcmZoVta#{&!UPQ_C!>j4Zj1^O3-vh}86e=n(sId8wB@@%+Uz}p~3W5;pUI;+#g;K$O{w|CR%nTe*zJoA? z0dpR@J_)Egt5#Mp3#Lx08Nz?m1fgNp?6LzZ6J~%ZoMi(sA<1Uq#&eSwunTNHA+m#a z;sK87yUaKwrZe@iN=%Qk}DgwD6sjleIg?x`*hn*R@cd0jwWz*tY0*NMojGy!wkNu<-gW>x@RhT`_M}$UBydPi zE)Wu!e#MhRVmng@s}tMAAZFXXtCziF2>^A>s4f5i diff --git a/tests/test_3.00.med b/tests/test_3.00.med index 0b41f32825a499167891ccb9d6b6d5ed33a31c20..c76b750e987b85ada88f0a2dfcbae2112d7d694d 100644 GIT binary patch delta 8110 zcmc&(4NP0t6@J&oU(wP&MC+(cmTh58r@4u?G7)XG-BPzHgthyj+r9VP zhauzs3tP4Rd0dddv(iOAinNm*pqJ+{>~8zgoS{$G+V z#bN`d=#>Se0Ji74@?E029f<9YXm|xNLr?B|N`GFDp(rHYHHdrbMgmuirSRvxWzb$= zhIhfCR8)-;Bav(nYqKj)7ak{2v9JKXYW+NfWOlbgkJSaC7i36S%b{Zi*pMNk}UirbHP@%oCjm@jw^Roy+fe7=)OWCxr9c1y<)4nkH7_^SxGET zSV{>UA2aI^3N~TP_ce6Z+(aOhvMVP`eCr`FF1Hm*U*M`l%8|_UuVHm9my3iE>?TP8 z|Eeu@^;;Sm>sPO<^>0~Mx6$8NS5qq$N)^-n3u*tAYY=AHEK!MF)%?F|=eoO6aIwi0 zN%X@bCvuei`(EA+uU^ZAu0q-9-%Fq-Y^Ru-A#v>v`0n`DoS*#S)c{;xQ31{gN72eP z8@c5fp5W8BmMU8&LWHuHxVASVed373oZQQW$;^AWm9c+}FN7D{mKgi?vq0UD`p`V+ z%p+ehkbE`?j49r3XPm<069t2P`Q(cjm_O=VK<=H6E;?eN@vgPXT0`O?GCPBGx~`%& zq7@dBjy1FXY>3fntKNR@!QetNo-fAK{rpT){L!J?W{x9#d#2+!xD3Z}p?GFI8TIGm z7`Vg{UQonx#R;(ErGAkF2T#{%Gmx*?)0l_-VELH;u zyt%CiDrC86L*v|h+x3KN#NkqTy&BsJFLMvQfo!1{xC8C*7n9Qu@( zvf@o5Ftv&~g(_`^gC$N<9f^Gzx=I{no{BkF<&E0ls?kxT*20nX=y+-afzusJ+BVG@ zmp}uf_^-IGuXJ^r)^Po8bhyZ!qT^|27%D8IZG@SlChp~4nfuYyE&~G#sV*!vPmSxOPFofn> zsm|#RAH;XK$}NABDp4s%gu*z_b7Uttrd{McUIP;@?~jkf<$G}l6PPIq{7 zCTUJXY{%!ygMZcSC%9W1a(gS9^HLoKd6~-*G#CuL(I~k%^LJA$*lb{p>a1Wz5__8I z9n+0qgJ@^lMF)R2692<&WiBdOB({)Dk?s8?X-^~;7R1!DT{NV=WhOmrwbR%hvZR&bEFrqlsVM#NgCe7G8y16^nrOjQ-lW4A!>ST|*vH7{9$dqN6}o8>ST|*&iT1x`RIEd1Np4;(fv%C(v*lvM~xjmqD^Uc z9}aPV>M%;Ls`)tdcio)!J*UlSb3d93Q=RN_nw+0gmXGerTg=C?pWz5H%g5iU>*Mfq zY3_OlbYt2|Pb#&x@ZJ~DT#)K8?*5~4XL?_^AO8t$?o2;Lb8f1WJ?`Aw=dGnIAG_li z$Y-68ttZl)`d-$JwKJy8>B!H~+!Q@_W}N<8G#2$^^u+zxAF~%^CbkFec7!Q`__R&z`pD@2{9Pu;&vfU9pU00As#zUMf|e! zBy4=jK8LhX6tD**GqNS^#7-d=E#S-{dAtyM$`W~nropt*+bL*P0f;)Ml*gkjb`{w z-J@(iuZ^bjH)zgBbr_nTsA#%B((T9dhBlh1^JvaOb+U(MOD1SGzmZ1M{YTxSG$pms zJo9@rH}(fa^J5jwo#VRwBrj^C*_%XjajKI&G$;3DFgHz?5KZ>Gr%CD(#WWBDR(YQm zqVE(Jj|*|^H7=eMV)uD2o)e-sNyQ(EA5zVt(Gy}iFg#&41Vo{>{`i{jpX)nvFBFNp=XT zeP+haFQ+bJ0PJ~8oQSdKZgIrIp1t2o>x_smJ=WeSJ`vcn=V)3dDYh!CJuFsH_PkTn TaQ1BfRa$>Y+ delta 909 zcmZvZKWGzS6u|FYlDo^LNxr03(wM{$9ioG_v9TZsQAp{ap#?1twnf1uP*5DyN-z%M zRLJ!;d^(676a*K`5pD|HoN{so;>w-VZs6F{L`D9r7Gc{7JT40-@SV_7^rX5emUwIt!WR?x({UWP#V{6S zNxfzK1)OdlR-cW$0khumaf%73I;gB^?IFOVL8`|s%)GR@b+6L z{c|5K;Y)E`{kA%P&zh}!mv|VQbLul+sT2zFK*1l$W${_W}(s#48I&L>8L=GC1!_1&|#NNY3_6?em;n^Imrs20{#2^v0G_tS2{*z4q gNqe<1dC+1pwZFB-8N0KMwx%+sh7&o>w3!Y612X9@)AkeQ+(Y{Eu2Sohd~lz^=A&t?WQSR@6U zD-1(3)N~xQCDYjPM==Cltz^?Lc3;eliB3N)Au+=by2LNj#4!Kj{rC1dSc`yr>Fw*i z@4R#G`JHpmJ?SviO-|HDoTlJl&$3$V>^Zd3Qd`}O=!MxgLZgYqwK-UVmYk(|4lx!2 zY*`%j?>8$D$r(?^b0a33Up&*q-R-r)&r%tDpSuu3`3n35_GCQ&2aGL{=$xO7nXh1Q z&CQ4UqQ}9n(t8m^iX1Rnrb4R7X;qQRG!55T*}Wfw)6ovWHaEy*b`iRTD8qIj>F zF9*lrm%hcxDtQ<~mF>wwj2vP)!A;g=g0xw~cWIYTYnL%;CekF*WYXr4mP1-D zX$on1q~#B2mkYl84Ej3>iY|(xe8BHF*PC!2^`;bKWAkC`5p`gEkNGKXU`;fz&%Aod z%IL^G5-fNQ_Go@k67KVUZOeNb%_T=dNI53i~GbUa`tt&p@L(&mz;4#Wc% z=S_7Sz-<^UaYdMkE$72$_*n#Ewj2NkQAZJhp6P6vMZBZQxQ>TXWN0 z5eJ7(&8N>G-e=AgQOL%Ems6z}QVR0=>R3M$)lBbc+o#XhdFPhR{NjU6=-n`V!aL@B0vQv!r!1UDEY!q{7RNf$ zqgNGLU4T~KmSE^yF?IM3Z(|dCaK8}lnRMW0(MrE}mR$pfmO7-dtJY+q<8Kyu6?)|H zGk_S}JQaD&&h?Gknx3g?W&uqHJTwwh_9e>uTuvp){uYLKt{NqIN|8plS>bAF<%~(6 zrskN?KS<>8@$x*>%Jl@f9&%_vYMxRYW|Je-=1X4=^tP8mWxE5OZLiAH6TQ19u`=Uy zuI>DN&Bvyb1_Q$Oc&=TF?X<#;(n^R+N(oOG2+=)5HT!mmbrG4NuC;Kz)gie*G+vei zyR8Uzm93ufZRaljwr4j<;iuNZ*WDT{?$u!2sll2x8g$obaAOA@%Yjv`n|e|?>}S`p zO#>4@=DTxgewSjq#Yw7`C(dA%q>$mBWV3QuttIV4fGa$pIoW)Kw|}Mm8BFS|61{ z9~l~CUt1Px_7}MdcN?eXblA6DbElve#g@I78C($ANP(O9D#EP6Tk@3Gu2L-@C$0F+0f!`Y|)w;YwI@GwA6XG)--vmHxB~BOZUv;3b7l zXC_|tDxb_xWGL}JbmG3Gp+VNVvk+IqT!pK9Hi^6a*>Xdt4lj0&FGf#5|9{NSSirzH zWfjZ|q3$#V@BRFT_7FG{}=@vv^@J!c~l(olP%y;(5%&vO-_ z-r2-7ni&%*rdD9aV5B#VLF_%l0x8&+nSuLVZh()-PzJYj2Ce}^gY3DKg@JN`t8iYL zO$L*PGHzIdLGY4bK>p4sG>Ky$A=eI8^r$>Rq7W&IE962<%AOo3k{3!-wvI@4DR7nk z%d&_RnkJS@^{ubhi_QZE6w#0v5=Xj_1d>E_B!#3yr`G-F zcPpi{VRATIwZd|l6tBAZZg-id03y?OjrG%8Gooh=hHg<~IC5nbZT jC-#*3x#JjT$W*)W -- 2.39.2