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=f87bd3f075bdb6ea0fd6bc2ae5d39ba2809ed5a7;hp=c37f1e60adddd7e446dc350fafc35d799db410ed;hb=104ff7b2818ce4d0f8a38d840abd3e5c70190668;hpb=c3bf92bd87b770fd81631a3853f7f5bb1ac6a4e8

diff --git a/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx b/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx
index c37f1e60a..f87bd3f07 100644
--- a/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx
+++ b/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx
@@ -17,7 +17,7 @@
 //  License along with this library; if not, write to the Free Software 
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
 // 
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //
 //
@@ -26,117 +26,64 @@
 
 #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_CoordUtils.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;
-}
-
-void DriverMED_R_SMESHDS_Mesh::SetFile(string aFile)
-{
-  myFile = aFile;
-}
+#ifdef _DEBUG_
+static int MYDEBUG = 0;
+//#define _DEXCEPT_
+#else
+static int MYDEBUG = 0;
+#endif
 
-void DriverMED_R_SMESHDS_Mesh::SetFileId(med_idt aFileId)
-{
-  myFileId = aFileId;
-}
+#define _EDF_NODE_IDS_
 
-void DriverMED_R_SMESHDS_Mesh::SetMeshId(int aMeshId)
-{
-  myMeshId = aMeshId;
-}
+using namespace MED;
 
-void DriverMED_R_SMESHDS_Mesh::SetMeshName(string theMeshName)
+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();
-}
-
-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);
-
-  SCRUTE(myFileId);
-  myReader->SetFileId(myFileId);
-
-  myReader->Read();
-}
-
-
 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);
 }
 
 
-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;
+#ifndef _DEXCEPT_
   try{
-    using namespace MEDA;
-
+#endif
     myFamilies.clear();
-    MESSAGE("ReadMySelf - myFile : "<<myFile);
-    TWrapper aMed(myFile);
+    if(MYDEBUG) MESSAGE("Perform - myFile : "<<myFile);
+    PWrapper aMed = CrWrapper(myFile,true);
 
-    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 +92,61 @@ 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);
+            aFamily->SetId( aFamId );
             myFamilies[aFamId] = aFamily;
-//          }
+	  }
         }
 
+	if (aMeshInfo->GetType() == MED::eSTRUCTURE){
+	  bool aRes = buildMeshGrille(aMed,aMeshInfo);
+	  continue;
+	}
+
         // 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);
+	if (!aNodeInfo) {
+          aResult = DRS_FAIL;
+	  continue;
+        }
+
+	PCoordHelper aCoordHelper = GetCoordHelper(aNodeInfo);
+
+	EBooleen anIsNodeNum = aNodeInfo->IsElemNum();
+	TInt aNbElems = aNodeInfo->GetNbElem();
+	if(MYDEBUG) MESSAGE("Perform - aNodeInfo->GetNbElem() = "<<aNbElems<<"; anIsNodeNum = "<<anIsNodeNum);
+        DriverMED_FamilyPtr aFamily;
+        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 < aMeshDim; iDim++)
-            aCoords[iDim] = aNodeInfo->GetNodeCoord(iElem,iDim);
+          for(TInt iDim = 0; iDim < 3; iDim++)
+            aCoords[iDim] = aCoordHelper->GetCoord(aCoordSlice,iDim);
           const SMDS_MeshNode* aNode;
           if(anIsNodeNum) {
 	    aNode = myMesh->AddNodeWithID
@@ -195,307 +158,610 @@ 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);
-          if (myFamilies.find(aFamNum) != myFamilies.end())
+          TInt aFamNum = aNodeInfo->GetFamNum(iElem);
+          if ( checkFamilyID ( aFamily, aFamNum ))
           {
-            myFamilies[aFamNum]->AddElement(aNode);
-            myFamilies[aFamNum]->SetType(SMDSAbs_Node);
+            aFamily->AddElement(aNode);
+            aFamily->SetType(SMDSAbs_Node);
           }
         }
 
 	// Reading pre information about all MED cells
 	//--------------------------------------------
