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. 2nd edition :)

diff --git a/src/SMESH_I/SMESH_MEDFamily_i.cxx b/src/SMESH_I/SMESH_MEDFamily_i.cxx
index 35895cb4be2bb8038e713d7677e5e838fae5d9ab..c9588503bea391689a05677978a983579bcfc3e3 100644 (file)
--- a/src/SMESH_I/SMESH_MEDFamily_i.cxx
+++ b/src/SMESH_I/SMESH_MEDFamily_i.cxx
@@ -262,3 +262,41 @@ char *  SMESH_MEDFamily_i::getAttributeDescription( CORBA::Long i)
   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_MEDMesh_i.cxx b/src/SMESH_I/SMESH_MEDMesh_i.cxx
index fb3b9fc404d35f84f44cf8225f1a750683f08c16..e4ca92bf5b57c764766824d417cf8dde1c5fafbd 100644 (file)
--- a/src/SMESH_I/SMESH_MEDMesh_i.cxx
+++ b/src/SMESH_I/SMESH_MEDMesh_i.cxx
@@ -162,7 +162,49 @@ CORBA::Long SMESH_MEDMesh_i::getMeshDimension()throw(SALOME::SALOME_Exception)
                        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
+ */
+//=============================================================================
+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
@@ -454,9 +496,11 @@ CORBA::Long SMESH_MEDMesh_i::getNumberOfElements(SALOME_MED::
  */
 //=============================================================================
 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)
+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",
@@ -483,8 +527,9 @@ SALOME_MED::long_array *
  */
 //=============================================================================
 SALOME_MED::long_array *
-       SMESH_MEDMesh_i::getConnectivityIndex(SALOME_MED::medConnectivity mode,
-       SALOME_MED::medEntityMesh entity) throw(SALOME::SALOME_Exception)
+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);
@@ -497,9 +542,10 @@ SALOME_MED::long_array *
  */
 //=============================================================================
 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)
+                                             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");
@@ -641,7 +687,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);
 }
+//=============================================================================
+/*!
+ * 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: 
@@ -1047,3 +1139,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 NULL;
+}

diff --git a/src/SMESH_I/SMESH_MEDSupport_i.cxx b/src/SMESH_I/SMESH_MEDSupport_i.cxx
index cccb7f9a2fcc2964dc9108972bac9e54a3dc3fdf..2d1f0e42742d6b09b88636ec08305eaafe2e328a 100644 (file)
--- a/src/SMESH_I/SMESH_MEDSupport_i.cxx
+++ b/src/SMESH_I/SMESH_MEDSupport_i.cxx
@@ -329,24 +329,69 @@ SALOME_MED::long_array * SMESH_MEDSupport_i::getNumber(
  * CORBA:  ??????????????????????????????
  */
 //=============================================================================
-
 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);
-       return 0;
+       return NULL;
 }
-
 //=============================================================================
 /*!
  * CORBA: Array containing indexes for elements included in the support  
  */
 //=============================================================================
-
 CORBA::Long SMESH_MEDSupport_i::getNumberOfGaussPoint(SALOME_MED::
        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;
+}