Corrections d'enchainement dans les schémas YACS produits.

Création d'un script sans effet, pour pouvoir tester.
Mise à jour du catalogue YACS.

diff --git a/doc/en/yacs.rst b/doc/en/yacs.rst
index 03e6de2a130eeb620df5a983556faa1134809650..afec03cf8b3dfdd6cd0988ea600768fec7e56f42 100644 (file)
--- a/doc/en/yacs.rst
+++ b/doc/en/yacs.rst
@@ -288,6 +288,7 @@ Use this scheme
 To reproduce this example, download:
   * :download:`the scheme <../files/yacs_01.en.xml>`
   * :download:`an example of python script <../files/yacs_script.py>`
+  * :download:`an example of python script ... for nothing <../files/yacs_script_test.py>`
 
 It should be adapted to simulation considered. In particular, it is necessary:
 

diff --git a/doc/files/yacs_script_test.py b/doc/files/yacs_script_test.py
new file mode 100755 (executable)
index 0000000..b401f48
--- /dev/null
+++ b/doc/files/yacs_script_test.py
@@ -0,0 +1,261 @@
+#!/usr/bin/env python
+# -*- coding: iso-8859-1 -*-
+# Copyright (C) 2013-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+"""
+Pseudo-lancement d'un calcul pour valider les tests
+"""
+__revision__ = "V2.1"
+#
+import sys
+import os
+#
+class Script :
+#
+  """
+Mode d'emploi :
+==============
+yacs_script_test --rep_calc=rep_calc --mesh_file=mesh_file --num=nro [-h|-help] [-v] [-v_max]
+
+Arguments obligatoires :
+------------------------
+--rep_calc=rep_calc : le repertoire du calcul.
+--mesh_file=mesh_file : le fichier contenant le maillage sur lequel on veut calculer. Le nom est absolu ou relatif par rapport au repertoire de calcul ou a $HOME.
+--num=nro : le numero du calcul, depuis 0.
+
+Exemples :
+----------
+./yacs_script_test.py --rep_calc=`pwd` --mesh_file=maill.00.med --num=0
+  """
+#
+#====
+# 0. Les defauts
+#====
+#
+  affiche_aide_globale = 0
+  verbose = 0
+  verbose_max = 0
+#
+  message_info = "\n"
+#
+#
+#========================= Debut de la fonction ==================================
+#
+  def __init__ ( self, liste_arg ) :
+#
+    """
+Le constructeur de la classe Script
+    """
+#
+# 1. Decodage des arguments
+#
+    self.rep_calc = None
+    self.numero = None
+    self.mesh_file = None
+#
+    for argu in liste_arg :
+#
+      #print argu
+      l_aux = argu.split("=")
+      #print l_aux
+      if len(l_aux) == 2 :
+        #print l_aux[0]
+        #print l_aux[1]
+        if l_aux[0] == "--rep_calc" :
+          self.rep_calc = l_aux[1]
+        elif l_aux[0] == "--num" :
+          self.numero = int(l_aux[1])
+        elif l_aux[0] == "--mesh_file" :
+          self.mesh_file = l_aux[1]
+      else :
+        saux = argu.upper()
+        if saux in ( "-H", "-HELP" ) :
+          self.affiche_aide_globale = 1
+        elif saux == "-V" :
+          self.verbose = 1
+        elif saux in ( "-V_MAX", "-VMAX" ) :
+          self.verbose = 1
+          self.verbose_max = 1
+#
+# 2. Les paramètres de base
+#
+    self.dico = {}
+#
+    if self.verbose_max :
+      nom_fonction = __name__ + "/__init__"
+      print "\nDans " + nom_fonction + ","
+      print ". rep_calc       :", self.rep_calc
+      print ". mesh_file      :", self.mesh_file
+      print ". numero         :", self.numero
+#
+#=========================  Fin de la fonction ===================================
+#
+#========================= Debut de la fonction ==================================
+#
+  def compute ( self ) :
+#
+    """
+Lancement d'un calcul
+    """
+#
+    nom_fonction = __name__ + "/compute"
+    blabla = "\nDans " + nom_fonction + ","
+#
+    erreur = 0
+    message_erreur = " "
+#
+    dico_resu = {}
+#
+    while not erreur :
+#
+# 1. Controles des arguments
+#
+      #print "\n==== self.controle_argument () ===="
+      erreur, message_erreur = self.controle_argument()
+      if erreur :
+        break
+#
+# 2. Pseudo-Calcul
+#
+      #print "\n==== self.calcul () ===="
+      dico_resu["FileName"] = self.mesh_file
+      dico_resu["V_TEST"] = 1./float(self.numero+1)
+#
+      break
+#
+    if self.verbose_max :
+      print blabla
+      print ". erreur :", erreur
+#
+    return erreur, message_erreur, dico_resu
+#
+#=========================  Fin de la fonction ===================================
+#
+#========================= Debut de la fonction ==================================
+#
+  def controle_argument ( self ) :
+#
+    """
+Controle les arguments et stockage de quelques informations
+    """
+#
+    messages_erreur = { 0 : None,
+                       -1 : "Quel repertoire de calcul ?",
+                       -3 : "Quel fichier de maillage ?",
+                       -4 : "Ce repertoire est inconnu.",
+                       -5 : "Ce fichier est inconnu.",
+                       -9 : "Quel numero de calcul ?" }
+#
+    nom_fonction = __name__ + "/controle_argument"
+    blabla = "\nDans " + nom_fonction + ","
+#
+    erreur = 0
+    message_erreur = " "
+#
+    if self.verbose_max :
+      print blabla
+      print ". rep_calc       :", self.rep_calc
+      print ". mesh_file      :", self.mesh_file
+      print ". numero         :", self.numero
+#
+    while not erreur :
+#
+# 1. Les repertoire et fichier
+# 1.1. Il y a bien eu une donnee
+#
+      if self.rep_calc == None :
+        erreur = -1
+      elif self.mesh_file == None :
+        erreur = -3
+      if erreur < 0 :
+        self.message_info += "Relancer avec -h pour avoir le mode d'emploi."
+        break
+#
+# 1.2. Le repertoire de calcul
+#
+      if os.environ.has_key("HOME") :
+        HOME = os.environ ["HOME"]
+      else :
+        HOME = "/local/home/salome"
+#
+      if ( self.rep_calc[:1] == "~" ) :
+        self.rep_calc = os.path.join(HOME, self.rep_calc[2:])
+      if not os.path.isdir(self.rep_calc) :
+        self.message_info += "Repertoire " + self.rep_calc
+        erreur = -4
+        break
+      else :
+        aux = os.path.join(os.getcwd(), self.rep_calc)
+        self.rep_calc = os.path.normpath(aux)
+#
+# 1.3. Les fichiers
+#
+      fic = self.mesh_file
+#
+      if ( fic[:1] == "~" ) :
+        fic = os.path.join(HOME, fic[2:])
+      if not os.path.isfile(fic) :
+        aux = os.path.join(self.rep_calc, fic)
+        if not os.path.isfile(aux) :
+          self.message_info += "Fichier : " + fic
+          erreur = -5
+          break
+        else :
+          fic = os.path.normpath(aux)
+      aux = os.path.join(os.getcwd(), fic)
+#
+      self.mesh_file = os.path.normpath(aux)
+#
+# 2. Le numero du calcul
+#
+      if self.numero == None :
+        erreur = -9
+#
+      break
+#
+    if erreur :
+      message_erreur = messages_erreur[erreur]
+#
+    if self.verbose_max :
+      print ". rep_calc  :", self.rep_calc
+      print ". mesh_file :", self.mesh_file
+#
+    return erreur, message_erreur
+#
+#=========================  Fin de la fonction ===================================
+#
+#
+if __name__ == "__main__" :
+#
+  #print "Arguments a l'entree de",  sys.argv[0], ":", sys.argv[1:], "\n"
+#
+  Script_A = Script(sys.argv[1:])
+#
+  if Script_A.affiche_aide_globale :
+    Script_A.message_info = Script_A.__doc__
+    erreur_m = 0
+    message_erreur_m = ""
+  else :
+    dico_resu_m = {}
+    erreur_m, message_erreur_m, dico_resu_m = Script_A.compute ()
+#
+  sys.stdout.write(Script_A.message_info+"\n")
+  sys.stderr.write(message_erreur_m+"\n")
+  sys.exit(erreur_m)

diff --git a/doc/fr/yacs.rst b/doc/fr/yacs.rst
index d9e47ba8d4c2a744179e8176a4fbd763f9a2e2f2..8a3bbf79e6c799c62aa3f51e7d930c52de8ae8bc 100644 (file)
--- a/doc/fr/yacs.rst
+++ b/doc/fr/yacs.rst
@@ -288,6 +288,7 @@ Utiliser ce sch
 Pour reproduire cet exemple, on pourra télécharger :
   * :download:`le schéma <../files/yacs_01.fr.xml>`
   * :download:`un exemple de script python <../files/yacs_script.py>`
+  * :download:`un exemple de script python qui ne fait rien <../files/yacs_script_test.py>`
 
 Il faut l'adapter à la simulation envisagée. En particulier, il faut :
 

diff --git a/idl/Gen.xml b/idl/Gen.xml
index 0f965c5f5e530ff684aa11a900dd9a7c8434f6e8..be9297ea859f9bbe1682728aa3fe55914f931475 100644 (file)
--- a/idl/Gen.xml
+++ b/idl/Gen.xml
@@ -8,14 +8,15 @@
         <sequence content="string" name="HOMARD/listeIterations"></sequence>
         <sequence content="string" name="HOMARD/listeCases"></sequence>
         <sequence content="string" name="HOMARD/listeBoundarys"></sequence>
+        <sequence content="string" name="HOMARD/listeYACSs"></sequence>
     </type-list>
     <component-list>
         <component>
             <component-name>HOMARD</component-name>
             <component-username>HOMARD</component-username>
             <component-type>OTHER</component-type>
-            <component-author>HOMARD team - EDF RD</component-author>
-            <component-version>1.5</component-version>
+            <component-author>EDF</component-author>
+            <component-version>1.6</component-version>
             <component-comment>unknown</component-comment>
             <component-multistudy>1</component-multistudy>
             <component-impltype>1</component-impltype>
@@ -26,14 +27,14 @@
                 <component-interface-comment>unknown</component-interface-comment>
                 <component-service-list>
                     <component-service>
-                        <service-name>CreateCase</service-name>
-                        <service-author>HOMARD team - EDF RD</service-author>
-                        <service-version>1.1</service-version>
+                        <service-name>CreateBoundaryDi</service-name>
+                        <service-author>EDF</service-author>
+                        <service-version>1.6</service-version>
                         <service-comment>unknown</service-comment>
                         <service-by-default>0</service-by-default>
                         <inParameter-list>
                             <inParameter>
-                                <inParameter-name>CaseName</inParameter-name>
+                                <inParameter-name>BoundaryName</inParameter-name>
                                 <inParameter-type>string</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
@@ -51,159 +52,160 @@
                         <outParameter-list>
                             <outParameter>
                                 <outParameter-name>return</outParameter-name>
-                                <outParameter-type>HOMARD/HOMARD_Cas</outParameter-type>
+                                <outParameter-type>HOMARD/HOMARD_Boundary</outParameter-type>
                                 <outParameter-comment>unknown</outParameter-comment>
                             </outParameter>
                         </outParameter-list>
                         <DataStream-list></DataStream-list>
                     </component-service>
                     <component-service>
-                        <service-name>CreateCaseFromIteration</service-name>
-                        <service-author>HOMARD team - EDF RD</service-author>
-                        <service-version>1.1</service-version>
+                        <service-name>CreateBoundaryCylinder</service-name>
+                        <service-author>EDF</service-author>
+                        <service-version>1.6</service-version>
                         <service-comment>unknown</service-comment>
                         <service-by-default>0</service-by-default>
                         <inParameter-list>
                             <inParameter>
-                                <inParameter-name>CaseName</inParameter-name>
+                                <inParameter-name>BoundaryName</inParameter-name>
                                 <inParameter-type>string</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>DirNameStart</inParameter-name>
-                                <inParameter-type>string</inParameter-type>
+                                <inParameter-name>Xcentre</inParameter-name>
+                                <inParameter-type>double</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
-                        </inParameter-list>
-                        <outParameter-list>
-                            <outParameter>
-                                <outParameter-name>return</outParameter-name>
-                                <outParameter-type>HOMARD/HOMARD_Cas</outParameter-type>
-                                <outParameter-comment>unknown</outParameter-comment>
-                            </outParameter>
-                        </outParameter-list>
-                        <DataStream-list></DataStream-list>
-                    </component-service>
-                    <component-service>
-                        <service-name>CreateCaseFromCaseLastIteration</service-name>
-                        <service-author>HOMARD team - EDF RD</service-author>
-                        <service-version>1.1</service-version>
-                        <service-comment>unknown</service-comment>
-                        <service-by-default>0</service-by-default>
-                        <inParameter-list>
                             <inParameter>
-                                <inParameter-name>CaseName</inParameter-name>
-                                <inParameter-type>string</inParameter-type>
+                                <inParameter-name>Ycentre</inParameter-name>
+                                <inParameter-type>double</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>DirNameStart</inParameter-name>
-                                <inParameter-type>string</inParameter-type>
+                                <inParameter-name>Zcentre</inParameter-name>
+                                <inParameter-type>double</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
-                        </inParameter-list>
-                        <outParameter-list>
-                            <outParameter>
-                                <outParameter-name>return</outParameter-name>
-                                <outParameter-type>HOMARD/HOMARD_Cas</outParameter-type>
-                                <outParameter-comment>unknown</outParameter-comment>
-                            </outParameter>
-                        </outParameter-list>
-                        <DataStream-list></DataStream-list>
-                    </component-service>
-                    <component-service>
-                        <service-name>CreateCaseFromCaseIteration</service-name>
-                        <service-author>HOMARD team - EDF RD</service-author>
-                        <service-version>1.1</service-version>
-                        <service-comment>unknown</service-comment>
-                        <service-by-default>0</service-by-default>
-                        <inParameter-list>
                             <inParameter>
-                                <inParameter-name>CaseName</inParameter-name>
-                                <inParameter-type>string</inParameter-type>
+                                <inParameter-name>Xaxis</inParameter-name>
+                                <inParameter-type>double</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>DirNameStart</inParameter-name>
-                                <inParameter-type>string</inParameter-type>
+                                <inParameter-name>Yaxis</inParameter-name>
+                                <inParameter-type>double</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>Number</inParameter-name>
-                                <inParameter-type>long</inParameter-type>
+                                <inParameter-name>Zaxis</inParameter-name>
+                                <inParameter-type>double</inParameter-type>
+                                <inParameter-comment>unknown</inParameter-comment>
+                            </inParameter>
+                            <inParameter>
+                                <inParameter-name>Radius</inParameter-name>
+                                <inParameter-type>double</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                         </inParameter-list>
                         <outParameter-list>
                             <outParameter>
                                 <outParameter-name>return</outParameter-name>
-                                <outParameter-type>HOMARD/HOMARD_Cas</outParameter-type>
+                                <outParameter-type>HOMARD/HOMARD_Boundary</outParameter-type>
                                 <outParameter-comment>unknown</outParameter-comment>
                             </outParameter>
                         </outParameter-list>
                         <DataStream-list></DataStream-list>
                     </component-service>
                     <component-service>
-                        <service-name>CreateHypothesis</service-name>
-                        <service-author>HOMARD team - EDF RD</service-author>
-                        <service-version>1.1</service-version>
+                        <service-name>CreateBoundarySphere</service-name>
+                        <service-author>EDF</service-author>
+                        <service-version>1.6</service-version>
                         <service-comment>unknown</service-comment>
                         <service-by-default>0</service-by-default>
                         <inParameter-list>
                             <inParameter>
-                                <inParameter-name>HypoName</inParameter-name>
+                                <inParameter-name>BoundaryName</inParameter-name>
                                 <inParameter-type>string</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
+                            <inParameter>
+                                <inParameter-name>Xcentre</inParameter-name>
+                                <inParameter-type>double</inParameter-type>
+                                <inParameter-comment>unknown</inParameter-comment>
+                            </inParameter>
+                            <inParameter>
+                                <inParameter-name>Ycentre</inParameter-name>
+                                <inParameter-type>double</inParameter-type>
+                                <inParameter-comment>unknown</inParameter-comment>
+                            </inParameter>
+                            <inParameter>
+                                <inParameter-name>Zcentre</inParameter-name>
+                                <inParameter-type>double</inParameter-type>
+                                <inParameter-comment>unknown</inParameter-comment>
+                            </inParameter>
+                            <inParameter>
+                                <inParameter-name>Radius</inParameter-name>
+                                <inParameter-type>double</inParameter-type>
+                                <inParameter-comment>unknown</inParameter-comment>
+                            </inParameter>
                         </inParameter-list>
                         <outParameter-list>
                             <outParameter>
                                 <outParameter-name>return</outParameter-name>
-                                <outParameter-type>HOMARD/HOMARD_Hypothesis</outParameter-type>
+                                <outParameter-type>HOMARD/HOMARD_Boundary</outParameter-type>
                                 <outParameter-comment>unknown</outParameter-comment>
                             </outParameter>
                         </outParameter-list>
                         <DataStream-list></DataStream-list>
                     </component-service>
                     <component-service>
-                        <service-name>CreateZoneBox</service-name>
-                        <service-author>HOMARD team - EDF RD</service-author>
-                        <service-version>1.1</service-version>
+                        <service-name>CreateBoundaryConeR</service-name>
+                        <service-author>EDF</service-author>
+                        <service-version>1.6</service-version>
                         <service-comment>unknown</service-comment>
                         <service-by-default>0</service-by-default>
                         <inParameter-list>
                             <inParameter>
-                                <inParameter-name>ZoneName</inParameter-name>
+                                <inParameter-name>BoundaryName</inParameter-name>
                                 <inParameter-type>string</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>Xmini</inParameter-name>
+                                <inParameter-name>Xcentre1</inParameter-name>
                                 <inParameter-type>double</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>Xmaxi</inParameter-name>
+                                <inParameter-name>Ycentre1</inParameter-name>
                                 <inParameter-type>double</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>Ymini</inParameter-name>
+                                <inParameter-name>Zcentre1</inParameter-name>
                                 <inParameter-type>double</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>Ymaxi</inParameter-name>
+                                <inParameter-name>Radius1</inParameter-name>
                                 <inParameter-type>double</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>Zmini</inParameter-name>
+                                <inParameter-name>Xcentre2</inParameter-name>
                                 <inParameter-type>double</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>Zmaxi</inParameter-name>
+                                <inParameter-name>Ycentre2</inParameter-name>
+                                <inParameter-type>double</inParameter-type>
+                                <inParameter-comment>unknown</inParameter-comment>
+                            </inParameter>
+                            <inParameter>
+                                <inParameter-name>Zcentre2</inParameter-name>
+                                <inParameter-type>double</inParameter-type>
+                                <inParameter-comment>unknown</inParameter-comment>
+                            </inParameter>
+                            <inParameter>
+                                <inParameter-name>Radius2</inParameter-name>
                                 <inParameter-type>double</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
@@ -211,61 +213,56 @@
                         <outParameter-list>
                             <outParameter>
                                 <outParameter-name>return</outParameter-name>
-                                <outParameter-type>HOMARD/HOMARD_Zone</outParameter-type>
+                                <outParameter-type>HOMARD/HOMARD_Boundary</outParameter-type>
                                 <outParameter-comment>unknown</outParameter-comment>
                             </outParameter>
                         </outParameter-list>
                         <DataStream-list></DataStream-list>
                     </component-service>
                     <component-service>
-                        <service-name>CreateZoneCylinder</service-name>
-                        <service-author>HOMARD team - EDF RD</service-author>
-                        <service-version>1.1</service-version>
+                        <service-name>CreateBoundaryConeA</service-name>
+                        <service-author>EDF</service-author>
+                        <service-version>1.6</service-version>
                         <service-comment>unknown</service-comment>
                         <service-by-default>0</service-by-default>
                         <inParameter-list>
                             <inParameter>
-                                <inParameter-name>ZoneName</inParameter-name>
+                                <inParameter-name>BoundaryName</inParameter-name>
                                 <inParameter-type>string</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>Xcentre</inParameter-name>
-                                <inParameter-type>double</inParameter-type>
-                                <inParameter-comment>unknown</inParameter-comment>
-                            </inParameter>
-                            <inParameter>
-                                <inParameter-name>Ycentre</inParameter-name>
+                                <inParameter-name>Xaxis</inParameter-name>
                                 <inParameter-type>double</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>Zcentre</inParameter-name>
+                                <inParameter-name>Yaxis</inParameter-name>
                                 <inParameter-type>double</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>Xaxis</inParameter-name>
+                                <inParameter-name>Zaxis</inParameter-name>
                                 <inParameter-type>double</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>Yaxis</inParameter-name>
+                                <inParameter-name>Angle</inParameter-name>
                                 <inParameter-type>double</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>Zaxis</inParameter-name>
+                                <inParameter-name>Xcentre</inParameter-name>
                                 <inParameter-type>double</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>Radius</inParameter-name>
+                                <inParameter-name>Ycentre</inParameter-name>
                                 <inParameter-type>double</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>Height</inParameter-name>
+                                <inParameter-name>Zcentre</inParameter-name>
                                 <inParameter-type>double</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
@@ -273,21 +270,21 @@
                         <outParameter-list>
                             <outParameter>
                                 <outParameter-name>return</outParameter-name>
-                                <outParameter-type>HOMARD/HOMARD_Zone</outParameter-type>
+                                <outParameter-type>HOMARD/HOMARD_Boundary</outParameter-type>
                                 <outParameter-comment>unknown</outParameter-comment>
                             </outParameter>
                         </outParameter-list>
                         <DataStream-list></DataStream-list>
                     </component-service>
                     <component-service>
-                        <service-name>CreateZonePipe</service-name>
-                        <service-author>HOMARD team - EDF RD</service-author>
-                        <service-version>1.1</service-version>
+                        <service-name>CreateBoundaryTorus</service-name>
+                        <service-author>EDF</service-author>
+                        <service-version>1.6</service-version>
                         <service-comment>unknown</service-comment>
                         <service-by-default>0</service-by-default>
                         <inParameter-list>
                             <inParameter>
-                                <inParameter-name>ZoneName</inParameter-name>
+                                <inParameter-name>BoundaryName</inParameter-name>
                                 <inParameter-type>string</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
@@ -322,17 +319,12 @@
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>Radius</inParameter-name>
+                                <inParameter-name>RadiusRev</inParameter-name>
                                 <inParameter-type>double</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>Height</inParameter-name>
-                                <inParameter-type>double</inParameter-type>
-                                <inParameter-comment>unknown</inParameter-comment>
-                            </inParameter>
-                            <inParameter>
-                                <inParameter-name>InternalRadius</inParameter-name>
+                                <inParameter-name>RadiusPri</inParameter-name>
                                 <inParameter-type>double</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
@@ -340,88 +332,117 @@
                         <outParameter-list>
                             <outParameter>
                                 <outParameter-name>return</outParameter-name>
-                                <outParameter-type>HOMARD/HOMARD_Zone</outParameter-type>
+                                <outParameter-type>HOMARD/HOMARD_Boundary</outParameter-type>
                                 <outParameter-comment>unknown</outParameter-comment>
                             </outParameter>
                         </outParameter-list>
                         <DataStream-list></DataStream-list>
                     </component-service>
                     <component-service>
-                        <service-name>CreateZoneSphere</service-name>
-                        <service-author>HOMARD team - EDF RD</service-author>
-                        <service-version>1.1</service-version>
+                        <service-name>CreateCase</service-name>
+                        <service-author>EDF</service-author>
+                        <service-version>1.6</service-version>
                         <service-comment>unknown</service-comment>
                         <service-by-default>0</service-by-default>
                         <inParameter-list>
                             <inParameter>
-                                <inParameter-name>ZoneName</inParameter-name>
+                                <inParameter-name>CaseName</inParameter-name>
                                 <inParameter-type>string</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>Xcentre</inParameter-name>
-                                <inParameter-type>double</inParameter-type>
+                                <inParameter-name>MeshName</inParameter-name>
+                                <inParameter-type>string</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>Ycentre</inParameter-name>
-                                <inParameter-type>double</inParameter-type>
+                                <inParameter-name>FileName</inParameter-name>
+                                <inParameter-type>string</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
+                        </inParameter-list>
+                        <outParameter-list>
+                            <outParameter>
+                                <outParameter-name>return</outParameter-name>
+                                <outParameter-type>HOMARD/HOMARD_Cas</outParameter-type>
+                                <outParameter-comment>unknown</outParameter-comment>
+                            </outParameter>
+                        </outParameter-list>
+                        <DataStream-list></DataStream-list>
+                    </component-service>
+                    <component-service>
+                        <service-name>CreateCaseFromIteration</service-name>
+                        <service-author>EDF</service-author>
+                        <service-version>1.6</service-version>
+                        <service-comment>unknown</service-comment>
+                        <service-by-default>0</service-by-default>
+                        <inParameter-list>
                             <inParameter>
-                                <inParameter-name>Zcentre</inParameter-name>
-                                <inParameter-type>double</inParameter-type>
+                                <inParameter-name>CaseName</inParameter-name>
+                                <inParameter-type>string</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>Radius</inParameter-name>
-                                <inParameter-type>double</inParameter-type>
+                                <inParameter-name>DirNameStart</inParameter-name>
+                                <inParameter-type>string</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                         </inParameter-list>
                         <outParameter-list>
                             <outParameter>
                                 <outParameter-name>return</outParameter-name>
-                                <outParameter-type>HOMARD/HOMARD_Zone</outParameter-type>
+                                <outParameter-type>HOMARD/HOMARD_Cas</outParameter-type>
                                 <outParameter-comment>unknown</outParameter-comment>
                             </outParameter>
                         </outParameter-list>
                         <DataStream-list></DataStream-list>
                     </component-service>
                     <component-service>
-                        <service-name>CreateZoneBox2D</service-name>
-                        <service-author>HOMARD team - EDF RD</service-author>
-                        <service-version>1.1</service-version>
+                        <service-name>CreateCaseFromCaseLastIteration</service-name>
+                        <service-author>EDF</service-author>
+                        <service-version>1.6</service-version>
                         <service-comment>unknown</service-comment>
                         <service-by-default>0</service-by-default>
                         <inParameter-list>
                             <inParameter>
-                                <inParameter-name>ZoneName</inParameter-name>
+                                <inParameter-name>CaseName</inParameter-name>
                                 <inParameter-type>string</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>Umini</inParameter-name>
-                                <inParameter-type>double</inParameter-type>
-                                <inParameter-comment>unknown</inParameter-comment>
-                            </inParameter>
-                            <inParameter>
-                                <inParameter-name>Umaxi</inParameter-name>
-                                <inParameter-type>double</inParameter-type>
+                                <inParameter-name>DirNameStart</inParameter-name>
+                                <inParameter-type>string</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
+                        </inParameter-list>
+                        <outParameter-list>
+                            <outParameter>
+                                <outParameter-name>return</outParameter-name>
+                                <outParameter-type>HOMARD/HOMARD_Cas</outParameter-type>
+                                <outParameter-comment>unknown</outParameter-comment>
+                            </outParameter>
+                        </outParameter-list>
+                        <DataStream-list></DataStream-list>
+                    </component-service>
+                    <component-service>
+                        <service-name>CreateCaseFromCaseIteration</service-name>
+                        <service-author>EDF</service-author>
+                        <service-version>1.6</service-version>
+                        <service-comment>unknown</service-comment>
+                        <service-by-default>0</service-by-default>
+                        <inParameter-list>
                             <inParameter>
-                                <inParameter-name>Vmini</inParameter-name>
-                                <inParameter-type>double</inParameter-type>
+                                <inParameter-name>CaseName</inParameter-name>
+                                <inParameter-type>string</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>Vmaxi</inParameter-name>
-                                <inParameter-type>double</inParameter-type>
+                                <inParameter-name>DirNameStart</inParameter-name>
+                                <inParameter-type>string</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>Orient</inParameter-name>
+                                <inParameter-name>Number</inParameter-name>
                                 <inParameter-type>long</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
@@ -429,58 +450,38 @@
                         <outParameter-list>
                             <outParameter>
                                 <outParameter-name>return</outParameter-name>
-                                <outParameter-type>HOMARD/HOMARD_Zone</outParameter-type>
+                                <outParameter-type>HOMARD/HOMARD_Cas</outParameter-type>
                                 <outParameter-comment>unknown</outParameter-comment>
                             </outParameter>
                         </outParameter-list>
                         <DataStream-list></DataStream-list>
                     </component-service>
                     <component-service>
-                        <service-name>CreateZoneDisk</service-name>
-                        <service-author>HOMARD team - EDF RD</service-author>
-                        <service-version>1.1</service-version>
+                        <service-name>CreateHypothesis</service-name>
+                        <service-author>EDF</service-author>
+                        <service-version>1.6</service-version>
                         <service-comment>unknown</service-comment>
                         <service-by-default>0</service-by-default>
                         <inParameter-list>
                             <inParameter>
-                                <inParameter-name>ZoneName</inParameter-name>
+                                <inParameter-name>HypoName</inParameter-name>
                                 <inParameter-type>string</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
-                            <inParameter>
-                                <inParameter-name>Ucentre</inParameter-name>
-                                <inParameter-type>double</inParameter-type>
-                                <inParameter-comment>unknown</inParameter-comment>
-                            </inParameter>
-                            <inParameter>
-                                <inParameter-name>Vcentre</inParameter-name>
-                                <inParameter-type>double</inParameter-type>
-                                <inParameter-comment>unknown</inParameter-comment>
-                            </inParameter>
-                            <inParameter>
-                                <inParameter-name>Radius</inParameter-name>
-                                <inParameter-type>double</inParameter-type>
-                                <inParameter-comment>unknown</inParameter-comment>
-                            </inParameter>
-                            <inParameter>
-                                <inParameter-name>Orient</inParameter-name>
-                                <inParameter-type>long</inParameter-type>
-                                <inParameter-comment>unknown</inParameter-comment>
-                            </inParameter>
                         </inParameter-list>
                         <outParameter-list>
                             <outParameter>
                                 <outParameter-name>return</outParameter-name>
-                                <outParameter-type>HOMARD/HOMARD_Zone</outParameter-type>
+                                <outParameter-type>HOMARD/HOMARD_Hypothesis</outParameter-type>
                                 <outParameter-comment>unknown</outParameter-comment>
                             </outParameter>
                         </outParameter-list>
                         <DataStream-list></DataStream-list>
                     </component-service>
                     <component-service>
-                        <service-name>CreateZoneDiskWithHole</service-name>
-                        <service-author>HOMARD team - EDF RD</service-author>
-                        <service-version>1.1</service-version>
+                        <service-name>CreateZoneBox</service-name>
+                        <service-author>EDF</service-author>
+                        <service-version>1.6</service-version>
                         <service-comment>unknown</service-comment>
                         <service-by-default>0</service-by-default>
                         <inParameter-list>
@@ -490,28 +491,33 @@
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>Ucentre</inParameter-name>
+                                <inParameter-name>Xmini</inParameter-name>
                                 <inParameter-type>double</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>Vcentre</inParameter-name>
+                                <inParameter-name>Xmaxi</inParameter-name>
                                 <inParameter-type>double</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>Radius</inParameter-name>
+                                <inParameter-name>Ymini</inParameter-name>
                                 <inParameter-type>double</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>InternalRadius</inParameter-name>
+                                <inParameter-name>Ymaxi</inParameter-name>
                                 <inParameter-type>double</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>Orient</inParameter-name>
-                                <inParameter-type>long</inParameter-type>
+                                <inParameter-name>Zmini</inParameter-name>
+                                <inParameter-type>double</inParameter-type>
+                                <inParameter-comment>unknown</inParameter-comment>
+                            </inParameter>
+                            <inParameter>
+                                <inParameter-name>Zmaxi</inParameter-name>
+                                <inParameter-type>double</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                         </inParameter-list>
@@ -525,46 +531,61 @@
                         <DataStream-list></DataStream-list>
                     </component-service>
                     <component-service>
-                        <service-name>CreateBoundaryDi</service-name>
-                        <service-author>HOMARD team - EDF RD</service-author>
-                        <service-version>1.1</service-version>
+                        <service-name>CreateZoneBox2D</service-name>
+                        <service-author>EDF</service-author>
+                        <service-version>1.6</service-version>
                         <service-comment>unknown</service-comment>
                         <service-by-default>0</service-by-default>
                         <inParameter-list>
                             <inParameter>
-                                <inParameter-name>BounName</inParameter-name>
-                                <inParameter-type>string</inParameter-type>
+                                <inParameter-name>ZoneName</inParameter-name>
+                                <inParameter-type>string</inParameter-type>
+                                <inParameter-comment>unknown</inParameter-comment>
+                            </inParameter>
+                            <inParameter>
+                                <inParameter-name>Umini</inParameter-name>
+                                <inParameter-type>double</inParameter-type>
+                                <inParameter-comment>unknown</inParameter-comment>
+                            </inParameter>
+                            <inParameter>
+                                <inParameter-name>Umaxi</inParameter-name>
+                                <inParameter-type>double</inParameter-type>
+                                <inParameter-comment>unknown</inParameter-comment>
+                            </inParameter>
+                            <inParameter>
+                                <inParameter-name>Vmini</inParameter-name>
+                                <inParameter-type>double</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>MeshName</inParameter-name>
-                                <inParameter-type>string</inParameter-type>
+                                <inParameter-name>Vmaxi</inParameter-name>
+                                <inParameter-type>double</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>FileName</inParameter-name>
-                                <inParameter-type>string</inParameter-type>
+                                <inParameter-name>Orient</inParameter-name>
+                                <inParameter-type>long</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                         </inParameter-list>
                         <outParameter-list>
                             <outParameter>
                                 <outParameter-name>return</outParameter-name>
-                                <outParameter-type>HOMARD/HOMARD_Boundary</outParameter-type>
+                                <outParameter-type>HOMARD/HOMARD_Zone</outParameter-type>
                                 <outParameter-comment>unknown</outParameter-comment>
                             </outParameter>
                         </outParameter-list>
                         <DataStream-list></DataStream-list>
                     </component-service>
                     <component-service>
-                        <service-name>CreateBoundaryCylinder</service-name>
-                        <service-author>HOMARD team - EDF RD</service-author>
-                        <service-version>1.1</service-version>
+                        <service-name>CreateZoneCylinder</service-name>
+                        <service-author>EDF</service-author>
+                        <service-version>1.6</service-version>
                         <service-comment>unknown</service-comment>
                         <service-by-default>0</service-by-default>
                         <inParameter-list>
                             <inParameter>
-                                <inParameter-name>BounName</inParameter-name>
+                                <inParameter-name>ZoneName</inParameter-name>
                                 <inParameter-type>string</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
@@ -603,164 +624,164 @@
                                 <inParameter-type>double</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
+                            <inParameter>
+                                <inParameter-name>Height</inParameter-name>
+                                <inParameter-type>double</inParameter-type>
+                                <inParameter-comment>unknown</inParameter-comment>
+                            </inParameter>
                         </inParameter-list>
                         <outParameter-list>
                             <outParameter>
                                 <outParameter-name>return</outParameter-name>
-                                <outParameter-type>HOMARD/HOMARD_Boundary</outParameter-type>
+                                <outParameter-type>HOMARD/HOMARD_Zone</outParameter-type>
                                 <outParameter-comment>unknown</outParameter-comment>
                             </outParameter>
                         </outParameter-list>
                         <DataStream-list></DataStream-list>
                     </component-service>
                     <component-service>
-                        <service-name>CreateBoundarySphere</service-name>
-                        <service-author>HOMARD team - EDF RD</service-author>
-                        <service-version>1.1</service-version>
+                        <service-name>CreateZoneDisk</service-name>
+                        <service-author>EDF</service-author>
+                        <service-version>1.6</service-version>
                         <service-comment>unknown</service-comment>
                         <service-by-default>0</service-by-default>
                         <inParameter-list>
                             <inParameter>
-                                <inParameter-name>BounName</inParameter-name>
+                                <inParameter-name>ZoneName</inParameter-name>
                                 <inParameter-type>string</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>Xcentre</inParameter-name>
+                                <inParameter-name>Ucentre</inParameter-name>
                                 <inParameter-type>double</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>Ycentre</inParameter-name>
+                                <inParameter-name>Vcentre</inParameter-name>
                                 <inParameter-type>double</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>Zcentre</inParameter-name>
+                                <inParameter-name>Radius</inParameter-name>
                                 <inParameter-type>double</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>Radius</inParameter-name>
-                                <inParameter-type>double</inParameter-type>
+                                <inParameter-name>Orient</inParameter-name>
+                                <inParameter-type>long</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                         </inParameter-list>
                         <outParameter-list>
                             <outParameter>
                                 <outParameter-name>return</outParameter-name>
-                                <outParameter-type>HOMARD/HOMARD_Boundary</outParameter-type>
+                                <outParameter-type>HOMARD/HOMARD_Zone</outParameter-type>
                                 <outParameter-comment>unknown</outParameter-comment>
                             </outParameter>
                         </outParameter-list>
                         <DataStream-list></DataStream-list>
                     </component-service>
                     <component-service>
-                        <service-name>CreateBoundaryConeA</service-name>
-                        <service-author>HOMARD team - EDF RD</service-author>
-                        <service-version>1.1</service-version>
+                        <service-name>CreateZoneDiskWithHole</service-name>
+                        <service-author>EDF</service-author>
+                        <service-version>1.6</service-version>
                         <service-comment>unknown</service-comment>
                         <service-by-default>0</service-by-default>
                         <inParameter-list>
                             <inParameter>
-                                <inParameter-name>BoundaryName</inParameter-name>
+                                <inParameter-name>ZoneName</inParameter-name>
                                 <inParameter-type>string</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>Xaxis</inParameter-name>
-                                <inParameter-type>double</inParameter-type>
-                                <inParameter-comment>unknown</inParameter-comment>
-                            </inParameter>
-                            <inParameter>
-                                <inParameter-name>Yaxis</inParameter-name>
-                                <inParameter-type>double</inParameter-type>
-                                <inParameter-comment>unknown</inParameter-comment>
-                            </inParameter>
-                            <inParameter>
-                                <inParameter-name>Zaxis</inParameter-name>
+                                <inParameter-name>Ucentre</inParameter-name>
                                 <inParameter-type>double</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>Angle</inParameter-name>
+                                <inParameter-name>Vcentre</inParameter-name>
                                 <inParameter-type>double</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>Xcentre</inParameter-name>
+                                <inParameter-name>Radius</inParameter-name>
                                 <inParameter-type>double</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>Ycentre</inParameter-name>
+                                <inParameter-name>InternalRadius</inParameter-name>
                                 <inParameter-type>double</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>Zcentre</inParameter-name>
-                                <inParameter-type>double</inParameter-type>
+                                <inParameter-name>Orient</inParameter-name>
+                                <inParameter-type>long</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                         </inParameter-list>
                         <outParameter-list>
                             <outParameter>
                                 <outParameter-name>return</outParameter-name>
-                                <outParameter-type>HOMARD/HOMARD_Boundary</outParameter-type>
+                                <outParameter-type>HOMARD/HOMARD_Zone</outParameter-type>
                                 <outParameter-comment>unknown</outParameter-comment>
                             </outParameter>
                         </outParameter-list>
                         <DataStream-list></DataStream-list>
                     </component-service>
                     <component-service>
-                        <service-name>CreateBoundaryConeR</service-name>
-                        <service-author>HOMARD team - EDF RD</service-author>
-                        <service-version>1.1</service-version>
+                        <service-name>CreateZonePipe</service-name>
+                        <service-author>EDF</service-author>
+                        <service-version>1.6</service-version>
                         <service-comment>unknown</service-comment>
                         <service-by-default>0</service-by-default>
                         <inParameter-list>
                             <inParameter>
-                                <inParameter-name>BoundaryName</inParameter-name>
+                                <inParameter-name>ZoneName</inParameter-name>
                                 <inParameter-type>string</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>Xcentre1</inParameter-name>
+                                <inParameter-name>Xcentre</inParameter-name>
                                 <inParameter-type>double</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>Ycentre1</inParameter-name>
+                                <inParameter-name>Ycentre</inParameter-name>
                                 <inParameter-type>double</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>Zcentre1</inParameter-name>
+                                <inParameter-name>Zcentre</inParameter-name>
                                 <inParameter-type>double</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>Radius1</inParameter-name>
+                                <inParameter-name>Xaxis</inParameter-name>
                                 <inParameter-type>double</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>Xcentre2</inParameter-name>
+                                <inParameter-name>Yaxis</inParameter-name>
                                 <inParameter-type>double</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>Ycentre2</inParameter-name>
+                                <inParameter-name>Zaxis</inParameter-name>
                                 <inParameter-type>double</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>Zcentre2</inParameter-name>
+                                <inParameter-name>Radius</inParameter-name>
                                 <inParameter-type>double</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>Radius2</inParameter-name>
+                                <inParameter-name>Height</inParameter-name>
+                                <inParameter-type>double</inParameter-type>
+                                <inParameter-comment>unknown</inParameter-comment>
+                            </inParameter>
+                            <inParameter>
+                                <inParameter-name>InternalRadius</inParameter-name>
                                 <inParameter-type>double</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
@@ -768,21 +789,21 @@
                         <outParameter-list>
                             <outParameter>
                                 <outParameter-name>return</outParameter-name>
-                                <outParameter-type>HOMARD/HOMARD_Boundary</outParameter-type>
+                                <outParameter-type>HOMARD/HOMARD_Zone</outParameter-type>
                                 <outParameter-comment>unknown</outParameter-comment>
                             </outParameter>
                         </outParameter-list>
                         <DataStream-list></DataStream-list>
                     </component-service>
                     <component-service>
-                        <service-name>CreateBoundaryTorus</service-name>
-                        <service-author>HOMARD team - EDF RD</service-author>
-                        <service-version>1.1</service-version>
+                        <service-name>CreateZoneSphere</service-name>
+                        <service-author>EDF</service-author>
+                        <service-version>1.6</service-version>
                         <service-comment>unknown</service-comment>
                         <service-by-default>0</service-by-default>
                         <inParameter-list>
                             <inParameter>
-                                <inParameter-name>BounName</inParameter-name>
+                                <inParameter-name>ZoneName</inParameter-name>
                                 <inParameter-type>string</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
@@ -802,27 +823,7 @@
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>Xaxis</inParameter-name>
-                                <inParameter-type>double</inParameter-type>
-                                <inParameter-comment>unknown</inParameter-comment>
-                            </inParameter>
-                            <inParameter>
-                                <inParameter-name>Yaxis</inParameter-name>
-                                <inParameter-type>double</inParameter-type>
-                                <inParameter-comment>unknown</inParameter-comment>
-                            </inParameter>
-                            <inParameter>
-                                <inParameter-name>Zaxis</inParameter-name>
-                                <inParameter-type>double</inParameter-type>
-                                <inParameter-comment>unknown</inParameter-comment>
-                            </inParameter>
-                            <inParameter>
-                                <inParameter-name>RRev</inParameter-name>
-                                <inParameter-type>double</inParameter-type>
-                                <inParameter-comment>unknown</inParameter-comment>
-                            </inParameter>
-                            <inParameter>
-                                <inParameter-name>RPri</inParameter-name>
+                                <inParameter-name>Radius</inParameter-name>
                                 <inParameter-type>double</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
@@ -830,21 +831,21 @@
                         <outParameter-list>
                             <outParameter>
                                 <outParameter-name>return</outParameter-name>
-                                <outParameter-type>HOMARD/HOMARD_Boundary</outParameter-type>
+                                <outParameter-type>HOMARD/HOMARD_Zone</outParameter-type>
                                 <outParameter-comment>unknown</outParameter-comment>
                             </outParameter>
                         </outParameter-list>
                         <DataStream-list></DataStream-list>
                     </component-service>
                     <component-service>
-                        <service-name>GetCase</service-name>
-                        <service-author>HOMARD team - EDF RD</service-author>
-                        <service-version>1.1</service-version>
+                        <service-name>GetBoundary</service-name>
+                        <service-author>EDF</service-author>
+                        <service-version>1.6</service-version>
                         <service-comment>unknown</service-comment>
                         <service-by-default>0</service-by-default>
                         <inParameter-list>
                             <inParameter>
-                                <inParameter-name>CaseName</inParameter-name>
+                                <inParameter-name>BoundaryName</inParameter-name>
                                 <inParameter-type>string</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
@@ -852,21 +853,21 @@
                         <outParameter-list>
                             <outParameter>
                                 <outParameter-name>return</outParameter-name>
-                                <outParameter-type>HOMARD/HOMARD_Cas</outParameter-type>
+                                <outParameter-type>HOMARD/HOMARD_Boundary</outParameter-type>
                                 <outParameter-comment>unknown</outParameter-comment>
                             </outParameter>
                         </outParameter-list>
                         <DataStream-list></DataStream-list>
                     </component-service>
                     <component-service>
-                        <service-name>GetBoundary</service-name>
-                        <service-author>HOMARD team - EDF RD</service-author>
-                        <service-version>1.1</service-version>
+                        <service-name>GetCase</service-name>
+                        <service-author>EDF</service-author>
+                        <service-version>1.6</service-version>
                         <service-comment>unknown</service-comment>
                         <service-by-default>0</service-by-default>
                         <inParameter-list>
                             <inParameter>
-                                <inParameter-name>BounName</inParameter-name>
+                                <inParameter-name>CaseName</inParameter-name>
                                 <inParameter-type>string</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
@@ -874,7 +875,7 @@
                         <outParameter-list>
                             <outParameter>
                                 <outParameter-name>return</outParameter-name>
-                                <outParameter-type>HOMARD/HOMARD_Boundary</outParameter-type>
+                                <outParameter-type>HOMARD/HOMARD_Cas</outParameter-type>
                                 <outParameter-comment>unknown</outParameter-comment>
                             </outParameter>
                         </outParameter-list>
@@ -882,8 +883,8 @@
                     </component-service>
                     <component-service>
                         <service-name>GetHypothesis</service-name>
-                        <service-author>HOMARD team - EDF RD</service-author>
-                        <service-version>1.1</service-version>
+                        <service-author>EDF</service-author>
+                        <service-version>1.6</service-version>
                         <service-comment>unknown</service-comment>
                         <service-by-default>0</service-by-default>
                         <inParameter-list>
@@ -904,8 +905,8 @@
                     </component-service>
                     <component-service>
                         <service-name>GetIteration</service-name>
-                        <service-author>HOMARD team - EDF RD</service-author>
-                        <service-version>1.1</service-version>
+                        <service-author>EDF</service-author>
+                        <service-version>1.6</service-version>
                         <service-comment>unknown</service-comment>
                         <service-by-default>0</service-by-default>
                         <inParameter-list>
@@ -926,8 +927,8 @@
                     </component-service>
                     <component-service>
                         <service-name>GetZone</service-name>
-                        <service-author>HOMARD team - EDF RD</service-author>
-                        <service-version>1.1</service-version>
+                        <service-author>EDF</service-author>
+                        <service-version>1.6</service-version>
                         <service-comment>unknown</service-comment>
                         <service-by-default>0</service-by-default>
                         <inParameter-list>
@@ -947,32 +948,32 @@
                         <DataStream-list></DataStream-list>
                     </component-service>
                     <component-service>
-                        <service-name>GetAllCasesName</service-name>
-                        <service-author>HOMARD team - EDF RD</service-author>
-                        <service-version>1.1</service-version>
+                        <service-name>GetAllBoundarysName</service-name>
+                        <service-author>EDF</service-author>
+                        <service-version>1.6</service-version>
                         <service-comment>unknown</service-comment>
                         <service-by-default>0</service-by-default>
                         <inParameter-list></inParameter-list>
                         <outParameter-list>
                             <outParameter>
                                 <outParameter-name>return</outParameter-name>
-                                <outParameter-type>HOMARD/listeCases</outParameter-type>
+                                <outParameter-type>HOMARD/listeBoundarys</outParameter-type>
                                 <outParameter-comment>unknown</outParameter-comment>
                             </outParameter>
                         </outParameter-list>
                         <DataStream-list></DataStream-list>
                     </component-service>
                     <component-service>
-                        <service-name>GetAllBoundarysName</service-name>
-                        <service-author>HOMARD team - EDF RD</service-author>
-                        <service-version>1.1</service-version>
+                        <service-name>GetAllCasesName</service-name>
+                        <service-author>EDF</service-author>
+                        <service-version>1.6</service-version>
                         <service-comment>unknown</service-comment>
                         <service-by-default>0</service-by-default>
                         <inParameter-list></inParameter-list>
                         <outParameter-list>
                             <outParameter>
                                 <outParameter-name>return</outParameter-name>
-                                <outParameter-type>HOMARD/listeBoundarys</outParameter-type>
+                                <outParameter-type>HOMARD/listeCases</outParameter-type>
                                 <outParameter-comment>unknown</outParameter-comment>
                             </outParameter>
                         </outParameter-list>
@@ -980,8 +981,8 @@
                     </component-service>
                     <component-service>
                         <service-name>GetAllHypothesesName</service-name>
-                        <service-author>HOMARD team - EDF RD</service-author>
-                        <service-version>1.1</service-version>
+                        <service-author>EDF</service-author>
+                        <service-version>1.6</service-version>
                         <service-comment>unknown</service-comment>
                         <service-by-default>0</service-by-default>
                         <inParameter-list></inParameter-list>
@@ -995,41 +996,97 @@
                         <DataStream-list></DataStream-list>
                     </component-service>
                     <component-service>
-                        <service-name>GetAllZonesName</service-name>
-                        <service-author>HOMARD team - EDF RD</service-author>
-                        <service-version>1.1</service-version>
+                        <service-name>GetAllIterationsName</service-name>
+                        <service-author>EDF</service-author>
+                        <service-version>1.6</service-version>
                         <service-comment>unknown</service-comment>
                         <service-by-default>0</service-by-default>
                         <inParameter-list></inParameter-list>
                         <outParameter-list>
                             <outParameter>
                                 <outParameter-name>return</outParameter-name>
-                                <outParameter-type>HOMARD/listeZones</outParameter-type>
+                                <outParameter-type>HOMARD/listeIterations</outParameter-type>
                                 <outParameter-comment>unknown</outParameter-comment>
                             </outParameter>
                         </outParameter-list>
                         <DataStream-list></DataStream-list>
                     </component-service>
                     <component-service>
-                        <service-name>GetAllIterationsName</service-name>
-                        <service-author>HOMARD team - EDF RD</service-author>
-                        <service-version>1.1</service-version>
+                        <service-name>GetAllZonesName</service-name>
+                        <service-author>EDF</service-author>
+                        <service-version>1.6</service-version>
                         <service-comment>unknown</service-comment>
                         <service-by-default>0</service-by-default>
                         <inParameter-list></inParameter-list>
                         <outParameter-list>
                             <outParameter>
                                 <outParameter-name>return</outParameter-name>
-                                <outParameter-type>HOMARD/listeIterations</outParameter-type>
+                                <outParameter-type>HOMARD/listeZones</outParameter-type>
                                 <outParameter-comment>unknown</outParameter-comment>
                             </outParameter>
                         </outParameter-list>
                         <DataStream-list></DataStream-list>
                     </component-service>
+                    <component-service>
+                        <service-name>MeshInfo</service-name>
+                        <service-author>EDF</service-author>
+                        <service-version>1.6</service-version>
+                        <service-comment>unknown</service-comment>
+                        <service-by-default>0</service-by-default>
+                        <inParameter-list>
+                            <inParameter>
+                                <inParameter-name>CaseName</inParameter-name>
+                                <inParameter-type>string</inParameter-type>
+                                <inParameter-comment>unknown</inParameter-comment>
+                            </inParameter>
+                            <inParameter>
+                                <inParameter-name>MeshName</inParameter-name>
+                                <inParameter-type>string</inParameter-type>
+                                <inParameter-comment>unknown</inParameter-comment>
+                            </inParameter>
+                            <inParameter>
+                                <inParameter-name>FileName</inParameter-name>
+                                <inParameter-type>string</inParameter-type>
+                                <inParameter-comment>unknown</inParameter-comment>
+                            </inParameter>
+                            <inParameter>
+                                <inParameter-name>DirName</inParameter-name>
+                                <inParameter-type>string</inParameter-type>
+                                <inParameter-comment>unknown</inParameter-comment>
+                            </inParameter>
+                            <inParameter>
+                                <inParameter-name>Qual</inParameter-name>
+                                <inParameter-type>long</inParameter-type>
+                                <inParameter-comment>unknown</inParameter-comment>
+                            </inParameter>
+                            <inParameter>
+                                <inParameter-name>Diam</inParameter-name>
+                                <inParameter-type>long</inParameter-type>
+                                <inParameter-comment>unknown</inParameter-comment>
+                            </inParameter>
+                            <inParameter>
+                                <inParameter-name>Conn</inParameter-name>
+                                <inParameter-type>long</inParameter-type>
+                                <inParameter-comment>unknown</inParameter-comment>
+                            </inParameter>
+                            <inParameter>
+                                <inParameter-name>Tail</inParameter-name>
+                                <inParameter-type>long</inParameter-type>
+                                <inParameter-comment>unknown</inParameter-comment>
+                            </inParameter>
+                            <inParameter>
+                                <inParameter-name>Inte</inParameter-name>
+                                <inParameter-type>long</inParameter-type>
+                                <inParameter-comment>unknown</inParameter-comment>
+                            </inParameter>
+                        </inParameter-list>
+                        <outParameter-list></outParameter-list>
+                        <DataStream-list></DataStream-list>
+                    </component-service>
                     <component-service>
                         <service-name>LastIteration</service-name>
-                        <service-author>HOMARD team - EDF RD</service-author>
-                        <service-version>1.1</service-version>
+                        <service-author>EDF</service-author>
+                        <service-version>1.6</service-version>
                         <service-comment>unknown</service-comment>
                         <service-by-default>0</service-by-default>
                         <inParameter-list>
@@ -1050,8 +1107,8 @@
                     </component-service>
                     <component-service>
                         <service-name>SetCurrentStudy</service-name>
-                        <service-author>HOMARD team - EDF RD</service-author>
-                        <service-version>1.1</service-version>
+                        <service-author>EDF</service-author>
+                        <service-version>1.6</service-version>
                         <service-comment>unknown</service-comment>
                         <service-by-default>0</service-by-default>
                         <inParameter-list>
@@ -1065,20 +1122,25 @@
                         <DataStream-list></DataStream-list>
                     </component-service>
                     <component-service>
-                        <service-name>PublishResultInSmesh</service-name>
-                        <service-author>HOMARD team - EDF RD</service-author>
-                        <service-version>1.1</service-version>
+                        <service-name>PublishFileUnderIteration</service-name>
+                        <service-author>EDF</service-author>
+                        <service-version>1.6</service-version>
                         <service-comment>unknown</service-comment>
                         <service-by-default>0</service-by-default>
                         <inParameter-list>
+                            <inParameter>
+                                <inParameter-name>IterName</inParameter-name>
+                                <inParameter-type>string</inParameter-type>
+                                <inParameter-comment>unknown</inParameter-comment>
+                            </inParameter>
                             <inParameter>
                                 <inParameter-name>FileName</inParameter-name>
                                 <inParameter-type>string</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>Option</inParameter-name>
-                                <inParameter-type>long</inParameter-type>
+                                <inParameter-name>Comment</inParameter-name>
+                                <inParameter-type>string</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                         </inParameter-list>
@@ -1086,9 +1148,9 @@
                         <DataStream-list></DataStream-list>
                     </component-service>
                     <component-service>
-                        <service-name>MeshInfo</service-name>
-                        <service-author>HOMARD team - EDF RD</service-author>
-                        <service-version>1.1</service-version>
+                        <service-name>PublishBoundaryUnderCase</service-name>
+                        <service-author>EDF</service-author>
+                        <service-version>1.6</service-version>
                         <service-comment>unknown</service-comment>
                         <service-by-default>0</service-by-default>
                         <inParameter-list>
@@ -1098,43 +1160,45 @@
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>MeshName</inParameter-name>
+                                <inParameter-name>BoundaryName</inParameter-name>
                                 <inParameter-type>string</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
+                        </inParameter-list>
+                        <outParameter-list></outParameter-list>
+                        <DataStream-list></DataStream-list>
+                    </component-service>
+                    <component-service>
+                        <service-name>PublishResultInSmesh</service-name>
+                        <service-author>EDF</service-author>
+                        <service-version>1.6</service-version>
+                        <service-comment>unknown</service-comment>
+                        <service-by-default>0</service-by-default>
+                        <inParameter-list>
                             <inParameter>
                                 <inParameter-name>FileName</inParameter-name>
                                 <inParameter-type>string</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                             <inParameter>
-                                <inParameter-name>DirName</inParameter-name>
-                                <inParameter-type>string</inParameter-type>
-                                <inParameter-comment>unknown</inParameter-comment>
-                            </inParameter>
-                            <inParameter>
-                                <inParameter-name>Qual</inParameter-name>
-                                <inParameter-type>long</inParameter-type>
-                                <inParameter-comment>unknown</inParameter-comment>
-                            </inParameter>
-                            <inParameter>
-                                <inParameter-name>Diam</inParameter-name>
-                                <inParameter-type>long</inParameter-type>
-                                <inParameter-comment>unknown</inParameter-comment>
-                            </inParameter>
-                            <inParameter>
-                                <inParameter-name>Conn</inParameter-name>
-                                <inParameter-type>long</inParameter-type>
-                                <inParameter-comment>unknown</inParameter-comment>
-                            </inParameter>
-                            <inParameter>
-                                <inParameter-name>Tail</inParameter-name>
+                                <inParameter-name>Option</inParameter-name>
                                 <inParameter-type>long</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
+                        </inParameter-list>
+                        <outParameter-list></outParameter-list>
+                        <DataStream-list></DataStream-list>
+                    </component-service>
+                    <component-service>
+                        <service-name>PublishMeshIterInSmesh</service-name>
+                        <service-author>EDF</service-author>
+                        <service-version>1.6</service-version>
+                        <service-comment>unknown</service-comment>
+                        <service-by-default>0</service-by-default>
+                        <inParameter-list>
                             <inParameter>
-                                <inParameter-name>Inte</inParameter-name>
-                                <inParameter-type>long</inParameter-type>
+                                <inParameter-name>IterName</inParameter-name>
+                                <inParameter-type>string</inParameter-type>
                                 <inParameter-comment>unknown</inParameter-comment>
                             </inParameter>
                         </inParameter-list>

diff --git a/resources/yacs_01.en.xml b/resources/yacs_01.en.xml
index da766f0343ed9f1621f45d941c21ae8ac5dd11e3..dad1bf3409c332ef26f460f6686a78d044b52fc2 100644 (file)
--- a/resources/yacs_01.en.xml
+++ b/resources/yacs_01.en.xml
@@ -219,6 +219,7 @@ Iter_1_Case_Options
 # Associated iteration #0
 Iter0 = Case.GetIter0()
 ]]></code></script>
+                              <load container="DefaultContainer"/>
                               <inport name="Case" type="HOMARD_Cas"/>
                               <outport name="Iter0" type="HOMARD_Iteration"/>
                            </inline>
@@ -301,6 +302,7 @@ else :
     OK = 1
     MessInfo = " "
 ]]></code></script>
+                     <load container="DefaultContainer"/>
                      <inport name="NumAdapt" type="int"/>
                      <inport name="LastIter" type="HOMARD_Iteration"/>
                      <inport name="Hypo" type="HOMARD_Hypothesis"/>

diff --git a/resources/yacs_01.fr.xml b/resources/yacs_01.fr.xml
index a05d16453c7d60edd60768838bc86cc704b36a57..1c14561d3635dbf8f4808dd7d9b470910d74eb06 100644 (file)
--- a/resources/yacs_01.fr.xml
+++ b/resources/yacs_01.fr.xml
@@ -219,6 +219,7 @@ Iter_1_Case_Options
 # Iteration 0 associee
 Iter0 = Case.GetIter0()
 ]]></code></script>
+                              <load container="DefaultContainer"/>
                               <inport name="Case" type="HOMARD_Cas"/>
                               <outport name="Iter0" type="HOMARD_Iteration"/>
                            </inline>
@@ -301,6 +302,7 @@ else :
     OK = 1
     MessInfo = " "
 ]]></code></script>
+                     <load container="DefaultContainer"/>
                      <inport name="NumAdapt" type="int"/>
                      <inport name="LastIter" type="HOMARD_Iteration"/>
                      <inport name="Hypo" type="HOMARD_Hypothesis"/>

diff --git a/src/HOMARD/YACSDriver.cxx b/src/HOMARD/YACSDriver.cxx
index 23c1483e37e85ca747d27133934d82bf28c5f4df..df73992e7b394fa5a0cf29ea5620c50bedc57914 100644 (file)
--- a/src/HOMARD/YACSDriver.cxx
+++ b/src/HOMARD/YACSDriver.cxx
@@ -38,7 +38,7 @@ YACSDriver::YACSDriver(const std::string XMLFile, const std::string DirName):
   _XMLFile( "" ), _DirName( "" ),
   _Texte( "" ),
   _Texte_parametres( "" ),
-  _noeud_1( "CreateHypothesis" ),
+  _noeud_1( "CreateCase" ),
   _bLu( false )
 {
   MESSAGE("XMLFile = "<<XMLFile<<", DirName ="<<DirName);
@@ -121,8 +121,9 @@ std::string YACSDriver::Texte_Iter_1_Zone( int ZoneType, const std::string pytho
   std::string noeud_2 = methode + "_" + ZoneName ;
   std::string node = "Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation.p1_Iter_1." ;
   node += noeud_2 ;
-// 2. Texte de controle
-  std::string texte_control = Texte_control (_noeud_1, noeud_2) ;
+// 2. Texte de controle : le noeud precedent est _noeud_1, le noeud courant noeud_2.
+//                        A la fin, on bascule le courant dans le precedent
+  std::string texte_control = Texte_control (_noeud_1, noeud_2, 1) ;
   _noeud_1 = noeud_2 ;
 // 3. Definition du service
   _Texte += "                           <service name=\"" + noeud_2 + "\">\n" ;
@@ -283,8 +284,9 @@ std::string YACSDriver::Texte_Iter_1_Boundary( int BoundaryType, const std::stri
   std::string noeud_2 = methode + "_" + BoundaryName ;
   std::string node = "Boucle_de_convergence.Alternance_Calcul_HOMARD.Adaptation.p0_Adaptation_HOMARD.HOMARD_Initialisation.p1_Iter_1." ;
   node += noeud_2 ;
-// 2. Texte de controle
-  std::string texte_control = Texte_control (_noeud_1, noeud_2) ;
+// 2. Texte de controle : le noeud precedent est _noeud_1, le noeud courant noeud_2.
+//                        A la fin, on bascule le courant dans le precedent
+  std::string texte_control = Texte_control (_noeud_1, noeud_2, 1) ;
   _noeud_1 = noeud_2 ;
 // 3. Definition du service
   _Texte += "                           <service name=\"" + noeud_2 + "\">\n" ;
@@ -438,15 +440,15 @@ std::string YACSDriver::Texte_Iter_1_Boundary( int BoundaryType, const std::stri
 //
 }
 //===============================================================================
-// Controle des enchainements de noeud dans le noeud Iter_1
+// Fin du controle des enchainements de noeud dans le noeud Iter_1
 //===============================================================================
   std::string YACSDriver::Texte_Iter_1_control()
 {
   MESSAGE("Texte_Iter_1_control");
 //
   std::string texte ;
-  texte  = Texte_control ("CreateCase", "Case_Options") ;
-  texte += Texte_control ("Case_Options", "CreateHypothesis") ;
+  texte  = Texte_control (_noeud_1, "CreateHypothesis", 1) ;
+  texte += Texte_control ("CreateHypothesis", "Case_Options", 0) ;
 //
   return texte ;
 //
@@ -455,16 +457,19 @@ std::string YACSDriver::Texte_Iter_1_Boundary( int BoundaryType, const std::stri
 // Controle des enchainements de noeuds
 // noeud_1 : noeud de depart
 // noeud_2 : noeud d'arrivee
+// option : 0 : sans caractere de saut de ligne a la fin
+//          1 : avec caractere de saut de ligne a la fin
 //===============================================================================
-  std::string YACSDriver::Texte_control( const std::string noeud_1, const std::string noeud_2 )
+  std::string YACSDriver::Texte_control( const std::string noeud_1, const std::string noeud_2, int option )
 {
-  MESSAGE("Texte_control, noeud_1 = "<<noeud_1<<", noeud_2 = "<<noeud_2);
+  MESSAGE("Texte_control, noeud_1 = "<<noeud_1<<", noeud_2 = "<<noeud_2<<", option = "<<option);
 //
   std::string texte ;
   texte  = "                           <control> " ;
   texte += "<fromnode>" + noeud_1 + "</fromnode>" ;
   texte += " <tonode>"  + noeud_2 + "</tonode>" ;
-  texte += " </control>\n" ;
+  texte += " </control>" ;
+  if ( option == 1 ) { texte += "\n" ; }
 
   return texte ;
 //
@@ -476,7 +481,7 @@ std::string YACSDriver::Texte_Iter_1_Boundary( int BoundaryType, const std::stri
 //===============================================================================
   std::string YACSDriver::Texte_inport( const std::string inport_type, const std::string inport_nom )
 {
-//   MESSAGE("Texte_control, inport_type = "<<inport_type<<", inport_nom = "<<inport_nom);
+//   MESSAGE("Texte_inport, inport_type = "<<inport_type<<", inport_nom = "<<inport_nom);
 //
   std::string texte ;
   texte  = "                              <inport " ;
@@ -530,11 +535,11 @@ void YACSDriver::Texte_python_1( const std::string pythonTexte, int indice, cons
     if ( cptr > indice )
     {
       int position = ligne.find_first_of( "." ) ;
-//       MESSAGE("\nposition : "<< position);
+      MESSAGE("\nposition : "<< position);
       if ( position > 0 )
       {
         ligne_bis = ligne.substr( position );
-//         MESSAGE("\nligne_bis : "<< ligne_bis);
+        MESSAGE("\nligne_bis : "<< ligne_bis);
         _Texte += concept + ligne_bis + "\n" ;
       }
     }

diff --git a/src/HOMARD/YACSDriver.hxx b/src/HOMARD/YACSDriver.hxx
index bbf500bbb4e5ae704c11dc0b64766c30bd44e677..d708dda0db94ffad0a074ec67d76404f1026ba1c 100644 (file)
--- a/src/HOMARD/YACSDriver.hxx
+++ b/src/HOMARD/YACSDriver.hxx
@@ -40,7 +40,7 @@ public:
   std::string Texte_Iter_1_Boundary( int BoundaryType, const std::string pythonStructure, const std::string methode, const std::string BoundaryName ) ;
   std::string Texte_Iter_1_Zone( int ZoneType, const std::string pythonStructure, const std::string methode, const std::string ZoneName ) ;
   std::string Texte_Iter_1_control() ;
-  std::string Texte_control( const std::string noeud_1, const std::string noeud_2 ) ;
+  std::string Texte_control( const std::string noeud_1, const std::string noeud_2, int option ) ;
   std::string Texte_inport( const std::string inport_type, const std::string inport_nom ) ;
   void        Texte_HOMARD_Exec_DirName( ) ;
   void        Texte_HOMARD_Exec_MeshName( const std::string MeshName ) ;

diff --git a/src/HOMARD_I/HOMARD_Gen_i.cxx b/src/HOMARD_I/HOMARD_Gen_i.cxx
index f7f2dc6bbd5b5a7b5309ab00afd5ba535cbbab74..3f12a7906edb0d7d9ab82edaf94ed9eb0171fa3e 100755 (executable)
--- a/src/HOMARD_I/HOMARD_Gen_i.cxx
+++ b/src/HOMARD_I/HOMARD_Gen_i.cxx
@@ -4162,12 +4162,14 @@ CORBA::Long HOMARD_Gen_i::YACSWriteOnFile(const char* nomYACS, const char* XMLFi
       // G.1.8. Execution de HOMARD : les options de l'iteration
       else if ( mot_cle == "HOMARD_Exec_Iter_Options" )
       { myDriver->Texte_python_2( pythonIter, "TimeStep", "Iter" ) ;  }
-      // G.1.9. Zones et frontieres : les creations
+      // G.1.9. a. Creation eventuelles des zones et frontieres
+      //        b. Enchainement
       else if ( mot_cle == "Iter_1" )
       {
-        std::string texte_control = myDriver->Texte_Iter_1_control() ;
+        std::string texte_control = "" ;
         if ( TypeAdap == 0 ) { texte_control += YACSDriverTexteZone( myHypo, myDriver ) ; }
         texte_control += YACSDriverTexteBoundary( myCase, myDriver ) ;
+        texte_control += myDriver->Texte_Iter_1_control() ;
         myDriver->TexteAdd(texte_control);
       }
       // G.1.10. Les tests de convergence

diff --git a/tests/test_1.py b/tests/test_1.py
index f9027d9066c67a4903ffc5adea946475d345e1a1..196524c433e444dfbd1c246f3d17ffe363931bb0 100755 (executable)
--- a/tests/test_1.py
+++ b/tests/test_1.py
@@ -22,7 +22,7 @@ Python script for HOMARD
 Copyright EDF-R&D 2010, 2014
 Test test_1
 """
