X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=resources%2Fyacs_01.en.xml;h=0a897a85a39443dd0f6ebe26ab021922fbfba479;hb=59e5d924b58ad7b1f582b18d05628e36d1f4a320;hp=da766f0343ed9f1621f45d941c21ae8ac5dd11e3;hpb=23bdd53f7112c6b4e4954b042919c390827085fb;p=modules%2Fhomard.git

diff --git a/resources/yacs_01.en.xml b/resources/yacs_01.en.xml
index da766f03..0a897a85 100644
--- a/resources/yacs_01.en.xml
+++ b/resources/yacs_01.en.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='iso-8859-1' ?>
 <proc name="HOMARD">
-   <property name="DefaultStudyID" value="1"/>
    <objref name="CALCIUM_real" id="IDL:Ports/Calcium_Ports/Calcium_Real_Port:1.0"/>
    <type name="string" kind="string"/>
    <struct name="Engines/dataref">
@@ -29,9 +28,12 @@
    <sequence name="seqdblevec" content="dblevec"/>
    <sequence name="seqint" content="int"/>
    <sequence name="seqintvec" content="intvec"/>
+   <sequence name="seqpyobj" content="pyobj"/>
    <sequence name="stringvec" content="string"/>
    <sequence name="seqstringvec" content="stringvec"/>
    <container name="DefaultContainer">
+      <property name="container_kind" value="Salome"/>
+      <property name="attached_on_cloning" value="0"/>
       <property name="container_name" value="FactoryServer"/>
       <property name="name" value="localhost"/>
    </container>
@@ -40,7 +42,7 @@
 DataInit_MeshFile
       </parameter>
    </datanode>
-   <bloc name="Etude_Initialisation">
+   <bloc name="Study_Initialisation">
       <inline name="StudyCreation">
          <script><code><![CDATA[
 import orbmodule
@@ -55,26 +57,18 @@ import HOMARD_Zone_idl
 import HOMARD_Boundary_idl
 
 clt = orbmodule.client()
-StudyManager = clt.Resolve("/myStudyManager")
-CurrentStudy = StudyManager.GetStudyByID(1)
+CurrentStudy = clt.Resolve("/Study")
 ]]></code></script>
-         <outport name="CurrentStudy" type="Study"/>
       </inline>
-      <service name="SetCurrentStudy">
+      <service name="UpdateStudy">
          <component>HOMARD</component>
          <load container="DefaultContainer"/>
-         <method>SetCurrentStudy</method>
-         <inport name="theStudy" type="Study"/>
+         <method>UpdateStudy</method>
       </service>
-      <control> <fromnode>StudyCreation</fromnode> <tonode>SetCurrentStudy</tonode> </control>
-      <datalink control="false">
-         <fromnode>StudyCreation</fromnode> <fromport>CurrentStudy</fromport>
-         <tonode>SetCurrentStudy</tonode> <toport>theStudy</toport>
-      </datalink>
    </bloc>
-   <while name="Boucle_de_convergence">
-      <bloc name="Alternance_Calcul_HOMARD">
-         <inline name="Calcul">
+   <while name="Convergence_Loop">
+      <bloc name="Alternation_Computation_HOMARD">
+         <inline name="Computation">
             <script><code><![CDATA[
 import sys
 import os
@@ -88,17 +82,17 @@ argu.append("--mesh_file="  + MeshFile)
 #
 Script_A = Script(argu)
 #
-Error, message_erreur, dico_resu = Script_A.compute ()
+Error, message_erreur, dict_resu = Script_A.compute ()
 #
-dico_resu["rep_calc"] = rep_calc
+dict_resu["rep_calc"] = rep_calc
 #
 ]]></code></script>
             <inport name="numCalc" type="int"/>
             <inport name="MeshFile" type="string"/>
             <outport name="Error" type="int"/>
-            <outport name="dico_resu" type="pyobj"/>
+            <outport name="dict_resu" type="pyobj"/>
          </inline>
