merge with the branch nadir_update_MED_v1_3_0 (branch to build the V1_3_0

version of the module.

diff --git a/src/SMESH_I/SMESH_MEDFamily_i.cxx b/src/SMESH_I/SMESH_MEDFamily_i.cxx
index 1fd40b967ef025164c49ea615ab130922f8ca618..cd8a6674234df8b1d3628acba1f0c885d9f187aa 100644 (file)
--- 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
  */
 //=============================================================================
  * 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)
 throw (SALOME::SALOME_Exception)
 {
   if (_subMeshDS==NULL)


@@ -138,7 +138,7 @@ throw (SALOME::SALOME_Exception)
                                   ,SALOME::BAD_PARAM);
     };
   
                                   ,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++)
     {
   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
  */
 //=============================================================================
  * 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)
   throw (SALOME::SALOME_Exception)
 {
   if (_subMeshDS==NULL)


@@ -189,7 +189,7 @@ Engines::long_array*  SMESH_MEDFamily_i::getAttributesValues()
                                   ,SALOME::BAD_PARAM);
     };
 
                                   ,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++)
     {
   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
  */
 //=============================================================================
  * 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)
   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);
     }
       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());
   for (int i=0;i<_numberOfAttribute;i++)
     {
       myseq[i]=CORBA::string_dup(_attributeDescription[i].c_str());


@@ -262,3 +262,39 @@ char *  SMESH_MEDFamily_i::getAttributeDescription( CORBA::Long i)
   ASSERT (i <= _numberOfAttribute);
   return CORBA::string_dup(_attributeDescription[i].c_str());
 }
   ASSERT (i <= _numberOfAttribute);
   return CORBA::string_dup(_attributeDescription[i].c_str());
 }

+//=============================================================================
+/*!
+ * CORBA: Accessor for the number of groups
+ */
+//=============================================================================
+CORBA::Long SMESH_MEDFamily_i::getNumberOfGroups()
+    throw (SALOME::SALOME_Exception)
+{
+  MESSAGE("!!! NOT YET IMPLEMENTED !!!!");
+  THROW_SALOME_CORBA_EXCEPTION("Not Implemented", SALOME::BAD_PARAM);
+  return 0;
+}
+//=============================================================================
+/*!
+ * CORBA: Accessor for the name of the group i
+ */
+//=============================================================================
+char * SMESH_MEDFamily_i::getGroupName( CORBA::Long i)
+  throw (SALOME::SALOME_Exception)
+{
+  MESSAGE("!!! NOT YET IMPLEMENTED !!!!");
+  THROW_SALOME_CORBA_EXCEPTION("Not Implemented", SALOME::BAD_PARAM);
+  return NULL;
+}
+//=============================================================================
+/*!
+ * CORBA: Accessor for all the groups name
+ */
+//=============================================================================
+SALOME_MED::string_array* SMESH_MEDFamily_i::getGroupsNames()
+  throw (SALOME::SALOME_Exception)
+{
+  MESSAGE("!!! NOT YET IMPLEMENTED !!!!");
+  THROW_SALOME_CORBA_EXCEPTION("Not Implemented", SALOME::BAD_PARAM);
+  return NULL;
+}

diff --git a/src/SMESH_I/SMESH_MEDFamily_i.hxx b/src/SMESH_I/SMESH_MEDFamily_i.hxx
index 31efc1a7cb1e5708c2798183009ecd8c27bc847c..05ed02971b7268bf8c1dc8c496f9282ad17504b7 100644 (file)
--- a/src/SMESH_I/SMESH_MEDFamily_i.hxx
+++ b/src/SMESH_I/SMESH_MEDFamily_i.hxx
@@ -62,18 +62,23 @@ public :
     throw (SALOME::SALOME_Exception);
   CORBA::Long            getNumberOfAttributes() 
     throw (SALOME::SALOME_Exception);
     throw (SALOME::SALOME_Exception);
   CORBA::Long            getNumberOfAttributes() 
     throw (SALOME::SALOME_Exception);

-  Engines::long_array*   getAttributesIdentifiers() 
+  SALOME_MED::long_array*   getAttributesIdentifiers() 

     throw (SALOME::SALOME_Exception);
   CORBA::Long            getAttributeIdentifier(CORBA::Long i) 
     throw (SALOME::SALOME_Exception);
     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);
     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);
     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_ */
 };
 #endif /* MED_FAMILY_I_HXX_ */

