Remplacement de mktemp par mkdtemp ou mkstemp.

[modules/homard.git] / resources / yacs_01.fr.xml

diff --git a/resources/yacs_01.fr.xml b/resources/yacs_01.fr.xml
index d3e238ba9c168c41c64ff52564a276657ff22b25..a05d16453c7d60edd60768838bc86cc704b36a57 100644 (file)
--- a/resources/yacs_01.fr.xml
+++ b/resources/yacs_01.fr.xml
@@ -56,9 +56,9 @@ import HOMARD_Boundary_idl
 
 clt = orbmodule.client()
 StudyManager = clt.Resolve("/myStudyManager")
-NewStudy = StudyManager.NewStudy("my_homard_study")
+CurrentStudy = StudyManager.GetStudyByID(1)
 ]]></code></script>
-         <outport name="NewStudy" type="Study"/>
+         <outport name="CurrentStudy" type="Study"/>
       </inline>
       <service name="SetCurrentStudy">
          <component>HOMARD</component>
@@ -68,7 +68,7 @@ NewStudy = StudyManager.NewStudy("my_homard_study")
       </service>
       <control> <fromnode>StudyCreation</fromnode> <tonode>SetCurrentStudy</tonode> </control>
       <datalink control="false">
-         <fromnode>StudyCreation</fromnode> <fromport>NewStudy</fromport>
+         <fromnode>StudyCreation</fromnode> <fromport>CurrentStudy</fromport>
          <tonode>SetCurrentStudy</tonode> <toport>theStudy</toport>
       </datalink>
    </bloc>
@@ -106,7 +106,7 @@ global resu1
 NumCalcP1 = NumCalc + 1
 FileName = " "
 #
-NbCalcMax = 5
+Analyse_Test_Convergence
 #
 MessInfo = None
 Error = 0
@@ -150,10 +150,11 @@ while not Error :
 #
 # Si on depasse le maximum, on arrete :
 #
-    if NumCalc > NbCalcMax :
-        MessInfo = "La limite en nombre de calculs a ete atteinte : %d" % NbCalcMax
-        Error = -1
-        break
+    if MaxIter > 0 :
+      if NumCalc >= MaxIter :
+          MessInfo = "La limite en nombre de calculs a ete atteinte : %d" % (MaxIter+1)
+          Error = -1
+          break
 #
     break
 ]]></code></script>
@@ -285,6 +286,8 @@ Iter.SetMeshFile(MeshFile)
 FileName = dico_resu["FileName"]
 Iter.SetFieldFile(FileName)
 #
+HOMARD_Exec_Iter_Options
+#
 # Calcul
 # ======
 Error = Iter.Compute(1,1)