+	typedef MED::TVector<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("ReadMySelf - anEntity = "<<anEntity<<"; anIsElemNum = "<<anIsElemNum);
-	    MESSAGE("ReadMySelf - 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);
-	      if(anIsNodeNum) {
-		for(int i = 0; i < aNbNodes; i++){
-		  aNodeIds.at(i) = aNodeInfo->GetElemNum(aCellInfo->GetConn(iElem,i)-1);
-		}
-	      }else{
-		for(int i = 0; i < aNbNodes; i++){
-		  aNodeIds.at(i) = aCellInfo->GetConn(iElem,i);
-		}
-	      }
-	      //if(anIsElemNum)
-	      //	cout<<aCellInfo->GetElemNum(iElem)<<": ";
-	      //else
-	      //	cout<<iElem<<": ";
-	      //for(int i = 0; i < aNbNodes; i++){
-	      //	cout<<aNodeIds.at(i)<<", ";
-	      //}
-
-	      bool isRenum = false;
-	      SMDS_MeshElement* anElement = NULL;
-	      med_int aFamNum = aCellInfo->GetFamNum(iElem);
-	      try{
-		switch(aGeom){
-		case MED_SEG2:
-		case MED_SEG3:
-		  if(anIsElemNum)
-		    anElement = myMesh->AddEdgeWithID(aNodeIds.at(0),
-						      aNodeIds.at(1),
-						      aCellInfo->GetElemNum(iElem));
-		  if (!anElement) {
-		    anElement = myMesh->AddEdge(FindNode(myMesh,aNodeIds.at(0)),
-						FindNode(myMesh,aNodeIds.at(1)));
-		    isRenum = anIsElemNum;
+	  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(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(TInt iConn = 0; iConn < aNbConn; iConn++)
+		  aNodeIds[iConn] = aConnSlice[iConn];
+#endif
+                bool isRenum = false;
+                SMDS_MeshElement* anElement = NULL;
+                TInt aFamNum = aPolygoneInfo->GetFamNum(iElem);
+
+#ifndef _DEXCEPT_
+                try{
+#endif
+                  if(anIsElemNum){
+		    TInt anElemId = aPolygoneInfo->GetElemNum(iElem);
+                    anElement = myMesh->AddPolygonalFaceWithID(aNodeIds,anElemId);
 		  }
-		  break;
-		case MED_TRIA3:
-		case MED_TRIA6:
-		  aNbNodes = 3;
-		  if(anIsElemNum)
-		    anElement = myMesh->AddFaceWithID(aNodeIds.at(0),
-						      aNodeIds.at(1),
-						      aNodeIds.at(2),
-						      aCellInfo->GetElemNum(iElem));
-		  if (!anElement) {
-		    anElement = myMesh->AddFace(FindNode(myMesh,aNodeIds.at(0)),
-						FindNode(myMesh,aNodeIds.at(1)),
-						FindNode(myMesh,aNodeIds.at(2)));
-		    isRenum = anIsElemNum;
-		  }
-		  break;
-		case MED_QUAD4:
-		case MED_QUAD8:
-		  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),
-						      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)));
-		    isRenum = anIsElemNum;
-		  }
-		  break;
-		case MED_TETRA4:
-		case MED_TETRA10:
-		  aNbNodes = 4;
-		  if(anIsElemNum)
-		    anElement = myMesh->AddVolumeWithID(aNodeIds.at(0),
-							aNodeIds.at(1),
-							aNodeIds.at(2),
-							aNodeIds.at(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)));
-		    isRenum = anIsElemNum;
+                  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;
+                  }
+#ifndef _DEXCEPT_
+                }catch(const std::exception& exc){
+                  aResult = DRS_FAIL;
+                }catch (...){
+                  aResult = DRS_FAIL;
+                }
+#endif
+                if(!anElement){
+                  aResult = DRS_WARN_SKIP_ELEM;
+                }else{
+                  if(isRenum){
+                    anIsElemNum = eFAUX;
+                    takeNumbers = false;
+                    if(aResult < DRS_WARN_RENUMBER)
+                      aResult = DRS_WARN_RENUMBER;
+                  }
+                  if ( checkFamilyID ( aFamily, aFamNum ))
+                  {
+                    // Save reference to this element from its family
+                    aFamily->AddElement(anElement);
+                    aFamily->SetType(anElement->GetType());
+                  }
+                }
+              }
+              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 MED::TVector<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);
+		
+#ifndef _DEXCEPT_
+		try{
+#endif
+		  if(anIsElemNum){
+		    TInt anElemId = aPolyedreInfo->GetElemNum(iElem);
+		    anElement = myMesh->AddPolyhedralVolumeWithID(aNodeIds,aQuantities,anElemId);
 		  }
-		  break;
-		case MED_PYRA5:
-		case MED_PYRA13:
-		  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),
-							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)));
+		  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;
 		  }
