From e308f283da9f52efa1fd1a5990069b8de83729c1 Mon Sep 17 00:00:00 2001 From: nadir Date: Thu, 14 Oct 2004 09:23:06 +0000 Subject: [PATCH] Final version V2_0_1 which works with Med File V2.1 and the KERNEL with AG addings. --- idl/MED.idl | 74 +++++++++++++++++++++++++++++++++++++++++++++---- idl/MED_Gen.idl | 9 ++---- 2 files changed, 71 insertions(+), 12 deletions(-) diff --git a/idl/MED.idl b/idl/MED.idl index f391d294d..39bb194a7 100644 --- a/idl/MED.idl +++ b/idl/MED.idl @@ -18,6 +18,7 @@ This file contains the main IDL definitions of the %MED component in %SALOME app #include "SALOME_Exception.idl" #include "SALOME_Component.idl" #include "SALOMEDS.idl" +#include "SALOME_Comm.idl" module SALOME_MED { /*! @@ -130,7 +131,7 @@ This enumeration contains a set of elements defining the type of connectivity. // mesh interface // ---------------------- - interface MESH { + interface MESH : SALOME::MultiCommClass, SALOME::ServantLifeCycle { // Index range begins from 1 // General Informations @@ -189,7 +190,13 @@ This enumeration contains a set of elements defining the type of connectivity. */ SALOME_MED::double_array getCoordinates(in medModeSwitch typeSwitch) raises (SALOME::SALOME_Exception); - + + /*! + Returns an array (Sender) of coordinates stored in any type.\n + It could be used in a Client code using the MED Client classes. + */ + SALOME::Sender getSenderForCoordinates(in medModeSwitch typeSwitch) + raises (SALOME::SALOME_Exception); /*! Returns coordinate n° Number on axis n° Axis */ @@ -291,6 +298,16 @@ This enumeration contains a set of elements defining the type of connectivity. in medGeometryElement geomElement) raises (SALOME::SALOME_Exception); + /*! + Idem getConnectivity but return a Sender.\n + It could be used in a Client code using the MED Client classes. + */ + SALOME::Sender getSenderForConnectivity(in medModeSwitch typeSwitch, + in medConnectivity mode, + in medEntityMesh entity, + in medGeometryElement geomElement) + raises (SALOME::SALOME_Exception); + /*! Give morse index array to use with getConnectivity(MED_FULL_INTERLACE,mode,entity,MED_ALL_ELEMENTS). @@ -348,6 +365,7 @@ This enumeration contains a set of elements defining the type of connectivity. long numberOfNodes; medGeometryElement_array meshTypes; SALOME_MED::long_array numberOfElements; + long entityDimension; }; connectivityInfos getConnectGlobal(in medEntityMesh entity) raises (SALOME::SALOME_Exception); @@ -498,7 +516,7 @@ Internal Corba method. // Support interface // ---------------------- - interface SUPPORT { + interface SUPPORT : SALOME::MultiCommClass, SALOME::ServantLifeCycle { /*! Returns the name of the support. @@ -570,6 +588,14 @@ Internal Corba method. SALOME_MED::long_array getNumber(in medGeometryElement geomElement) raises (SALOME::SALOME_Exception); + /*! + Idem SALOME::Sender getNumber(in medGeometryElement geomElement) but returning Sender.\n + It could be used in a Client code using the MED Client classes. + */ + + SALOME::Sender getSenderForNumber(in medGeometryElement geomElement) + raises (SALOME::SALOME_Exception); + /*! If the method %isOnAllElements() returns False, this method returns the index of element number. @@ -581,6 +607,14 @@ Internal Corba method. */ SALOME_MED::long_array getNumberIndex() raises (SALOME::SALOME_Exception); + + /*! + Idem SALOME_MED::long_array getNumberIndex() but return a Sender.\n + It could be used in a Client code using the MED Client classes. + */ + SALOME::Sender getSenderForNumberIndex() + raises (SALOME::SALOME_Exception); + /*! Returns the number of Gauss points for this %medGeometryElement. @@ -739,7 +773,7 @@ Internal Corba method. // Field interface //---------------- - interface FIELD + interface FIELD : SALOME::ServantLifeCycle { /*! @@ -792,6 +826,21 @@ Internal Corba method. */ string getComponentUnit(in long i) raises (SALOME::SALOME_Exception); + /*! + Returns an array containing components descriptions. + */ + SALOME_MED::string_array getComponentsDescriptions() + raises (SALOME::SALOME_Exception); + + /*! + Returns the description of i-th component. + + \note + - i is bounded by 1 and NumberOfComponents. + - Name is mandatory for each field's component. + */ + string getComponentDescription(in long i) raises (SALOME::SALOME_Exception); + /*! Returns the iteration number. */ @@ -845,16 +894,23 @@ Internal Corba method. }; - interface FIELDDOUBLE : FIELD { + interface FIELDDOUBLE : FIELD , SALOME::MultiCommClass { /*! Returns an array of values of the field */ SALOME_MED::double_array getValue(in medModeSwitch mode) raises (SALOME::SALOME_Exception); + + /*! + Idem as getValue but it could be used in a Client code using the + MED Client classes. + */ + SALOME::Sender getSenderForValue(in medModeSwitch mode) + raises (SALOME::SALOME_Exception); }; - interface FIELDINT : FIELD { + interface FIELDINT : FIELD , SALOME::MultiCommClass { /*! Returns an array of values of the field @@ -862,6 +918,12 @@ Internal Corba method. SALOME_MED::long_array getValue(in medModeSwitch mode) raises (SALOME::SALOME_Exception); + /*! + Idem as getValue but it could be used in a Client code using the + MED Client classes. + */ + SALOME::Sender getSenderForValue(in medModeSwitch mode) + raises (SALOME::SALOME_Exception); }; // MED interface diff --git a/idl/MED_Gen.idl b/idl/MED_Gen.idl index c84f5a241..cf80dede9 100644 --- a/idl/MED_Gen.idl +++ b/idl/MED_Gen.idl @@ -19,8 +19,7 @@ module SALOME_MED { /*! it returns a Corba pointer %MESH on the mesh stored in the .med file - fileName with the name meshName; and it pushes it - in the study named studyName. + fileName with the name meshName. */ SALOME_MED::MESH readMeshInFile(in string fileName, in string studyName, in string meshName) @@ -29,8 +28,7 @@ module SALOME_MED /*! it returns a Corba pointer %FIELD on the field instance with the order ordre at the iteration iter, stored in the .med - file fileName with the name fieldName; and it - pushes it in the study named studyName. + file fileName with the name fieldName. */ SALOME_MED::FIELD readFieldInFile(in string fileName, in string studyName, in string fieldName, in long ordre, @@ -39,8 +37,7 @@ module SALOME_MED /*! it returns a Corba pointer on the %MED object regrouping all objects - (%MESH and %FIELD) stored in the file fileName; and it pushes - all those objects in the study named studyName. All instances + (%MESH and %FIELD) stored in the file fileName. All instances of the fields are stored without their type. */ SALOME_MED::MED readStructFile(in string fileName, -- 2.39.2