Changed the parametric types to support types needed by ADAO

diff --git a/idl/SALOME_Parametric.idl b/idl/SALOME_Parametric.idl
index 093fcfc3cd6f1a87f63c07b29f32eb953dc2c0b3..72a7bef3474671b8592af758de6cdb8a55f7c7f3 100644 (file)
--- a/idl/SALOME_Parametric.idl
+++ b/idl/SALOME_Parametric.idl
@@ -45,33 +45,43 @@ module SALOME_TYPES
 */
   typedef sequence<Parameter> ParameterList;
 
-/*! \brief Type representing the value of a variable exchanged between the
-    codes. As the variables may be matrices, a value is a 2D object
-    represented as a sequence of sequences of real numbers.
+/*! \brief Type representing the value of a single variable exchanged between
+    the codes (e.g. a force "F"). As the variables may be vectors (or even
+    matrices), their value is represented as a sequence of real numbers.
 */
-  typedef sequence<sequence<double> > Value;
+  typedef sequence<double> Variable;
 
-/*! \brief List of variable names.
+/*! \brief Type representing a state, i.e. a set containing the values of all
+    the variables of interest.
 */
-  typedef sequence<string> VarList;
+  typedef sequence<Variable> VariableSequence;
+
+/*! \brief Type representing a set of states.
+*/
+  typedef sequence<VariableSequence> StateSequence;
 
-/*! \brief List of variable values.
+/*! \brief Type representing a time sequence, with a set of states for each
+    time step. Hence it is represented as a sequence of StateSequence.
 */
-  typedef sequence<Value> ValueList;
+  typedef sequence<StateSequence> TimeSequence;
+
+/*! \brief List of variable names.
+*/
+  typedef sequence<string> VarList;
 
 /*! \brief Structure describing the input of a computation code.
 */
   struct ParametricInput {
     VarList inputVarList;
     VarList outputVarList;
-    ValueList inputValues;
+    TimeSequence inputValues;
     ParameterList specificParameters;
   };
 
 /*! \brief Structure describing the output of a computation code.
 */
   struct ParametricOutput {
-    ValueList outputValues;
+    TimeSequence outputValues;
     ParameterList specificOutputInfos;
     long returnCode;
     string errorMessage;

diff --git a/resources/KERNELCatalog.xml.in b/resources/KERNELCatalog.xml.in
index 4a7f336614675b6ddebfb6374247af47a3614f48..1fdc30adac13d831419e2fd94a70074dbd267d65 100644 (file)
--- a/resources/KERNELCatalog.xml.in
+++ b/resources/KERNELCatalog.xml.in
@@ -48,23 +48,23 @@
     <member type="string" name="value"></member>
   </struct>
   <sequence content="SALOME_TYPES/Parameter" name="SALOME_TYPES/ParameterList"></sequence>
-  <sequence content="double" name="Value1D"></sequence>
-  <sequence content="Value1D" name="SALOME_TYPES/Value"></sequence>
+  <sequence content="double" name="SALOME_TYPES/Variable"></sequence>
+  <sequence content="SALOME_TYPES/Variable" name="SALOME_TYPES/VariableSequence"></sequence>
+  <sequence content="SALOME_TYPES/VariableSequence" name="SALOME_TYPES/StateSequence"></sequence>
+  <sequence content="SALOME_TYPES/StateSequence" name="SALOME_TYPES/TimeSequence"></sequence>
   <sequence content="string" name="SALOME_TYPES/VarList"></sequence>
-  <sequence content="SALOME_TYPES/Value" name="SALOME_TYPES/ValueList"></sequence>
   <struct name="SALOME_TYPES/ParametricInput">
     <member type="SALOME_TYPES/VarList" name="inputVarList"></member>
     <member type="SALOME_TYPES/VarList" name="outputVarList"></member>
-    <member type="SALOME_TYPES/ValueList" name="inputValues"></member>
+    <member type="SALOME_TYPES/TimeSequence" name="inputValues"></member>
     <member type="SALOME_TYPES/ParameterList" name="specificParameters"></member>
   </struct>
   <struct name="SALOME_TYPES/ParametricOutput">
-    <member type="SALOME_TYPES/ValueList" name="outputValues"></member>
+    <member type="SALOME_TYPES/TimeSequence" name="outputValues"></member>
     <member type="SALOME_TYPES/ParameterList" name="specificOutputInfos"></member>
     <member type="long" name="returnCode"></member>
     <member type="string" name="errorMessage"></member>
   </struct>
-
 </type-list>
 
 <!-- Component list -->