SetSurrentStudy --> UpdateStudy

diff --git a/doc/files/tutorial_4.xml b/doc/files/tutorial_4.xml
index 2ccdb22c8a28a79f934009bfd1ef595d440c6efc..fcb633e8fb533ed4fac6168e08254f0f7a03a5d3 100644 (file)
--- a/doc/files/tutorial_4.xml
+++ b/doc/files/tutorial_4.xml
@@ -58,20 +58,19 @@ CurrentStudy = clt.Resolve("/Study")
          <load container="DefaultContainer"/>
          <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>
       <service name="CreateHypothesis_1">
-         <node>Etude_Initialisation.SetCurrentStudy</node>
+         <node>Etude_Initialisation.UpdateStudy</node>
          <method>CreateHypothesis</method>
          <inport name="HypoName" type="string"/>
          <outport name="return" type="HOMARD_Hypothesis"/>
       </service>
       <service name="CreateCase">
-         <node>Etude_Initialisation.SetCurrentStudy</node>
+         <node>Etude_Initialisation.UpdateStudy</node>
          <method>CreateCase</method>
          <inport name="CaseName" type="string"/>
          <inport name="MeshName" type="string"/>
@@ -108,14 +107,14 @@ Iter0 = Case.GetIter0()
          <outport name="Iter0" type="HOMARD_Iteration"/>
       </inline>
       <service name="CreateBoundaryCAO">
-         <node>Etude_Initialisation.SetCurrentStudy</node>
+         <node>Etude_Initialisation.UpdateStudy</node>
          <method>CreateBoundaryCAO</method>
          <inport name="BoundaryName" type="string"/>
          <inport name="FileName" type="string"/>
          <outport name="return" type="HOMARD_Boundary"/>
       </service>
       <service name="CreateHypothesis_2">
-         <node>Etude_Initialisation.SetCurrentStudy</node>
+         <node>Etude_Initialisation.UpdateStudy</node>
          <method>CreateHypothesis</method>
          <inport name="HypoName" type="string"/>
          <outport name="return" type="HOMARD_Hypothesis"/>
@@ -131,8 +130,8 @@ Hypo.AddGroup('T2_EXT')
          <load container="DefaultContainer"/>
          <inport name="Hypo" type="HOMARD_Hypothesis"/>
       </inline>
-      <control> <fromnode>StudyCreation</fromnode> <tonode>SetCurrentStudy</tonode> </control>
-      <control> <fromnode>SetCurrentStudy</fromnode> <tonode>CreateBoundaryCAO</tonode> </control>
+      <control> <fromnode>StudyCreation</fromnode> <tonode>UpdateStudy</tonode> </control>
+      <control> <fromnode>UpdateStudy</fromnode> <tonode>CreateBoundaryCAO</tonode> </control>
       <control> <fromnode>CreateHypothesis_1</fromnode> <tonode>Hypo_Options_1</tonode> </control>
       <control> <fromnode>CreateCase</fromnode> <tonode>Case_Options</tonode> </control>
       <control> <fromnode>Hypo_Options_1</fromnode> <tonode>CreateHypothesis_2</tonode> </control>
@@ -140,10 +139,6 @@ Hypo.AddGroup('T2_EXT')
       <control> <fromnode>CreateBoundaryCAO</fromnode> <tonode>CreateCase</tonode> </control>
       <control> <fromnode>CreateBoundaryCAO</fromnode> <tonode>Case_Options</tonode> </control>
       <control> <fromnode>CreateHypothesis_2</fromnode> <tonode>Hypo_Options_2</tonode> </control>
-      <datalink control="false">
-         <fromnode>StudyCreation</fromnode> <fromport>CurrentStudy</fromport>
-         <tonode>SetCurrentStudy</tonode> <toport>theStudy</toport>
-      </datalink>
       <datalink control="false">
          <fromnode>CreateHypothesis_1</fromnode> <fromport>return</fromport>
          <tonode>Hypo_Options_1</tonode> <toport>Hypo</toport>
@@ -439,7 +434,7 @@ else :
       <value><string>Hypo_4</string></value>
    </parameter>
    <presentation name="Etude_Initialisation.StudyCreation" x="4" y="32" width="158" height="63" expanded="1" expx="4" expy="32" expWidth="158" expHeight="63" shownState="0"/>