-		  break;
-		case MED_PENTA6:
-		case MED_PENTA15:
-		  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),
-							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)));
-		    isRenum = anIsElemNum;
+#ifndef _DEXCEPT_
+		}catch(const std::exception& exc){
+		  aResult = DRS_FAIL;
+		}catch(...){
+		  aResult = DRS_FAIL;
+		}
+#endif		
+		if(!anElement){
+		  aResult = DRS_WARN_SKIP_ELEM;
+		}else{
+		  if(isRenum){
+		    anIsElemNum = eFAUX;
+		    takeNumbers = false;
+		    if (aResult < DRS_WARN_RENUMBER)
+		      aResult = DRS_WARN_RENUMBER;
 		  }
-		  break;
-		case MED_HEXA8:
-		case MED_HEXA20:
-		  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),
-							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)));
-		    isRenum = anIsElemNum;
+		  if ( checkFamilyID ( aFamily, aFamNum )) {
+		    // Save reference to this element from its family
+		    aFamily->AddElement(anElement);
+		    aFamily->SetType(anElement->GetType());
 		  }
-		  break;
 		}
-	      }catch(const std::exception& exc){
-		//INFOS("Follow exception was cought:\n\t"<<exc.what());
-		result = DRS_FAIL;
-	      }catch(...){
-		//INFOS("Unknown exception was cought !!!");
-		result = DRS_FAIL;
 	      }