-__revision__ = "V2.2"
+__revision__ = "V2.3"
 
 #========================================================================
 Test_Name = "test_1"
@@ -167,7 +167,7 @@ Python script for HOMARD
   #
   # Creation of the schema YACS
   # ===========================
-    ScriptFile = os.path.join(pathHomard, "share", "doc", "salome", "gui", "HOMARD", "en", "_downloads", "yacs_script.py")
+    ScriptFile = os.path.join(pathHomard, "share", "doc", "salome", "gui", "HOMARD", "en", "_downloads", "yacs_script_test.py")
     ScriptFile = os.path.normpath(ScriptFile)
     DirName = dircase
     YACS_test_1 = Case_test_1.CreateYACSSchema("YACS_test_1", ScriptFile, DirName, MeshFile)

diff --git a/tests/test_2.py b/tests/test_2.py
index df81982198cc9ced022e07a8eac403fd85a68d3d..4d9dd18da87eea061a93788c74779eb159583d59 100755 (executable)
--- a/tests/test_2.py
+++ b/tests/test_2.py
@@ -22,7 +22,7 @@ Python script for HOMARD
 Copyright EDF-R&D 2010, 2014
 Test test_2
 """
-__revision__ = "V2.2"
+__revision__ = "V2.3"
 
 #========================================================================
 Test_Name = "test_2"
@@ -143,7 +143,7 @@ Python script for HOMARD
   #
   # Creation of the schema YACS
   # ===========================
-    ScriptFile = os.path.join(pathHomard, "share", "doc", "salome", "gui", "HOMARD", "en", "_downloads", "yacs_script.py")
+    ScriptFile = os.path.join(pathHomard, "share", "doc", "salome", "gui", "HOMARD", "en", "_downloads", "yacs_script_test.py")
     ScriptFile = os.path.normpath(ScriptFile)
     DirName = dircase
     YACS_test_2 = Case_test_2.CreateYACSSchema("YACS_test_2", ScriptFile, DirName, MeshFile)
@@ -176,7 +176,7 @@ except Exception, e:
 # Test of the results
 #
 n_rep_test_file = n_iter_test_file
-test_results(Rep_Test, Test_Name, dircase, n_iter_test_file, n_rep_test_file)
+test_results(Rep_Test, Test_Name, dircase, n_iter_test_file, n_rep_test_file, True)
 #
 if salome.sg.hasDesktop():
   salome.sg.updateObjBrowser(1)

diff --git a/tests/test_3.py b/tests/test_3.py
index 936c1a2da4ec65ab8883894ddc076aedd9938be3..02df6ef8c46e043089f66a33ecafd1dbdceb7e02 100755 (executable)
--- a/tests/test_3.py
+++ b/tests/test_3.py
@@ -22,7 +22,7 @@ Python script for HOMARD
 Copyright EDF-R&D 2011, 2013
 Test test_3
 """