-         <inline name="Analyse">
+         <inline name="Analysis">
             <script><code><![CDATA[
 global NumCalc
 global resu1
@@ -121,8 +115,8 @@ while not Error :
 #
 # If the file is not defined, stop:
 #
-    if dico_resu.has_key("FileName") :
-        FileName = dico_resu["FileName"]
+    if ( "FileName" in dict_resu ) :
+        FileName = dict_resu["FileName"]
     else :
         MessInfo = "The file for the mesh is not defined."
         Error = -2
@@ -130,8 +124,8 @@ while not Error :
 #
 # If the criterion is satisfied, stop:
 #
-    if dico_resu.has_key("V_TEST") :
-        valeur_v = dico_resu["V_TEST"]
+    if ( "V_TEST" in dict_resu ) :
+        valeur_v = dict_resu["V_TEST"]
         if NumCalc == 0 :
             resu1 = [valeur_v]
         else :
@@ -160,7 +154,7 @@ while not Error :
 ]]></code></script>
             <inport name="NumCalc" type="int"/>
             <inport name="ErrCalc" type="int"/>
-            <inport name="dico_resu" type="pyobj"/>
+            <inport name="dict_resu" type="pyobj"/>
             <outport name="Error" type="int"/>
             <outport name="NumCalcP1" type="int"/>
             <outport name="FileName" type="string"/>
@@ -168,12 +162,13 @@ while not Error :
          </inline>
          <switch name="Adaptation" select="0">
             <default>
-               <bloc name="Arret_boucle">
-                  <inline name="Arret">
+               <bloc name="Loop_Stop">
+                  <inline name="Stop">
                      <script><code><![CDATA[
 OK = 0
 MeshFile = " "
 ]]></code></script>
+                     <load container="DefaultContainer"/>
                      <inport name="MessInfo" type="string"/>
                      <outport name="OK" type="bool"/>
                      <outport name="MeshFile" type="string"/>
@@ -187,13 +182,13 @@ MeshFile = " "
                      <default>
                         <bloc name="Iter_n">
                            <service name="LastIteration">
-                              <node>Etude_Initialisation.SetCurrentStudy</node>
+                              <node>Study_Initialisation.UpdateStudy</node>
                               <method>LastIteration</method>
                               <inport name="CaseName" type="string"/>
                               <outport name="return" type="HOMARD_Iteration"/>
                            </service>
                            <service name="GetHypothesis">
-                              <node>Etude_Initialisation.SetCurrentStudy</node>
+                              <node>Study_Initialisation.UpdateStudy</node>
                               <method>GetHypothesis</method>
                               <inport name="HypoName" type="string"/>
                               <outport name="return" type="HOMARD_Hypothesis"/>
@@ -204,7 +199,7 @@ MeshFile = " "
                      <case id="1">
                         <bloc name="Iter_1">
                            <service name="CreateCase">
-                              <node>Etude_Initialisation.SetCurrentStudy</node>
+                              <node>Study_Initialisation.UpdateStudy</node>
                               <method>CreateCase</method>
                               <inport name="CaseName" type="string"/>
                               <inport name="MeshName" type="string"/>
@@ -216,14 +211,14 @@ MeshFile = " "
 import os
 # Directory for the adaptation
 Iter_1_Case_Options
-# Associated iteration #0
+# Associated iteration 0
 Iter0 = Case.GetIter0()
 ]]></code></script>
                               <inport name="Case" type="HOMARD_Cas"/>
                               <outport name="Iter0" type="HOMARD_Iteration"/>
                            </inline>
                            <service name="CreateHypothesis">
-                              <node>Etude_Initialisation.SetCurrentStudy</node>
+                              <node>Study_Initialisation.UpdateStudy</node>
                               <method>CreateHypothesis</method>
                               <inport name="HypoName" type="string"/>
                               <outport name="return" type="HOMARD_Hypothesis"/>
@@ -258,7 +253,7 @@ HOMARD_Exec_Hypo_Options
 # . Name of the previous iteration
 LastIterName = LastIter.GetName()
 aux = '%03d' % NumAdapt
-# . At iteration #1, addition
+# . At iteration 1, addition
 if  NumAdapt == 1 :
   IterName = LastIterName + "_" + aux
 # . Then, substitution
@@ -283,12 +278,12 @@ MeshFile = os.path.join (DirName, "maill."+aux+".med")
 Iter.SetMeshFile(MeshFile)
 #
 # . The file for the fields
-FileName = dico_resu["FileName"]
+FileName = dict_resu["FileName"]
 Iter.SetFieldFile(FileName)
 #
 HOMARD_Exec_Iter_Options
 #
-# Calculation
+# Computationation
 # ===========
 Error = Iter.Compute(1,1)
 #
