som xmls are updated

diff --git a/Workspace/Siman-Common/src/test/som.xml b/Workspace/Siman-Common/src/test/som.xml
index d3015996f2524127afdfd88274156a4388e7dedb..629a6c23041b34b06cd32be4d08618d0eabe3c76 100644 (file)
--- a/Workspace/Siman-Common/src/test/som.xml
+++ b/Workspace/Siman-Common/src/test/som.xml
@@ -214,7 +214,7 @@
             <import format="med"/>      <!-- Result mesh without input parameters     -->
         </document>
         <document type="loads">
-            <import format="c3m"/>      <!-- Input data created interactively         -->
+            <import format="model"/>    <!-- Input data created interactively         -->
         </document>
         <document type="results">
             <import format="med"/>      <!-- Calculation results source file          -->
@@ -253,6 +253,10 @@
             <mapping extension="med"    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>
         <step number="6">
             <mapping extension="srd"    type="coparisonResult"/>
             <mapping extension="py"     type="visualisation"/>

diff --git a/Workspace/Siman-WS/WebContent/conf/som.xml b/Workspace/Siman-WS/WebContent/conf/som.xml
index c85982bdb38940a7dff1bfc45d1de487d65a5246..585d84c445a530c37c72a34d1593c8b136ec2a62 100644 (file)
--- a/Workspace/Siman-WS/WebContent/conf/som.xml
+++ b/Workspace/Siman-WS/WebContent/conf/som.xml
@@ -214,7 +214,7 @@
             <import format="med"/>      <!-- Result mesh without input parameters     -->
         </document>
         <document type="loads">
-            <import format="c3m"/>      <!-- Input data created interactively         -->
+            <import format="model"/>    <!-- Input data created interactively         -->
         </document>
         <document type="results">
             <import format="med"/>      <!-- Calculation results source file          -->
@@ -253,6 +253,10 @@
             <mapping extension="med"    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>
         <step number="6">
             <mapping extension="srd"    type="coparisonResult"/>
             <mapping extension="py"     type="visualisation"/>

diff --git a/Workspace/Siman/WebContent/conf/som.xml b/Workspace/Siman/WebContent/conf/som.xml
index 27a147afce4b3efc10d0f50f403b43a456a41ef5..614ab3ec3b0caad588713adbe7992901fba88b0f 100644 (file)
--- a/Workspace/Siman/WebContent/conf/som.xml
+++ b/Workspace/Siman/WebContent/conf/som.xml
@@ -214,7 +214,7 @@
             <import format="med"/>      <!-- Result mesh without input parameters     -->
         </document>
         <document type="loads">
-            <import format="c3m"/>      <!-- Input data created interactively         -->
+            <import format="model"/>    <!-- Input data created interactively         -->
         </document>
         <document type="results">
             <import format="med"/>      <!-- Calculation results source file          -->
@@ -253,6 +253,10 @@
             <mapping extension="med"    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>
         <step number="6">
             <mapping extension="srd"    type="coparisonResult"/>
             <mapping extension="py"     type="visualisation"/>