diff --git a/src/SMESH_I/SMESH_MEDMesh_i.cxx b/src/SMESH_I/SMESH_MEDMesh_i.cxx
index 71fc85c08e673ab86e5048c6d5efca9135e7709c..cfbea781a3c1db8d1154be8a7d15b10914170120 100644 (file)
--- a/src/SMESH_I/SMESH_MEDMesh_i.cxx
+++ b/src/SMESH_I/SMESH_MEDMesh_i.cxx
@@ -162,13 +162,55 @@ CORBA::Long SMESH_MEDMesh_i::getMeshDimension()throw(SALOME::SALOME_Exception)
                        SALOME::INTERNAL_ERROR);
        return 3;
 }
                        SALOME::INTERNAL_ERROR);
        return 3;
 }

+//=============================================================================
+/*!
+ * CORBA: Accessor for the boolean _isAGrid
+ */
+//=============================================================================
+CORBA::Boolean SMESH_MEDMesh_i::getIsAGrid() throw (SALOME::SALOME_Exception)
+{
+  MESSAGE("!!!!!! NOT YET IMPLEMENTED !!!!!!");
+
+  THROW_SALOME_CORBA_EXCEPTION("Unimplemented Method", SALOME::BAD_PARAM);
+
+  return false;
+}
+//=============================================================================
+/*!
+ * CORBA: Accessor for the connectivities, to see if they exist
+ */
+//=============================================================================
+CORBA::Boolean
+SMESH_MEDMesh_i::existConnectivity(SALOME_MED::medConnectivity connectivityType,
+                                  SALOME_MED::medEntityMesh entity)
+  throw (SALOME::SALOME_Exception)
+{
+  MESSAGE("!!!!!! IMPLEMENTED BUT ONLY PARTIALLY !!!!!!");
+
+
+  return false;
+
+}
+//=============================================================================
+/*!
+ * CORBA: Accessor for Coordinate
+ */
+//=============================================================================
+CORBA::Double SMESH_MEDMesh_i::getCoordinate(CORBA::Long Number, CORBA::Long Axis)
+  throw (SALOME::SALOME_Exception)
+{
+  MESSAGE("!!!!!! NOT YET IMPLEMENTED !!!!");
+
+  THROW_SALOME_CORBA_EXCEPTION("Unimplemented Method", SALOME::BAD_PARAM);

 
 

+  return 0.0;
+}

 //=============================================================================
 /*!
  * CORBA: Accessor for Coordinates System
  */
 //=============================================================================
 //=============================================================================
 /*!
  * 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",
 {
        if (_mesh_i == 0)
                THROW_SALOME_CORBA_EXCEPTION("No associated Mesh",


@@ -192,13 +234,13 @@ char *SMESH_MEDMesh_i::getCoordinateSystem() throw(SALOME::SALOME_Exception)
  * CORBA: Accessor for Coordinates
  */
 //=============================================================================
  * 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);
        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
        try
        {
                // PN  : En dur


@@ -250,13 +292,13 @@ Engines::double_array * SMESH_MEDMesh_i::getCoordinates(
  * CORBA: Accessor for Coordinates Names
  */
 //=============================================================================
  * 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);
        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
        try
        {
                // PN : en dur


@@ -281,13 +323,13 @@ Engines::string_array *
  * CORBA: Accessor for Coordinates Units
  */
 //=============================================================================
  * 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);
        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
        try
        {
                // PN : en dur


@@ -453,10 +495,12 @@ CORBA::Long SMESH_MEDMesh_i::getNumberOfElements(SALOME_MED::
  * CORBA: Accessor for connectivities
  */
 //=============================================================================
  * CORBA: Accessor for connectivities
  */
 //=============================================================================

-Engines::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)
+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)

 {
        if (_mesh_i == 0)
                THROW_SALOME_CORBA_EXCEPTION("No associated Mesh",
 {
        if (_mesh_i == 0)
                THROW_SALOME_CORBA_EXCEPTION("No associated Mesh",


@@ -482,9 +526,10 @@ Engines::long_array *
  * CORBA: Accessor for connectivities
  */
 //=============================================================================
  * CORBA: Accessor for connectivities
  */
 //=============================================================================

-Engines::long_array *
-       SMESH_MEDMesh_i::getConnectivityIndex(SALOME_MED::medConnectivity mode,
-       SALOME_MED::medEntityMesh entity) throw(SALOME::SALOME_Exception)
+SALOME_MED::long_array *
+SMESH_MEDMesh_i::getConnectivityIndex(SALOME_MED::medConnectivity mode,
+                                     SALOME_MED::medEntityMesh entity)
+  throw(SALOME::SALOME_Exception)

 {
        MESSAGE("Pas Implemente dans SMESH");
        THROW_SALOME_CORBA_EXCEPTION("Unimplemented Method", SALOME::BAD_PARAM);
 {
        MESSAGE("Pas Implemente dans SMESH");
        THROW_SALOME_CORBA_EXCEPTION("Unimplemented Method", SALOME::BAD_PARAM);


@@ -496,10 +541,12 @@ Engines::long_array *
  * CORBA: Find an element corresponding to the given connectivity
  */
 //=============================================================================
  * CORBA: Find an element corresponding to the given connectivity
  */
 //=============================================================================

-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)
+CORBA::Long
+SMESH_MEDMesh_i::getElementNumber(SALOME_MED::medConnectivity mode,
+                                 SALOME_MED::medEntityMesh entity,
+                                 SALOME_MED::medGeometryElement type,
+                                 const SALOME_MED::long_array & connectivity)
+  throw(SALOME::SALOME_Exception)

 {
        const char *LOC = "getElementNumber ";
        MESSAGE(LOC << "Pas Implemente dans SMESH");
 {
        const char *LOC = "getElementNumber ";
        MESSAGE(LOC << "Pas Implemente dans SMESH");


@@ -513,7 +560,7 @@ CORBA::Long SMESH_MEDMesh_i::getElementNumber(SALOME_MED::medConnectivity mode,
  * not implemented for MED_ALL_ENTITIES and MED_MAILLE
  */
 //=============================================================================
  * 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)
 {
        SMESH_MEDMesh_i::getReverseConnectivity(SALOME_MED::
        medConnectivity mode) throw(SALOME::SALOME_Exception)
 {


@@ -527,7 +574,7 @@ Engines::long_array *
  * CORBA: Accessor for connectivities
  */
 //=============================================================================
  * CORBA: Accessor for connectivities
  */
 //=============================================================================

-Engines::long_array *
+SALOME_MED::long_array *

        SMESH_MEDMesh_i::getReverseConnectivityIndex(SALOME_MED::
        medConnectivity mode) throw(SALOME::SALOME_Exception)
 {
        SMESH_MEDMesh_i::getReverseConnectivityIndex(SALOME_MED::
        medConnectivity mode) throw(SALOME::SALOME_Exception)
 {


@@ -641,7 +688,53 @@ SALOME_MED::GROUP_ptr SMESH_MEDMesh_i::getGroup(SALOME_MED::
        MESSAGE(" Pas d implementation des groupes dans SMESH");
        THROW_SALOME_CORBA_EXCEPTION("No group implementation", SALOME::BAD_PARAM);
 }
        MESSAGE(" Pas d implementation des groupes dans SMESH");
        THROW_SALOME_CORBA_EXCEPTION("No group implementation", SALOME::BAD_PARAM);
 }

+//=============================================================================
+/*!
+ * CORBA: Returns references for the global numbering index
+ */
+//=============================================================================
+SALOME_MED::long_array*
+SMESH_MEDMesh_i::getGlobalNumberingIndex(SALOME_MED::medEntityMesh entity)
+  throw (SALOME::SALOME_Exception)
+{
+  MESSAGE("!!!! NOT YET IMPLEMENTED !!!!!");
+
+  THROW_SALOME_CORBA_EXCEPTION("Unimplemented Method", SALOME::BAD_PARAM);
+
+  return NULL;
+}
+//=============================================================================
+/*!
+ * CORBA: Returns references for the support of boundary elements of type
+ * entity
+ */
+//=============================================================================
+SALOME_MED::SUPPORT_ptr
+SMESH_MEDMesh_i::getBoundaryElements(SALOME_MED::medEntityMesh entity)
+  throw (SALOME::SALOME_Exception)
+{
+  MESSAGE("!!!! NOT YET IMPLEMENTED !!!!!");
+
+  THROW_SALOME_CORBA_EXCEPTION("Unimplemented Method", SALOME::BAD_PARAM);
+
+  return NULL;
+}
+//=============================================================================
+/*!
+ * CORBA: Returns references for the support of the skin of the support
+ * mySupport3D
+ */
+//=============================================================================
+SALOME_MED::SUPPORT_ptr
+SMESH_MEDMesh_i::getSkin(SALOME_MED::SUPPORT_ptr mySupport3D)
+  throw (SALOME::SALOME_Exception)
+{
+  MESSAGE("!!!! NOT YET IMPLEMENTED !!!!!");
+
+  THROW_SALOME_CORBA_EXCEPTION("Unimplemented Method", SALOME::BAD_PARAM);

 
 

+  return NULL;
+}

 //=============================================================================
 /*!
  * CORBA: 
 //=============================================================================
 /*!
  * CORBA: 


@@ -1047,3 +1140,63 @@ void SMESH_MEDMesh_i::createFamilies() throw(SALOME::SALOME_Exception)
                }
        }
 };
                }
        }
 };

+//=============================================================================
+/*!
+ * Gives informations of the considered mesh.
+ */
+//=============================================================================
+SALOME_MED::MESH::meshInfos * SMESH_MEDMesh_i::getMeshGlobal()
+  throw (SALOME::SALOME_Exception)
+{
+  MESSAGE("!!!! NOT YET IMPLEMENTED !!!!!");
+
+  THROW_SALOME_CORBA_EXCEPTION("Unimplemented Method", SALOME::BAD_PARAM);
+
+  return NULL;
+}
+//=============================================================================
+/*!
+ * Gives informations on coordinates of the considered mesh.
+ */
+//=============================================================================
+SALOME_MED::MESH::coordinateInfos * SMESH_MEDMesh_i::getCoordGlobal()
+  throw (SALOME::SALOME_Exception)
+{
+  MESSAGE("!!!! NOT YET IMPLEMENTED !!!!!");
+
+  THROW_SALOME_CORBA_EXCEPTION("Unimplemented Method", SALOME::BAD_PARAM);
+
+  return NULL;
+}
+//=============================================================================
+/*!
+ * Gives informations on connectivities of the considered mesh for the entity
+ * entity.
+ */
+//=============================================================================
+SALOME_MED::MESH::connectivityInfos *
+SMESH_MEDMesh_i::getConnectGlobal(SALOME_MED::medEntityMesh entity)
+  throw (SALOME::SALOME_Exception)
+{
+  MESSAGE("!!!! NOT YET IMPLEMENTED !!!!!");
+
+  THROW_SALOME_CORBA_EXCEPTION("Unimplemented Method", SALOME::BAD_PARAM);
+
+  return NULL;
+}
+//=============================================================================
+/*!
+ * Gives the type of the element number of entity entity
+ */
+//=============================================================================
+SALOME_MED::medGeometryElement
+SMESH_MEDMesh_i::getElementType(SALOME_MED::medEntityMesh entity,
+                               CORBA::Long number)
+  throw (SALOME::SALOME_Exception)
+{
+  MESSAGE("!!!! NOT YET IMPLEMENTED !!!!!");
+
+  THROW_SALOME_CORBA_EXCEPTION("Unimplemented Method", SALOME::BAD_PARAM);
+
+  return 0;
+}

diff --git a/src/SMESH_I/SMESH_MEDMesh_i.hxx b/src/SMESH_I/SMESH_MEDMesh_i.hxx
index 73370701a5fa8eac0e2e50644517992fceea84e5..9e9814e20860342b4947b5cbb91c367b430de5c5 100644 (file)
--- 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;
        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;
 
        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);
        // IDL Methods 
        char *getName() throw(SALOME::SALOME_Exception);
        CORBA::Long getSpaceDimension() throw(SALOME::SALOME_Exception);

+

        CORBA::Long getMeshDimension() 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)
-               throw(SALOME::SALOME_Exception);
-       Engines::string_array * getCoordinatesNames()
+        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);
+
+        CORBA::Double getCoordinate(CORBA::Long Number, CORBA::Long Axis)
+         throw (SALOME::SALOME_Exception);
+
+       SALOME_MED::double_array * getCoordinates(SALOME_MED::medModeSwitch typeSwitch)

                throw(SALOME::SALOME_Exception);
                throw(SALOME::SALOME_Exception);

-       Engines::string_array * getCoordinatesUnits()
+
+       SALOME_MED::string_array * getCoordinatesNames()

                throw(SALOME::SALOME_Exception);
                throw(SALOME::SALOME_Exception);

+
+       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);
        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_array *
                getTypes(SALOME_MED::medEntityMesh entity) 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
+       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);
                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,
 
        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);
 
                throw(SALOME::SALOME_Exception);
 

-       Engines::long_array *
-               getReverseConnectivity(SALOME_MED::medConnectivity mode) throw(SALOME::
-               SALOME_Exception);
-       Engines::long_array *
+       SALOME_MED::long_array *
+               getReverseConnectivity(SALOME_MED::medConnectivity mode)
+         throw(SALOME::SALOME_Exception);
+
+       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);
                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);
        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_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_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_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::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 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 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 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 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 getBarycenter(SALOME_MED::SUPPORT_ptr mySupport)
                throw(SALOME::SALOME_Exception);

+

        SALOME_MED::FIELD_ptr getNeighbourhood(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);
 
        //                    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);
        //
        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 931bb835bb7e56c2f54e51b64fcc26e9291507e5..0db6c4095e9300ff7ef67e836828f3d58eacb9ba 100644 (file)
--- 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)
        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);
 
        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());
 
        int i = 0;
        myseq->length(_subMeshDS->NbNodes());


