Salome HOME
To port on new version of MEDWrapper
[modules/smesh.git] / src / DriverMED / DriverMED_R_SMESHDS_Mesh.cxx
index 513454316ef57da8f9328384f0d6a4469eae7aad..e88e3598d5759df2ad66bbd208653e0c1588ecf6 100644 (file)
 
 #include "SMESHDS_Group.hxx"
 
-#include "MEDA_Wrapper.hxx"
+#include "MED_Factory.hxx"
+#include "MED_CoordUtils.hxx"
 #include "MED_Utilities.hxx"
 
 #include <stdlib.h>
 
+#ifdef _DEBUG_
+static int MYDEBUG = 0;
+#else
+static int MYDEBUG = 0;
+#endif
+
 #define _EDF_NODE_IDS_
 
-void DriverMED_R_SMESHDS_Mesh::SetMeshName(string theMeshName)
+using namespace MED;
+
+void
+DriverMED_R_SMESHDS_Mesh
+::SetMeshName(string theMeshName)
 {
   myMeshName = theMeshName;
 }
 
 static const SMDS_MeshNode* 
-FindNode(const SMDS_Mesh* theMesh, med_int theId){
+FindNode(const SMDS_Mesh* theMesh, TInt theId){
   const SMDS_MeshNode* aNode = theMesh->FindNode(theId);
   if(aNode) return aNode;
   EXCEPTION(runtime_error,"SMDS_Mesh::FindNode - cannot find a SMDS_MeshNode for ID = "<<theId);
 }
 
 
-enum ECoordName{eX, eY, eZ, eNone};
-typedef med_float (*TGetCoord)(MEDA::PNodeInfo&, med_int);
-
-template<ECoordName TheCoordId>
-med_float GetCoord(MEDA::PNodeInfo& thePNodeInfo, med_int theElemId){
-  return thePNodeInfo->GetNodeCoord(theElemId,TheCoordId);
-}
-
-template<>
-med_float GetCoord<eNone>(MEDA::PNodeInfo& thePNodeInfo, med_int theElemId){
-  return 0.0;
-}
-
-
-static TGetCoord aXYZGetCoord[3] = {
-  &GetCoord<eX>, 
-  &GetCoord<eY>, 
-  &GetCoord<eZ>
-};
-
-
-static TGetCoord aXYGetCoord[3] = {
-  &GetCoord<eX>, 
-  &GetCoord<eY>, 
-  &GetCoord<eNone>
-};
-
-static TGetCoord aYZGetCoord[3] = {
-  &GetCoord<eNone>,
-  &GetCoord<eX>, 
-  &GetCoord<eY>
-};
-
-static TGetCoord aXZGetCoord[3] = {
-  &GetCoord<eX>, 
-  &GetCoord<eNone>,
-  &GetCoord<eY>
-};
-
-
-static TGetCoord aXGetCoord[3] = {
-  &GetCoord<eX>, 
-  &GetCoord<eNone>,
-  &GetCoord<eNone>
-};
-
-static TGetCoord aYGetCoord[3] = {
-  &GetCoord<eNone>,
-  &GetCoord<eX>, 
-  &GetCoord<eNone>
-};
-
-static TGetCoord aZGetCoord[3] = {
-  &GetCoord<eNone>,
-  &GetCoord<eNone>,
-  &GetCoord<eX>
-};
-
-
-class TCoordHelper{
-  MEDA::PNodeInfo myPNodeInfo;
-  TGetCoord* myGetCoord;
-public:
-  TCoordHelper(const MEDA::PNodeInfo& thePNodeInfo,
-              TGetCoord* theGetCoord):
-    myPNodeInfo(thePNodeInfo),
-    myGetCoord(theGetCoord)
-  {}
-  virtual ~TCoordHelper(){}
-  med_float GetCoord(med_int theElemId, med_int theCoodId){
-    return (*myGetCoord[theCoodId])(myPNodeInfo,theElemId);
-  }
-};
-typedef boost::shared_ptr<TCoordHelper> TCoordHelperPtr;
-
-
-Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform()
+Driver_Mesh::Status 
+DriverMED_R_SMESHDS_Mesh
+::Perform()
 {
   Status aResult = DRS_FAIL;
   try{
-    using namespace MEDA;
-
     myFamilies.clear();
-    MESSAGE("Perform - myFile : "<<myFile);
-    TWrapper aMed(myFile);
+    if(MYDEBUG) MESSAGE("Perform - myFile : "<<myFile);
+    PWrapper aMed = CrWrapper(myFile);
 
     aResult = DRS_EMPTY;
-    if(med_int aNbMeshes = aMed.GetNbMeshes()){
+    if(TInt aNbMeshes = aMed->GetNbMeshes()){
       for(int iMesh = 0; iMesh < aNbMeshes; iMesh++){
        // Reading the MED mesh
        //---------------------
-       PMeshInfo aMeshInfo = aMed.GetMeshInfo(iMesh);
+       PMeshInfo aMeshInfo = aMed->GetPMeshInfo(iMesh+1);
         string aMeshName;
         if (myMeshId != -1) {
           ostringstream aMeshNameStr;
@@ -153,79 +88,49 @@ Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform()
         } else {
           aMeshName = myMeshName;
         }
-       MESSAGE("Perform - aMeshName : "<<aMeshName<<"; "<<aMeshInfo->GetName());
+       if(MYDEBUG) MESSAGE("Perform - aMeshName : "<<aMeshName<<"; "<<aMeshInfo->GetName());
        if(aMeshName != aMeshInfo->GetName()) continue;
         aResult = DRS_OK;
-       med_int aMeshDim = aMeshInfo->GetDim();
+       //TInt aMeshDim = aMeshInfo->GetDim();
        
         // Reading MED families to the temporary structure
        //------------------------------------------------
-        med_int aNbFams = aMed.GetNbFamilies(aMeshInfo);
-        MESSAGE("Read " << aNbFams << " families");
-        for (med_int iFam = 0; iFam < aNbFams; iFam++) {
-          PFamilyInfo aFamilyInfo = aMed.GetFamilyInfo(aMeshInfo, iFam);
-          med_int aFamId = aFamilyInfo->GetId();
-          MESSAGE("Family " << aFamId << " :");
-
+       TErr anErr;
+       TInt aNbFams = aMed->GetNbFamilies(aMeshInfo);
+        if(MYDEBUG) MESSAGE("Read " << aNbFams << " families");
+        for (TInt iFam = 0; iFam < aNbFams; iFam++) {
+         PFamilyInfo aFamilyInfo = aMed->GetPFamilyInfo(aMeshInfo,iFam+1,&anErr);
+         if(anErr >= 0){
+           TInt aFamId = aFamilyInfo->GetId();
+           if(MYDEBUG) MESSAGE("Family " << aFamId << " :");
+           
             DriverMED_FamilyPtr aFamily (new DriverMED_Family);
-
-            med_int aNbGrp = aFamilyInfo->GetNbGroup();
-            MESSAGE("belong to " << aNbGrp << " groups");
-            for (med_int iGr = 0; iGr < aNbGrp; iGr++) {
+           
+            TInt aNbGrp = aFamilyInfo->GetNbGroup();
+            if(MYDEBUG) MESSAGE("belong to " << aNbGrp << " groups");
+            for (TInt iGr = 0; iGr < aNbGrp; iGr++) {
               string aGroupName = aFamilyInfo->GetGroupName(iGr);
-              MESSAGE(aGroupName);
+              if(MYDEBUG) MESSAGE(aGroupName);
               aFamily->AddGroupName(aGroupName);
             }
             myFamilies[aFamId] = aFamily;
+         }
         }
 
         // Reading MED nodes to the corresponding SMDS structure
        //------------------------------------------------------
-       PNodeInfo aNodeInfo = aMed.GetNodeInfo(aMeshInfo);
-
-       TCoordHelperPtr aCoordHelperPtr;
-       {
-         med_int aMeshDimension = aMeshInfo->GetDim();
-         bool anIsDimPresent[3] = {false, false, false};
-          for(med_int iDim = 0; iDim < aMeshDimension; iDim++){
-           string aDimName = aNodeInfo->GetCoordName(iDim);
-           if(aDimName == "x" || aDimName == "X")
-             anIsDimPresent[eX] = true;
-           else if(aDimName == "y" || aDimName == "Y")
-             anIsDimPresent[eY] = true;
-           else if(aDimName == "z" || aDimName == "Z")
-             anIsDimPresent[eZ] = true;
-         }
-         switch(aMeshDimension){
-         case 3:
-           aCoordHelperPtr.reset(new TCoordHelper(aNodeInfo,aXYZGetCoord));
-           break;
-         case 2:
-           if(anIsDimPresent[eY] && anIsDimPresent[eZ])
-             aCoordHelperPtr.reset(new TCoordHelper(aNodeInfo,aYZGetCoord));
-           else if(anIsDimPresent[eX] && anIsDimPresent[eZ])
-             aCoordHelperPtr.reset(new TCoordHelper(aNodeInfo,aXZGetCoord));
-           else
-             aCoordHelperPtr.reset(new TCoordHelper(aNodeInfo,aXYGetCoord));
-           break;
-         case 1:
-           if(anIsDimPresent[eY])
-             aCoordHelperPtr.reset(new TCoordHelper(aNodeInfo,aYGetCoord));
-           else if(anIsDimPresent[eZ])
-             aCoordHelperPtr.reset(new TCoordHelper(aNodeInfo,aZGetCoord));
-           else
-             aCoordHelperPtr.reset(new TCoordHelper(aNodeInfo,aXGetCoord));
-           break;
-         }
-       }
+       PNodeInfo aNodeInfo = aMed->GetPNodeInfo(aMeshInfo);
 
-       med_booleen anIsNodeNum = aNodeInfo->IsElemNum();
-       med_int aNbElems = aNodeInfo->GetNbElem();
-       MESSAGE("Perform - aNodeInfo->GetNbElem() = "<<aNbElems<<"; anIsNodeNum = "<<anIsNodeNum);
-        for(med_int iElem = 0; iElem < aNbElems; iElem++){
+       PCoordHelper aCoordHelper = GetCoordHelper(aNodeInfo);
+
+       EBooleen anIsNodeNum = aNodeInfo->IsElemNum();
+       TInt aNbElems = aNodeInfo->GetNbElem();
+       if(MYDEBUG) MESSAGE("Perform - aNodeInfo->GetNbElem() = "<<aNbElems<<"; anIsNodeNum = "<<anIsNodeNum);
+        for(TInt iElem = 0; iElem < aNbElems; iElem++){
+         TCCoordSlice aCoordSlice = aNodeInfo->GetCoordSlice(iElem);
           double aCoords[3] = {0.0, 0.0, 0.0};
-          for(med_int iDim = 0; iDim < 3; iDim++)
-            aCoords[iDim] = aCoordHelperPtr->GetCoord(iElem,iDim);
+          for(TInt iDim = 0; iDim < 3; iDim++)
+            aCoords[iDim] = aCoordHelper->GetCoord(aCoordSlice,iDim);
           const SMDS_MeshNode* aNode;
           if(anIsNodeNum) {
            aNode = myMesh->AddNodeWithID
@@ -237,7 +142,7 @@ Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform()
           //cout<<aNode->GetID()<<": "<<aNode->X()<<", "<<aNode->Y()<<", "<<aNode->Z()<<endl;
 
           // Save reference to this node from its family
-          med_int aFamNum = aNodeInfo->GetFamNum(iElem);
+          TInt aFamNum = aNodeInfo->GetFamNum(iElem);
           if (myFamilies.find(aFamNum) != myFamilies.end())
           {
             myFamilies[aFamNum]->AddElement(aNode);
@@ -247,237 +152,383 @@ Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform()
 
        // Reading pre information about all MED cells
        //--------------------------------------------
+       typedef std::vector<int> TNodeIds;
         bool takeNumbers = true;  // initially we trust the numbers from file
-       MED::TEntityInfo aEntityInfo = aMed.GetEntityInfo(aMeshInfo);
+       MED::TEntityInfo aEntityInfo = aMed->GetEntityInfo(aMeshInfo);
        MED::TEntityInfo::iterator anEntityIter = aEntityInfo.begin();
        for(; anEntityIter != aEntityInfo.end(); anEntityIter++){
-         const med_entite_maillage& anEntity = anEntityIter->first;
-         if(anEntity == MED_NOEUD) continue;
+         const EEntiteMaillage& anEntity = anEntityIter->first;
+         if(anEntity == eNOEUD) continue;
          // Reading MED cells to the corresponding SMDS structure
          //------------------------------------------------------
-         const MED::TGeom& aTGeom = anEntityIter->second;
-         MED::TGeom::const_iterator anTGeomIter = aTGeom.begin();
-         for(; anTGeomIter != aTGeom.end(); anTGeomIter++){
-           const med_geometrie_element& aGeom = anTGeomIter->first;
-           if(aGeom == MED_POINT1) continue;
-           PCellInfo aCellInfo = aMed.GetCellInfo(aMeshInfo,anEntity,aGeom);
-           med_booleen anIsElemNum = takeNumbers ? aCellInfo->IsElemNum() : MED_FAUX;
-           med_int aNbElems = aCellInfo->GetNbElem();
-           MESSAGE("Perform - anEntity = "<<anEntity<<"; anIsElemNum = "<<anIsElemNum);
-           MESSAGE("Perform - aGeom = "<<aGeom<<"; aNbElems = "<<aNbElems);
-
-           for(int iElem = 0; iElem < aNbElems; iElem++){
-             med_int aNbNodes = -1;
-             switch(aGeom){
-             case MED_SEG2:
-             case MED_SEG3:
-               aNbNodes = 2;
-               break;
-             case MED_TRIA3:
-             case MED_TRIA6:
-               aNbNodes = 3;
-               break;
-               break;
-             case MED_QUAD4:
-             case MED_QUAD8:
-               aNbNodes = 4;
-                break;
-              case MED_TETRA4:
-             case MED_TETRA10:
-               aNbNodes = 4;
-               break;
-             case MED_PYRA5:
-             case MED_PYRA13:
-               aNbNodes = 5;
-               break;
-             case MED_PENTA6:
-             case MED_PENTA15:
-               aNbNodes = 6;
-               break;
-             case MED_HEXA8:
-             case MED_HEXA20:
-               aNbNodes = 8;
-               break;
-             }
-             vector<med_int> aNodeIds(aNbNodes);
+         const MED::TGeom2Size& aGeom2Size = anEntityIter->second;
+         MED::TGeom2Size::const_iterator aGeom2SizeIter = aGeom2Size.begin();
+         for(; aGeom2SizeIter != aGeom2Size.end(); aGeom2SizeIter++){
+           const EGeometrieElement& aGeom = aGeom2SizeIter->first;
+
+           switch(aGeom){
+           case ePOINT1:
+             break;
+           case ePOLYGONE: {
+              PPolygoneInfo aPolygoneInfo = aMed->GetPPolygoneInfo(aMeshInfo,anEntity,aGeom);
+              EBooleen anIsElemNum = takeNumbers ? aPolygoneInfo->IsElemNum() : eFAUX;
+             
+             TInt aNbElem = aPolygoneInfo->GetNbElem();
+             for(TInt iElem = 0; iElem < aNbElem; iElem++){
+               MED::TCConnSlice aConnSlice = aPolygoneInfo->GetConnSlice(iElem);
+               TInt aNbConn = aPolygoneInfo->GetNbConn(iElem);
+               TNodeIds aNodeIds(aNbConn);
 #ifdef _EDF_NODE_IDS_
-             if(anIsNodeNum) {
-               for(int i = 0; i < aNbNodes; i++){
-                 aNodeIds[i] = aNodeInfo->GetElemNum(aCellInfo->GetConn(iElem,i)-1);
-               }
-             }else{
-               for(int i = 0; i < aNbNodes; i++){
-                 aNodeIds[i] = aCellInfo->GetConn(iElem,i);
-               }
-             }
+               if(anIsNodeNum)
+                 for(TInt iConn = 0; iConn < aNbConn; iConn++)
+                   aNodeIds[iConn] = aNodeInfo->GetElemNum(aConnSlice[iConn] - 1);
+               else
+                 for(TInt iConn = 0; iConn < aNbConn; iConn++)
+                   aNodeIds[iConn] = aConnSlice[iConn];
 #else
-             for(int i = 0; i < aNbNodes; i++){
-               aNodeIds[i] = aCellInfo->GetConn(iElem,i);
-             }
+               for(TInt iConn = 0; iConn < aNbConn; iConn++)
+                 aNodeIds[iConn] = aConnSlice[iConn];
 #endif
+                bool isRenum = false;
+                SMDS_MeshElement* anElement = NULL;
+                TInt aFamNum = aPolygoneInfo->GetFamNum(iElem);
+
+                try{
+                  if(anIsElemNum){
+                   TInt anElemId = aPolygoneInfo->GetElemNum(iElem);
+                    anElement = myMesh->AddPolygonalFaceWithID(aNodeIds,anElemId);
+                 }
+                  if(!anElement){
+                    std::vector<const SMDS_MeshNode*> aNodes(aNbConn);
+                   for(TInt iConn = 0; iConn < aNbConn; iConn++)
+                      aNodes[iConn] = FindNode(myMesh,aNodeIds[iConn]);
+                    anElement = myMesh->AddPolygonalFace(aNodes);
+                    isRenum = anIsElemNum;
+                  }
+                }catch(const std::exception& exc){
+                  aResult = DRS_FAIL;
+                }catch (...){
+                  aResult = DRS_FAIL;
+                }
 
-             bool isRenum = false;
-             SMDS_MeshElement* anElement = NULL;
-             med_int aFamNum = aCellInfo->GetFamNum(iElem);
-             try{
+                if(!anElement){
+                  aResult = DRS_WARN_SKIP_ELEM;
+                }else{
+                  if(isRenum){
+                    anIsElemNum = eFAUX;
+                    takeNumbers = false;
+                    if(aResult < DRS_WARN_RENUMBER)
+                      aResult = DRS_WARN_RENUMBER;
+                  }
+                  if(myFamilies.find(aFamNum) != myFamilies.end()){
+                    // Save reference to this element from its family
+                    myFamilies[aFamNum]->AddElement(anElement);
+                    myFamilies[aFamNum]->SetType(anElement->GetType());
+                  }
+                }
+              } // for (TInt iPG = 0; iPG < nbPolygons; iPG++)
+              break;
+           }
+           case ePOLYEDRE: {
+              PPolyedreInfo aPolyedreInfo = aMed->GetPPolyedreInfo(aMeshInfo,anEntity,aGeom);
+              EBooleen anIsElemNum = takeNumbers ? aPolyedreInfo->IsElemNum() : eFAUX;
+
+             TInt aNbElem = aPolyedreInfo->GetNbElem();
+             for(TInt iElem = 0; iElem < aNbElem; iElem++){
+               MED::TCConnSliceArr aConnSliceArr = aPolyedreInfo->GetConnSliceArr(iElem);
+               TInt aNbFaces = aConnSliceArr.size();
+                typedef std::vector<int> TQuantities;
+               TQuantities aQuantities(aNbFaces);
+               TInt aNbNodes = aPolyedreInfo->GetNbNodes(iElem);
+               TNodeIds aNodeIds(aNbNodes);
+               for(TInt iFace = 0, iNode = 0; iFace < aNbFaces; iFace++){
+                 MED::TCConnSlice aConnSlice = aConnSliceArr[iFace];
+                 TInt aNbConn = aConnSlice.size();
+                  aQuantities[iFace] = aNbConn;
+#ifdef _EDF_NODE_IDS_
+                 if(anIsNodeNum)
+                   for(TInt iConn = 0; iConn < aNbConn; iConn++)
+                     aNodeIds[iNode++] = aNodeInfo->GetElemNum(aConnSlice[iConn] - 1);
+                 else
+                   for(TInt iConn = 0; iConn < aNbConn; iConn++)
+                     aNodeIds[iNode++] = aConnSlice[iConn];
+#else
+                 for(TInt iConn = 0; iConn < aNbConn; iConn++)
+                   aNodeIds[iNode++] = aConnSlice[iConn];
+#endif
+               }
+               
+                bool isRenum = false;
+                SMDS_MeshElement* anElement = NULL;
+                TInt aFamNum = aPolyedreInfo->GetFamNum(iElem);
+
+                try{
+                  if(anIsElemNum){
+                   TInt anElemId = aPolyedreInfo->GetElemNum(iElem);
+                    anElement = myMesh->AddPolyhedralVolumeWithID(aNodeIds,aQuantities,anElemId);
+                  }
+                  if(!anElement){
+                    std::vector<const SMDS_MeshNode*> aNodes(aNbNodes);
+                   for(TInt iConn = 0; iConn < aNbNodes; iConn++)
+                      aNodes[iConn] = FindNode(myMesh,aNodeIds[iConn]);
+                    anElement = myMesh->AddPolyhedralVolume(aNodes,aQuantities);
+                    isRenum = anIsElemNum;
+                  }
+                }catch(const std::exception& exc){
+                  aResult = DRS_FAIL;
+                }catch(...){
+                  aResult = DRS_FAIL;
+                }
+
+                if(!anElement){
+                  aResult = DRS_WARN_SKIP_ELEM;
+                }else{
+                  if(isRenum){
+                    anIsElemNum = eFAUX;
+                    takeNumbers = false;
+                    if (aResult < DRS_WARN_RENUMBER)
+                      aResult = DRS_WARN_RENUMBER;
+                  }
+                  if(myFamilies.find(aFamNum) != myFamilies.end()){
+                    // Save reference to this element from its family
+                    myFamilies[aFamNum]->AddElement(anElement);
+                    myFamilies[aFamNum]->SetType(anElement->GetType());
+                  }
+                }
+              } // for (int iPE = 0; iPE < nbPolyedres; iPE++)
+              break;
+            }
+           default: {
+             PCellInfo aCellInfo = aMed->GetPCellInfo(aMeshInfo,anEntity,aGeom);
+             EBooleen anIsElemNum = takeNumbers ? aCellInfo->IsElemNum() : eFAUX;
+             TInt aNbElems = aCellInfo->GetNbElem();
+             if(MYDEBUG) MESSAGE("Perform - anEntity = "<<anEntity<<"; anIsElemNum = "<<anIsElemNum);
+             if(MYDEBUG) MESSAGE("Perform - aGeom = "<<aGeom<<"; aNbElems = "<<aNbElems);
+             
+             for(int iElem = 0; iElem < aNbElems; iElem++){
+               TInt aNbNodes = -1;
                switch(aGeom){
-               case MED_SEG2:
-               case MED_SEG3:
-                 if(anIsElemNum)
-                   anElement = myMesh->AddEdgeWithID(aNodeIds[0],
-                                                     aNodeIds[1],
-                                                     aCellInfo->GetElemNum(iElem));
-                 if (!anElement) {
-                   anElement = myMesh->AddEdge(FindNode(myMesh,aNodeIds[0]),
-                                               FindNode(myMesh,aNodeIds[1]));
-                   isRenum = anIsElemNum;
-                 }
+               case eSEG2:
+               case eSEG3:
+                 aNbNodes = 2;
                  break;
-               case MED_TRIA3:
-               case MED_TRIA6:
+               case eTRIA3:
+               case eTRIA6:
                  aNbNodes = 3;
-                 if(anIsElemNum)
-                   anElement = myMesh->AddFaceWithID(aNodeIds[0],
-                                                     aNodeIds[1],
-                                                     aNodeIds[2],
-                                                     aCellInfo->GetElemNum(iElem));
-                 if (!anElement) {
-                   anElement = myMesh->AddFace(FindNode(myMesh,aNodeIds[0]),
-                                               FindNode(myMesh,aNodeIds[1]),
-                                               FindNode(myMesh,aNodeIds[2]));
-                   isRenum = anIsElemNum;
-                 }
                  break;
-               case MED_QUAD4:
-               case MED_QUAD8:
+                 break;
+               case eQUAD4:
+               case eQUAD8:
                  aNbNodes = 4;
-                 // There is some differnce between SMDS and MED
-                 if(anIsElemNum)
-                   anElement = myMesh->AddFaceWithID(aNodeIds[0],
-                                                     aNodeIds[1],
-                                                     aNodeIds[2],
-                                                     aNodeIds[3],
-                                                     aCellInfo->GetElemNum(iElem));
-                 if (!anElement) {
-                   anElement = myMesh->AddFace(FindNode(myMesh,aNodeIds[0]),
-                                               FindNode(myMesh,aNodeIds[1]),
-                                               FindNode(myMesh,aNodeIds[2]),
-                                               FindNode(myMesh,aNodeIds[3]));
-                   isRenum = anIsElemNum;
-                 }
                  break;
-               case MED_TETRA4:
-               case MED_TETRA10:
+               case eTETRA4:
+               case eTETRA10:
                  aNbNodes = 4;
-                 if(anIsElemNum)
-                   anElement = myMesh->AddVolumeWithID(aNodeIds[0],
-                                                       aNodeIds[1],
-                                                       aNodeIds[2],
-                                                       aNodeIds[3],
-                                                       aCellInfo->GetElemNum(iElem));
-                 if (!anElement) {
-                   anElement = myMesh->AddVolume(FindNode(myMesh,aNodeIds[0]),
-                                                 FindNode(myMesh,aNodeIds[1]),
-                                                 FindNode(myMesh,aNodeIds[2]),
-                                                 FindNode(myMesh,aNodeIds[3]));
-                   isRenum = anIsElemNum;
-                 }
                  break;
-               case MED_PYRA5:
-               case MED_PYRA13:
+               case ePYRA5:
+               case ePYRA13:
                  aNbNodes = 5;
-                 // There is some differnce between SMDS and MED
-                 if(anIsElemNum)
-                   anElement = myMesh->AddVolumeWithID(aNodeIds[0],
-                                                       aNodeIds[1],
-                                                       aNodeIds[2],
-                                                       aNodeIds[3],
-                                                       aNodeIds[4],
-                                                       aCellInfo->GetElemNum(iElem));
-                 if (!anElement) {
-                   anElement = myMesh->AddVolume(FindNode(myMesh,aNodeIds[0]),
-                                                 FindNode(myMesh,aNodeIds[1]),
-                                                 FindNode(myMesh,aNodeIds[2]),
-                                                 FindNode(myMesh,aNodeIds[3]),
-                                                 FindNode(myMesh,aNodeIds[4]));
-                   isRenum = anIsElemNum;
-                 }
                  break;
-               case MED_PENTA6:
-               case MED_PENTA15:
+               case ePENTA6:
+               case ePENTA15:
                  aNbNodes = 6;
-                 if(anIsElemNum)
-                   anElement = myMesh->AddVolumeWithID(aNodeIds[0],
+                 break;
+               case eHEXA8:
+               case eHEXA20:
+                 aNbNodes = 8;
+                 break;
+               }
+               TNodeIds aNodeIds(aNbNodes);
+               bool anIsValidConnect = false;
+               TCConnSlice aConnSlice = aCellInfo->GetConnSlice(iElem);
+               try{
+#ifdef _EDF_NODE_IDS_
+                 if(anIsNodeNum)
+                   for(int iNode = 0; iNode < aNbNodes; iNode++)
+                     aNodeIds[iNode] = aNodeInfo->GetElemNum(aConnSlice[iNode] - 1);
+                 else
+                   for(int iNode = 0; iNode < aNbNodes; iNode++)
+                     aNodeIds[iNode] = aConnSlice[iNode];
+#else
+                 for(int iNode = 0; iNode < aNbNodes; iNode++)
+                   aNodeIds[iNode] = aConnSlice[iNode];
+#endif
+                 anIsValidConnect = true;
+               }catch(const std::exception& exc){
+                 //INFOS("Follow exception was cought:\n\t"<<exc.what());
+                 aResult = DRS_FAIL;
+               }catch(...){
+                 //INFOS("Unknown exception was cought !!!");
+                 aResult = DRS_FAIL;
+               }
+               
+               if(!anIsValidConnect)
+                 continue;
+               
+               bool isRenum = false;
+               SMDS_MeshElement* anElement = NULL;
+               TInt aFamNum = aCellInfo->GetFamNum(iElem);
+               try{
+                 //MESSAGE("Try to create element # " << iElem << " with id = "
+                 //        << aCellInfo->GetElemNum(iElem));
+                 switch(aGeom){
+                 case eSEG2:
+                 case eSEG3:
+                   if(anIsElemNum)
+                     anElement = myMesh->AddEdgeWithID(aNodeIds[0],
+                                                       aNodeIds[1],
+                                                       aCellInfo->GetElemNum(iElem));
+                   if (!anElement) {
+                     anElement = myMesh->AddEdge(FindNode(myMesh,aNodeIds[0]),
+                                                 FindNode(myMesh,aNodeIds[1]));
+                     isRenum = anIsElemNum;
+                   }
+                   break;
+                 case eTRIA3:
+                 case eTRIA6:
+                   aNbNodes = 3;
+                   if(anIsElemNum)
+                     anElement = myMesh->AddFaceWithID(aNodeIds[0],
                                                        aNodeIds[1],
                                                        aNodeIds[2],
-                                                       aNodeIds[3],
-                                                       aNodeIds[4],
-                                                       aNodeIds[5],
                                                        aCellInfo->GetElemNum(iElem));
-                 if (!anElement) {
-                   anElement = myMesh->AddVolume(FindNode(myMesh,aNodeIds[0]),
+                   if (!anElement) {
+                     anElement = myMesh->AddFace(FindNode(myMesh,aNodeIds[0]),
                                                  FindNode(myMesh,aNodeIds[1]),
-                                                 FindNode(myMesh,aNodeIds[2]),
-                                                 FindNode(myMesh,aNodeIds[3]),
-                                                 FindNode(myMesh,aNodeIds[4]),
-                                                 FindNode(myMesh,aNodeIds[5]));
-                   isRenum = anIsElemNum;
-                 }
-                 break;
-               case MED_HEXA8:
-               case MED_HEXA20:
-                 aNbNodes = 8;
-                 if(anIsElemNum)
-                   anElement = myMesh->AddVolumeWithID(aNodeIds[0],
+                                                 FindNode(myMesh,aNodeIds[2]));
+                     isRenum = anIsElemNum;
+                   }
+                   break;
+                 case eQUAD4:
+                 case eQUAD8:
+                   aNbNodes = 4;
+                   // There is some differnce between SMDS and MED
+                   if(anIsElemNum)
+                     anElement = myMesh->AddFaceWithID(aNodeIds[0],
                                                        aNodeIds[1],
                                                        aNodeIds[2],
                                                        aNodeIds[3],
-                                                       aNodeIds[4],
-                                                       aNodeIds[5],
-                                                       aNodeIds[6],
-                                                       aNodeIds[7],
                                                        aCellInfo->GetElemNum(iElem));
-                 if (!anElement) {
-                   anElement = myMesh->AddVolume(FindNode(myMesh,aNodeIds[0]),
+                   if (!anElement) {
+                     anElement = myMesh->AddFace(FindNode(myMesh,aNodeIds[0]),
                                                  FindNode(myMesh,aNodeIds[1]),
                                                  FindNode(myMesh,aNodeIds[2]),
-                                                 FindNode(myMesh,aNodeIds[3]),
-                                                 FindNode(myMesh,aNodeIds[4]),
-                                                 FindNode(myMesh,aNodeIds[5]),
-                                                 FindNode(myMesh,aNodeIds[6]),
-                                                 FindNode(myMesh,aNodeIds[7]));
-                   isRenum = anIsElemNum;
+                                                 FindNode(myMesh,aNodeIds[3]));
+                     isRenum = anIsElemNum;
+                   }
+                   break;
+                 case eTETRA4:
+                 case eTETRA10:
+                   aNbNodes = 4;
+                   if(anIsElemNum)
+                     anElement = myMesh->AddVolumeWithID(aNodeIds[0],
+                                                         aNodeIds[1],
+                                                         aNodeIds[2],
+                                                         aNodeIds[3],
+                                                         aCellInfo->GetElemNum(iElem));
+                   if (!anElement) {
+                     anElement = myMesh->AddVolume(FindNode(myMesh,aNodeIds[0]),
+                                                   FindNode(myMesh,aNodeIds[1]),
+                                                   FindNode(myMesh,aNodeIds[2]),
+                                                   FindNode(myMesh,aNodeIds[3]));
+                     isRenum = anIsElemNum;
+                   }
+                   break;
+                 case ePYRA5:
+                 case ePYRA13:
+                   aNbNodes = 5;
+                   // There is some differnce between SMDS and MED
+                   if(anIsElemNum)
+                     anElement = myMesh->AddVolumeWithID(aNodeIds[0],
+                                                         aNodeIds[1],
+                                                         aNodeIds[2],
+                                                         aNodeIds[3],
+                                                         aNodeIds[4],
+                                                         aCellInfo->GetElemNum(iElem));
+                   if (!anElement) {
+                     anElement = myMesh->AddVolume(FindNode(myMesh,aNodeIds[0]),
+                                                   FindNode(myMesh,aNodeIds[1]),
+                                                   FindNode(myMesh,aNodeIds[2]),
+                                                   FindNode(myMesh,aNodeIds[3]),
+                                                   FindNode(myMesh,aNodeIds[4]));
+                     isRenum = anIsElemNum;
+                   }
+                   break;
+                 case ePENTA6:
+                 case ePENTA15:
+                   aNbNodes = 6;
+                   if(anIsElemNum)
+                     anElement = myMesh->AddVolumeWithID(aNodeIds[0],
+                                                         aNodeIds[1],
+                                                         aNodeIds[2],
+                                                         aNodeIds[3],
+                                                         aNodeIds[4],
+                                                         aNodeIds[5],
+                                                         aCellInfo->GetElemNum(iElem));
+                   if (!anElement) {
+                     anElement = myMesh->AddVolume(FindNode(myMesh,aNodeIds[0]),
+                                                   FindNode(myMesh,aNodeIds[1]),
+                                                   FindNode(myMesh,aNodeIds[2]),
+                                                   FindNode(myMesh,aNodeIds[3]),
+                                                   FindNode(myMesh,aNodeIds[4]),
+                                                   FindNode(myMesh,aNodeIds[5]));
+                     isRenum = anIsElemNum;
+                   }
+                   break;
+                 case eHEXA8:
+                 case eHEXA20:
+                   aNbNodes = 8;
+                   if(anIsElemNum)
+                     anElement = myMesh->AddVolumeWithID(aNodeIds[0],
+                                                         aNodeIds[1],
+                                                         aNodeIds[2],
+                                                         aNodeIds[3],
+                                                         aNodeIds[4],
+                                                         aNodeIds[5],
+                                                         aNodeIds[6],
+                                                         aNodeIds[7],
+                                                         aCellInfo->GetElemNum(iElem));
+                   if (!anElement) {
+                     anElement = myMesh->AddVolume(FindNode(myMesh,aNodeIds[0]),
+                                                   FindNode(myMesh,aNodeIds[1]),
+                                                   FindNode(myMesh,aNodeIds[2]),
+                                                   FindNode(myMesh,aNodeIds[3]),
+                                                   FindNode(myMesh,aNodeIds[4]),
+                                                   FindNode(myMesh,aNodeIds[5]),
+                                                   FindNode(myMesh,aNodeIds[6]),
+                                                   FindNode(myMesh,aNodeIds[7]));
+                     isRenum = anIsElemNum;
+                   }
+                   break;
                  }
-                 break;
+               }catch(const std::exception& exc){
+                 //INFOS("Follow exception was cought:\n\t"<<exc.what());
+                 aResult = DRS_FAIL;
+               }catch(...){
+                 //INFOS("Unknown exception was cought !!!");
+                 aResult = DRS_FAIL;
                }
-             }catch(const std::exception& exc){
-               //INFOS("Follow exception was cought:\n\t"<<exc.what());
-               aResult = DRS_FAIL;
-             }catch(...){
-               //INFOS("Unknown exception was cought !!!");
-               aResult = DRS_FAIL;
-             }
                
-              if (!anElement) {
-                aResult = DRS_WARN_SKIP_ELEM;
-              }
-              else {
-                if (isRenum) {
-                  anIsElemNum = MED_FAUX;
-                  takeNumbers = false;
-                  if (aResult < DRS_WARN_RENUMBER)
-                    aResult = DRS_WARN_RENUMBER;
-                }
-                if (myFamilies.find(aFamNum) != myFamilies.end()) {
-                  // Save reference to this element from its family
-                  myFamilies[aFamNum]->AddElement(anElement);
-                  myFamilies[aFamNum]->SetType(anElement->GetType());
-                }
-              }
-            }
+               if (!anElement) {
+                 aResult = DRS_WARN_SKIP_ELEM;
+               }
+               else {
+                 if (isRenum) {
+                   anIsElemNum = eFAUX;
+                   takeNumbers = false;
+                   if (aResult < DRS_WARN_RENUMBER)
+                     aResult = DRS_WARN_RENUMBER;
+                 }
+                 if (myFamilies.find(aFamNum) != myFamilies.end()) {
+                   // Save reference to this element from its family
+                   myFamilies[aFamNum]->AddElement(anElement);
+                   myFamilies[aFamNum]->SetType(anElement->GetType());
+                 }
+               }
+             }
+           }}
          }
        }
-       break;
       }
     }
   }catch(const std::exception& exc){
@@ -487,7 +538,7 @@ Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform()
     INFOS("Unknown exception was cought !!!");
     aResult = DRS_FAIL;
   }
-  MESSAGE("Perform - aResult status = "<<aResult);
+  if(MYDEBUG) MESSAGE("Perform - aResult status = "<<aResult);
   return aResult;
 }
 
@@ -496,17 +547,15 @@ list<string> DriverMED_R_SMESHDS_Mesh::GetMeshNames(Status& theStatus)
   list<string> aMeshNames;
 
   try {
-    using namespace MEDA;
-
-    MESSAGE("GetMeshNames - myFile : " << myFile);
+    if(MYDEBUG) MESSAGE("GetMeshNames - myFile : " << myFile);
     theStatus = DRS_OK;
-    TWrapper aMed (myFile);
+    PWrapper aMed = CrWrapper(myFile);
 
-    if (med_int aNbMeshes = aMed.GetNbMeshes()) {
+    if (TInt aNbMeshes = aMed->GetNbMeshes()) {
       for (int iMesh = 0; iMesh < aNbMeshes; iMesh++) {
        // Reading the MED mesh
        //---------------------
-       PMeshInfo aMeshInfo = aMed.GetMeshInfo(iMesh);
+       PMeshInfo aMeshInfo = aMed->GetPMeshInfo(iMesh+1);
        aMeshNames.push_back(aMeshInfo->GetName());
       }
     }
@@ -551,7 +600,7 @@ list<string> DriverMED_R_SMESHDS_Mesh::GetGroupNames()
 void DriverMED_R_SMESHDS_Mesh::GetGroup(SMESHDS_Group* theGroup)
 {
   string aGroupName (theGroup->GetStoreName());
-  MESSAGE("Get Group " << aGroupName);
+  if(MYDEBUG) MESSAGE("Get Group " << aGroupName);
 
   map<int, DriverMED_FamilyPtr>::iterator aFamsIter = myFamilies.begin();
   for (; aFamsIter != myFamilies.end(); aFamsIter++)
@@ -565,7 +614,7 @@ void DriverMED_R_SMESHDS_Mesh::GetGroup(SMESHDS_Group* theGroup)
       for (; anElemsIter != anElements.end(); anElemsIter++)
       {
         element = *anElemsIter;
-        theGroup->SMDSGroup().Add(element);
+       theGroup->SMDSGroup().Add(element);
       }
       if ( element )
         theGroup->SetType( element->GetType() );