Insertion de la création d'une frontière torique dans un schéma YACS

diff --git a/idl/Gen.xml b/idl/Gen.xml
index 5ff23f748417dfdf457c82ed7ce66191db614f03..0f965c5f5e530ff684aa11a900dd9a7c8434f6e8 100644 (file)
--- a/idl/Gen.xml
+++ b/idl/Gen.xml
@@ -15,7 +15,7 @@
             <component-username>HOMARD</component-username>
             <component-type>OTHER</component-type>
             <component-author>HOMARD team - EDF RD</component-author>
-            <component-version>1.4</component-version>
+            <component-version>1.5</component-version>
             <component-comment>unknown</component-comment>
             <component-multistudy>1</component-multistudy>
             <component-impltype>1</component-impltype>
@@ -774,6 +774,68 @@
                         </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-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-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>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-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-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>

diff --git a/src/HOMARD/YACSDriver.cxx b/src/HOMARD/YACSDriver.cxx
index dee4f8944472b4d3f61e025b09b012d80f68bcb2..99a666f113065d9f3c94d02cd70e6279215c1926 100644 (file)
--- a/src/HOMARD/YACSDriver.cxx
+++ b/src/HOMARD/YACSDriver.cxx
@@ -365,7 +365,7 @@ std::string YACSDriver::Texte_Iter_1_Boundary( int BoundaryType, const std::stri
     TexteParametre( node, "Radius", "double", x7 ) ;
   }
 //
-// 4.2. Cas d un cone defini par un axe et un angle
+// 4.3. Cas d un cone defini par un axe et un angle
   else if ( BoundaryType == 3 )
   {
     _Texte += Texte_inport( "double", "Xaxis" ) ;
@@ -384,7 +384,7 @@ std::string YACSDriver::Texte_Iter_1_Boundary( int BoundaryType, const std::stri
     TexteParametre( node, "Zcentre", "double", x7 ) ;
   }
 //
-// 4.2. Cas d un cone defini par les 2 rayons
+// 4.4. Cas d un cone defini par les 2 rayons
   else if ( BoundaryType == 4 )
   {
     _Texte += Texte_inport( "double", "Xcentre1" ) ;
@@ -404,6 +404,26 @@ std::string YACSDriver::Texte_Iter_1_Boundary( int BoundaryType, const std::stri
     TexteParametre( node, "Zcentre2", "double", x6 ) ;
     TexteParametre( node, "Radius2", "double", x7 ) ;
   }
+// 4.5. Cas du tore (5)
+  else if ( BoundaryType == 5 )
+  {
+    _Texte += Texte_inport( "double", "Xcentre" ) ;
+    _Texte += Texte_inport( "double", "Ycentre" ) ;
+    _Texte += Texte_inport( "double", "Zcentre" ) ;
+    _Texte += Texte_inport( "double", "Xaxis" ) ;
+    _Texte += Texte_inport( "double", "Yaxis" ) ;
+    _Texte += Texte_inport( "double", "Zaxis" ) ;
+    _Texte += Texte_inport( "double", "RRev" ) ;
+    _Texte += Texte_inport( "double", "RPri" ) ;
+    TexteParametre( node, "Xcentre", "double", x0 ) ;
+    TexteParametre( node, "Ycentre", "double", x1 ) ;
+    TexteParametre( node, "Zcentre", "double", x2 ) ;
+    TexteParametre( node, "Xaxis", "double", x3 ) ;
+    TexteParametre( node, "Yaxis", "double", x4 ) ;
+    TexteParametre( node, "Zaxis", "double", x5 ) ;
+    TexteParametre( node, "RRev", "double", x6 ) ;
+    TexteParametre( node, "RPri", "double", x7 ) ;
+  }
 //
 // 4.2. Erreur
   else