-__revision__ = "V2.1"
+__revision__ = "V2.2"
 
 #========================================================================
 Test_Name = "test_3"
@@ -137,7 +137,7 @@ Copyright EDF-R&D 2010, 2013
   #
   # Creation of the schema YACS
   # ===========================
-      ScriptFile = os.path.join(pathHomard, "share", "doc", "salome", "gui", "HOMARD", "en", "_downloads", "yacs_script.py")
+      ScriptFile = os.path.join(pathHomard, "share", "doc", "salome", "gui", "HOMARD", "en", "_downloads", "yacs_script_test.py")
       ScriptFile = os.path.normpath(ScriptFile)
       DirName = dircase
       YACSName = "YACS_" + Test_Name
@@ -207,7 +207,7 @@ except Exception, e:
 # Test of the results
 #
 n_rep_test_file = n_iter_test_file*n_boucle
-test_results(Rep_Test, Test_Name, dircase, n_iter_test_file, n_rep_test_file)
+test_results(Rep_Test, Test_Name, dircase, n_iter_test_file, n_rep_test_file, True)
 #
 if salome.sg.hasDesktop():
   salome.sg.updateObjBrowser(1)

diff --git a/tests/test_util.py b/tests/test_util.py
index 75a851af7ec8ea9726d6b7d03adfdf7196336969..15035462959a01a9590ee71c59abab3b75060256 100755 (executable)
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -22,7 +22,7 @@ Python script for HOMARD
 Copyright EDF-R&D 2014
 Test test_1
 """
-__revision__ = "V1.1"
+__revision__ = "V1.2"
 
 import os
 #========================================================================
@@ -46,7 +46,7 @@ Copyright EDF-R&D 2013
 #
 #========================================================================
 #========================================================================
-def test_results(Rep_Test, Test_Name, dircase, n_iter_test_file, n_rep_test_file) :
+def test_results(Rep_Test, Test_Name, dircase, n_iter_test_file, n_rep_test_file, destroy_dir = True) :
   """
 Test of the result
 Rep_Test: repertoire des tests
@@ -54,11 +54,10 @@ Test_Name: nom du test
 dircase: repertoire des resultats du test
 n_iter_test_file: numero de l'iteration a tester
 n_rep_test_file: numero du repertoire de l'iteration a tester
+destroy_dir: destruction du repertoire de calcul
 Copyright EDF-R&D 2014
   """
   #
-  destroy_dir = True
-  #
   test_file_suff = "apad.%02d.bilan" % n_iter_test_file
   rep_test_file = "I%02d" % n_rep_test_file
   #