-		
-              if (!anElement) {
-                result = DRS_WARN_SKIP_ELEM;
-              }
-              else {
-                if (isRenum) {
-                  anIsElemNum = MED_FAUX;
-                  takeNumbers = false;
-                  if (result < DRS_WARN_RENUMBER)
-                    result = DRS_WARN_RENUMBER;
+              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 eSEG2:    aNbNodes = 2;  break;
+                case eSEG3:    aNbNodes = 3;  break;
+                case eTRIA3:   aNbNodes = 3;  break;
+                case eTRIA6:   aNbNodes = 6;  break;
+                case eQUAD4:   aNbNodes = 4;  break;
+                case eQUAD8:   aNbNodes = 8;  break;
+                case eTETRA4:  aNbNodes = 4;  break;
+                case eTETRA10: aNbNodes = 10; break;
+                case ePYRA5:   aNbNodes = 5;  break;
+                case ePYRA13:  aNbNodes = 13; break;
+                case ePENTA6:  aNbNodes = 6;  break;
+                case ePENTA15: aNbNodes = 15; break;
+                case eHEXA8:   aNbNodes = 8;  break;
+                case eHEXA20:  aNbNodes = 20; break;
+                default:;
+                }
+                vector<TInt> aNodeIds(aNbNodes);
+                bool anIsValidConnect = false;
+                TCConnSlice aConnSlice = aCellInfo->GetConnSlice(iElem);
+#ifndef _DEXCEPT_
+                try{
+#endif
+#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;
+#ifndef _DEXCEPT_
+                }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 (myFamilies.find(aFamNum) != myFamilies.end()) {
-                  // Save reference to this element from its family
-                  myFamilies[aFamNum]->AddElement(anElement);
-                  myFamilies[aFamNum]->SetType(anElement->GetType());
+#endif          
+                if(!anIsValidConnect)
+                  continue;
+
+                bool isRenum = false;
+                SMDS_MeshElement* anElement = NULL;
+                TInt aFamNum = aCellInfo->GetFamNum(iElem);
+#ifndef _DEXCEPT_
+                try{
+#endif
+                  //MESSAGE("Try to create element # " << iElem << " with id = "
+                  //        << aCellInfo->GetElemNum(iElem));
+                  switch(aGeom){
+                  case eSEG2:
+                    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 eSEG3:
+                    if(anIsElemNum)
+                      anElement = myMesh->AddEdgeWithID(aNodeIds[0],
+                                                        aNodeIds[1],
+                                                        aNodeIds[2],
+                                                        aCellInfo->GetElemNum(iElem));
+                    if (!anElement) {
+                      anElement = myMesh->AddEdge(FindNode(myMesh,aNodeIds[0]),
+                                                  FindNode(myMesh,aNodeIds[1]),
+                                                  FindNode(myMesh,aNodeIds[2]));
+                      isRenum = anIsElemNum;
+                    }
+                    break;
+                  case eTRIA3:
+                    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 eTRIA6:
+                    aNbNodes = 6;
+                    if(anIsElemNum)
+                      anElement = myMesh->AddFaceWithID(aNodeIds[0], aNodeIds[1],
+                                                        aNodeIds[2], aNodeIds[3],
+                                                        aNodeIds[4], aNodeIds[5],
+                                                        aCellInfo->GetElemNum(iElem));
+                    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 eQUAD4:
+                    aNbNodes = 4;
+                    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 eQUAD8:
+                    aNbNodes = 8;
+                    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->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;
+                    }
+                    break;
+                  case eTETRA4:
+                    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 eTETRA10:
+                    aNbNodes = 10;
+                    if(anIsElemNum)
+                      anElement = myMesh->AddVolumeWithID(aNodeIds[0], aNodeIds[1],
+                                                          aNodeIds[2], aNodeIds[3],
+                                                          aNodeIds[4], aNodeIds[5],
+                                                          aNodeIds[6], aNodeIds[7],
+                                                          aNodeIds[8], aNodeIds[9],
+                                                          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]),
+                                                    FindNode(myMesh,aNodeIds[8]),
+                                                    FindNode(myMesh,aNodeIds[9]));
+                      isRenum = anIsElemNum;
+                    }
+                    break;
+                  case ePYRA5:
+                    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 ePYRA13:
+                    aNbNodes = 13;
+                    // There is some differnce between SMDS and MED
+                    if(anIsElemNum)
+                      anElement = myMesh->AddVolumeWithID(aNodeIds[0], aNodeIds[1],
+                                                          aNodeIds[2], aNodeIds[3],
+                                                          aNodeIds[4], aNodeIds[5],
+                                                          aNodeIds[6], aNodeIds[7],
+                                                          aNodeIds[8], aNodeIds[9],
+                                                          aNodeIds[10], aNodeIds[11],
+                                                          aNodeIds[12],
+                                                          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]),
+                                                    FindNode(myMesh,aNodeIds[8]),
+                                                    FindNode(myMesh,aNodeIds[9]),
+                                                    FindNode(myMesh,aNodeIds[10]),
+                                                    FindNode(myMesh,aNodeIds[11]),
+                                                    FindNode(myMesh,aNodeIds[12]));
+                      isRenum = anIsElemNum;
+                    }
+                    break;
+                  case ePENTA6:
+                    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 ePENTA15:
+                    aNbNodes = 15;
+                    if(anIsElemNum)
+                      anElement = myMesh->AddVolumeWithID(aNodeIds[0], aNodeIds[1],
+                                                          aNodeIds[2], aNodeIds[3],
+                                                          aNodeIds[4], aNodeIds[5],
+                                                          aNodeIds[6], aNodeIds[7],
+                                                          aNodeIds[8], aNodeIds[9],
+                                                          aNodeIds[10], aNodeIds[11],
+                                                          aNodeIds[12], aNodeIds[13],
+                                                          aNodeIds[14],
+                                                          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]),
+                                                    FindNode(myMesh,aNodeIds[8]),
+                                                    FindNode(myMesh,aNodeIds[9]),
+                                                    FindNode(myMesh,aNodeIds[10]),
+                                                    FindNode(myMesh,aNodeIds[11]),
+                                                    FindNode(myMesh,aNodeIds[12]),
+                                                    FindNode(myMesh,aNodeIds[13]),
+                                                    FindNode(myMesh,aNodeIds[14]));
+                      isRenum = anIsElemNum;
+                    }
+                    break;
+                  case eHEXA8:
+                    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;
+                  case eHEXA20:
+                    aNbNodes = 20;
+                    if(anIsElemNum)
+                      anElement = myMesh->AddVolumeWithID(aNodeIds[0], aNodeIds[1],
+                                                          aNodeIds[2], aNodeIds[3],
+                                                          aNodeIds[4], aNodeIds[5],
+                                                          aNodeIds[6], aNodeIds[7],
+                                                          aNodeIds[8], aNodeIds[9],
+                                                          aNodeIds[10], aNodeIds[11],
+                                                          aNodeIds[12], aNodeIds[13],
+                                                          aNodeIds[14], aNodeIds[15],
+                                                          aNodeIds[16], aNodeIds[17],
+                                                          aNodeIds[18], aNodeIds[19],
+                                                          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]),
+                                                    FindNode(myMesh,aNodeIds[8]),
+                                                    FindNode(myMesh,aNodeIds[9]),
+                                                    FindNode(myMesh,aNodeIds[10]),
+                                                    FindNode(myMesh,aNodeIds[11]),
+                                                    FindNode(myMesh,aNodeIds[12]),
+                                                    FindNode(myMesh,aNodeIds[13]),
+                                                    FindNode(myMesh,aNodeIds[14]),
+                                                    FindNode(myMesh,aNodeIds[15]),
+                                                    FindNode(myMesh,aNodeIds[16]),
+                                                    FindNode(myMesh,aNodeIds[17]),
+                                                    FindNode(myMesh,aNodeIds[18]),
+                                                    FindNode(myMesh,aNodeIds[19]));
+                      isRenum = anIsElemNum;
+                    }
+                    break;
+                  }
+#ifndef _DEXCEPT_
+                }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;
+                }
+#endif          
+                if (!anElement) {
+                  aResult = DRS_WARN_SKIP_ELEM;
+                }
+                else {
+                  if (isRenum) {
+                    anIsElemNum = eFAUX;
+                    takeNumbers = false;
+                    if (aResult < DRS_WARN_RENUMBER)
+                      aResult = DRS_WARN_RENUMBER;
+                  }
+                  if ( checkFamilyID ( aFamily, aFamNum )) {
+                    // Save reference to this element from its family
+                    myFamilies[aFamNum]->AddElement(anElement);
+                    myFamilies[aFamNum]->SetType(anElement->GetType());
+                  }
                 }
               }
