From: nadir Date: Wed, 8 Oct 2003 14:01:31 +0000 (+0000) Subject: version corresponding to the updating of the module SMESH with the latest X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d1169e8b77297876b9ae70fae2b2c1eb327ba2d4;p=modules%2Fsmesh.git version corresponding to the updating of the module SMESH with the latest version of the module MED (V1_2_3). This is the version right before the integration of NETGEN in SMESH. --- diff --git a/src/SMESH_I/SMESH_MEDFamily_i.cxx b/src/SMESH_I/SMESH_MEDFamily_i.cxx index 1fd40b967..35895cb4b 100644 --- a/src/SMESH_I/SMESH_MEDFamily_i.cxx +++ b/src/SMESH_I/SMESH_MEDFamily_i.cxx @@ -125,7 +125,7 @@ throw (SALOME::SALOME_Exception) * CORBA: Accessor for attributes identifiers */ //============================================================================= -Engines::long_array* SMESH_MEDFamily_i::getAttributesIdentifiers() +SALOME_MED::long_array* SMESH_MEDFamily_i::getAttributesIdentifiers() throw (SALOME::SALOME_Exception) { if (_subMeshDS==NULL) @@ -138,7 +138,7 @@ throw (SALOME::SALOME_Exception) ,SALOME::BAD_PARAM); }; - Engines::long_array_var myseq= new Engines::long_array; + SALOME_MED::long_array_var myseq= new SALOME_MED::long_array; myseq->length(_numberOfAttribute); for (int i=0;i<_numberOfAttribute;i++) { @@ -175,7 +175,7 @@ CORBA::Long SMESH_MEDFamily_i::getAttributeIdentifier(CORBA::Long i) * CORBA: Accessor for attributes values */ //============================================================================= -Engines::long_array* SMESH_MEDFamily_i::getAttributesValues() +SALOME_MED::long_array* SMESH_MEDFamily_i::getAttributesValues() throw (SALOME::SALOME_Exception) { if (_subMeshDS==NULL) @@ -189,7 +189,7 @@ Engines::long_array* SMESH_MEDFamily_i::getAttributesValues() ,SALOME::BAD_PARAM); }; - Engines::long_array_var myseq= new Engines::long_array; + SALOME_MED::long_array_var myseq= new SALOME_MED::long_array; myseq->length(_numberOfAttribute); for (int i=0;i<_numberOfAttribute;i++) { @@ -223,7 +223,7 @@ CORBA::Long SMESH_MEDFamily_i::getAttributeValue(CORBA::Long i) * CORBA: Accessor for attributes desriptions */ //============================================================================= -Engines::string_array * SMESH_MEDFamily_i::getAttributesDescriptions() +SALOME_MED::string_array * SMESH_MEDFamily_i::getAttributesDescriptions() throw (SALOME::SALOME_Exception) { if (_subMeshDS==NULL) @@ -235,7 +235,7 @@ Engines::string_array * SMESH_MEDFamily_i::getAttributesDescriptions() THROW_SALOME_CORBA_EXCEPTION("No attributes"\ ,SALOME::BAD_PARAM); } - Engines::string_array_var myseq = new Engines::string_array; + SALOME_MED::string_array_var myseq = new SALOME_MED::string_array; for (int i=0;i<_numberOfAttribute;i++) { myseq[i]=CORBA::string_dup(_attributeDescription[i].c_str()); diff --git a/src/SMESH_I/SMESH_MEDFamily_i.hxx b/src/SMESH_I/SMESH_MEDFamily_i.hxx index 31efc1a7c..3506c5c8f 100644 --- a/src/SMESH_I/SMESH_MEDFamily_i.hxx +++ b/src/SMESH_I/SMESH_MEDFamily_i.hxx @@ -62,18 +62,24 @@ public : throw (SALOME::SALOME_Exception); CORBA::Long getNumberOfAttributes() throw (SALOME::SALOME_Exception); - Engines::long_array* getAttributesIdentifiers() +// Engines::long_array* getAttributesIdentifiers() + SALOME_MED::long_array* getAttributesIdentifiers() throw (SALOME::SALOME_Exception); CORBA::Long getAttributeIdentifier(CORBA::Long i) throw (SALOME::SALOME_Exception); - Engines::long_array* getAttributesValues() + SALOME_MED::long_array* getAttributesValues() throw (SALOME::SALOME_Exception); CORBA::Long getAttributeValue(CORBA::Long i) throw (SALOME::SALOME_Exception); - Engines::string_array* getAttributesDescriptions() + SALOME_MED::string_array* getAttributesDescriptions() throw (SALOME::SALOME_Exception); char* getAttributeDescription( CORBA::Long i) throw (SALOME::SALOME_Exception); - + CORBA::Long getNumberOfGroups() + throw (SALOME::SALOME_Exception); + char * getGroupName( CORBA::Long i) + throw (SALOME::SALOME_Exception); + SALOME_MED::string_array* getGroupsNames() + throw (SALOME::SALOME_Exception); }; #endif /* MED_FAMILY_I_HXX_ */ diff --git a/src/SMESH_I/SMESH_MEDMesh_i.cxx b/src/SMESH_I/SMESH_MEDMesh_i.cxx index 71fc85c08..fb3b9fc40 100644 --- a/src/SMESH_I/SMESH_MEDMesh_i.cxx +++ b/src/SMESH_I/SMESH_MEDMesh_i.cxx @@ -168,7 +168,7 @@ CORBA::Long SMESH_MEDMesh_i::getMeshDimension()throw(SALOME::SALOME_Exception) * CORBA: Accessor for Coordinates System */ //============================================================================= -char *SMESH_MEDMesh_i::getCoordinateSystem() throw(SALOME::SALOME_Exception) +char *SMESH_MEDMesh_i::getCoordinatesSystem() throw(SALOME::SALOME_Exception) { if (_mesh_i == 0) THROW_SALOME_CORBA_EXCEPTION("No associated Mesh", @@ -192,13 +192,13 @@ char *SMESH_MEDMesh_i::getCoordinateSystem() throw(SALOME::SALOME_Exception) * CORBA: Accessor for Coordinates */ //============================================================================= -Engines::double_array * SMESH_MEDMesh_i::getCoordinates( +SALOME_MED::double_array * SMESH_MEDMesh_i::getCoordinates( SALOME_MED::medModeSwitch typeSwitch) throw(SALOME::SALOME_Exception) { if (_mesh_i == 0) THROW_SALOME_CORBA_EXCEPTION("No associated Mesh", SALOME::INTERNAL_ERROR); - Engines::double_array_var myseq = new Engines::double_array; + SALOME_MED::double_array_var myseq = new SALOME_MED::double_array; try { // PN : En dur @@ -250,13 +250,13 @@ Engines::double_array * SMESH_MEDMesh_i::getCoordinates( * CORBA: Accessor for Coordinates Names */ //============================================================================= -Engines::string_array * +SALOME_MED::string_array * SMESH_MEDMesh_i::getCoordinatesNames()throw(SALOME::SALOME_Exception) { if (_mesh_i == 0) THROW_SALOME_CORBA_EXCEPTION("No associated Mesh", SALOME::INTERNAL_ERROR); - Engines::string_array_var myseq = new Engines::string_array; + SALOME_MED::string_array_var myseq = new SALOME_MED::string_array; try { // PN : en dur @@ -281,13 +281,13 @@ Engines::string_array * * CORBA: Accessor for Coordinates Units */ //============================================================================= -Engines::string_array * +SALOME_MED::string_array * SMESH_MEDMesh_i::getCoordinatesUnits()throw(SALOME::SALOME_Exception) { if (_mesh_i == 0) THROW_SALOME_CORBA_EXCEPTION("No associated Mesh", SALOME::INTERNAL_ERROR); - Engines::string_array_var myseq = new Engines::string_array; + SALOME_MED::string_array_var myseq = new SALOME_MED::string_array; try { // PN : en dur @@ -453,7 +453,7 @@ CORBA::Long SMESH_MEDMesh_i::getNumberOfElements(SALOME_MED:: * CORBA: Accessor for connectivities */ //============================================================================= -Engines::long_array * +SALOME_MED::long_array * SMESH_MEDMesh_i::getConnectivity(SALOME_MED::medModeSwitch typeSwitch, SALOME_MED::medConnectivity mode, SALOME_MED::medEntityMesh entity, SALOME_MED::medGeometryElement geomElement) throw(SALOME::SALOME_Exception) @@ -482,7 +482,7 @@ Engines::long_array * * CORBA: Accessor for connectivities */ //============================================================================= -Engines::long_array * +SALOME_MED::long_array * SMESH_MEDMesh_i::getConnectivityIndex(SALOME_MED::medConnectivity mode, SALOME_MED::medEntityMesh entity) throw(SALOME::SALOME_Exception) { @@ -499,7 +499,7 @@ Engines::long_array * CORBA::Long SMESH_MEDMesh_i::getElementNumber(SALOME_MED::medConnectivity mode, SALOME_MED::medEntityMesh entity, SALOME_MED::medGeometryElement type, - const Engines::long_array & connectivity)throw(SALOME::SALOME_Exception) + const SALOME_MED::long_array & connectivity)throw(SALOME::SALOME_Exception) { const char *LOC = "getElementNumber "; MESSAGE(LOC << "Pas Implemente dans SMESH"); @@ -513,7 +513,7 @@ CORBA::Long SMESH_MEDMesh_i::getElementNumber(SALOME_MED::medConnectivity mode, * not implemented for MED_ALL_ENTITIES and MED_MAILLE */ //============================================================================= -Engines::long_array * +SALOME_MED::long_array * SMESH_MEDMesh_i::getReverseConnectivity(SALOME_MED:: medConnectivity mode) throw(SALOME::SALOME_Exception) { @@ -527,7 +527,7 @@ Engines::long_array * * CORBA: Accessor for connectivities */ //============================================================================= -Engines::long_array * +SALOME_MED::long_array * SMESH_MEDMesh_i::getReverseConnectivityIndex(SALOME_MED:: medConnectivity mode) throw(SALOME::SALOME_Exception) { diff --git a/src/SMESH_I/SMESH_MEDMesh_i.hxx b/src/SMESH_I/SMESH_MEDMesh_i.hxx index 73370701a..0f7f1523a 100644 --- a/src/SMESH_I/SMESH_MEDMesh_i.hxx +++ b/src/SMESH_I/SMESH_MEDMesh_i.hxx @@ -59,7 +59,7 @@ class SMESH_MEDMesh_i: int _famIdent; map < SALOME_MED::medGeometryElement, int >_mapIndToSeqElts; - Engines::long_array_var _seq_elemId[MED_NBR_GEOMETRIE_MAILLE]; + SALOME_MED::long_array_var _seq_elemId[MED_NBR_GEOMETRIE_MAILLE]; map < SALOME_MED::medEntityMesh, int >_mapNbTypes; map < SALOME_MED::medEntityMesh, int >_mapIndToVectTypes; @@ -77,71 +77,120 @@ class SMESH_MEDMesh_i: // IDL Methods char *getName() throw(SALOME::SALOME_Exception); CORBA::Long getSpaceDimension() throw(SALOME::SALOME_Exception); + CORBA::Long getMeshDimension() throw(SALOME::SALOME_Exception); - char *getCoordinateSystem() throw(SALOME::SALOME_Exception); - Engines::double_array * getCoordinates(SALOME_MED::medModeSwitch typeSwitch) + CORBA::Boolean getIsAGrid() throw (SALOME::SALOME_Exception); + + CORBA::Boolean + existConnectivity(SALOME_MED::medConnectivity connectivityType, + SALOME_MED::medEntityMesh entity) + throw (SALOME::SALOME_Exception); + + char *getCoordinatesSystem() throw(SALOME::SALOME_Exception); + SALOME_MED::double_array * getCoordinates(SALOME_MED::medModeSwitch typeSwitch) throw(SALOME::SALOME_Exception); - Engines::string_array * getCoordinatesNames() + + double getCoordinate(CORBA::Long Number, CORBA::Long Axis) + throw (SALOME::SALOME_Exception); + + SALOME_MED::string_array * getCoordinatesNames() throw(SALOME::SALOME_Exception); - Engines::string_array * getCoordinatesUnits() + + SALOME_MED::string_array * getCoordinatesUnits() throw(SALOME::SALOME_Exception); + CORBA::Long getNumberOfNodes() throw(SALOME::SALOME_Exception); CORBA::Long getNumberOfTypes(SALOME_MED::medEntityMesh entity) throw(SALOME::SALOME_Exception); + SALOME_MED::medGeometryElement_array * getTypes(SALOME_MED::medEntityMesh entity) throw(SALOME:: SALOME_Exception); + SALOME_MED::medGeometryElement + getElementType(SALOME_MED::medEntityMesh entity, + CORBA::Long number) + throw (SALOME::SALOME_Exception); + CORBA::Long getNumberOfElements(SALOME_MED::medEntityMesh entity, SALOME_MED::medGeometryElement geomElement) throw(SALOME::SALOME_Exception); - Engines::long_array * getConnectivity(SALOME_MED::medModeSwitch typeSwitch, - SALOME_MED::medConnectivity mode, - SALOME_MED::medEntityMesh entity, - SALOME_MED::medGeometryElement geomElement) - throw(SALOME::SALOME_Exception); - Engines::long_array * getConnectivityIndex(SALOME_MED::medConnectivity mode, - SALOME_MED::medEntityMesh entity) throw(SALOME::SALOME_Exception); + + SALOME_MED::long_array * + getConnectivity(SALOME_MED::medModeSwitch typeSwitch, + SALOME_MED::medConnectivity mode, + SALOME_MED::medEntityMesh entity, + SALOME_MED::medGeometryElement geomElement) + throw(SALOME::SALOME_Exception); + + SALOME_MED::long_array * + getConnectivityIndex(SALOME_MED::medConnectivity mode, + SALOME_MED::medEntityMesh entity) + throw(SALOME::SALOME_Exception); + + SALOME_MED::long_array* + getGlobalNumberingIndex(SALOME_MED::medEntityMesh entity) + throw (SALOME::SALOME_Exception); CORBA::Long getElementNumber(SALOME_MED::medConnectivity mode, SALOME_MED::medEntityMesh entity, SALOME_MED::medGeometryElement type, - const Engines::long_array & connectivity) + const SALOME_MED::long_array & connectivity) throw(SALOME::SALOME_Exception); - Engines::long_array * + SALOME_MED::long_array * getReverseConnectivity(SALOME_MED::medConnectivity mode) throw(SALOME:: SALOME_Exception); - Engines::long_array * + + SALOME_MED::long_array * getReverseConnectivityIndex(SALOME_MED:: medConnectivity mode) throw(SALOME::SALOME_Exception); // Family and Group CORBA::Long getNumberOfFamilies(SALOME_MED::medEntityMesh entity) throw(SALOME::SALOME_Exception); + CORBA::Long getNumberOfGroups(SALOME_MED::medEntityMesh entity) throw(SALOME::SALOME_Exception); - SALOME_MED::Family_array * getFamilies(SALOME_MED::medEntityMesh entity) - throw(SALOME::SALOME_Exception); - SALOME_MED::FAMILY_ptr getFamily(SALOME_MED::medEntityMesh entity, - CORBA::Long i) throw(SALOME::SALOME_Exception); + + SALOME_MED::Family_array * + getFamilies(SALOME_MED::medEntityMesh entity) + throw(SALOME::SALOME_Exception); + + SALOME_MED::FAMILY_ptr + getFamily(SALOME_MED::medEntityMesh entity, + CORBA::Long i) throw(SALOME::SALOME_Exception); + SALOME_MED::Group_array * getGroups(SALOME_MED::medEntityMesh entity) throw(SALOME::SALOME_Exception); + SALOME_MED::GROUP_ptr getGroup(SALOME_MED::medEntityMesh entity, CORBA::Long i) throw(SALOME::SALOME_Exception); - // + + SALOME_MED::SUPPORT_ptr + getBoundaryElements(SALOME_MED::medEntityMesh entity) + throw (SALOME::SALOME_Exception); + + SALOME_MED::SUPPORT_ptr getSkin(SALOME_MED::SUPPORT_ptr mySupport3D) + throw (SALOME::SALOME_Exception); + SALOME_MED::FIELD_ptr getVolume(SALOME_MED::SUPPORT_ptr mySupport) throw(SALOME::SALOME_Exception); + SALOME_MED::FIELD_ptr getArea(SALOME_MED::SUPPORT_ptr mySupport) throw(SALOME::SALOME_Exception); + SALOME_MED::FIELD_ptr getLength(SALOME_MED::SUPPORT_ptr mySupport) throw(SALOME::SALOME_Exception); + SALOME_MED::FIELD_ptr getNormal(SALOME_MED::SUPPORT_ptr mySupport) throw(SALOME::SALOME_Exception); + SALOME_MED::FIELD_ptr getBarycenter(SALOME_MED::SUPPORT_ptr mySupport) throw(SALOME::SALOME_Exception); + SALOME_MED::FIELD_ptr getNeighbourhood(SALOME_MED::SUPPORT_ptr mySupport) throw(SALOME::SALOME_Exception); @@ -159,6 +208,16 @@ class SMESH_MEDMesh_i: // Cuisine interne CORBA::Long getCorbaIndex() throw(SALOME::SALOME_Exception); + SALOME_MED::MESH::meshInfos * getMeshGlobal() + throw (SALOME::SALOME_Exception); + + SALOME_MED::MESH::coordinateInfos * getCoordGlobal() + throw (SALOME::SALOME_Exception); + + SALOME_MED::MESH::connectivityInfos * + getConnectGlobal(SALOME_MED::medEntityMesh entity) + throw (SALOME::SALOME_Exception); + // void calculeNbElts() throw(SALOME::SALOME_Exception); void createFamilies() throw(SALOME::SALOME_Exception); diff --git a/src/SMESH_I/SMESH_MEDSupport_i.cxx b/src/SMESH_I/SMESH_MEDSupport_i.cxx index 931bb835b..cccb7f9a2 100644 --- a/src/SMESH_I/SMESH_MEDSupport_i.cxx +++ b/src/SMESH_I/SMESH_MEDSupport_i.cxx @@ -293,7 +293,7 @@ CORBA::Long SMESH_MEDSupport_i::getNumberOfElements(SALOME_MED:: */ //============================================================================= -Engines::long_array * SMESH_MEDSupport_i::getNumber( +SALOME_MED::long_array * SMESH_MEDSupport_i::getNumber( SALOME_MED::medGeometryElement geomElement) throw(SALOME::SALOME_Exception) { if (_subMeshDS==NULL) @@ -304,7 +304,7 @@ Engines::long_array * SMESH_MEDSupport_i::getNumber( if (geomElement != SALOME_MED::MED_NONE) THROW_SALOME_CORBA_EXCEPTION("Not implemented", SALOME::BAD_PARAM); - Engines::long_array_var myseq = new Engines::long_array; + SALOME_MED::long_array_var myseq = new SALOME_MED::long_array; int i = 0; myseq->length(_subMeshDS->NbNodes()); @@ -330,7 +330,7 @@ Engines::long_array * SMESH_MEDSupport_i::getNumber( */ //============================================================================= -Engines::long_array * +SALOME_MED::long_array * SMESH_MEDSupport_i::getNumberIndex()throw(SALOME::SALOME_Exception) { MESSAGE("Not implemented for SMESH_i"); @@ -344,7 +344,7 @@ Engines::long_array * */ //============================================================================= -CORBA::Long SMESH_MEDSupport_i::getNumberOfGaussPoints(SALOME_MED:: +CORBA::Long SMESH_MEDSupport_i::getNumberOfGaussPoint(SALOME_MED:: medGeometryElement geomElement) throw(SALOME::SALOME_Exception) { MESSAGE("Not implemented for SMESH_i"); diff --git a/src/SMESH_I/SMESH_MEDSupport_i.hxx b/src/SMESH_I/SMESH_MEDSupport_i.hxx index 81d59dc4a..aa1458fee 100644 --- a/src/SMESH_I/SMESH_MEDSupport_i.hxx +++ b/src/SMESH_I/SMESH_MEDSupport_i.hxx @@ -58,14 +58,27 @@ class SMESH_MEDSupport_i: SALOME_MED::medEntityMesh getEntity() throw(SALOME::SALOME_Exception); CORBA::Long getNumberOfElements(SALOME_MED::medGeometryElement geomElement) throw(SALOME::SALOME_Exception); - Engines::long_array * getNumber(SALOME_MED::medGeometryElement geomElement) - throw(SALOME::SALOME_Exception); - Engines::long_array * getNumberIndex() throw(SALOME::SALOME_Exception); - CORBA::Long getNumberOfGaussPoints(SALOME_MED:: + CORBA::Long getNumberOfTypes() throw (SALOME::SALOME_Exception); + SALOME_MED::long_array * + getNumber(SALOME_MED::medGeometryElement geomElement) + throw(SALOME::SALOME_Exception); + + SALOME_MED::long_array * getNumberIndex() + throw(SALOME::SALOME_Exception); + + CORBA::Long getNumberOfGaussPoint(SALOME_MED:: medGeometryElement geomElement) throw(SALOME::SALOME_Exception); + SALOME_MED::long_array* getNumbersOfGaussPoint() + throw (SALOME::SALOME_Exception); + SALOME_MED::medGeometryElement_array * getTypes() throw(SALOME::SALOME_Exception); + + void getBoundaryElements() throw (SALOME::SALOME_Exception); + CORBA::Long getCorbaIndex() throw(SALOME::SALOME_Exception); + SALOME_MED::SUPPORT::supportInfos * getSupportGlobal() + throw (SALOME::SALOME_Exception); void createSeq() throw(SALOME::SALOME_Exception); public: //public field