X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FDriverMED%2FDriverMED_R_SMESHDS_Mesh.cxx;h=1433e3208a970c74ef6d00e1f498552e3100d94d;hp=c37f1e60adddd7e446dc350fafc35d799db410ed;hb=0cf919dde01c300a8f74d697198fba6538560c22;hpb=c3bf92bd87b770fd81631a3853f7f5bb1ac6a4e8

diff --git a/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx b/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx
index c37f1e60a..1433e3208 100644
--- a/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx
+++ b/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx
@@ -26,117 +26,131 @@
 
 #include "DriverMED_R_SMESHDS_Mesh.h"
 #include "DriverMED_R_SMDS_Mesh.h"
+#include "SMESHDS_Mesh.hxx"
 #include "utilities.h"
 
 #include "DriverMED_Family.h"
 
 #include "SMESHDS_Group.hxx"
 
-#include "MEDA_Wrapper.hxx"
+#include "MED_Factory.hxx"
 #include "MED_Utilities.hxx"
 
 #include <stdlib.h>
 
-DriverMED_R_SMESHDS_Mesh::DriverMED_R_SMESHDS_Mesh()
-     :
-       myMesh (NULL),
-       myFile (""),
-       myFileId (-1),
-       myMeshId (-1)
-{
-}
-
-DriverMED_R_SMESHDS_Mesh::~DriverMED_R_SMESHDS_Mesh()
-{
-//  map<int, DriverMED_FamilyPtr>::iterator aFamsIter = myFamilies.begin();
-//  for (; aFamsIter != myFamilies.end(); aFamsIter++)
-//  {
-//    delete (*aFamsIter).second;
-//  }
-}
-
-void DriverMED_R_SMESHDS_Mesh::SetMesh(SMDS_Mesh * aMesh)
-{
-  myMesh = aMesh;
-}
+#ifdef _DEBUG_
+static int MYDEBUG = 0;
+#else
+static int MYDEBUG = 0;
+#endif
 
-void DriverMED_R_SMESHDS_Mesh::SetFile(string aFile)
-{
-  myFile = aFile;
-}
+#define _EDF_NODE_IDS_
 
-void DriverMED_R_SMESHDS_Mesh::SetFileId(med_idt aFileId)
-{
-  myFileId = aFileId;
-}
-
-void DriverMED_R_SMESHDS_Mesh::SetMeshId(int aMeshId)
-{
-  myMeshId = aMeshId;
-}
+using namespace MED;
 
 void DriverMED_R_SMESHDS_Mesh::SetMeshName(string theMeshName)
 {
   myMeshName = theMeshName;
 }
 
-void DriverMED_R_SMESHDS_Mesh::Read()
-{
-
-  string myClass = string("SMDS_Mesh");
-  string myExtension = string("MED");
-
-  DriverMED_R_SMDS_Mesh *myReader = new DriverMED_R_SMDS_Mesh;
-
-  myReader->SetMesh(myMesh);
-  myReader->SetMeshId(myMeshId);
-  myReader->SetFile(myFile);
-  myReader->SetFileId(-1);
-
-  myReader->Read();
+static const SMDS_MeshNode* 
+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);
 }
 