-   <presentation name="Etude_Initialisation.SetCurrentStudy" x="163" y="32" width="158" height="63" expanded="1" expx="163" expy="32" expWidth="158" expHeight="63" shownState="0"/>
+   <presentation name="Etude_Initialisation.UpdateStudy" x="163" y="32" width="158" height="63" expanded="1" expx="163" expy="32" expWidth="158" expHeight="63" shownState="0"/>
    <presentation name="Etude_Initialisation.Hypo_Options_1" x="163" y="214.605" width="158" height="63" expanded="1" expx="163" expy="214.605" expWidth="158" expHeight="63" shownState="0"/>
    <presentation name="Etude_Initialisation.CreateBoundaryCAO" x="4" y="96" width="158" height="90" expanded="1" expx="4" expy="96" expWidth="158" expHeight="90" shownState="0"/>
    <presentation name="Etude_Initialisation.Case_Options" x="322.605" y="98.2103" width="158" height="117" expanded="1" expx="322.605" expy="98.2103" expWidth="158" expHeight="117" shownState="0"/>

diff --git a/doc/files/tutorial_6.xml b/doc/files/tutorial_6.xml
old mode 100755 (executable)
new mode 100644 (file)
index 542251c..6d486b8
--- a/doc/files/tutorial_6.xml
+++ b/doc/files/tutorial_6.xml
@@ -53,20 +53,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>
          <load container="DefaultContainer"/>
          <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>
       <service name="CreateBoundarycyl_1_int">
-         <node>Etude_Initialisation.SetCurrentStudy</node>
+         <node>Etude_Initialisation.UpdateStudy</node>
          <method>CreateBoundaryCylinder</method>
          <inport name="BoundaryName" type="string"/>
          <inport name="Xcentre" type="double"/>
@@ -79,7 +77,7 @@ CurrentStudy = StudyManager.GetStudyByID(1)
          <outport name="return" type="HOMARD_Boundary"/>
       </service>
       <service name="CreateBoundarycyl_1_ext">
-         <node>Etude_Initialisation.SetCurrentStudy</node>
+         <node>Etude_Initialisation.UpdateStudy</node>
          <method>CreateBoundaryCylinder</method>
          <inport name="BoundaryName" type="string"/>
          <inport name="Xcentre" type="double"/>
@@ -92,7 +90,7 @@ CurrentStudy = StudyManager.GetStudyByID(1)
          <outport name="return" type="HOMARD_Boundary"/>
       </service>
       <service name="CreateBoundarycyl_2_int">
-         <node>Etude_Initialisation.SetCurrentStudy</node>
+         <node>Etude_Initialisation.UpdateStudy</node>
          <method>CreateBoundaryCylinder</method>
          <inport name="BoundaryName" type="string"/>
          <inport name="Xcentre" type="double"/>
@@ -105,13 +103,13 @@ CurrentStudy = StudyManager.GetStudyByID(1)
          <outport name="return" type="HOMARD_Boundary"/>
       </service>
       <service name="CreateHypothesis_1">
-         <node>Etude_Initialisation.SetCurrentStudy</node>
+         <node>Etude_Initialisation.UpdateStudy</node>
          <method>CreateHypothesis</method>
          <inport name="HypoName" type="string"/>
          <outport name="return" type="HOMARD_Hypothesis"/>
       </service>
       <service name="CreateCase">
-         <node>Etude_Initialisation.SetCurrentStudy</node>
+         <node>Etude_Initialisation.UpdateStudy</node>
          <method>CreateCase</method>
          <inport name="CaseName" type="string"/>
          <inport name="MeshName" type="string"/>
@@ -153,7 +151,7 @@ Iter0 = Case.GetIter0()
          <outport name="Iter0" type="HOMARD_Iteration"/>
       </inline>
       <service name="CreateBoundarycyl_2_ext">
-         <node>Etude_Initialisation.SetCurrentStudy</node>
+         <node>Etude_Initialisation.UpdateStudy</node>
          <method>CreateBoundaryCylinder</method>
          <inport name="BoundaryName" type="string"/>
          <inport name="Xcentre" type="double"/>
@@ -166,7 +164,7 @@ Iter0 = Case.GetIter0()
          <outport name="return" type="HOMARD_Boundary"/>
       </service>
       <service name="CreateBoundaryintersection">
-         <node>Etude_Initialisation.SetCurrentStudy</node>
+         <node>Etude_Initialisation.UpdateStudy</node>
          <method>CreateBoundaryDi</method>
          <inport name="BoundaryName" type="string"/>
          <inport name="MeshName" type="string"/>
@@ -174,7 +172,7 @@ Iter0 = Case.GetIter0()
          <outport name="return" type="HOMARD_Boundary"/>
       </service>
       <service name="CreateHypothesis_2">
