The YACS step is introduced.

diff --git a/Workspace/Siman-WS/WebContent/conf/som.xml b/Workspace/Siman-WS/WebContent/conf/som.xml
index 419200919bf8317957080bd6d0db763c31313c45..8f7515625f754b827a65b404e19d2fc346abb20a 100644 (file)
--- a/Workspace/Siman-WS/WebContent/conf/som.xml
+++ b/Workspace/Siman-WS/WebContent/conf/som.xml
@@ -70,6 +70,7 @@
         <article type="log"           uses="script"/>
         <article type="results"       uses="script"/>
         <article type="report"        uses="results"/>
+        <article type="schema"/>
         <article type="memorandum"/>
         <article type="minutes"/>
         <article type="coparisonResult"/>
@@ -164,9 +165,14 @@
             <flow contents="memorandum,minutes,coparisonResult" result="coparisonResult"/>
             <storage path="6.Report"/>
         </step>
+        <step name="schema">
+            <flow contents="schema" result="schema"/>
+            <storage path="7.Schema"/>
+            <module name="YACS"/>
+        </step>
         <step name="capitalization">
             <flow contents="knowledge"/>
-            <storage path="6.Report"/>
+            <storage path="8.Summary"/>
         </step>
       </scenario>
         <step name="reporting">
@@ -211,6 +217,9 @@
         <document type="results">
             <import format="med"/>      <!-- Calculation results source file          -->
         </document>
+        <document type="schema">
+            <import format="xml"/>      <!-- Calculation results source file          -->
+        </document>
     </mappings>
     
     <default-doctypes>
@@ -245,6 +254,9 @@
         <step number="6">
             <mapping extension="srd"    type="coparisonResult"/>
         </step>
+        <step number="7">
+            <mapping extension="xml"    type="schema"/>
+        </step>
     </default-doctypes>
     
 </project-structure>
\ No newline at end of file

diff --git a/Workspace/Siman-WS/src/som.properties b/Workspace/Siman-WS/src/som.properties
index e9b05e29b57e354197566c3bdbf8ea204fd1b46f..dded4fbd94ee25eca1c8b6f3aeff6c58320661e3 100644 (file)
--- a/Workspace/Siman-WS/src/som.properties
+++ b/Workspace/Siman-WS/src/som.properties
@@ -11,18 +11,20 @@ menu.step.4   = G
 #menu.step.5   = Entrer les conditions de calcul
 menu.step.5   = Effectuer le calcul
 menu.step.6   = Analyser les résultats
-menu.step.7   = Capitaliser ce cas d''étude
-menu.step.8   = Finaliser l''étude
+menu.step.7   = Schéma de calcul
+menu.step.8   = Capitaliser ce cas d''étude
+menu.step.9   = Finaliser l''étude
 
 folder.step.1 = Spécification de l''étude
 folder.step.2 = Description du scénario
 folder.step.3 = Géométrie
 folder.step.4 = Modèle d''analyse
 #folder.step.5 = Conditions de calcul
-folder.step.5 = Schéma de calcul
+folder.step.5 = Exécution de calcul
 folder.step.6 = Résultats
-folder.step.7 = Élements de connaissances
-folder.step.8 = Rapport final
+folder.step.7 = Schéma de calcul
+folder.step.8 = Élements de connaissances
+folder.step.9 = Rapport final
 
 type.document.requirements   = Cahier des charges
 type.document.specification  = Document de spécification
@@ -36,6 +38,8 @@ type.document.results        = R
 type.document.report         = Rapport final
 type.document.memorandum     = Note technique
 type.document.minutes        = Compte rendu
+type.document.coparisonResult= Study comparison result
+type.document.schema         = Calculation schema
 
 type.context.customer        = Client
 type.context.product         = Produit

diff --git a/Workspace/Siman-WS/src/som_en.properties b/Workspace/Siman-WS/src/som_en.properties
index 2d87e0a5abbe76accaa6012e0c77dc6cc0f30832..1261b9657d02a60c9dc7d86b2b27f3bfff1f3f58 100644 (file)
--- a/Workspace/Siman-WS/src/som_en.properties
+++ b/Workspace/Siman-WS/src/som_en.properties
@@ -11,18 +11,20 @@ menu.step.4   = Generate the analysis model
 #menu.step.5   = Enter the boundary conditions
 menu.step.5   = Execute the calculation
 menu.step.6   = Analyze the results
-menu.step.7   = Capitalize this use-case
-menu.step.8   = Finalize the study
+menu.step.7   = Calculation schema
+menu.step.8   = Capitalize this use-case
+menu.step.9   = Finalize the study
 
 folder.step.1 = Specification of the study
 folder.step.2 = Description of the scenario
 folder.step.3 = Geometry
 folder.step.4 = Analysis model
 #folder.step.5 = Boundary conditions
-folder.step.5 = Calculation scheme
+folder.step.5 = Calculation execution
 folder.step.6 = Calculation results
-folder.step.7 = Knowledge elements
-folder.step.8 = Final report
+folder.step.7 = Calculation schema
+folder.step.8 = Knowledge elements
+folder.step.9 = Final report
 
 type.document.requirements   = Customer requirements
 type.document.specification  = Specification document
@@ -36,6 +38,8 @@ type.document.results        = Calculation results
 type.document.report         = Final report
 type.document.memorandum     = Technical report
 type.document.minutes        = Minute meeting
+type.document.coparisonResult= Study comparison result
+type.document.schema         = Calculation schema
 
 type.context.customer        = Customer
 type.context.product         = Product