@@ -304,7 +299,7 @@ else :
                      <inport name="NumAdapt" type="int"/>
                      <inport name="LastIter" type="HOMARD_Iteration"/>
                      <inport name="Hypo" type="HOMARD_Hypothesis"/>
-                     <inport name="dico_resu" type="pyobj"/>
+                     <inport name="dict_resu" type="pyobj"/>
                      <outport name="OK" type="bool"/>
                      <outport name="MessInfo" type="string"/>
                      <outport name="MeshFile" type="string"/>
@@ -329,157 +324,158 @@ else :
                </bloc>
             </case>
          </switch>
-         <control> <fromnode>Calcul</fromnode> <tonode>Analyse</tonode> </control>
-         <control> <fromnode>Analyse</fromnode> <tonode>Adaptation</tonode> </control>
+         <control> <fromnode>Computation</fromnode> <tonode>Analysis</tonode> </control>
+         <control> <fromnode>Analysis</fromnode> <tonode>Adaptation</tonode> </control>
          <datalink control="false">
-            <fromnode>Analyse</fromnode> <fromport>Error</fromport>
+            <fromnode>Analysis</fromnode> <fromport>Error</fromport>
             <tonode>Adaptation</tonode> <toport>select</toport>
          </datalink>
          <datalink control="false">
-            <fromnode>Analyse</fromnode> <fromport>NumCalcP1</fromport>
-            <tonode>Calcul</tonode> <toport>numCalc</toport>
+            <fromnode>Analysis</fromnode> <fromport>NumCalcP1</fromport>
+            <tonode>Computation</tonode> <toport>numCalc</toport>
          </datalink>
          <datalink control="false">
-            <fromnode>Analyse</fromnode> <fromport>NumCalcP1</fromport>
+            <fromnode>Analysis</fromnode> <fromport>NumCalcP1</fromport>
             <tonode>Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation</tonode> <toport>select</toport>
          </datalink>
          <datalink control="false">
-            <fromnode>Analyse</fromnode> <fromport>NumCalcP1</fromport>
+            <fromnode>Analysis</fromnode> <fromport>NumCalcP1</fromport>
             <tonode>Adaptation.p0_Adaptation_HOMARD.HOMARD_Exec</tonode> <toport>NumAdapt</toport>
          </datalink>
          <datalink control="false">
-            <fromnode>Analyse</fromnode> <fromport>FileName</fromport>
+            <fromnode>Analysis</fromnode> <fromport>FileName</fromport>
             <tonode>Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation.p1_Iter_1.CreateCase</tonode> <toport>FileName</toport>
          </datalink>
          <datalink control="false">
-            <fromnode>Analyse</fromnode> <fromport>MessInfo</fromport>
-            <tonode>Adaptation.default_Arret_boucle.Arret</tonode> <toport>MessInfo</toport>
+            <fromnode>Analysis</fromnode> <fromport>MessInfo</fromport>
+            <tonode>Adaptation.default_Loop_Stop.Stop</tonode> <toport>MessInfo</toport>
          </datalink>
          <datalink control="false">
-            <fromnode>Calcul</fromnode> <fromport>Error</fromport>
-            <tonode>Analyse</tonode> <toport>ErrCalc</toport>
+            <fromnode>Computation</fromnode> <fromport>Error</fromport>
+            <tonode>Analysis</tonode> <toport>ErrCalc</toport>
          </datalink>
          <datalink control="false">
-            <fromnode>Calcul</fromnode> <fromport>dico_resu</fromport>
-            <tonode>Analyse</tonode> <toport>dico_resu</toport>
+            <fromnode>Computation</fromnode> <fromport>dict_resu</fromport>
+            <tonode>Analysis</tonode> <toport>dict_resu</toport>
          </datalink>
          <datalink control="false">
-            <fromnode>Calcul</fromnode> <fromport>dico_resu</fromport>
-            <tonode>Adaptation.p0_Adaptation_HOMARD.HOMARD_Exec</tonode> <toport>dico_resu</toport>
+            <fromnode>Computation</fromnode> <fromport>dict_resu</fromport>
+            <tonode>Adaptation.p0_Adaptation_HOMARD.HOMARD_Exec</tonode> <toport>dict_resu</toport>
          </datalink>
          <datalink control="false">