-void DriverMED_R_SMESHDS_Mesh::Add()
-{
-  string myClass = string("SMDS_Mesh");
-  string myExtension = string("MED");
-
-  DriverMED_R_SMDS_Mesh *myReader = new DriverMED_R_SMDS_Mesh;
 
-  myReader->SetMesh(myMesh);
-  myReader->SetMeshId(myMeshId);
+enum ECoordName{eX, eY, eZ, eNone};
+typedef TFloat (*TGetCoord)(MED::PNodeInfo&, TInt);
 
-  SCRUTE(myFileId);
-  myReader->SetFileId(myFileId);
+template<ECoordName TheCoordId>
+TFloat GetCoord(MED::PNodeInfo& thePNodeInfo, TInt theElemId){
+  return thePNodeInfo->GetNodeCoord(theElemId,TheCoordId);
+}
 
-  myReader->Read();
+template<>
+TFloat GetCoord<eNone>(MED::PNodeInfo& thePNodeInfo, TInt theElemId){
+  return 0.0;
 }
 
 
-static const SMDS_MeshNode* 
-FindNode(const SMDS_Mesh* theMesh, med_int 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);
-}
+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{
+  MED::PNodeInfo myPNodeInfo;
+  TGetCoord* myGetCoord;
+public:
+  TCoordHelper(const MED::PNodeInfo& thePNodeInfo,
+	       TGetCoord* theGetCoord):
+    myPNodeInfo(thePNodeInfo),
+    myGetCoord(theGetCoord)
+  {}
+  virtual ~TCoordHelper(){}
+  TFloat GetCoord(TInt theElemId, TInt theCoodId){
+    return (*myGetCoord[theCoodId])(myPNodeInfo,theElemId);
+  }
+};
+typedef boost::shared_ptr<TCoordHelper> TCoordHelperPtr;
 
 
-DriverMED_R_SMESHDS_Mesh::ReadStatus DriverMED_R_SMESHDS_Mesh::ReadMySelf()
+Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform()
 {
-  ReadStatus result = DRS_FAIL;
+  Status aResult = DRS_FAIL;
   try{
-    using namespace MEDA;
-
     myFamilies.clear();
-    MESSAGE("ReadMySelf - myFile : "<<myFile);
-    TWrapper aMed(myFile);
+    if(MYDEBUG) MESSAGE("Perform - myFile : "<<myFile);
+    PWrapper aMed = CrWrapper(myFile);
 
-    result = DRS_EMPTY;
-    if(med_int aNbMeshes = aMed.GetNbMeshes()){
+    aResult = DRS_EMPTY;
+    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;
@@ -145,45 +159,82 @@ DriverMED_R_SMESHDS_Mesh::ReadStatus DriverMED_R_SMESHDS_Mesh::ReadMySelf()
         } else {
           aMeshName = myMeshName;
         }
-	MESSAGE("ReadMySelf - aMeshName : "<<aMeshName<<"; "<<aMeshInfo->GetName());
+	if(MYDEBUG) MESSAGE("Perform - aMeshName : "<<aMeshName<<"; "<<aMeshInfo->GetName());
 	if(aMeshName != aMeshInfo->GetName()) continue;
-        result = DRS_OK;
-	med_int aMeshDim = aMeshInfo->GetDim();
+        aResult = DRS_OK;
+	//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 << " :");
-
-//if (aFamId >= FIRST_VALID_FAMILY) {
+	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);
             }
-//        aFamily->SetId(aFamId);
             myFamilies[aFamId] = aFamily;
-//          }
+	  }
         }
 
         // Reading MED nodes to the corresponding SMDS structure
 	//------------------------------------------------------