-            }
-	  }
-	}
-	break;
+            }}
+          }
+        }
       }
     }
+#ifndef _DEXCEPT_
   }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;
+#endif
+  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;
-
-    MESSAGE("GetMeshNames - myFile : " << myFile);
-    TWrapper aMed (myFile);
+    if(MYDEBUG) MESSAGE("GetMeshNames - myFile : " << myFile);
+    theStatus = DRS_OK;
+    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());
       }
     }
   }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;
 }
 
-list<string> DriverMED_R_SMESHDS_Mesh::GetGroupNames()
+list<TNameAndType> DriverMED_R_SMESHDS_Mesh::GetGroupNamesAndTypes()
 {
-  list<string> aResult;
-  set<string> aResGroupNames;
+  list<TNameAndType> aResult;
+  set<TNameAndType> aResGroupNames;
 
   map<int, DriverMED_FamilyPtr>::iterator aFamsIter = myFamilies.begin();
   for (; aFamsIter != myFamilies.end(); aFamsIter++)
   {
     DriverMED_FamilyPtr aFamily = (*aFamsIter).second;
     const MED::TStringSet& aGroupNames = aFamily->GetGroupNames();
-    set<string>::iterator aGrNamesIter = aGroupNames.begin();
+    set<string>::const_iterator aGrNamesIter = aGroupNames.begin();
     for (; aGrNamesIter != aGroupNames.end(); aGrNamesIter++)
     {
-      string aName = *aGrNamesIter;
+      TNameAndType aNameAndType = make_pair( *aGrNamesIter, aFamily->GetType() );
       // Check, if this is a Group or SubMesh name
 //if (aName.substr(0, 5) == string("Group")) {
-        if (aResGroupNames.find(aName) == aResGroupNames.end()) {
-          aResGroupNames.insert(aName);
-          aResult.push_back(aName);
+        if ( aResGroupNames.insert( aNameAndType ).second ) {
+          aResult.push_back( aNameAndType );
         }
 //    }
     }
@@ -507,20 +773,24 @@ 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++)
   {
     DriverMED_FamilyPtr aFamily = (*aFamsIter).second;
-    if (aFamily->MemberOf(aGroupName))
+    if (aFamily->GetType() == theGroup->GetType() && aFamily->MemberOf(aGroupName))
     {
       const set<const SMDS_MeshElement *>& anElements = aFamily->GetElements();
-      set<const SMDS_MeshElement *>::iterator anElemsIter = anElements.begin();
+      set<const SMDS_MeshElement *>::const_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() );
     }
   }
 }
