EDF workflow was updated

[tools/siman.git] / Workspace / Siman-WS / conf / edf_som.xml

diff --git a/Workspace/Siman-WS/conf/edf_som.xml b/Workspace/Siman-WS/conf/edf_som.xml
index affa0b6c584d61e2cfabf38d66ef74d900c06eaa..78dfb47f14a1dad02aa3609e00644741612a4d12 100644 (file)
--- a/Workspace/Siman-WS/conf/edf_som.xml
+++ b/Workspace/Siman-WS/conf/edf_som.xml
@@ -70,7 +70,7 @@
         <article type="log"           uses="script"/>
         <article type="resultsMeca"   uses="script"/>
         <article type="resultsSyrthes" uses="script"/>
-        <article type="report"        uses="results, resultsMeca, resultsSyrthes"/>
+        <article type="report"        uses="resultsMeca, resultsSyrthes"/>
         <article type="schema"/>
         <article type="memorandum"/>
         <article type="minutes"/>
@@ -161,7 +161,7 @@
             <classification context="loads,script,platform,module,component"/>
             <flow contents="loads,model,log,minutes,resultsMeca" result="resultsMeca"/>
             <storage path="5.Result"/>
-            <module name="SALOME_MECA"/>
+            <module name="ASTER"/>
         </step>
         <step name="syrthes">
             <classification context="loads,script,platform,module,component"/>
@@ -222,9 +222,8 @@
             <import format="mmed"/>      <!-- Result mesh without input parameters     -->
         </document>
         <document type="loads">
-            <import format="model"/>    <!-- Input data created interactively         -->
-            <import format="comm"/>      <!-- Input data created interactively         -->
-            <import format="syd"/>      <!-- 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          -->
@@ -270,12 +269,7 @@
             <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"/>
-            <mapping extension="py"     type="loads"/>
-        </step>
-        <step number="6">
+        <step number="5"> <!-- execute the MECA calculations -->
             <mapping extension="comm"    type="loads"/>
             <mapping extension="resu"    type="resultsMeca"/>
             <mapping extension="mess"    type="resultsMeca"/>
@@ -283,16 +277,16 @@
             <mapping extension="bz2"     type="resultsMeca"/>
             <mapping extension="py"     type="loads"/>
         </step>
-        <step number="7">
+        <step number="6">
             <mapping extension="syd"    type="loads"/>
             <mapping extension="bz2"    type="resultsSyrthes"/>
             <mapping extension="py"     type="loads"/>
         </step>
-        <step number="8">
+        <step number="7">
             <mapping extension="srd"    type="coparisonResult"/>
             <mapping extension="py"     type="visualisation"/>
         </step>
-        <step number="9">
+        <step number="8">
             <mapping extension="xml"    type="schema"/>
         </step>
     </default-doctypes>