-         <node>Etude_Initialisation.SetCurrentStudy</node>
+         <node>Etude_Initialisation.UpdateStudy</node>
          <method>CreateHypothesis</method>
          <inport name="HypoName" type="string"/>
          <outport name="return" type="HOMARD_Hypothesis"/>
@@ -190,8 +188,8 @@ Hypo.AddGroup('T2_EXT')
          <load container="DefaultContainer"/>
          <inport name="Hypo" type="HOMARD_Hypothesis"/>
       </inline>
-      <control> <fromnode>StudyCreation</fromnode> <tonode>SetCurrentStudy</tonode> </control>
-      <control> <fromnode>SetCurrentStudy</fromnode> <tonode>CreateBoundarycyl_1_int</tonode> </control>
+      <control> <fromnode>StudyCreation</fromnode> <tonode>UpdateStudy</tonode> </control>
+      <control> <fromnode>UpdateStudy</fromnode> <tonode>CreateBoundarycyl_1_int</tonode> </control>
       <control> <fromnode>CreateBoundarycyl_1_int</fromnode> <tonode>CreateBoundarycyl_1_ext</tonode> </control>
       <control> <fromnode>CreateBoundarycyl_1_ext</fromnode> <tonode>CreateBoundarycyl_2_int</tonode> </control>
       <control> <fromnode>CreateBoundarycyl_2_int</fromnode> <tonode>CreateBoundarycyl_2_ext</tonode> </control>
@@ -204,7 +202,7 @@ Hypo.AddGroup('T2_EXT')
       <control> <fromnode>CreateHypothesis_2</fromnode> <tonode>Hypo_Options_2</tonode> </control>
       <datalink control="false">
          <fromnode>StudyCreation</fromnode> <fromport>CurrentStudy</fromport>
-         <tonode>SetCurrentStudy</tonode> <toport>theStudy</toport>
+         <tonode>UpdateStudy</tonode> <toport>theStudy</toport>
       </datalink>
       <datalink control="false">
          <fromnode>CreateHypothesis_1</fromnode> <fromport>return</fromport>
@@ -330,12 +328,12 @@ FileName = os.path.join(data_dir, "tutorial_4.00.med")
 #
 # Maillage de la frontiere
 # . Nom du maillage
-BMeshName = "PIQUAGE"
+BMeshName = "COURBES"
 # . Fichier du maillage
 BFileName = os.path.join(data_dir, "tutorial_6.fr.med")
 #
-# Répertoire de travail
-if os.environ.has_key("LOGNAME") :
+# Repertoire de travail
+if "LOGNAME" in os.environ :
   user = os.environ ["LOGNAME"]
 else :
   user = "anonymous"
@@ -644,7 +642,7 @@ else :
    <presentation name="Etude_Initialisation.CreateCase" x="4" y="348.5" width="158" height="117" expanded="1" expx="4" expy="348.5" expWidth="158" expHeight="117" shownState="0"/>
    <presentation name="Etude_Initialisation.CreateBoundarycyl_1_int" x="4" y="96" width="158" height="252" expanded="1" expx="4" expy="96" expWidth="158" expHeight="252" shownState="0"/>
    <presentation name="ForLoop.HOMARD_2" x="7" y="62" width="158" height="171" expanded="1" expx="7" expy="62" expWidth="158" expHeight="171" shownState="0"/>
-   <presentation name="Etude_Initialisation.SetCurrentStudy" x="163" y="32" width="158" height="63" expanded="1" expx="163" expy="32" expWidth="158" expHeight="63" shownState="0"/>
+   <presentation name="Etude_Initialisation.UpdateStudy" x="163" y="32" width="158" height="63" expanded="1" expx="163" expy="32" expWidth="158" expHeight="63" shownState="0"/>
    <presentation name="Etude_Initialisation.StudyCreation" x="4" y="32" width="158" height="63" expanded="1" expx="4" expy="32" expWidth="158" expHeight="63" shownState="0"/>
    <presentation name="ForLoop" x="163" y="738.933" width="169" height="237" expanded="1" expx="163" expy="738.933" expWidth="169" expHeight="237" shownState="0"/>
    <presentation name="Etude_Initialisation" x="4" y="204" width="800.5" height="533.933" expanded="1" expx="4" expy="204" expWidth="800.5" expHeight="533.933" shownState="0"/>