-            <fromnode>Adaptation.default_Arret_boucle.Arret</fromnode> <fromport>MeshFile</fromport>
-            <tonode>Calcul</tonode> <toport>MeshFile</toport>
+            <fromnode>Adaptation.default_Loop_Stop.Stop</fromnode> <fromport>MeshFile</fromport>
+            <tonode>Computation</tonode> <toport>MeshFile</toport>
          </datalink>
          <datalink control="false">
             <fromnode>Adaptation.p0_Adaptation_HOMARD.HOMARD_Exec</fromnode> <fromport>MeshFile</fromport>
-            <tonode>Calcul</tonode> <toport>MeshFile</toport>
+            <tonode>Computation</tonode> <toport>MeshFile</toport>
          </datalink>
       </bloc>
       <datalink control="false">
-         <fromnode>Alternance_Calcul_HOMARD.Analyse</fromnode> <fromport>NumCalcP1</fromport>
-         <tonode>Alternance_Calcul_HOMARD.Analyse</tonode> <toport>NumCalc</toport>
+         <fromnode>Alternation_Computation_HOMARD.Analysis</fromnode> <fromport>NumCalcP1</fromport>
+         <tonode>Alternation_Computation_HOMARD.Analysis</tonode> <toport>NumCalc</toport>
       </datalink>
    </while>
-   <inline name="Bilan">
+   <inline name="Results">
       <script><code><![CDATA[
-from PyQt4 import QtGui
+from PyQt5 import QtWidgets
 import sys
-app = QtGui.QApplication(sys.argv)
-MessageBoxTitle = "Bilan"
+app = QtWidgets.QApplication(sys.argv)
+MessageBoxTitle = "Results"
 if MessInfo == "" :
     MessInfo = "The convergence is reached."
-    QtGui.QMessageBox.information(None, MessageBoxTitle, MessInfo)
+    QtWidgets.QMessageBox.information(None, MessageBoxTitle, MessInfo)
 else :
-    QtGui.QMessageBox.critical(None, MessageBoxTitle, MessInfo)
+    QtWidgets.QMessageBox.critical(None, MessageBoxTitle, MessInfo)
 ]]></code></script>
+      <load container="DefaultContainer"/>
       <inport name="MessInfo" type="string"/>
    </inline>
-   <control> <fromnode>DataInit</fromnode> <tonode>Etude_Initialisation</tonode> </control>
-   <control> <fromnode>Etude_Initialisation</fromnode> <tonode>Boucle_de_convergence</tonode> </control>
-   <control> <fromnode>Boucle_de_convergence</fromnode> <tonode>Bilan</tonode> </control>
+   <control> <fromnode>DataInit</fromnode> <tonode>Study_Initialisation</tonode> </control>
+   <control> <fromnode>Study_Initialisation</fromnode> <tonode>Convergence_Loop</tonode> </control>
+   <control> <fromnode>Convergence_Loop</fromnode> <tonode>Results</tonode> </control>
    <datalink control="false">
       <fromnode>DataInit</fromnode> <fromport>MeshFile</fromport>
-      <tonode>Boucle_de_convergence.Alternance_Calcul_HOMARD.Calcul</tonode> <toport>MeshFile</toport>
+      <tonode>Convergence_Loop.Alternation_Computation_HOMARD.Computation</tonode> <toport>MeshFile</toport>
    </datalink>
    <datalink control="false">
-      <fromnode>Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation.default_Arret_boucle.Arret</fromnode> <fromport>OK</fromport>
-      <tonode>Boucle_de_convergence</tonode> <toport>condition</toport>
+      <fromnode>Convergence_Loop.Alternation_Computation_HOMARD.Adaptation.default_Loop_Stop.Stop</fromnode> <fromport>OK</fromport>
+      <tonode>Convergence_Loop</tonode> <toport>condition</toport>
    </datalink>
    <datalink control="false">
-      <fromnode>Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Exec</fromnode> <fromport>OK</fromport>
-      <tonode>Boucle_de_convergence</tonode> <toport>condition</toport>
+      <fromnode>Convergence_Loop.Alternation_Computation_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Exec</fromnode> <fromport>OK</fromport>
+      <tonode>Convergence_Loop</tonode> <toport>condition</toport>
    </datalink>
    <datalink control="false">
-      <fromnode>Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation.default_Arret_boucle.Arret</fromnode> <fromport>MessInfo</fromport>
-      <tonode>Bilan</tonode> <toport>MessInfo</toport>
+      <fromnode>Convergence_Loop.Alternation_Computation_HOMARD.Adaptation.default_Loop_Stop.Stop</fromnode> <fromport>MessInfo</fromport>
+      <tonode>Results</tonode> <toport>MessInfo</toport>
    </datalink>
    <datalink control="false">
