X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=Workspace%2FSiman-WS%2FWebContent%2Fconf%2Fsom.xml;h=0d6e9fe0d229d9c7f1d5b4de2fabe6f2878a5568;hb=ce43f60fa4774623c789470e20939031152394aa;hp=585d84c445a530c37c72a34d1593c8b136ec2a62;hpb=309e8c3cebabcc5457241b0fa1aae3eb67495e8f;p=tools%2Fsiman.git

diff --git a/Workspace/Siman-WS/WebContent/conf/som.xml b/Workspace/Siman-WS/WebContent/conf/som.xml
index 585d84c..0d6e9fe 100644
--- a/Workspace/Siman-WS/WebContent/conf/som.xml
+++ b/Workspace/Siman-WS/WebContent/conf/som.xml
@@ -68,8 +68,9 @@
         <article type="loads"         uses="model"/>
         <article type="script"        uses="loads"/>
         <article type="log"           uses="script"/>
-        <article type="results"       uses="script"/>
-        <article type="report"        uses="results"/>
+        <article type="resultsMeca"   uses="script"/>
+        <article type="resultsSyrthes" uses="script"/>
+        <article type="report"        uses="resultsMeca, resultsSyrthes"/>
         <article type="schema"/>
         <article type="memorandum"/>
         <article type="minutes"/>
@@ -156,11 +157,17 @@
             <storage path="3.Mesh"/>
             <module name="SMESH"/>
         </step>
-        <step name="solving">
+        <step name="meca">
             <classification context="loads,script,platform,module,component"/>
-            <flow contents="log,results,minutes" result="results"/>
+            <flow contents="loads,model,log,minutes,resultsMeca" result="resultsMeca"/>
             <storage path="5.Result"/>
-            <module name="CASTEM"/>
+            <module name="ASTER"/>
+        </step>
+        <step name="syrthes">
+            <classification context="loads,script,platform,module,component"/>
+            <flow contents="loads,model,log,minutes,resultsSyrthes" result="resultsSyrthes"/>
+            <storage path="5.Result"/>
+            <module name="SYRTHES"/>
         </step>
         <step name="postprocessing">
             <flow contents="memorandum,minutes,coparisonResult,visualisation" result="coparisonResult"/>
@@ -212,12 +219,20 @@
         </document>
         <document type="model">
             <import format="med"/>      <!-- Result mesh without input parameters     -->
+            <import format="mmed"/>      <!-- Result mesh without input parameters     -->
         </document>
         <document type="loads">
-            <import format="model"/>    <!-- Input data created interactively         -->
+            <import format="comm"/>      <!-- MECA input data created interactively         -->
+            <import format="bz2"/>      <!-- SYRTHES input data created interactively         -->
+        </document>
+        <document type="resultsMeca">
+            <import format="resu"/>      <!-- Calculation results source file          -->
+            <import format="mess"/>      <!-- Calculation results source file          -->
+            <import format="rmed"/>      <!-- Calculation results source file          -->
+            <import format="bz2"/>      <!-- Calculation results source file          -->
         </document>
-        <document type="results">
-            <import format="med"/>      <!-- Calculation results source file          -->
+        <document type="resultsSyrthes">
+            <import format="bz2"/>      <!-- Calculation results source file          -->
         </document>
         <document type="schema">
             <import format="xml"/>      <!-- Calculation results source file          -->
@@ -245,23 +260,37 @@
             <mapping extension="part"   type="geometry"/>          <!-- GEOM Part                       -->
             <mapping extension="py"     type="geometry"/>          <!-- GEOM Python script              -->
             <mapping extension="brep"   type="geometry"/>          <!-- GEOM Part                       -->
+            <mapping extension="xao"    type="geometry"/>          <!-- GEOM Part                       -->
         </step>
         <step number="4">
             <mapping extension="doc"    type="memorandum"/>
             <mapping extension="docx"   type="memorandum"/>
             <mapping extension="xml"    type="memorandum"/>
             <mapping extension="med"    type="model"/>
+            <mapping extension="mmed"   type="model"/>
             <mapping extension="py"     type="model"/>             <!-- SMESH Python script             -->
         </step>
-        <step number="5"> <!-- execute the calculations -->
-        	<mapping extension="med"    type="model"/>
-        	<mapping extension="model"  type="loads"/>
+        <step number="5"> <!-- execute the MECA calculations -->
+            <mapping extension="comm"    type="loads"/>
+            <mapping extension="resu"    type="resultsMeca"/>
+            <mapping extension="mess"    type="resultsMeca"/>
+            <mapping extension="rmed"    type="resultsMeca"/>
+            <mapping extension="bz2"     type="resultsMeca"/>
+            <mapping extension="py"     type="loads"/>
         </step>
         <step number="6">
+            <mapping extension="syd"    type="loads"/>
+            <mapping extension="syr"    type="loads"/>
+            <mapping extension="syr_desc"    type="loads"/>
+            <mapping extension="c"      type="loads"/>
+            <mapping extension="bz2"    type="resultsSyrthes"/>
+            <mapping extension="py"     type="loads"/>
+        </step>
+        <step number="7">
             <mapping extension="srd"    type="coparisonResult"/>
             <mapping extension="py"     type="visualisation"/>
         </step>
-        <step number="7">
+        <step number="8">
             <mapping extension="xml"    type="schema"/>
         </step>
     </default-doctypes>