@@ -330,12 +330,12 @@ 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");
        THROW_SALOME_CORBA_EXCEPTION("Not Implemented", SALOME::BAD_PARAM);
        SMESH_MEDSupport_i::getNumberIndex()throw(SALOME::SALOME_Exception)
 {
        MESSAGE("Not implemented for SMESH_i");
        THROW_SALOME_CORBA_EXCEPTION("Not Implemented", SALOME::BAD_PARAM);

-       return 0;
+       return NULL;

 }
 
 //=============================================================================
 }
 
 //=============================================================================


@@ -344,9 +344,57 @@ 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");
        return 0;
 }
        medGeometryElement geomElement) throw(SALOME::SALOME_Exception)
 {
        MESSAGE("Not implemented for SMESH_i");
        return 0;
 }

+//=============================================================================
+/*!
+ * Gives the number of types of elements included in the support 
+ */
+//=============================================================================
+CORBA::Long SMESH_MEDSupport_i::getNumberOfTypes()
+  throw (SALOME::SALOME_Exception)
+{
+  MESSAGE("!!! NOT YET IMPLEMENTED !!!!");
+  THROW_SALOME_CORBA_EXCEPTION("Not Implemented", SALOME::BAD_PARAM);
+  return 0;
+}
+//=============================================================================
+/*!
+ * Gives CORBA: Array containing the numbers of Gauss point of elements
+ * included in the support 
+ */
+//=============================================================================
+SALOME_MED::long_array* SMESH_MEDSupport_i::getNumbersOfGaussPoint()
+  throw (SALOME::SALOME_Exception)
+{
+  MESSAGE("!!! NOT YET IMPLEMENTED !!!!");
+  THROW_SALOME_CORBA_EXCEPTION("Not Implemented", SALOME::BAD_PARAM);
+  return NULL;
+}
+//=============================================================================
+/*!
+ * build the object which will contain all the boundary elements of the mesh.
+ */
+//=============================================================================
+void SMESH_MEDSupport_i::getBoundaryElements()
+  throw (SALOME::SALOME_Exception)
+{
+  MESSAGE("!!! NOT YET IMPLEMENTED !!!!");
+  THROW_SALOME_CORBA_EXCEPTION("Not Implemented", SALOME::BAD_PARAM);
+}
+//=============================================================================
+/*!
+ * Gives information on the support
+ */
+//=============================================================================
+SALOME_MED::SUPPORT::supportInfos * SMESH_MEDSupport_i::getSupportGlobal()
+  throw (SALOME::SALOME_Exception)
+{
+  MESSAGE("!!! NOT YET IMPLEMENTED !!!!");
+  THROW_SALOME_CORBA_EXCEPTION("Not Implemented", SALOME::BAD_PARAM);
+  return NULL;
+}