-      <fromnode>Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Exec</fromnode> <fromport>MessInfo</fromport>
-      <tonode>Bilan</tonode> <toport>MessInfo</toport>
+      <fromnode>Convergence_Loop.Alternation_Computation_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Exec</fromnode> <fromport>MessInfo</fromport>
+      <tonode>Results</tonode> <toport>MessInfo</toport>
    </datalink>
    <parameter>
-      <tonode>Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation.p1_Iter_1.CreateCase</tonode><toport>CaseName</toport>
-      <value><string>Calcul</string></value>
+      <tonode>Convergence_Loop.Alternation_Computation_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation.p1_Iter_1.CreateCase</tonode><toport>CaseName</toport>
+      <value><string>Computation</string></value>
    </parameter>
    <parameter>
-      <tonode>Boucle_de_convergence.Alternance_Calcul_HOMARD.Calcul</tonode><toport>numCalc</toport>
+      <tonode>Convergence_Loop.Alternation_Computation_HOMARD.Computation</tonode><toport>numCalc</toport>
       <value><int>0</int></value>
    </parameter>
    <parameter>
-      <tonode>Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation</tonode><toport>select</toport>
+      <tonode>Convergence_Loop.Alternation_Computation_HOMARD.Adaptation</tonode><toport>select</toport>
       <value><int>0</int></value>
    </parameter>
    <parameter>
-      <tonode>Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation</tonode><toport>select</toport>
+      <tonode>Convergence_Loop.Alternation_Computation_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation</tonode><toport>select</toport>
       <value><int>0</int></value>
    </parameter>
    <parameter>
-      <tonode>Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation.default_Iter_n.LastIteration</tonode><toport>CaseName</toport>
-      <value><string>Calcul</string></value>
+      <tonode>Convergence_Loop.Alternation_Computation_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation.default_Iter_n.LastIteration</tonode><toport>CaseName</toport>
+      <value><string>Computation</string></value>
    </parameter>
    <parameter>
-      <tonode>Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation.default_Iter_n.GetHypothesis</tonode><toport>HypoName</toport>
+      <tonode>Convergence_Loop.Alternation_Computation_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation.default_Iter_n.GetHypothesis</tonode><toport>HypoName</toport>
       <value><string>Hypo</string></value>
    </parameter>
    <parameter>
-      <tonode>Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation.p1_Iter_1.CreateHypothesis</tonode><toport>HypoName</toport>
+      <tonode>Convergence_Loop.Alternation_Computation_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation.p1_Iter_1.CreateHypothesis</tonode><toport>HypoName</toport>
       <value><string>Hypo</string></value>
    </parameter>
    <parameter>
-      <tonode>Boucle_de_convergence</tonode><toport>condition</toport>
+      <tonode>Convergence_Loop</tonode><toport>condition</toport>
       <value><boolean>true</boolean></value>
    </parameter>
    <parameter>
-      <tonode>Boucle_de_convergence.Alternance_Calcul_HOMARD.Analyse</tonode><toport>NumCalc</toport>
+      <tonode>Convergence_Loop.Alternation_Computation_HOMARD.Analysis</tonode><toport>NumCalc</toport>
       <value><int>0</int></value>
    </parameter>
    <parameter>
-      <tonode>Boucle_de_convergence.Alternance_Calcul_HOMARD.Analyse</tonode><toport>ErrCalc</toport>
+      <tonode>Convergence_Loop.Alternation_Computation_HOMARD.Analysis</tonode><toport>ErrCalc</toport>
       <value><int>0</int></value>
    </parameter>
 PARAMETRES
    <presentation name="__ROOT__" x="0" y="0" width="704" height="977" expanded="1" expx="0" expy="0" expWidth="704" expHeight="977" shownState="0"/>
    <presentation name="DataInit" x="4" y="32" width="158" height="63" expanded="1" expx="4" expy="32" expWidth="158" expHeight="63" shownState="0"/>
