From ca82c1517726495a18a24b56fc9b8fe950be56e0 Mon Sep 17 00:00:00 2001 From: barate Date: Thu, 7 Apr 2011 15:48:59 +0000 Subject: [PATCH] Changed the parametric types to support types needed by ADAO --- idl/SALOME_Parametric.idl | 30 ++++++++++++++++++++---------- resources/KERNELCatalog.xml.in | 12 ++++++------ 2 files changed, 26 insertions(+), 16 deletions(-) diff --git a/idl/SALOME_Parametric.idl b/idl/SALOME_Parametric.idl index 093fcfc3c..72a7bef34 100644 --- a/idl/SALOME_Parametric.idl +++ b/idl/SALOME_Parametric.idl @@ -45,33 +45,43 @@ module SALOME_TYPES */ typedef sequence 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 > Value; + typedef sequence 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 VarList; + typedef sequence VariableSequence; + +/*! \brief Type representing a set of states. +*/ + typedef sequence 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 ValueList; + typedef sequence TimeSequence; + +/*! \brief List of variable names. +*/ + typedef sequence 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 4a7f33661..1fdc30ada 100644 --- a/resources/KERNELCatalog.xml.in +++ b/resources/KERNELCatalog.xml.in @@ -48,23 +48,23 @@ - - + + + + - - + - + - -- 2.39.2