diff --git a/src/SMESH_I/SMESH_MEDSupport_i.hxx b/src/SMESH_I/SMESH_MEDSupport_i.hxx
index 81d59dc4ad68aac58119acd871908bd5a81579b2..5be60dda40e76743c8110b3b4d7bde3168ed6334 100644 (file)
--- a/src/SMESH_I/SMESH_MEDSupport_i.hxx
+++ b/src/SMESH_I/SMESH_MEDSupport_i.hxx
@@ -56,16 +56,36 @@ class SMESH_MEDSupport_i:
        SALOME_MED::MESH_ptr getMesh() throw(SALOME::SALOME_Exception);
        CORBA::Boolean isOnAllElements() throw(SALOME::SALOME_Exception);
        SALOME_MED::medEntityMesh getEntity() throw(SALOME::SALOME_Exception);
        SALOME_MED::MESH_ptr getMesh() throw(SALOME::SALOME_Exception);
        CORBA::Boolean isOnAllElements() throw(SALOME::SALOME_Exception);
        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::
-               medGeometryElement geomElement) throw(SALOME::SALOME_Exception);
-       SALOME_MED::medGeometryElement_array *
-               getTypes() throw(SALOME::SALOME_Exception);
+        CORBA::Long
+       getNumberOfElements(SALOME_MED::medGeometryElement geomElement)
+         throw(SALOME::SALOME_Exception);
+
+        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);
        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
        void createSeq() throw(SALOME::SALOME_Exception);
 
   public: //public field