-   <presentation name="Etude_Initialisation" x="175" y="32" width="158" height="38" expanded="0" expx="175" expy="32" expWidth="162.5" expHeight="40.5" shownState="1"/>
-   <presentation name="Etude_Initialisation.StudyCreation" x="0" y="0" width="158" height="36" expanded="1" expx="4" expy="32" expWidth="158" expHeight="36" shownState="2"/>
-   <presentation name="Etude_Initialisation.SetCurrentStudy" x="0" y="0" width="158" height="36" expanded="1" expx="163" expy="32" expWidth="158" expHeight="36" shownState="2"/>
-   <presentation name="Boucle_de_convergence" x="4" y="103" width="569" height="514" expanded="1" expx="4" expy="103" expWidth="569" expHeight="514" shownState="0"/>
-   <presentation name="Boucle_de_convergence.Alternance_Calcul_HOMARD" x="4" y="59" width="561" height="451" expanded="1" expx="10" expy="59" expWidth="561" expHeight="451" shownState="0"/>
-   <presentation name="Boucle_de_convergence.Alternance_Calcul_HOMARD.Calcul" x="4" y="32" width="158" height="90" expanded="1" expx="4" expy="32" expWidth="158" expHeight="90" shownState="0"/>
-   <presentation name="Boucle_de_convergence.Alternance_Calcul_HOMARD.Analyse" x="181" y="32" width="158" height="171" expanded="1" expx="181" expy="32" expWidth="158" expHeight="171" shownState="0"/>
-   <presentation name="Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation" x="4" y="204" width="553" height="243" expanded="1" expx="4" expy="204" expWidth="553" expHeight="243" shownState="0"/>
-   <presentation name="Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation.default_Arret_boucle" x="4" y="59" width="166" height="153" expanded="1" expx="4" expy="59" expWidth="166" expHeight="153" shownState="0"/>
-   <presentation name="Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation.default_Arret_boucle.Arret" x="4" y="32" width="158" height="117" expanded="1" expx="4" expy="32" expWidth="158" expHeight="117" shownState="0"/>
-   <presentation name="Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation.p0_Adaptation_HOMARD"  x="202" y="59" width="347" height="180" expanded="1" expx="202" expy="59" expWidth="347" expHeight="180" shownState="0"/>
-   <presentation name="Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation" x="4" y="32" width="158" height="65" expanded="0" expx="4" expy="32" expWidth="167" expHeight="67.5" shownState="1"/>
-   <presentation name="Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation.p1_Iter_1" x="0" y="0" width="162.5" height="40.5" expanded="1" expx="4" expy="59" expWidth="162.5" expHeight="40.5" shownState="2"/>
-   <presentation name="Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation.p1_Iter_1.CreateCase" x="0" y="0" width="158" height="36" expanded="1" expx="4" expy="32" expWidth="158" expHeight="36" shownState="2"/>
-   <presentation name="Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation.p1_Iter_1.Case_Options" x="0" y="0" width="158" height="36" expanded="1" expx="163" expy="32" expWidth="158" expHeight="36" shownState="2"/>
-   <presentation name="Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation.p1_Iter_1.CreateHypothesis" x="0" y="0" width="158" height="36" expanded="1" expx="322" expy="32" expWidth="158" expHeight="36" shownState="2"/>
-   <presentation name="Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation.default_Iter_n" x="0" y="0" width="162.5" height="40.5" expanded="1" expx="4" expy="1639.5" expWidth="162.5" expHeight="40.5" shownState="2"/>
-   <presentation name="Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation.default_Iter_n.LastIteration" x="0" y="0" width="158" height="36" expanded="1" expx="4" expy="32" expWidth="158" expHeight="36" shownState="2"/>
-   <presentation name="Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation.default_Iter_n.GetHypothesis" x="0" y="0" width="158" height="36" expanded="1" expx="163" expy="32" expWidth="158" expHeight="36" shownState="2"/>
-   <presentation name="Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Exec" x="185" y="32" width="158" height="144" expanded="1" expx="185" expy="32" expWidth="158" expHeight="144" shownState="0"/>
-   <presentation name="Bilan" x="350" y="32" width="158" height="63" expanded="1" expx="350" expy="32" expWidth="158" expHeight="63" shownState="0"/>
+   <presentation name="Study_Initialisation" x="175" y="32" width="158" height="38" expanded="0" expx="175" expy="32" expWidth="162.5" expHeight="40.5" shownState="1"/>
+   <presentation name="Study_Initialisation.StudyCreation" x="0" y="0" width="158" height="36" expanded="1" expx="4" expy="32" expWidth="158" expHeight="36" shownState="2"/>
+   <presentation name="Study_Initialisation.UpdateStudy" x="0" y="0" width="158" height="36" expanded="1" expx="163" expy="32" expWidth="158" expHeight="36" shownState="2"/>
+   <presentation name="Convergence_Loop" x="4" y="103" width="569" height="514" expanded="1" expx="4" expy="103" expWidth="569" expHeight="514" shownState="0"/>
+   <presentation name="Convergence_Loop.Alternation_Computation_HOMARD" x="4" y="59" width="561" height="451" expanded="1" expx="10" expy="59" expWidth="561" expHeight="451" shownState="0"/>
+   <presentation name="Convergence_Loop.Alternation_Computation_HOMARD.Computation" x="4" y="32" width="158" height="90" expanded="1" expx="4" expy="32" expWidth="158" expHeight="90" shownState="0"/>
+   <presentation name="Convergence_Loop.Alternation_Computation_HOMARD.Analysis" x="181" y="32" width="158" height="171" expanded="1" expx="181" expy="32" expWidth="158" expHeight="171" shownState="0"/>
+   <presentation name="Convergence_Loop.Alternation_Computation_HOMARD.Adaptation" x="4" y="204" width="553" height="243" expanded="1" expx="4" expy="204" expWidth="553" expHeight="243" shownState="0"/>
+   <presentation name="Convergence_Loop.Alternation_Computation_HOMARD.Adaptation.default_Loop_Stop" x="4" y="59" width="166" height="153" expanded="1" expx="4" expy="59" expWidth="166" expHeight="153" shownState="0"/>
+   <presentation name="Convergence_Loop.Alternation_Computation_HOMARD.Adaptation.default_Loop_Stop.Stop" x="4" y="32" width="158" height="117" expanded="1" expx="4" expy="32" expWidth="158" expHeight="117" shownState="0"/>
+   <presentation name="Convergence_Loop.Alternation_Computation_HOMARD.Adaptation.p0_Adaptation_HOMARD"  x="202" y="59" width="347" height="180" expanded="1" expx="202" expy="59" expWidth="347" expHeight="180" shownState="0"/>
+   <presentation name="Convergence_Loop.Alternation_Computation_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation" x="4" y="32" width="158" height="65" expanded="0" expx="4" expy="32" expWidth="167" expHeight="67.5" shownState="1"/>
+   <presentation name="Convergence_Loop.Alternation_Computation_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation.p1_Iter_1" x="0" y="0" width="162.5" height="40.5" expanded="1" expx="4" expy="59" expWidth="162.5" expHeight="40.5" shownState="2"/>
+   <presentation name="Convergence_Loop.Alternation_Computation_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation.p1_Iter_1.CreateCase" x="0" y="0" width="158" height="36" expanded="1" expx="4" expy="32" expWidth="158" expHeight="36" shownState="2"/>
+   <presentation name="Convergence_Loop.Alternation_Computation_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation.p1_Iter_1.Case_Options" x="0" y="0" width="158" height="36" expanded="1" expx="163" expy="32" expWidth="158" expHeight="36" shownState="2"/>
+   <presentation name="Convergence_Loop.Alternation_Computation_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation.p1_Iter_1.CreateHypothesis" x="0" y="0" width="158" height="36" expanded="1" expx="322" expy="32" expWidth="158" expHeight="36" shownState="2"/>
+   <presentation name="Convergence_Loop.Alternation_Computation_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation.default_Iter_n" x="0" y="0" width="162.5" height="40.5" expanded="1" expx="4" expy="1639.5" expWidth="162.5" expHeight="40.5" shownState="2"/>
+   <presentation name="Convergence_Loop.Alternation_Computation_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation.default_Iter_n.LastIteration" x="0" y="0" width="158" height="36" expanded="1" expx="4" expy="32" expWidth="158" expHeight="36" shownState="2"/>
+   <presentation name="Convergence_Loop.Alternation_Computation_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation.default_Iter_n.GetHypothesis" x="0" y="0" width="158" height="36" expanded="1" expx="163" expy="32" expWidth="158" expHeight="36" shownState="2"/>
+   <presentation name="Convergence_Loop.Alternation_Computation_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Exec" x="185" y="32" width="158" height="144" expanded="1" expx="185" expy="32" expWidth="158" expHeight="144" shownState="0"/>
+   <presentation name="Results" x="350" y="32" width="158" height="63" expanded="1" expx="350" expy="32" expWidth="158" expHeight="63" shownState="0"/>
 </proc>