From: mka <mka@opencascade.com>
Date: Tue, 9 Apr 2013 08:45:44 +0000 (+0000)
Subject: som xmls are updated
X-Git-Tag: Root_Delivery2_2013_04_22~44
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=309e8c3cebabcc5457241b0fa1aae3eb67495e8f;p=tools%2Fsiman.git

som xmls are updated
---

diff --git a/Workspace/Siman-Common/src/test/som.xml b/Workspace/Siman-Common/src/test/som.xml
index d301599..629a6c2 100644
--- 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 c85982b..585d84c 100644
--- 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 27a147a..614ab3e 100644
--- 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"/>