@@ -538,7 +808,7 @@ void DriverMED_R_SMESHDS_Mesh::GetSubMesh (SMESHDS_SubMesh* theSubMesh,
     if (aFamily->MemberOf(aName))
     {
       const set<const SMDS_MeshElement *>& anElements = aFamily->GetElements();
-      set<const SMDS_MeshElement *>::iterator anElemsIter = anElements.begin();
+      set<const SMDS_MeshElement *>::const_iterator anElemsIter = anElements.begin();
       if (aFamily->GetType() == SMDSAbs_Node)
       {
         for (; anElemsIter != anElements.end(); anElemsIter++)
@@ -560,10 +830,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,21 +849,138 @@ 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);
           }
         }
       }
     }
   }
 }
+/*!
+ * \brief Ensure aFamily to have required ID
+ * \param aFamily - a family to check and update
+ * \param anID - an ID aFamily should have
+ * \retval bool  - true if successful
+ */
+bool DriverMED_R_SMESHDS_Mesh::checkFamilyID(DriverMED_FamilyPtr & aFamily, int anID) const
+{
+  if ( !aFamily || aFamily->GetId() != anID ) {
+    map<int, DriverMED_FamilyPtr>::const_iterator i_fam = myFamilies.find(anID);
+    if ( i_fam == myFamilies.end() )
+      return false;
+    aFamily = i_fam->second;
+  }
+  return ( aFamily->GetId() == anID );
+}
+
+
+/*! \brief Reading the structured mesh and convert to non structured (by filling of smesh structure for non structured mesh)
+ * \param theWrapper  - PWrapper const pointer
+ * \param theMeshInfo - PMeshInfo const pointer
+ * \return TRUE, if successfully. Else FALSE
+ */
+bool DriverMED_R_SMESHDS_Mesh::buildMeshGrille(const MED::PWrapper& theWrapper,
+					       const MED::PMeshInfo& theMeshInfo)
+{
+  bool res = true;
+
+  MED::PGrilleInfo aGrilleInfo = theWrapper->GetPGrilleInfo(theMeshInfo);
+  MED::TInt aNbNodes = aGrilleInfo->GetNbNodes();
+  MED::TInt aNbCells = aGrilleInfo->GetNbCells();
+  MED::TInt aMeshDim = theMeshInfo->GetDim();
+  DriverMED_FamilyPtr aFamily;
+  for(MED::TInt iNode=0;iNode < aNbNodes; iNode++){
+    double aCoords[3] = {0.0, 0.0, 0.0};
+    const SMDS_MeshNode* aNode;
+    MED::TNodeCoord aMEDNodeCoord = aGrilleInfo->GetCoord(iNode);
+    for(MED::TInt iDim=0;iDim<aMeshDim;iDim++)
+      aCoords[(int)iDim] = aMEDNodeCoord[(int)iDim];
+    aNode = myMesh->AddNodeWithID(aCoords[0],aCoords[1],aCoords[2],(int)iNode);
+
+    if((aGrilleInfo->myFamNumNode).size() > 0){
+      TInt aFamNum = aGrilleInfo->GetFamNumNode(iNode);
+      if ( checkFamilyID ( aFamily, aFamNum ))
+	{
+	  aFamily->AddElement(aNode);
+	  aFamily->SetType(SMDSAbs_Node);
+	}
+    }
+    
+  }
+
+  SMDS_MeshElement* anElement = NULL;
+  MED::TIntVector aNodeIds;
+  for(MED::TInt iCell=0;iCell < aNbCells; iCell++){
+    aNodeIds = aGrilleInfo->GetConn(iCell);
+    switch(aGrilleInfo->GetGeom()){
+    case MED::eSEG2:
+      if(aNodeIds.size() != 2){
+	res = false;
+	EXCEPTION(runtime_error,"buildMeshGrille Error. Incorrect size of ids 2!="<<aNodeIds.size());
+      }
+      anElement = myMesh->AddEdgeWithID(aNodeIds[0],
+					aNodeIds[1],
+					iCell);
+      break;
+    case MED::eQUAD4:
+      if(aNodeIds.size() != 4){
+	res = false;
+	EXCEPTION(runtime_error,"buildMeshGrille Error. Incorrect size of ids 4!="<<aNodeIds.size());
+      }
+      anElement = myMesh->AddFaceWithID(aNodeIds[0],
+					aNodeIds[2],
+					aNodeIds[3],
+					aNodeIds[1],
+					iCell);
+      break;
+    case MED::eHEXA8:
+      if(aNodeIds.size() != 8){
+	res = false;
+	EXCEPTION(runtime_error,"buildMeshGrille Error. Incorrect size of ids 8!="<<aNodeIds.size());
+      }
+      anElement = myMesh->AddVolumeWithID(aNodeIds[0],
+					  aNodeIds[2],
+					  aNodeIds[3],
+					  aNodeIds[1],
+					  aNodeIds[4],
+					  aNodeIds[6],
+					  aNodeIds[7],
+					  aNodeIds[5],
+					  iCell);
+      break;
+    default:
+      break;
+    }
+    
+    if((aGrilleInfo->myFamNum).size() > 0){
+      TInt aFamNum = aGrilleInfo->GetFamNum(iCell);
+      if ( checkFamilyID ( aFamily, aFamNum )){
+	aFamily->AddElement(anElement);
+	aFamily->SetType(anElement->GetType());
+      }
+    }
+  }
+
+  return res;
+}