-	PNodeInfo aNodeInfo = aMed.GetNodeInfo(aMeshInfo);
-	med_booleen anIsNodeNum = aNodeInfo->IsElemNum();
-	med_int aNbElems = aNodeInfo->GetNbElem();
-	MESSAGE("ReadMySelf - aNodeInfo->GetNbElem() = "<<aNbElems<<"; anIsNodeNum = "<<anIsNodeNum);
-        for(med_int iElem = 0; iElem < aNbElems; iElem++){
+	PNodeInfo aNodeInfo = aMed->GetPNodeInfo(aMeshInfo);
+
+	TCoordHelperPtr aCoordHelperPtr;
+	{
+	  TInt aMeshDimension = aMeshInfo->GetDim();
+	  bool anIsDimPresent[3] = {false, false, false};
+          for(TInt 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;
+	  }
+	}
+
+	EBooleen anIsNodeNum = aNodeInfo->IsElemNum();
+	TInt aNbElems = aNodeInfo->GetNbElem();
+	if(MYDEBUG) MESSAGE("Perform - aNodeInfo->GetNbElem() = "<<aNbElems<<"; anIsNodeNum = "<<anIsNodeNum);
+        for(TInt iElem = 0; iElem < aNbElems; iElem++){
           double aCoords[3] = {0.0, 0.0, 0.0};
-          for(med_int iDim = 0; iDim < aMeshDim; iDim++)
-            aCoords[iDim] = aNodeInfo->GetNodeCoord(iElem,iDim);
+          for(TInt iDim = 0; iDim < 3; iDim++)
+            aCoords[iDim] = aCoordHelperPtr->GetCoord(iElem,iDim);
           const SMDS_MeshNode* aNode;
           if(anIsNodeNum) {
 	    aNode = myMesh->AddNodeWithID
@@ -195,7 +246,7 @@ DriverMED_R_SMESHDS_Mesh::ReadStatus DriverMED_R_SMESHDS_Mesh::ReadMySelf()
           //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);
@@ -206,226 +257,239 @@ DriverMED_R_SMESHDS_Mesh::ReadStatus DriverMED_R_SMESHDS_Mesh::ReadMySelf()
 	// Reading pre information about all MED cells
 	//--------------------------------------------
         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("ReadMySelf - anEntity = "<<anEntity<<"; anIsElemNum = "<<anIsElemNum);
-	    MESSAGE("ReadMySelf - aGeom = "<<aGeom<<"; aNbElems = "<<aNbElems);
+	    const EGeometrieElement& aGeom = anTGeomIter->first;
+	    if(aGeom == ePOINT1) continue;
+	    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++){
-	      med_int aNbNodes = -1;
+	      TInt aNbNodes = -1;
 	      switch(aGeom){
-	      case MED_SEG2:
-	      case MED_SEG3:
+	      case eSEG2:
+	      case eSEG3:
 		aNbNodes = 2;
 		break;
-	      case MED_TRIA3:
-	      case MED_TRIA6:
+	      case eTRIA3:
+	      case eTRIA6:
 		aNbNodes = 3;
 		break;
 		break;
-	      case MED_QUAD4:
-	      case MED_QUAD8:
+	      case eQUAD4:
+	      case eQUAD8:
 		aNbNodes = 4;
                 break;
-              case MED_TETRA4:
-	      case MED_TETRA10:
+              case eTETRA4:
+	      case eTETRA10:
 		aNbNodes = 4;
 		break;
-	      case MED_PYRA5:
-	      case MED_PYRA13:
+	      case ePYRA5:
+	      case ePYRA13:
 		aNbNodes = 5;
 		break;
-	      case MED_PENTA6:
-	      case MED_PENTA15:
+	      case ePENTA6:
+	      case ePENTA15:
 		aNbNodes = 6;
 		break;
-	      case MED_HEXA8:
-	      case MED_HEXA20:
+	      case eHEXA8:
+	      case eHEXA20:
 		aNbNodes = 8;
 		break;
 	      }
-	      vector<med_int> aNodeIds(aNbNodes);
-	      if(anIsNodeNum) {
-		for(int i = 0; i < aNbNodes; i++){
-		  aNodeIds.at(i) = aNodeInfo->GetElemNum(aCellInfo->GetConn(iElem,i)-1);
+	      vector<TInt> aNodeIds(aNbNodes);
+	      bool anIsValidConnect = false;
+
+	      try{
+#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);
+		  }
 		}
-	      }else{
+#else
 		for(int i = 0; i < aNbNodes; i++){
-		  aNodeIds.at(i) = aCellInfo->GetConn(iElem,i);
+		  aNodeIds[i] = aCellInfo->GetConn(iElem,i);
 		}
+#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(anIsElemNum)
-	      //	cout<<aCellInfo->GetElemNum(iElem)<<": ";
-	      //else
-	      //	cout<<iElem<<": ";
-	      //for(int i = 0; i < aNbNodes; i++){
-	      //	cout<<aNodeIds.at(i)<<", ";
-	      //}
+	      
+	      if(!anIsValidConnect)
+		continue;
 
 	      bool isRenum = false;
 	      SMDS_MeshElement* anElement = NULL;
-	      med_int aFamNum = aCellInfo->GetFamNum(iElem);
+	      TInt aFamNum = aCellInfo->GetFamNum(iElem);
 	      try{
 		switch(aGeom){
-		case MED_SEG2:
-		case MED_SEG3:
+		case eSEG2:
+		case eSEG3:
 		  if(anIsElemNum)
-		    anElement = myMesh->AddEdgeWithID(aNodeIds.at(0),
-						      aNodeIds.at(1),
+		    anElement = myMesh->AddEdgeWithID(aNodeIds[0],
+						      aNodeIds[1],
 						      aCellInfo->GetElemNum(iElem));
 		  if (!anElement) {
-		    anElement = myMesh->AddEdge(FindNode(myMesh,aNodeIds.at(0)),
-						FindNode(myMesh,aNodeIds.at(1)));
+		    anElement = myMesh->AddEdge(FindNode(myMesh,aNodeIds[0]),
+						FindNode(myMesh,aNodeIds[1]));
 		    isRenum = anIsElemNum;
 		  }
 		  break;
-		case MED_TRIA3:
-		case MED_TRIA6:
+		case eTRIA3:
+		case eTRIA6:
 		  aNbNodes = 3;
 		  if(anIsElemNum)
-		    anElement = myMesh->AddFaceWithID(aNodeIds.at(0),
-						      aNodeIds.at(1),
-						      aNodeIds.at(2),
+		    anElement = myMesh->AddFaceWithID(aNodeIds[0],
+						      aNodeIds[1],
+						      aNodeIds[2],
 						      aCellInfo->GetElemNum(iElem));
 		  if (!anElement) {
-		    anElement = myMesh->AddFace(FindNode(myMesh,aNodeIds.at(0)),
-						FindNode(myMesh,aNodeIds.at(1)),
-						FindNode(myMesh,aNodeIds.at(2)));
+		    anElement = myMesh->AddFace(FindNode(myMesh,aNodeIds[0]),
+						FindNode(myMesh,aNodeIds[1]),
+						FindNode(myMesh,aNodeIds[2]));
 		    isRenum = anIsElemNum;
 		  }
 		  break;
-		case MED_QUAD4:
-		case MED_QUAD8:
+		case eQUAD4:
+		case eQUAD8:
 		  aNbNodes = 4;
 		  // There is some differnce between SMDS and MED
 		  if(anIsElemNum)
-		    anElement = myMesh->AddFaceWithID(aNodeIds.at(0),
-						      aNodeIds.at(1),
-						      aNodeIds.at(2),
-						      aNodeIds.at(3),
+		    anElement = myMesh->AddFaceWithID(aNodeIds[0],
+						      aNodeIds[1],
+						      aNodeIds[2],
+						      aNodeIds[3],
 						      aCellInfo->GetElemNum(iElem));
 		  if (!anElement) {
-		    anElement = myMesh->AddFace(FindNode(myMesh,aNodeIds.at(0)),
-						FindNode(myMesh,aNodeIds.at(1)),
-						FindNode(myMesh,aNodeIds.at(2)),
-						FindNode(myMesh,aNodeIds.at(3)));
+		    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.at(0),
-							aNodeIds.at(1),
-							aNodeIds.at(2),
-							aNodeIds.at(3),
+		    anElement = myMesh->AddVolumeWithID(aNodeIds[0],
+							aNodeIds[1],
+							aNodeIds[2],
+							aNodeIds[3],
 							aCellInfo->GetElemNum(iElem));
 		  if (!anElement) {
-		    anElement = myMesh->AddVolume(FindNode(myMesh,aNodeIds.at(0)),
-						  FindNode(myMesh,aNodeIds.at(1)),
-						  FindNode(myMesh,aNodeIds.at(2)),
-						  FindNode(myMesh,aNodeIds.at(3)));
+		    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.at(0),
-							aNodeIds.at(1),
-							aNodeIds.at(2),
-							aNodeIds.at(3),
-							aNodeIds.at(4),
+		    anElement = myMesh->AddVolumeWithID(aNodeIds[0],
+							aNodeIds[1],
+							aNodeIds[2],
+							aNodeIds[3],
+							aNodeIds[4],
 							aCellInfo->GetElemNum(iElem));
 		  if (!anElement) {
-		    anElement = myMesh->AddVolume(FindNode(myMesh,aNodeIds.at(0)),
-						  FindNode(myMesh,aNodeIds.at(1)),
-						  FindNode(myMesh,aNodeIds.at(2)),
-						  FindNode(myMesh,aNodeIds.at(3)),
-						  FindNode(myMesh,aNodeIds.at(4)));
+		    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.at(0),
-							aNodeIds.at(1),
-							aNodeIds.at(2),
-							aNodeIds.at(3),
-							aNodeIds.at(4),
-							aNodeIds.at(5),
+		    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.at(0)),
-						  FindNode(myMesh,aNodeIds.at(1)),
-						  FindNode(myMesh,aNodeIds.at(2)),
-						  FindNode(myMesh,aNodeIds.at(3)),
-						  FindNode(myMesh,aNodeIds.at(4)),
-						  FindNode(myMesh,aNodeIds.at(5)));
+		    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 MED_HEXA8:
-		case MED_HEXA20:
+		case eHEXA8:
+		case eHEXA20:
 		  aNbNodes = 8;
 		  if(anIsElemNum)
-		    anElement = myMesh->AddVolumeWithID(aNodeIds.at(0),
-							aNodeIds.at(1),
-							aNodeIds.at(2),
-							aNodeIds.at(3),
-							aNodeIds.at(4),
-							aNodeIds.at(5),
-							aNodeIds.at(6),
-							aNodeIds.at(7),
+		    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.at(0)),
-						  FindNode(myMesh,aNodeIds.at(1)),
-						  FindNode(myMesh,aNodeIds.at(2)),
-						  FindNode(myMesh,aNodeIds.at(3)),
-						  FindNode(myMesh,aNodeIds.at(4)),
-						  FindNode(myMesh,aNodeIds.at(5)),
-						  FindNode(myMesh,aNodeIds.at(6)),
-						  FindNode(myMesh,aNodeIds.at(7)));
+		    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;
 		}
 	      }catch(const std::exception& exc){
 		//INFOS("Follow exception was cought:\n\t"<<exc.what());
-		result = DRS_FAIL;
+		aResult = DRS_FAIL;
 	      }catch(...){
 		//INFOS("Unknown exception was cought !!!");
-		result = DRS_FAIL;
+		aResult = DRS_FAIL;
 	      }
 		
               if (!anElement) {
-                result = DRS_WARN_SKIP_ELEM;
+                aResult = DRS_WARN_SKIP_ELEM;
               }
               else {
                 if (isRenum) {
-                  anIsElemNum = MED_FAUX;
+                  anIsElemNum = eFAUX;
                   takeNumbers = false;
-                  if (result < DRS_WARN_RENUMBER)
-                    result = DRS_WARN_RENUMBER;
+                  if (aResult < DRS_WARN_RENUMBER)
+                    aResult = DRS_WARN_RENUMBER;
                 }
                 if (myFamilies.find(aFamNum) != myFamilies.end()) {
                   // Save reference to this element from its family
@@ -441,37 +505,38 @@ DriverMED_R_SMESHDS_Mesh::ReadStatus DriverMED_R_SMESHDS_Mesh::ReadMySelf()
     }
   }catch(const std::exception& exc){
     INFOS("Follow exception was cought:\n\t"<<exc.what());
-    result = DRS_FAIL;
+    aResult = DRS_FAIL;
   }catch(...){
     INFOS("Unknown exception was cought !!!");
-    result = DRS_FAIL;
+    aResult = DRS_FAIL;
   }
-  MESSAGE("ReadMySelf - result status = "<<result);
-  return result;
+  if(MYDEBUG) MESSAGE("Perform - aResult status = "<<aResult);
+  return aResult;
 }
 
-list<string> DriverMED_R_SMESHDS_Mesh::GetMeshNames()
+list<string> DriverMED_R_SMESHDS_Mesh::GetMeshNames(Status& theStatus)
 {
   list<string> aMeshNames;
 
   try {
-    using namespace MEDA;
+    if(MYDEBUG) MESSAGE("GetMeshNames - myFile : " << myFile);
+    theStatus = DRS_OK;
+    PWrapper aMed = CrWrapper(myFile);
 
-    MESSAGE("GetMeshNames - myFile : " << myFile);
-    TWrapper aMed (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());
       }
     }
   }catch(const std::exception& exc){
     INFOS("Follow exception was cought:\n\t"<<exc.what());
+    theStatus = DRS_FAIL;
   }catch(...){
     INFOS("Unknown exception was cought !!!");
+    theStatus = DRS_FAIL;
   }
 
   return aMeshNames;
@@ -507,7 +572,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++)
@@ -517,10 +582,14 @@ void DriverMED_R_SMESHDS_Mesh::GetGroup(SMESHDS_Group* theGroup)
     {
       const set<const SMDS_MeshElement *>& anElements = aFamily->GetElements();
       set<const SMDS_MeshElement *>::iterator anElemsIter = anElements.begin();
+      const SMDS_MeshElement * element = 0;
       for (; anElemsIter != anElements.end(); anElemsIter++)
       {
-        theGroup->SMDS_MeshGroup::Add(*anElemsIter);
+        element = *anElemsIter;
+        theGroup->SMDSGroup().Add(element);
       }
+      if ( element )
+        theGroup->SetType( element->GetType() );
     }
   }
 }
@@ -560,10 +629,6 @@ void DriverMED_R_SMESHDS_Mesh::GetSubMesh (SMESHDS_SubMesh* theSubMesh,
 
 void DriverMED_R_SMESHDS_Mesh::CreateAllSubMeshes ()
 {
-  SMESHDS_Mesh* aSMESHDSMesh = dynamic_cast<SMESHDS_Mesh*>(myMesh);
-  if (!aSMESHDSMesh) {
-    EXCEPTION(runtime_error,"Can not cast SMDS_Mesh to SMESHDS_Mesh");
-  }
   map<int, DriverMED_FamilyPtr>::iterator aFamsIter = myFamilies.begin();
   for (; aFamsIter != myFamilies.end(); aFamsIter++)
   {
@@ -583,18 +648,28 @@ void DriverMED_R_SMESHDS_Mesh::CreateAllSubMeshes ()
         {
           for (; anElemsIter != anElements.end(); anElemsIter++)
           {
-            const SMDS_MeshNode* node = static_cast<const SMDS_MeshNode*>(*anElemsIter);
-            aSMESHDSMesh->SetNodeInVolume(node, Id);
-//            aSMESHDSMesh->SetNodeOnFace(node, Id);
-//            aSMESHDSMesh->SetNodeOnEdge(node, Id);
-//            aSMESHDSMesh->SetNodeOnVertex(node, Id);
+            SMDS_MeshNode* node = const_cast<SMDS_MeshNode*>
+              ( static_cast<const SMDS_MeshNode*>( *anElemsIter ));
+            // find out a shape type
+            TopoDS_Shape aShape = myMesh->IndexToShape( Id );
+            int aShapeType = ( aShape.IsNull() ? -1 : aShape.ShapeType() );
+            switch ( aShapeType ) {
+            case TopAbs_FACE:
+              myMesh->SetNodeOnFace(node, Id); break;
+            case TopAbs_EDGE:
+              myMesh->SetNodeOnEdge(node, Id); break;
+            case TopAbs_VERTEX:
+              myMesh->SetNodeOnVertex(node, Id); break;
+            default:
+              myMesh->SetNodeInVolume(node, Id);
+            }
           }
         }
         else
         {
           for (; anElemsIter != anElements.end(); anElemsIter++)
           {
-            aSMESHDSMesh->SetMeshElementOnShape(*anElemsIter, Id);
+            myMesh->SetMeshElementOnShape(*anElemsIter, Id);
           }
         }
       }