diff --git a/doc/files/yacs_01.en.xml b/doc/files/yacs_01.en.xml
index 83166861f4991ab3895f39217e9733c5660771ed..babc556c80e98033c79f49a90b0e1eff21cf3b46 100644 (file)
--- a/doc/files/yacs_01.en.xml
+++ b/doc/files/yacs_01.en.xml
@@ -58,17 +58,12 @@ 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>
+      <control> <fromnode>StudyCreation</fromnode> <tonode>UpdateStudy</tonode> </control>
    </bloc>
    <while name="Boucle_de_convergence">
       <bloc name="Alternance_Calcul_HOMARD">
@@ -122,7 +117,7 @@ while not Error :
 #
 # If the file is not defined, stop:
 #
-    if dico_resu.has_key("FileName") :
+    if ( "FileName" in dico_resu ) :
         FileName = dico_resu["FileName"]
     else :
         MessInfo = "The file for the mesh is not defined."
@@ -131,7 +126,7 @@ while not Error :
 #
 # If the criterion is satisfied, stop:
 #
-    if dico_resu.has_key("V_TEST") :
+    if ( "V_TEST" in dico_resu ) :
         valeur_v = dico_resu["V_TEST"]
         if NumCalc == 0 :
             resu1 = [valeur_v]
@@ -187,13 +182,13 @@ MeshFile = " "
                      <default>
                         <bloc name="Iter_n">
                            <service name="LastIteration">
-                              <node>Etude_Initialisation.SetCurrentStudy</node>
+                              <node>Etude_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>Etude_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>Etude_Initialisation.UpdateStudy</node>
                               <method>CreateCase</method>
                               <inport name="CaseName" type="string"/>
                               <inport name="MeshName" type="string"/>
@@ -225,7 +220,7 @@ Iter0 = Case.GetIter0()
                               <outport name="Iter0" type="HOMARD_Iteration"/>
                            </inline>
                            <service name="CreateHypothesis">
-                              <node>Etude_Initialisation.SetCurrentStudy</node>
+                              <node>Etude_Initialisation.UpdateStudy</node>
                               <method>CreateHypothesis</method>
                               <inport name="HypoName" type="string"/>
                               <outport name="return" type="HOMARD_Hypothesis"/>
@@ -487,7 +482,7 @@ else :
    <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="Etude_Initialisation.UpdateStudy" 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"/>

diff --git a/doc/files/yacs_01.fr.xml b/doc/files/yacs_01.fr.xml
index c384530c7fbba8af7da8fa777ad24e9575f91097..9eda8c3336ece9b29c0132e65fa23f536750df28 100644 (file)
--- a/doc/files/yacs_01.fr.xml
+++ b/doc/files/yacs_01.fr.xml
@@ -58,17 +58,12 @@ 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>
+      <control> <fromnode>StudyCreation</fromnode> <tonode>UpdateStudy</tonode> </control>
    </bloc>
    <while name="Boucle_de_convergence">
       <bloc name="Alternance_Calcul_HOMARD">
@@ -122,7 +117,7 @@ while not Error :
 #
 # Si le fichier n'a pas ete defini, on arrete :
 #
-    if dico_resu.has_key("FileName") :
+    if ( "FileName" in dico_resu ) :
         FileName = dico_resu["FileName"]
     else :
         MessInfo = "Le fichier du maillage n'a pas ete defini"
@@ -131,7 +126,7 @@ while not Error :
 #
 # Si le critere est respecte, on arrete :
 #
-    if dico_resu.has_key("V_TEST") :
+    if ( "V_TEST" in dico_resu ) :
         valeur_v = dico_resu["V_TEST"]
         if NumCalc == 0 :
             resu1 = [valeur_v]
@@ -187,13 +182,13 @@ MeshFile = " "
                      <default>
                         <bloc name="Iter_n">
                            <service name="LastIteration">
-                              <node>Etude_Initialisation.SetCurrentStudy</node>
+                              <node>Etude_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>Etude_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>Etude_Initialisation.UpdateStudy</node>
                               <method>CreateCase</method>
                               <inport name="CaseName" type="string"/>
                               <inport name="MeshName" type="string"/>
@@ -225,7 +220,7 @@ Iter0 = Case.GetIter0()
                               <outport name="Iter0" type="HOMARD_Iteration"/>
                            </inline>
                            <service name="CreateHypothesis">
-                              <node>Etude_Initialisation.SetCurrentStudy</node>
+                              <node>Etude_Initialisation.UpdateStudy</node>
                               <method>CreateHypothesis</method>
                               <inport name="HypoName" type="string"/>
                               <outport name="return" type="HOMARD_Hypothesis"/>
@@ -487,7 +482,7 @@ else :
    <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="Etude_Initialisation.UpdateStudy" 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"/>