Update to match the changes in SMDS

src/DriverDAT/DriverDAT_R_SMDS_Mesh.cxx

@@ -29,43 +29,51 @@ using namespace std;
 
 #include "utilities.h"
 
-DriverDAT_R_SMDS_Mesh::DriverDAT_R_SMDS_Mesh() {
+DriverDAT_R_SMDS_Mesh::DriverDAT_R_SMDS_Mesh()
-;
+{
-}
-
-DriverDAT_R_SMDS_Mesh::~DriverDAT_R_SMDS_Mesh() {
-;
-}
-
-void DriverDAT_R_SMDS_Mesh::SetMesh(Handle(SMDS_Mesh)& aMesh) {
-  myMesh = aMesh;
-}
-
-void DriverDAT_R_SMDS_Mesh::SetFile(string aFile) {
-  myFile = aFile;
-}
-
-void DriverDAT_R_SMDS_Mesh::SetFileId(FILE* aFileId) {
-  myFileId = aFileId;
-}
-
-void DriverDAT_R_SMDS_Mesh::SetMeshId(int aMeshId) {
-  myMeshId = aMeshId;
-}
-
-void DriverDAT_R_SMDS_Mesh::Add() {
 	;
 }
 
-void DriverDAT_R_SMDS_Mesh::Read() {
+DriverDAT_R_SMDS_Mesh::~DriverDAT_R_SMDS_Mesh()
+{
+	;
+}
 
-  int i,j;
+void DriverDAT_R_SMDS_Mesh::SetMesh(SMDS_Mesh * aMesh)
-  int nbNodes,nbCells;
+{
+	myMesh = aMesh;
+}
+
+void DriverDAT_R_SMDS_Mesh::SetFile(string aFile)
+{
+	myFile = aFile;
+}
+
+void DriverDAT_R_SMDS_Mesh::SetFileId(FILE * aFileId)
+{
+	myFileId = aFileId;
+}
+
+void DriverDAT_R_SMDS_Mesh::SetMeshId(int aMeshId)
+{
+	myMeshId = aMeshId;
+}
+
+void DriverDAT_R_SMDS_Mesh::Add()
+{
+	;
+}
+
+void DriverDAT_R_SMDS_Mesh::Read()
+{
+
+	int i, j;
+	int nbNodes, nbCells;
 	int intNumPoint;
 	float coordX, coordY, coordZ;
 	int nbNoeuds;
 
-  int intNumMaille,Degre;
+	int intNumMaille, Degre;
 	int ValElement;
 	int ValDegre;
 	int NoeudsMaille[20];
@@ -77,116 +85,132 @@ void DriverDAT_R_SMDS_Mesh::Read() {
   /****************************************************************************
   *                      OUVERTURE DU FICHIER EN LECTURE                      *
   ****************************************************************************/
-  char* file2Read = (char*)myFile.c_str();
+	char *file2Read = (char *)myFile.c_str();
-  myFileId = fopen(file2Read,"r");
+	myFileId = fopen(file2Read, "r");
 	if (myFileId < 0)
 	{
-      fprintf(stderr,">> ERREUR : ouverture du fichier %s \n",file2Read);
+		fprintf(stderr, ">> ERREUR : ouverture du fichier %s \n", file2Read);
 		exit(EXIT_FAILURE);
 	}
 
-  fscanf(myFileId,"%d %d\n",&nbNodes,&nbCells);
+	fscanf(myFileId, "%d %d\n", &nbNodes, &nbCells);
 
   /****************************************************************************
   *                       LECTURE DES NOEUDS                                  *
   ****************************************************************************/
-  fprintf(stdout,"\n(************************)\n");
+	fprintf(stdout, "\n(************************)\n");
-  fprintf(stdout,"(* NOEUDS DU MAILLAGE : *)\n");
+	fprintf(stdout, "(* NOEUDS DU MAILLAGE : *)\n");
-  fprintf(stdout,"(************************)\n");
+	fprintf(stdout, "(************************)\n");
 
-  for (i=0;i<nbNodes;i++) {
+	for (i = 0; i < nbNodes; i++)
-    fscanf(myFileId,"%d %e %e %e\n",&intNumPoint,&coordX,&coordY,&coordZ);
+	{
-    ok = myMesh->AddNodeWithID(coordX,coordY,coordZ,intNumPoint);
+		fscanf(myFileId, "%d %e %e %e\n", &intNumPoint, &coordX, &coordY,
+			&coordZ);
+		ok = myMesh->AddNodeWithID(coordX, coordY, coordZ, intNumPoint);
 	}
 
-  fprintf(stdout,"%d noeuds\n",myMesh->NbNodes());
+	fprintf(stdout, "%d noeuds\n", myMesh->NbNodes());
   /****************************************************************************
   *                       LECTURE DES ELEMENTS                                *
   ****************************************************************************/
-  fprintf(stdout,"\n(**************************)\n");
+	fprintf(stdout, "\n(**************************)\n");
-  fprintf(stdout,"(* ELEMENTS DU MAILLAGE : *)\n");
+	fprintf(stdout, "(* ELEMENTS DU MAILLAGE : *)\n");
-  fprintf(stdout,"(**************************)");
+	fprintf(stdout, "(**************************)");
 
-  fprintf(stdout,"%d elements\n",nbCells);
+	fprintf(stdout, "%d elements\n", nbCells);
 
-  for (i=0; i<nbCells; i++) {
+	for (i = 0; i < nbCells; i++)
-    fscanf(myFileId,"%d %d",&intNumMaille,&ValElement);
+	{
-    Degre=abs(ValElement/100);
+		fscanf(myFileId, "%d %d", &intNumMaille, &ValElement);
-    nbNoeuds=ValElement-(Degre*100);
+		Degre = abs(ValElement / 100);
+		nbNoeuds = ValElement - (Degre * 100);
 
 		// Recuperation des noeuds de la maille
-    for (j=0; j<nbNoeuds; j++) {
+		for (j = 0; j < nbNoeuds; j++)
-      fscanf(myFileId,"%d",&NoeudMaille);
+		{
-      NoeudsMaille[j]=NoeudMaille;
+			fscanf(myFileId, "%d", &NoeudMaille);
+			NoeudsMaille[j] = NoeudMaille;
 		}
 
 		// Analyse des cas de cellules
-    switch (ValElement) {
+		switch (ValElement)
-    case 102 : ;
-    case 103 : ;
 		{
-      ValDegre=3;
+		case 102:;
-      nbNoeuds=2;
+		case 103:;
-      ok = myMesh->AddEdgeWithID(NoeudsMaille[0],NoeudsMaille[1],intNumMaille);
+			{
+				ValDegre = 3;
+				nbNoeuds = 2;
+				ok = myMesh->AddEdgeWithID(NoeudsMaille[0], NoeudsMaille[1],
+					intNumMaille);
 				break;
 			}
-    case 204 : ;
+		case 204:;
-    case 208 : ;
+		case 208:;
 			{
-      ValDegre=9;
+				ValDegre = 9;
-      nbNoeuds=4;
+				nbNoeuds = 4;
-      ok = myMesh->AddFaceWithID(NoeudsMaille[0],NoeudsMaille[1],NoeudsMaille[2],NoeudsMaille[3],intNumMaille);
+				ok = myMesh->AddFaceWithID(NoeudsMaille[0], NoeudsMaille[1],
+					NoeudsMaille[2], NoeudsMaille[3], intNumMaille);
 				break;
 			}
-    case 203 : ;
+		case 203:;
-    case 206 : ;
+		case 206:;
 			{
-      ValDegre=5;
+				ValDegre = 5;
-      nbNoeuds=3;
+				nbNoeuds = 3;
-      ok = myMesh->AddFaceWithID(NoeudsMaille[0],NoeudsMaille[1],NoeudsMaille[2],intNumMaille);
+				ok = myMesh->AddFaceWithID(NoeudsMaille[0], NoeudsMaille[1],
+					NoeudsMaille[2], intNumMaille);
 				break;
 			}
-    case 308 : ;
+		case 308:;
-    case 320 : ;
+		case 320:;
+			{
+				ValDegre = 12;
+				nbNoeuds = 8;
+				if (ValElement == 320)
 				{
-      ValDegre=12;
-      nbNoeuds=8;
-      if (ValElement==320) {
 					//A voir, correspondance VTK
-	NoeudsMaille[4]=NoeudsMaille[8];
+					NoeudsMaille[4] = NoeudsMaille[8];
-	NoeudsMaille[5]=NoeudsMaille[9];
+					NoeudsMaille[5] = NoeudsMaille[9];
-	NoeudsMaille[6]=NoeudsMaille[10];
+					NoeudsMaille[6] = NoeudsMaille[10];
-	NoeudsMaille[7]=NoeudsMaille[11];
+					NoeudsMaille[7] = NoeudsMaille[11];
 				}
-      ok = myMesh->AddVolumeWithID(NoeudsMaille[0],NoeudsMaille[1],NoeudsMaille[2],NoeudsMaille[3],NoeudsMaille[4],NoeudsMaille[5],NoeudsMaille[6],NoeudsMaille[7],intNumMaille);
+				ok = myMesh->AddVolumeWithID(NoeudsMaille[0], NoeudsMaille[1],
+					NoeudsMaille[2], NoeudsMaille[3], NoeudsMaille[4],
+					NoeudsMaille[5], NoeudsMaille[6], NoeudsMaille[7],
+					intNumMaille);
 				break;
 			}
-    case 304 : ;
+		case 304:;
-    case 310 : ;
+		case 310:;
 			{
-      ValDegre=10;
+				ValDegre = 10;
-      nbNoeuds=4;
+				nbNoeuds = 4;
-      if (ValElement==310)
+				if (ValElement == 310)
-	NoeudsMaille[3]=NoeudsMaille[6];
+					NoeudsMaille[3] = NoeudsMaille[6];
-      ok = myMesh->AddVolumeWithID(NoeudsMaille[0],NoeudsMaille[1],NoeudsMaille[2],NoeudsMaille[3],intNumMaille);
+				ok = myMesh->AddVolumeWithID(NoeudsMaille[0], NoeudsMaille[1],
+					NoeudsMaille[2], NoeudsMaille[3], intNumMaille);
 				break;
 			}
-    case 306 : ;
+		case 306:;
-    case 315 : ;
+		case 315:;
 			{
-      ValDegre=12;
+				ValDegre = 12;
-      nbNoeuds=8;
+				nbNoeuds = 8;
-      if (ValElement==315) {
+				if (ValElement == 315)
-	NoeudsMaille[3]=NoeudsMaille[6];
+				{
-	NoeudsMaille[4]=NoeudsMaille[7];
+					NoeudsMaille[3] = NoeudsMaille[6];
-	NoeudsMaille[5]=NoeudsMaille[8];
+					NoeudsMaille[4] = NoeudsMaille[7];
+					NoeudsMaille[5] = NoeudsMaille[8];
 				}
-      NoeudsMaille[7]=NoeudsMaille[5];
+				NoeudsMaille[7] = NoeudsMaille[5];
-      NoeudsMaille[6]=NoeudsMaille[5];
+				NoeudsMaille[6] = NoeudsMaille[5];
-      NoeudsMaille[5]=NoeudsMaille[4];
+				NoeudsMaille[5] = NoeudsMaille[4];
-      NoeudsMaille[4]=NoeudsMaille[3];
+				NoeudsMaille[4] = NoeudsMaille[3];
-      NoeudsMaille[3]=NoeudsMaille[2];
+				NoeudsMaille[3] = NoeudsMaille[2];
-      ok = myMesh->AddVolumeWithID(NoeudsMaille[0],NoeudsMaille[1],NoeudsMaille[2],NoeudsMaille[3],NoeudsMaille[4],NoeudsMaille[5],intNumMaille);
+				ok = myMesh->AddVolumeWithID(NoeudsMaille[0], NoeudsMaille[1],
+					NoeudsMaille[2], NoeudsMaille[3], NoeudsMaille[4],
+					NoeudsMaille[5], intNumMaille);
 				break;
 			}
 

src/DriverDAT/DriverDAT_R_SMDS_Mesh.h

@@ -32,24 +32,23 @@
 #include "SMDS_Mesh.hxx"
 #include "Mesh_Reader.h"
 
-class DriverDAT_R_SMDS_Mesh : public Mesh_Reader {
+class DriverDAT_R_SMDS_Mesh:public Mesh_Reader
+{
 
-  public :
+  public:DriverDAT_R_SMDS_Mesh();
-    DriverDAT_R_SMDS_Mesh();
 	~DriverDAT_R_SMDS_Mesh();
 
 	void Add();
 	void Read();
-    void SetMesh(Handle(SMDS_Mesh)& aMesh);
+	void SetMesh(SMDS_Mesh * aMesh);
 	void SetFile(string);
 
-    void SetFileId(FILE*);
+	void SetFileId(FILE *);
 	void SetMeshId(int);
 
-  private :
+  private:  SMDS_Mesh * myMesh;
-    Handle_SMDS_Mesh myMesh;
 	string myFile;
-    FILE* myFileId;
+	FILE *myFileId;
 	int myMeshId;
 
 };

src/DriverDAT/DriverDAT_R_SMESHDS_Document.cxx

@@ -30,25 +30,30 @@ using namespace std;
 
 #include "utilities.h"
 
-int getOne() {
+int getOne()
+{
 	printf("in getOne");
 	return (1);
 }
 
-extern "C" {
+extern "C"
+{
 	//  Document_Reader* maker() {
-  DriverDAT_R_SMESHDS_Document* maker() {
+	DriverDAT_R_SMESHDS_Document *maker()
-    fprintf(stdout,"here in maker\n");
+	{
+		fprintf(stdout, "here in maker\n");
 		return new DriverDAT_R_SMESHDS_Document;
 	}
 }
 
-DriverDAT_R_SMESHDS_Document::DriverDAT_R_SMESHDS_Document() {
+DriverDAT_R_SMESHDS_Document::DriverDAT_R_SMESHDS_Document()
+{
 	myFile = string("");
 }
 
-DriverDAT_R_SMESHDS_Document::~DriverDAT_R_SMESHDS_Document() {
+DriverDAT_R_SMESHDS_Document::~DriverDAT_R_SMESHDS_Document()
-;
+{
+	;
 }
 
 //void DriverDAT_R_SMESHDS_Document::SetFile(string aFile) {
@@ -59,7 +64,8 @@ DriverDAT_R_SMESHDS_Document::~DriverDAT_R_SMESHDS_Document() {
 //myDocument = aDoc;
 //}
 
-void DriverDAT_R_SMESHDS_Document::Read() {
+void DriverDAT_R_SMESHDS_Document::Read()
+{
 
 	int myMeshId;
 	MESSAGE("in read");
@@ -69,11 +75,11 @@ void DriverDAT_R_SMESHDS_Document::Read() {
   /****************************************************************************
   *                      OUVERTURE DU FICHIER EN LECTURE                      *
   ****************************************************************************/
-  char* file2Read = (char*)myFile.c_str();
+	char *file2Read = (char *)myFile.c_str();
-  FILE* fid = fopen(file2Read,"r");
+	FILE *fid = fopen(file2Read, "r");
 	if (fid < 0)
 	{
-      fprintf(stderr,">> ERREUR : ouverture du fichier %s \n",file2Read);
+		fprintf(stderr, ">> ERREUR : ouverture du fichier %s \n", file2Read);
 		exit(EXIT_FAILURE);
 	}
 
@@ -87,18 +93,18 @@ void DriverDAT_R_SMESHDS_Document::Read() {
   ****************************************************************************/
 	fclose(fid);
 
-  printf("Nombre de maillages = %d\n",nmaa);
+	printf("Nombre de maillages = %d\n", nmaa);
 
 	string myClass = string("SMESHDS_Mesh");
 	string myExtension = string("DAT");
 
-  for (int meshIt=1;meshIt<=nmaa;meshIt++) {
+	for (int meshIt = 1; meshIt <= nmaa; meshIt++)
+	{
 		myMeshId = myDocument->NewMesh();
 
-    Handle(SMDS_Mesh) myMesh = myDocument->GetMesh(myMeshId);
+		SMDS_Mesh * myMesh = myDocument->GetMesh(myMeshId);
-
-    DriverDAT_R_SMESHDS_Mesh* myReader = new DriverDAT_R_SMESHDS_Mesh;
 
+		DriverDAT_R_SMESHDS_Mesh *myReader = new DriverDAT_R_SMESHDS_Mesh;
 
 		myReader->SetMesh(myMesh);
 		myReader->SetFile(myFile);
@@ -108,5 +114,4 @@ void DriverDAT_R_SMESHDS_Document::Read() {
 
 	}
 
-
 }

src/DriverDAT/DriverDAT_R_SMESHDS_Mesh.cxx

@@ -30,41 +30,49 @@ using namespace std;
 
 #include "utilities.h"
 
-DriverDAT_R_SMESHDS_Mesh::DriverDAT_R_SMESHDS_Mesh() {
+DriverDAT_R_SMESHDS_Mesh::DriverDAT_R_SMESHDS_Mesh()
-;
+{
-}
-
-DriverDAT_R_SMESHDS_Mesh::~DriverDAT_R_SMESHDS_Mesh() {
-;
-}
-
-void DriverDAT_R_SMESHDS_Mesh::SetMesh(Handle(SMDS_Mesh)& aMesh) {
-  //myMesh = Handle(SMESHDS_Mesh)::DownCast(aMesh);
-  myMesh = aMesh;
-}
-
-void DriverDAT_R_SMESHDS_Mesh::SetFile(string aFile) {
-  myFile = aFile;
-}
-
-void DriverDAT_R_SMESHDS_Mesh::SetFileId(FILE* aFileId) {
-  myFileId = aFileId;
-}
-
-void DriverDAT_R_SMESHDS_Mesh::SetMeshId(int aMeshId) {
-  myMeshId = aMeshId;
-}
-
-void DriverDAT_R_SMESHDS_Mesh::Add() {
 	;
 }
 
-void DriverDAT_R_SMESHDS_Mesh::Read() {
+DriverDAT_R_SMESHDS_Mesh::~DriverDAT_R_SMESHDS_Mesh()
+{
+	;
+}
+
+void DriverDAT_R_SMESHDS_Mesh::SetMesh(SMDS_Mesh * aMesh)
+{
+	//myMesh = SMESHDS_Mesh *::DownCast(aMesh);
+	myMesh = aMesh;
+}
+
+void DriverDAT_R_SMESHDS_Mesh::SetFile(string aFile)
+{
+	myFile = aFile;
+}
+
+void DriverDAT_R_SMESHDS_Mesh::SetFileId(FILE * aFileId)
+{
+	myFileId = aFileId;
+}
+
+void DriverDAT_R_SMESHDS_Mesh::SetMeshId(int aMeshId)
+{
+	myMeshId = aMeshId;
+}
+
+void DriverDAT_R_SMESHDS_Mesh::Add()
+{
+	;
+}
+
+void DriverDAT_R_SMESHDS_Mesh::Read()
+{
 	string myClass = string("SMDS_Mesh");
 	string myExtension = string("DAT");
 
 	MESSAGE("in DriverDAT_R_SMESHDS_Mesh::Read() 1");
-  DriverDAT_R_SMDS_Mesh* myReader = new DriverDAT_R_SMDS_Mesh;
+	DriverDAT_R_SMDS_Mesh *myReader = new DriverDAT_R_SMDS_Mesh;
 
 	MESSAGE("in DriverDAT_R_SMESHDS_Mesh::Read() 2");
 	myReader->SetMesh(myMesh);

src/DriverDAT/DriverDAT_R_SMESHDS_Mesh.h

@@ -32,24 +32,23 @@
 #include "SMESHDS_Mesh.hxx"
 #include "Mesh_Reader.h"
 
-class DriverDAT_R_SMESHDS_Mesh : public Mesh_Reader {
+class DriverDAT_R_SMESHDS_Mesh:public Mesh_Reader
+{
 
-  public :
+  public:DriverDAT_R_SMESHDS_Mesh();
-    DriverDAT_R_SMESHDS_Mesh();
 	~DriverDAT_R_SMESHDS_Mesh();
 
 	void Add();
 	void Read();
-    void SetMesh(Handle(SMDS_Mesh)& aMesh);
+	void SetMesh(SMDS_Mesh * aMesh);
 	void SetFile(string);
 
-    void SetFileId(FILE*);
+	void SetFileId(FILE *);
 	void SetMeshId(int);
 
-private :
+  private:  SMDS_Mesh * myMesh;
-    Handle_SMDS_Mesh myMesh;
 	string myFile;
-    FILE* myFileId;
+	FILE *myFileId;
 	int myMeshId;
 
 };

src/DriverDAT/DriverDAT_W_SMDS_Mesh.cxx

@@ -29,66 +29,70 @@ using namespace std;
 
 #include "SMDS_MeshElement.hxx"
 #include "SMDS_MeshNode.hxx"
-#include "SMDS_MeshEdgesIterator.hxx"
-#include "SMDS_MeshFacesIterator.hxx"
-#include "SMDS_MeshNodesIterator.hxx"
-#include "SMDS_MeshVolumesIterator.hxx"
 
 #include "utilities.h"
 
-DriverDAT_W_SMDS_Mesh::DriverDAT_W_SMDS_Mesh() {
+DriverDAT_W_SMDS_Mesh::DriverDAT_W_SMDS_Mesh()
-;
+{
-}
-
-DriverDAT_W_SMDS_Mesh::~DriverDAT_W_SMDS_Mesh() {
-;
-}
-
-void DriverDAT_W_SMDS_Mesh::SetMesh(Handle(SMDS_Mesh)& aMesh) {
-  myMesh = aMesh;
-}
-
-void DriverDAT_W_SMDS_Mesh::SetFile(string aFile) {
-  myFile = aFile;
-}
-
-void DriverDAT_W_SMDS_Mesh::SetFileId(FILE* aFileId) {
-  myFileId = aFileId;
-}
-
-void DriverDAT_W_SMDS_Mesh::SetMeshId(int aMeshId) {
-  myMeshId = aMeshId;
-}
-
-void DriverDAT_W_SMDS_Mesh::Add() {
 	;
 }
 
-void DriverDAT_W_SMDS_Mesh::Write() {
+DriverDAT_W_SMDS_Mesh::~DriverDAT_W_SMDS_Mesh()
+{
+	;
+}
 
-  int nbNodes,nbCells;
+void DriverDAT_W_SMDS_Mesh::SetMesh(SMDS_Mesh * aMesh)
+{
+	myMesh = aMesh;
+}
+
+void DriverDAT_W_SMDS_Mesh::SetFile(string aFile)
+{
+	myFile = aFile;
+}
+
+void DriverDAT_W_SMDS_Mesh::SetFileId(FILE * aFileId)
+{
+	myFileId = aFileId;
+}
+
+void DriverDAT_W_SMDS_Mesh::SetMeshId(int aMeshId)
+{
+	myMeshId = aMeshId;
+}
+
+void DriverDAT_W_SMDS_Mesh::Add()
+{
+	;
+}
+
+void DriverDAT_W_SMDS_Mesh::Write()
+{
+
+	int nbNodes, nbCells;
 	int i;
 
-  char* file2Read = (char*)myFile.c_str();
+	char *file2Read = (char *)myFile.c_str();
-  myFileId = fopen(file2Read,"w+");
+	myFileId = fopen(file2Read, "w+");
 	if (myFileId < 0)
 	{
-      fprintf(stderr,">> ERREUR : ouverture du fichier %s \n",file2Read);
+		fprintf(stderr, ">> ERREUR : ouverture du fichier %s \n", file2Read);
 		exit(EXIT_FAILURE);
 	}
 	SCRUTE(myMesh);
   /****************************************************************************
   *                       NOMBRES D'OBJETS                                    *
   ****************************************************************************/
-  fprintf(stdout,"\n(****************************)\n");
+	fprintf(stdout, "\n(****************************)\n");
-  fprintf(stdout,"(* INFORMATIONS GENERALES : *)\n");
+	fprintf(stdout, "(* INFORMATIONS GENERALES : *)\n");
-  fprintf(stdout,"(****************************)\n");
+	fprintf(stdout, "(****************************)\n");
 
 	/* Combien de noeuds ? */
 	nbNodes = myMesh->NbNodes();
 
 	/* Combien de mailles, faces ou aretes ? */
-  Standard_Integer nb_of_nodes, nb_of_edges,nb_of_faces, nb_of_volumes;
+	int nb_of_nodes, nb_of_edges, nb_of_faces, nb_of_volumes;
 	nb_of_edges = myMesh->NbEdges();
 	nb_of_faces = myMesh->NbFaces();
 	nb_of_volumes = myMesh->NbVolumes();
@@ -97,94 +101,106 @@ void DriverDAT_W_SMDS_Mesh::Write() {
 	SCRUTE(nb_of_faces);
 	SCRUTE(nb_of_volumes);
 
-  fprintf(stdout,"%d %d\n",nbNodes,nbCells);
+	fprintf(stdout, "%d %d\n", nbNodes, nbCells);
-  fprintf(myFileId,"%d %d\n",nbNodes,nbCells);
+	fprintf(myFileId, "%d %d\n", nbNodes, nbCells);
 
   /****************************************************************************
   *                       ECRITURE DES NOEUDS                                 *
   ****************************************************************************/
-  fprintf(stdout,"\n(************************)\n");
+	fprintf(stdout, "\n(************************)\n");
-  fprintf(stdout,"(* NOEUDS DU MAILLAGE : *)\n");
+	fprintf(stdout, "(* NOEUDS DU MAILLAGE : *)\n");
-  fprintf(stdout,"(************************)\n");
+	fprintf(stdout, "(************************)\n");
 
-  SMDS_MeshNodesIterator itNodes(myMesh);
+	SMDS_Iterator<const SMDS_MeshNode *> * itNodes=myMesh->nodesIterator();
-  for (;itNodes.More();itNodes.Next()) {
+	while(itNodes->more())
-    const Handle(SMDS_MeshElement)& elem = itNodes.Value();
+	{		
-    const Handle(SMDS_MeshNode)& node = myMesh->GetNode(1,elem);
+		const SMDS_MeshNode * node = itNodes->next();
- 
+		fprintf(myFileId, "%d %e %e %e\n", node->GetID(), node->X(),
-    fprintf(myFileId,"%d %e %e %e\n",node->GetID(),node->X(),node->Y(),node->Z());
+			node->Y(), node->Z());
 	}
 	
   /****************************************************************************
   *                       ECRITURE DES ELEMENTS                                *
   ****************************************************************************/
-  fprintf(stdout,"\n(**************************)\n");
+	fprintf(stdout, "\n(**************************)\n");
-  fprintf(stdout,"(* ELEMENTS DU MAILLAGE : *)\n");
+	fprintf(stdout, "(* ELEMENTS DU MAILLAGE : *)\n");
-  fprintf(stdout,"(**************************)");
+	fprintf(stdout, "(**************************)");
 	/* Ecriture des connectivites, noms, numeros des mailles */
 
-  SMDS_MeshEdgesIterator itEdges(myMesh);
+	SMDS_Iterator<const SMDS_MeshEdge *> * itEdges=myMesh->edgesIterator();
-  for (;itEdges.More();itEdges.Next()) {
+	while(itEdges->more())
-    const Handle(SMDS_MeshElement)& elem = itEdges.Value();
+	{
+		const SMDS_MeshElement * elem = itEdges->next();
 
-    switch (elem->NbNodes()) {
+		switch (elem->NbNodes())
-    case 2 : {
+		{
-      fprintf(myFileId,"%d %d ",elem->GetID(),102);
+		case 2:
+		{
+			fprintf(myFileId, "%d %d ", elem->GetID(), 102);
 			break;
 		}
-    case 3 : {
+		case 3:
-      fprintf(myFileId,"%d %d ",elem->GetID(),103);
+		{
+			fprintf(myFileId, "%d %d ", elem->GetID(), 103);
 			break;
 		}
 		}
 
-    for (i=0;i<elem->NbNodes();i++)
+		SMDS_Iterator<const SMDS_MeshElement *> * it=elem->nodesIterator();
-      fprintf(myFileId,"%d ",elem->GetConnection(i+1));
+		while(it->more()) fprintf(myFileId, "%d ", it->next()->GetID());
 
-    fprintf(myFileId,"\n");
+		fprintf(myFileId, "\n");
 	}
 
-  SMDS_MeshFacesIterator itFaces(myMesh);
+	SMDS_Iterator<const SMDS_MeshFace *> * itFaces=myMesh->facesIterator();
-  for (;itFaces.More();itFaces.Next()) {
+	while(itFaces->more())
-    const Handle(SMDS_MeshElement)& elem = itFaces.Value();
+	{
+		const SMDS_MeshElement * elem = itFaces->next();
 
-    switch (elem->NbNodes()) {
+		switch (elem->NbNodes())
-    case 3 : {
+		{
-      fprintf(myFileId,"%d %d ",elem->GetID(),203);
+		case 3:
+		{
+			fprintf(myFileId, "%d %d ", elem->GetID(), 203);
 			break;
 		}
-    case 4 : {
+		case 4:
-      fprintf(myFileId,"%d %d ",elem->GetID(),204);
+		{
+			fprintf(myFileId, "%d %d ", elem->GetID(), 204);
 			break;
 		}
-    case 6 : {
+		case 6:
-      fprintf(myFileId,"%d %d ",elem->GetID(),206);
+		{
+			fprintf(myFileId, "%d %d ", elem->GetID(), 206);
 			break;
 		}
 		}
 
-    for (i=0;i<elem->NbNodes();i++)
+		SMDS_Iterator<const SMDS_MeshElement *> * it=elem->nodesIterator();
-      fprintf(myFileId,"%d ",elem->GetConnection(i+1));
+		while(it->more()) fprintf(myFileId, "%d ", it->next()->GetID());
 
-    fprintf(myFileId,"\n");
+		fprintf(myFileId, "\n");
 	}
 
-  SMDS_MeshVolumesIterator itVolumes(myMesh);
+	SMDS_Iterator<const SMDS_MeshVolume *> * itVolumes=myMesh->volumesIterator();
-  for (;itVolumes.More();itVolumes.Next()) {
+	while(itVolumes->more())
-    const Handle(SMDS_MeshElement)& elem = itVolumes.Value();
+	{
+		const SMDS_MeshElement * elem = itVolumes->next();
 		
-    switch (elem->NbNodes()) {
+		switch (elem->NbNodes())
-    case 8 : {
+		{
-      fprintf(myFileId,"%d %d ",elem->GetID(),308);
+		case 8:
+		{
+			fprintf(myFileId, "%d %d ", elem->GetID(), 308);
 			break;
 		}
 		}
 
-    for (i=0;i<elem->NbNodes();i++)
+		SMDS_Iterator<const SMDS_MeshElement *> * it=elem->nodesIterator();
-      fprintf(myFileId,"%d ",elem->GetConnection(i+1));
+		while(it->more()) fprintf(myFileId, "%d ", it->next()->GetID());
 
-    fprintf(myFileId,"\n");
+		fprintf(myFileId, "\n");
 	}
 
-  fclose (myFileId);
+	fclose(myFileId);
 }

src/DriverDAT/DriverDAT_W_SMDS_Mesh.h

@@ -33,24 +33,23 @@
 #include "SMDS_Mesh.hxx"
 #include "Mesh_Writer.h"
 
-class DriverDAT_W_SMDS_Mesh : public Mesh_Writer {
+class DriverDAT_W_SMDS_Mesh:public Mesh_Writer
+{
 
-  public :
+  public:DriverDAT_W_SMDS_Mesh();
-    DriverDAT_W_SMDS_Mesh();
 	~DriverDAT_W_SMDS_Mesh();
 
 	void Add();
 	void Write();
-    void SetMesh(Handle(SMDS_Mesh)& aMesh);
+	void SetMesh(SMDS_Mesh * aMesh);
 	void SetFile(string);
 
-    void SetFileId(FILE*);
+	void SetFileId(FILE *);
 	void SetMeshId(int);
 
-private :
+  private:  SMDS_Mesh * myMesh;
-    Handle_SMDS_Mesh myMesh;
 	string myFile;
-    FILE* myFileId;
+	FILE *myFileId;
 	int myMeshId;
 
 };

src/DriverDAT/DriverDAT_W_SMESHDS_Document.cxx

@@ -32,17 +32,20 @@ using namespace std;
 
 extern "C"
 {
-  Document_Writer* Wmaker() {
+	Document_Writer *Wmaker()
+	{
 		return new DriverDAT_W_SMESHDS_Document;
 	}
 }
 
-DriverDAT_W_SMESHDS_Document::DriverDAT_W_SMESHDS_Document() {
+DriverDAT_W_SMESHDS_Document::DriverDAT_W_SMESHDS_Document()
-;
+{
+	;
 }
 
-DriverDAT_W_SMESHDS_Document::~DriverDAT_W_SMESHDS_Document() {
+DriverDAT_W_SMESHDS_Document::~DriverDAT_W_SMESHDS_Document()
-;
+{
+	;
 }
 
 //void DriverDAT_W_SMESHDS_Document::SetFile(string aFile) {
@@ -53,18 +56,19 @@ DriverDAT_W_SMESHDS_Document::~DriverDAT_W_SMESHDS_Document() {
 //myDocument = aDocument;
 //}
 
-void DriverDAT_W_SMESHDS_Document::Write() {
+void DriverDAT_W_SMESHDS_Document::Write()
+{
 
-  Handle(SMESHDS_Mesh) myMesh;
+	SMESHDS_Mesh * myMesh;
 
   /****************************************************************************
   *                      OUVERTURE DU FICHIER EN ECRITURE                      *
   ****************************************************************************/
-  char* file2Write = (char*)myFile.c_str();
+	char *file2Write = (char *)myFile.c_str();
-  FILE* fid = fopen(file2Write,"w+");
+	FILE *fid = fopen(file2Write, "w+");
 	if (fid < 0)
 	{
-      fprintf(stderr,">> ERREUR : ouverture du fichier %s \n",file2Write);
+		fprintf(stderr, ">> ERREUR : ouverture du fichier %s \n", file2Write);
 		exit(EXIT_FAILURE);
 	}
 
@@ -86,11 +90,12 @@ void DriverDAT_W_SMESHDS_Document::Write() {
 	//numero++;
 	//myMesh = myDocument->GetMesh(numero);
 	myDocument->InitMeshesIterator();
-  for (;myDocument->MoreMesh();myDocument->NextMesh()) {
+	while(myDocument->MoreMesh())
+	{
 		numero++;
-    myMesh = myDocument->CurrentMesh();
+		myMesh = myDocument->NextMesh();
 
-    DriverDAT_W_SMESHDS_Mesh* myWriter = new DriverDAT_W_SMESHDS_Mesh;
+		DriverDAT_W_SMESHDS_Mesh *myWriter = new DriverDAT_W_SMESHDS_Mesh;
 		//Mesh_Writer* myWriter = Driver::GetMeshWriter(myExtension, myClass);
 
 		myWriter->SetMesh(myMesh);

src/DriverDAT/DriverDAT_W_SMESHDS_Mesh.cxx

@@ -30,44 +30,51 @@ using namespace std;
 
 #include "SMDS_MeshElement.hxx"
 #include "SMDS_MeshNode.hxx"
-#include "SMDS_MeshEdgesIterator.hxx"
+
-#include "SMDS_MeshFacesIterator.hxx"
+
-#include "SMDS_MeshNodesIterator.hxx"
+
-#include "SMDS_MeshVolumesIterator.hxx"
+
 
 #include "utilities.h"
 
-DriverDAT_W_SMESHDS_Mesh::DriverDAT_W_SMESHDS_Mesh() {
+DriverDAT_W_SMESHDS_Mesh::DriverDAT_W_SMESHDS_Mesh()
-;
+{
+	;
 }
 
-DriverDAT_W_SMESHDS_Mesh::~DriverDAT_W_SMESHDS_Mesh() {
+DriverDAT_W_SMESHDS_Mesh::~DriverDAT_W_SMESHDS_Mesh()
-;
+{
+	;
 }
 
-void DriverDAT_W_SMESHDS_Mesh::SetMesh(Handle(SMDS_Mesh)& aMesh) {
+void DriverDAT_W_SMESHDS_Mesh::SetMesh(SMDS_Mesh * aMesh)
-  //myMesh = Handle(SMESHDS_Mesh)::DownCast(aMesh);
+{
+	//myMesh = SMESHDS_Mesh *::DownCast(aMesh);
 	myMesh = aMesh;
 }
 
-void DriverDAT_W_SMESHDS_Mesh::SetFile(string aFile) {
+void DriverDAT_W_SMESHDS_Mesh::SetFile(string aFile)
+{
 	myFile = aFile;
 }
 
-void DriverDAT_W_SMESHDS_Mesh::SetFileId(FILE* aFileId) {
+void DriverDAT_W_SMESHDS_Mesh::SetFileId(FILE * aFileId)
+{
 	myFileId = aFileId;
 }
 
-void DriverDAT_W_SMESHDS_Mesh::SetMeshId(int aMeshId) {
+void DriverDAT_W_SMESHDS_Mesh::SetMeshId(int aMeshId)
+{
 	myMeshId = aMeshId;
 }
 
-void DriverDAT_W_SMESHDS_Mesh::Write() {
+void DriverDAT_W_SMESHDS_Mesh::Write()
+{
 
 	string myClass = string("SMDS_Mesh");
 	string myExtension = string("DAT");
 
-  DriverDAT_W_SMDS_Mesh* myWriter = new DriverDAT_W_SMDS_Mesh;
+	DriverDAT_W_SMDS_Mesh *myWriter = new DriverDAT_W_SMDS_Mesh;
 
 	myWriter->SetMesh(myMesh);
 	myWriter->SetFile(myFile);
@@ -76,126 +83,145 @@ void DriverDAT_W_SMESHDS_Mesh::Write() {
 
 	myWriter->Write();
 
-
 }
-void DriverDAT_W_SMESHDS_Mesh::Add() {
+
-  int nbNodes,nbCells;
+void DriverDAT_W_SMESHDS_Mesh::Add()
+{
+	int nbNodes, nbCells;
 	int i;
 
-  char* file2Read = (char*)myFile.c_str();
+	char *file2Read = (char *)myFile.c_str();
-  myFileId = fopen(file2Read,"w+");
+	myFileId = fopen(file2Read, "w+");
 	if (myFileId < 0)
 	{
-      fprintf(stderr,">> ERREUR : ouverture du fichier %s \n",file2Read);
+		fprintf(stderr, ">> ERREUR : ouverture du fichier %s \n", file2Read);
 		exit(EXIT_FAILURE);
 	}
 
   /****************************************************************************
   *                       NOMBRES D'OBJETS                                    *
   ****************************************************************************/
-  fprintf(stdout,"\n(****************************)\n");
+	fprintf(stdout, "\n(****************************)\n");
-  fprintf(stdout,"(* INFORMATIONS GENERALES : *)\n");
+	fprintf(stdout, "(* INFORMATIONS GENERALES : *)\n");
-  fprintf(stdout,"(****************************)\n");
+	fprintf(stdout, "(****************************)\n");
 
 	/* Combien de noeuds ? */
 	nbNodes = myMesh->NbNodes();
 
 	/* Combien de mailles, faces ou aretes ? */
-  Standard_Integer nb_of_nodes, nb_of_edges,nb_of_faces, nb_of_volumes;
+	int nb_of_nodes, nb_of_edges, nb_of_faces, nb_of_volumes;
 	nb_of_edges = myMesh->NbEdges();
 	nb_of_faces = myMesh->NbFaces();
 	nb_of_volumes = myMesh->NbVolumes();
 	nbCells = nb_of_edges + nb_of_faces + nb_of_volumes;
 
-  fprintf(stdout,"%d %d\n",nbNodes,nbCells);
+	fprintf(stdout, "%d %d\n", nbNodes, nbCells);
-  fprintf(myFileId,"%d %d\n",nbNodes,nbCells);
+	fprintf(myFileId, "%d %d\n", nbNodes, nbCells);
 
   /****************************************************************************
   *                       ECRITURE DES NOEUDS                                 *
   ****************************************************************************/
-  fprintf(stdout,"\n(************************)\n");
+	fprintf(stdout, "\n(************************)\n");
-  fprintf(stdout,"(* NOEUDS DU MAILLAGE : *)\n");
+	fprintf(stdout, "(* NOEUDS DU MAILLAGE : *)\n");
-  fprintf(stdout,"(************************)\n");
+	fprintf(stdout, "(************************)\n");
 
-  SMDS_MeshNodesIterator itNodes(myMesh);
+	SMDS_Iterator<const SMDS_MeshNode *> * itNodes=myMesh->nodesIterator();
-  for (;itNodes.More();itNodes.Next()) {
+	while(itNodes->more())
-    const Handle(SMDS_MeshElement)& elem = itNodes.Value();
+	{		
-    const Handle(SMDS_MeshNode)& node = myMesh->GetNode(1,elem);
+		const SMDS_MeshNode * node = itNodes->next();
- 
+		fprintf(myFileId, "%d %e %e %e\n", node->GetID(), node->X(),
-    fprintf(myFileId,"%d %e %e %e\n",node->GetID(),node->X(),node->Y(),node->Z());
+			node->Y(), node->Z());
 	}
+	delete itNodes;
 
   /****************************************************************************
   *                       ECRITURE DES ELEMENTS                                *
   ****************************************************************************/
-  fprintf(stdout,"\n(**************************)\n");
+	fprintf(stdout, "\n(**************************)\n");
-  fprintf(stdout,"(* ELEMENTS DU MAILLAGE : *)\n");
+	fprintf(stdout, "(* ELEMENTS DU MAILLAGE : *)\n");
-  fprintf(stdout,"(**************************)");
+	fprintf(stdout, "(**************************)");
 	/* Ecriture des connectivites, noms, numeros des mailles */
 
-  SMDS_MeshEdgesIterator itEdges(myMesh);
+	SMDS_Iterator<const SMDS_MeshEdge*> * itEdges=myMesh->edgesIterator();
-  for (;itEdges.More();itEdges.Next()) {
+	while(itEdges->more())
-    const Handle(SMDS_MeshElement)& elem = itEdges.Value();
+	{
+		const SMDS_MeshEdge * elem = itEdges->next();
 
-    switch (elem->NbNodes()) {
+		switch (elem->NbNodes())
-    case 2 : {
+		{
-      fprintf(myFileId,"%d %d ",elem->GetID(),102);
+		case 2:
+		{
+			fprintf(myFileId, "%d %d ", elem->GetID(), 102);
 			break;
 		}
-    case 3 : {
+		case 3:
-      fprintf(myFileId,"%d %d ",elem->GetID(),103);
+		{
+			fprintf(myFileId, "%d %d ", elem->GetID(), 103);
 			break;
 		}
 		}
 
-    for (i=0;i<elem->NbNodes();i++)
+		SMDS_Iterator<const SMDS_MeshElement *> * itNodes=elem->nodesIterator();
-      fprintf(myFileId,"%d ",elem->GetConnection(i+1));
+		while(itNodes->more())
+			fprintf(myFileId, "%d ", itNodes->next()->GetID());
 		
-    fprintf(myFileId,"\n");
+		fprintf(myFileId, "\n");
 	}
+	delete itEdges;
 
-  SMDS_MeshFacesIterator itFaces(myMesh);
+	SMDS_Iterator<const SMDS_MeshFace *> * itFaces=myMesh->facesIterator();
-  for (;itFaces.More();itFaces.Next()) {
+	while(itFaces->more())
-    const Handle(SMDS_MeshElement)& elem = itFaces.Value();
+	{
+		const SMDS_MeshElement * elem = itFaces->next();
 
-    switch (elem->NbNodes()) {
+		switch (elem->NbNodes())
-    case 3 : {
+		{
-      fprintf(myFileId,"%d %d ",elem->GetID(),203);
+		case 3:
+		{
+			fprintf(myFileId, "%d %d ", elem->GetID(), 203);
 			break;
 		}
-    case 4 : {
+		case 4:
-      fprintf(myFileId,"%d %d ",elem->GetID(),204);
+		{
+			fprintf(myFileId, "%d %d ", elem->GetID(), 204);
 			break;
 		}
-    case 6 : {
+		case 6:
-      fprintf(myFileId,"%d %d ",elem->GetID(),206);
+		{
+			fprintf(myFileId, "%d %d ", elem->GetID(), 206);
 			break;
 		}
 		}
 
-    for (i=0;i<elem->NbNodes();i++)
+		SMDS_Iterator<const SMDS_MeshElement *> * itNodes=elem->nodesIterator();
-      fprintf(myFileId,"%d ",elem->GetConnection(i+1));
+		while(itNodes->more())
+			fprintf(myFileId, "%d ", itNodes->next()->GetID());
 	
-    fprintf(myFileId,"\n");
+		fprintf(myFileId, "\n");
 	}
+	delete itFaces;
 
-  SMDS_MeshVolumesIterator itVolumes(myMesh);
+	SMDS_Iterator<const SMDS_MeshVolume*> * itVolumes=myMesh->volumesIterator();
-  for (;itVolumes.More();itVolumes.Next()) {
+	while(itVolumes->more())
-    const Handle(SMDS_MeshElement)& elem = itVolumes.Value();
+	{
+		const SMDS_MeshElement * elem = itVolumes->next();
 		
-    switch (elem->NbNodes()) {
+		switch (elem->NbNodes())
-    case 8 : {
+		{
-      fprintf(myFileId,"%d %d ",elem->GetID(),308);
+		case 8:
+		{
+			fprintf(myFileId, "%d %d ", elem->GetID(), 308);
 			break;
 		}
 		}
 
-    for (i=0;i<elem->NbNodes();i++)
+		SMDS_Iterator<const SMDS_MeshElement *> * itNodes=elem->nodesIterator();
-      fprintf(myFileId,"%d ",elem->GetConnection(i+1));
+		while(itNodes->more())
+			fprintf(myFileId, "%d ", itNodes->next()->GetID());
 		
-    fprintf(myFileId,"\n");
+		fprintf(myFileId, "\n");
 	}
+	delete itVolumes;
 
-  fclose (myFileId);
+	fclose(myFileId);
 }
-

src/DriverDAT/DriverDAT_W_SMESHDS_Mesh.h

@@ -33,24 +33,23 @@
 #include "SMESHDS_Mesh.hxx"
 #include "Mesh_Writer.h"
 
-class DriverDAT_W_SMESHDS_Mesh : public Mesh_Writer {
+class DriverDAT_W_SMESHDS_Mesh:public Mesh_Writer
+{
 
-  public :
+  public:DriverDAT_W_SMESHDS_Mesh();
-    DriverDAT_W_SMESHDS_Mesh();
 	~DriverDAT_W_SMESHDS_Mesh();
 
 	void Add();
 	void Write();
-    void SetMesh(Handle(SMDS_Mesh)& aMesh);
+	void SetMesh(SMDS_Mesh * aMesh);
 	void SetFile(string);
 
-    void SetFileId(FILE*);
+	void SetFileId(FILE *);
 	void SetMeshId(int);
 
-private :
+  private:  SMDS_Mesh * myMesh;
-    Handle_SMDS_Mesh myMesh;
 	string myFile;
-    FILE* myFileId;
+	FILE *myFileId;
 	int myMeshId;
 
 };

src/DriverMED/DriverMED_R_SMDS_Mesh.cxx

@@ -28,63 +28,71 @@ using namespace std;
 #include "DriverMED_R_SMDS_Mesh.h"
 #include "utilities.h"
 
-DriverMED_R_SMDS_Mesh::DriverMED_R_SMDS_Mesh() {
+DriverMED_R_SMDS_Mesh::DriverMED_R_SMDS_Mesh()
+{
 }
 
-DriverMED_R_SMDS_Mesh::~DriverMED_R_SMDS_Mesh() {
+DriverMED_R_SMDS_Mesh::~DriverMED_R_SMDS_Mesh()
-;
+{
+	;
 }
 
-void DriverMED_R_SMDS_Mesh::SetMesh(Handle(SMDS_Mesh)& aMesh) {
+void DriverMED_R_SMDS_Mesh::SetMesh(SMDS_Mesh * aMesh)
+{
 	myMesh = aMesh;
 }
 
-void DriverMED_R_SMDS_Mesh::SetFile(string aFile) {
+void DriverMED_R_SMDS_Mesh::SetFile(string aFile)
+{
 	myFileId = -1;
 	myFile = aFile;
 }
 
-void DriverMED_R_SMDS_Mesh::SetFileId(med_idt aFileId) {
+void DriverMED_R_SMDS_Mesh::SetFileId(med_idt aFileId)
+{
 	myFileId = aFileId;
 }
 
-void DriverMED_R_SMDS_Mesh::SetMeshId(int aMeshId) {
+void DriverMED_R_SMDS_Mesh::SetMeshId(int aMeshId)
+{
 	myMeshId = aMeshId;
 }
 
-void DriverMED_R_SMDS_Mesh::Add() {
+void DriverMED_R_SMDS_Mesh::Add()
+{
 	;
 }
 
-void DriverMED_R_SMDS_Mesh::Read() {
+void DriverMED_R_SMDS_Mesh::Read()
+{
 
 	med_err ret = 0;
-  int i,j,k,l;
+	int i, j, k, l;
 	int numero;
 	char message[200];
-  Standard_Boolean ok;
+	bool ok;
 	/* nombre d'objets MED */
-  char nom_universel[MED_TAILLE_LNOM+1];
+	char nom_universel[MED_TAILLE_LNOM + 1];
 	med_int long_fichier_en_tete;
 	char *fichier_en_tete;
 	char version_hdf[10];
 	char version_med[10];
-  med_int nmaa,mdim,nnoe;
+	med_int nmaa, mdim, nnoe;
-  med_int nmai[MED_NBR_GEOMETRIE_MAILLE],nfac[MED_NBR_GEOMETRIE_FACE];
+	med_int nmai[MED_NBR_GEOMETRIE_MAILLE], nfac[MED_NBR_GEOMETRIE_FACE];
 	med_int nare[MED_NBR_GEOMETRIE_ARETE];
 	/* nom du maillage */
-  char nommaa[MED_TAILLE_NOM+1];
+	char nommaa[MED_TAILLE_NOM + 1];
 	/* noeuds */
 	med_float *coo;
-  char nomcoo[3*MED_TAILLE_PNOM+1];
+	char nomcoo[3 * MED_TAILLE_PNOM + 1];
-  char unicoo[3*MED_TAILLE_PNOM+1];
+	char unicoo[3 * MED_TAILLE_PNOM + 1];
 	char *nomnoe;
 	med_int *numnoe;
 	med_int *nufano;
 	med_repere rep;
-  med_booleen inonoe,inunoe;
+	med_booleen inonoe, inunoe;
 	med_mode_switch mode_coo;
-  char str[MED_TAILLE_PNOM+1];
+	char str[MED_TAILLE_PNOM + 1];
 	/* elements */
 	med_int nsup;
 	med_int edim;
@@ -98,17 +106,20 @@ void DriverMED_R_SMDS_Mesh::Read() {
 	med_booleen inoele, inuele;
 	med_connectivite typ_con;
 	med_geometrie_element typgeo;
-  med_geometrie_element typmai[MED_NBR_GEOMETRIE_MAILLE] = {MED_POINT1,MED_SEG2, 
+	med_geometrie_element typmai[MED_NBR_GEOMETRIE_MAILLE] =
-						   MED_SEG3,MED_TRIA3,
+		{ MED_POINT1, MED_SEG2,
-						   MED_TRIA6,MED_QUAD4,
+		MED_SEG3, MED_TRIA3,
-						   MED_QUAD8,MED_TETRA4,
+		MED_TRIA6, MED_QUAD4,
-						   MED_TETRA10,MED_HEXA8,
+		MED_QUAD8, MED_TETRA4,
-						   MED_HEXA20,MED_PENTA6,
+		MED_TETRA10, MED_HEXA8,
-						   MED_PENTA15,MED_PYRA5,
+		MED_HEXA20, MED_PENTA6,
-						   MED_PYRA13};
+		MED_PENTA15, MED_PYRA5,
-  med_int desmai[MED_NBR_GEOMETRIE_MAILLE] = {0,2,3,3,3,4,4,4,4,6,6,5,5,5,5};
+		MED_PYRA13
+	};
+	med_int desmai[MED_NBR_GEOMETRIE_MAILLE] =
+		{ 0, 2, 3, 3, 3, 4, 4, 4, 4, 6, 6, 5, 5, 5, 5 };
 	med_int nmailles[MED_NBR_GEOMETRIE_MAILLE];
-  char nommai[MED_NBR_GEOMETRIE_MAILLE] [MED_TAILLE_NOM+1] = {"MED_POINT1",
+	char nommai[MED_NBR_GEOMETRIE_MAILLE][MED_TAILLE_NOM + 1] = { "MED_POINT1",
 		"MED_SEG2",
 		"MED_SEG3",
 		"MED_TRIA3",
@@ -122,42 +133,50 @@ void DriverMED_R_SMDS_Mesh::Read() {
 		"MED_PENTA6",
 		"MED_PENTA15",
 		"MED_PYRA5",
-							  "MED_PYRA13"};
+		"MED_PYRA13"
-  med_geometrie_element typfac[MED_NBR_GEOMETRIE_FACE] = {MED_TRIA3,MED_TRIA6,
+	};
-						 MED_QUAD4,MED_QUAD8};
+	med_geometrie_element typfac[MED_NBR_GEOMETRIE_FACE] =
-  med_int desfac[MED_NBR_GEOMETRIE_FACE] = {3,3,4,4};
+		{ MED_TRIA3, MED_TRIA6,
+		MED_QUAD4, MED_QUAD8
+	};
+	med_int desfac[MED_NBR_GEOMETRIE_FACE] = { 3, 3, 4, 4 };
 	med_int nfaces[MED_NBR_GEOMETRIE_FACE];
-  char nomfac[MED_NBR_GEOMETRIE_FACE][MED_TAILLE_NOM+1] = {"MED_TRIA3","MED_TRIA6",
+	char nomfac[MED_NBR_GEOMETRIE_FACE][MED_TAILLE_NOM + 1] =
-						       "MED_QUAD4","MED_QUAD8"};
+		{ "MED_TRIA3", "MED_TRIA6",
-  med_geometrie_element typare[MED_NBR_GEOMETRIE_ARETE] = {MED_SEG2,MED_SEG3};
+		"MED_QUAD4", "MED_QUAD8"
-  med_int desare[MED_NBR_GEOMETRIE_ARETE] = {2,3};
+	};
+	med_geometrie_element typare[MED_NBR_GEOMETRIE_ARETE] =
+		{ MED_SEG2, MED_SEG3 };
+	med_int desare[MED_NBR_GEOMETRIE_ARETE] = { 2, 3 };
 	med_int naretes[MED_NBR_GEOMETRIE_ARETE];
-  char nomare[MED_NBR_GEOMETRIE_ARETE] [MED_TAILLE_NOM+1] = {"MED_SEG2","MED_SEG3"};
+	char nomare[MED_NBR_GEOMETRIE_ARETE][MED_TAILLE_NOM + 1] =
+		{ "MED_SEG2", "MED_SEG3" };
 	/* familles */
 	med_int nfam;
-  med_int natt,ngro;
+	med_int natt, ngro;
-  char *attdes,*gro;
+	char *attdes, *gro;
-  med_int *attval,*attide;
+	med_int *attval, *attide;
-  char nomfam[MED_TAILLE_NOM+1];
+	char nomfam[MED_TAILLE_NOM + 1];
 	med_int numfam;
-  char str1[MED_TAILLE_DESC+1];
+	char str1[MED_TAILLE_DESC + 1];
-  char str2[MED_TAILLE_LNOM+1];
+	char str2[MED_TAILLE_LNOM + 1];
 
-  char* file2Read;
+	char *file2Read;
 	bool locally_managed;
 	SCRUTE(myFileId);
-  if (myFileId==-1) 
+	if (myFileId == -1)
 		locally_managed = true;
 	else
 		locally_managed = false;
 
 	if (locally_managed)
 	{
-    file2Read = (char*)myFile.c_str();
+		file2Read = (char *)myFile.c_str();
-    myFileId = MEDouvrir(file2Read,MED_LECT);
+		myFileId = MEDouvrir(file2Read, MED_LECT);
 		if (myFileId < 0)
 		{
-	fprintf(stderr,">> ERREUR : ouverture du fichier %s \n",file2Read);
+			fprintf(stderr, ">> ERREUR : ouverture du fichier %s \n",
+				file2Read);
 			exit(EXIT_FAILURE);
 		}
 		numero = 1;
@@ -168,120 +187,130 @@ void DriverMED_R_SMDS_Mesh::Read() {
 	typ_con = MED_NOD;
 	mode_coo = MED_FULL_INTERLACE;
 
-
   /****************************************************************************
   *                       NOMBRES D'OBJETS MED                                *
   ****************************************************************************/
-  fprintf(stdout,"\n(****************************)\n");
+	fprintf(stdout, "\n(****************************)\n");
-  fprintf(stdout,"(* INFORMATIONS GENERALES : *)\n");
+	fprintf(stdout, "(* INFORMATIONS GENERALES : *)\n");
-  fprintf(stdout,"(****************************)\n");
+	fprintf(stdout, "(****************************)\n");
 
 	/* lecture du nom et de la dimension du maillage */
-  fprintf(stdout,"%d %d\n",myFileId,numero);
+	fprintf(stdout, "%d %d\n", myFileId, numero);
-  ret = MEDmaaInfo(myFileId,numero,nommaa,&mdim);
+	ret = MEDmaaInfo(myFileId, numero, nommaa, &mdim);
-  fprintf(stdout,"%d\n",ret);
+	fprintf(stdout, "%d\n", ret);
 	if (ret < 0)
 	{
-      fprintf(stderr,">> ERREUR : lecture du nom du maillage \n");
+		fprintf(stderr, ">> ERREUR : lecture du nom du maillage \n");
 		exit(EXIT_FAILURE);
 	}
-  fprintf(stdout,"- Nom du maillage : <<%s>>\n",nommaa);
+	fprintf(stdout, "- Nom du maillage : <<%s>>\n", nommaa);
-  fprintf(stdout,"- Dimension du maillage : %d\n",mdim);
+	fprintf(stdout, "- Dimension du maillage : %d\n", mdim);
 
 	/* Combien de noeuds ? */
-  nnoe = MEDnEntMaa(myFileId,nommaa,MED_COOR,MED_NOEUD,MED_POINT1,typ_con);
+	nnoe =
+		MEDnEntMaa(myFileId, nommaa, MED_COOR, MED_NOEUD, MED_POINT1, typ_con);
 	if (nnoe < 0)
 	{
-      fprintf(stderr,">> ERREUR : lecture du nombre de noeuds \n");
+		fprintf(stderr, ">> ERREUR : lecture du nombre de noeuds \n");
 		exit(EXIT_FAILURE);
 	}
-  fprintf(stdout,"- Nombre de noeuds : %d \n",nnoe);
+	fprintf(stdout, "- Nombre de noeuds : %d \n", nnoe);
 
 	/* Combien de mailles, faces ou aretes ? */
-  for (i=0;i<MED_NBR_GEOMETRIE_MAILLE;i++)
+	for (i = 0; i < MED_NBR_GEOMETRIE_MAILLE; i++)
 	{
-      nmailles[i] = MEDnEntMaa(myFileId,nommaa,MED_CONN,MED_MAILLE,typmai[i],
+		nmailles[i] =
+			MEDnEntMaa(myFileId, nommaa, MED_CONN, MED_MAILLE, typmai[i],
 			typ_con);
 		if (nmailles[i] < 0)
 		{
-	  fprintf(stderr,">> ERREUR : lecture du nombre de mailles \n");
+			fprintf(stderr, ">> ERREUR : lecture du nombre de mailles \n");
 			exit(EXIT_FAILURE);
 		}
-      fprintf (stdout,"- Nombre de mailles de type %s : %d \n",nommai[i],nmailles[i]);
+		fprintf(stdout, "- Nombre de mailles de type %s : %d \n", nommai[i],
+			nmailles[i]);
 	}
 
-  for (i=0;i<MED_NBR_GEOMETRIE_FACE;i++)
+	for (i = 0; i < MED_NBR_GEOMETRIE_FACE; i++)
 	{
-      nfaces[i] = MEDnEntMaa(myFileId,nommaa,MED_CONN,MED_FACE,typfac[i],
+		nfaces[i] = MEDnEntMaa(myFileId, nommaa, MED_CONN, MED_FACE, typfac[i],
 			typ_con);
 		if (nfaces[i] < 0)
 		{
-	  fprintf(stderr,">> ERREUR : lecture du nombre de faces \n");
+			fprintf(stderr, ">> ERREUR : lecture du nombre de faces \n");
 			exit(EXIT_FAILURE);
 		}
-      fprintf (stdout,"- Nombre de faces de type %s : %d \n",nomfac[i],nfaces[i]);
+		fprintf(stdout, "- Nombre de faces de type %s : %d \n", nomfac[i],
+			nfaces[i]);
 	}
 
-  for (i=0;i<MED_NBR_GEOMETRIE_ARETE;i++)
+	for (i = 0; i < MED_NBR_GEOMETRIE_ARETE; i++)
 	{
-      naretes[i] = MEDnEntMaa(myFileId,nommaa,MED_CONN,MED_ARETE,typare[i],
+		naretes[i] =
+			MEDnEntMaa(myFileId, nommaa, MED_CONN, MED_ARETE, typare[i],
 			typ_con);
 		if (naretes[i] < 0)
 		{
-	  fprintf(stderr,">> ERREUR : lecture du nombre d'aretes \n");
+			fprintf(stderr, ">> ERREUR : lecture du nombre d'aretes \n");
 			exit(EXIT_FAILURE);
 		}
-      fprintf (stdout,"- Nombre d'aretes de type %s : %d \n",nomare[i],naretes[i]);
+		fprintf(stdout, "- Nombre d'aretes de type %s : %d \n", nomare[i],
+			naretes[i]);
 	}
 
 	/* nombre de familles */
-  nfam = MEDnFam(myFileId,nommaa,0,MED_FAMILLE);
+	nfam = MEDnFam(myFileId, nommaa, 0, MED_FAMILLE);
 	if (nfam < 0)
 	{
-      fprintf(stderr,">> ERREUR : lecture du nombre de familles \n");
+		fprintf(stderr, ">> ERREUR : lecture du nombre de familles \n");
 		exit(EXIT_FAILURE);
 	}
-  fprintf(stdout,"- Nombre de familles : %d \n",nfam);
+	fprintf(stdout, "- Nombre de familles : %d \n", nfam);
 
   /****************************************************************************
   *                       LECTURE DES NOEUDS                                  *
   ****************************************************************************/
-  fprintf(stdout,"\n(************************)\n");
+	fprintf(stdout, "\n(************************)\n");
-  fprintf(stdout,"(* NOEUDS DU MAILLAGE : *)\n");
+	fprintf(stdout, "(* NOEUDS DU MAILLAGE : *)\n");
-  fprintf(stdout,"(************************)\n");
+	fprintf(stdout, "(************************)\n");
 
 	/* Allocations memoires */
 	/* table des coordonnees 
-     profil : (dimension * nombre de noeuds ) */
+	 * profil : (dimension * nombre de noeuds ) */
-  coo = (med_float*) malloc(sizeof(med_float)*nnoe*mdim);
+	coo = (med_float *) malloc(sizeof(med_float) * nnoe * mdim);
 	/* table  des numeros, des numeros de familles des noeuds
-     profil : (nombre de noeuds) */
+	 * profil : (nombre de noeuds) */
-  numnoe = (med_int*) malloc(sizeof(med_int)*nnoe);
+	numnoe = (med_int *) malloc(sizeof(med_int) * nnoe);
-  nufano = (med_int*) malloc(sizeof(med_int)*nnoe);
+	nufano = (med_int *) malloc(sizeof(med_int) * nnoe);
 	/* table des noms des noeuds 
-     profil : (nnoe*MED_TAILLE_PNOM+1) */
+	 * profil : (nnoe*MED_TAILLE_PNOM+1) */
-  nomnoe = (char*) malloc(MED_TAILLE_PNOM*nnoe+1);
+	nomnoe = (char *)malloc(MED_TAILLE_PNOM * nnoe + 1);
 
 	/* lecture des noeuds : 
-     - coordonnees
+	 * - coordonnees
-     - noms (optionnel dans un fichier MED) 
+	 * - noms (optionnel dans un fichier MED) 
-     - numeros (optionnel dans un fichier MED) 
+	 * - numeros (optionnel dans un fichier MED) 
-     - numeros des familles */
+	 * - numeros des familles */
-  ret = MEDnoeudsLire(myFileId,nommaa,mdim,coo,mode_coo,&rep,
+	ret = MEDnoeudsLire(myFileId, nommaa, mdim, coo, mode_coo, &rep,
-		      nomcoo,unicoo,nomnoe,&inonoe,numnoe,&inunoe,
+		nomcoo, unicoo, nomnoe, &inonoe, numnoe, &inunoe, nufano, nnoe);
-		      nufano,nnoe);
 	if (ret < 0)
-    strcpy(message,">> ERREUR : lecture des noeuds \n");
+		strcpy(message, ">> ERREUR : lecture des noeuds \n");
 
-  if (inunoe) {
+	if (inunoe)
-    for (int i=0;i<nnoe;i++) {
+	{
-      ok = myMesh->AddNodeWithID(coo[i*3],coo[i*3+1],coo[i*3+2],numnoe[i]);
+		for (int i = 0; i < nnoe; i++)
+		{
+			ok = myMesh->AddNodeWithID(coo[i * 3], coo[i * 3 + 1],
+				coo[i * 3 + 2], numnoe[i]);
 			//fprintf(Out,"%d %f %f %f\n",numnoe[i],coo[i*3],coo[i*3+1],coo[i*3+2]);
 		}
 	}
-  else {
+	else
-    for (int i=0;i<nnoe;i++) {
+	{
-      ok = myMesh->AddNodeWithID(coo[i*3],coo[i*3+1],coo[i*3+2],i+1);
+		for (int i = 0; i < nnoe; i++)
+		{
+			ok = myMesh->AddNodeWithID(coo[i * 3], coo[i * 3 + 1],
+				coo[i * 3 + 2], i + 1);
 			//fprintf(Out,"%d %f %f %f\n",numnoe[i],coo[i*3],coo[i*3+1],i);
 		}
 	}
@@ -302,15 +331,15 @@ void DriverMED_R_SMDS_Mesh::Read() {
   /****************************************************************************
   *                       LECTURE DES ELEMENTS                                *
   ****************************************************************************/
-  fprintf(stdout,"\n(**************************)\n");
+	fprintf(stdout, "\n(**************************)\n");
-  fprintf(stdout,"(* ELEMENTS DU MAILLAGE : *)\n");
+	fprintf(stdout, "(* ELEMENTS DU MAILLAGE : *)\n");
-  fprintf(stdout,"(**************************)");
+	fprintf(stdout, "(**************************)");
 	//fprintf(Out,"CELLS\n");
 	/* Lecture des connectivites, noms, numeros des mailles */
 	//printf("%d %d %d %d\n",nmailles[3],nmailles[4],nmailles[5],nmailles[9]);
 
 	if (ret == 0)
-    for (i=0;i<MED_NBR_GEOMETRIE_MAILLE;i++)
+		for (i = 0; i < MED_NBR_GEOMETRIE_MAILLE; i++)
 		{
 			if (nmailles[i] > 0 && ret == 0)
 			{
@@ -324,97 +353,150 @@ void DriverMED_R_SMDS_Mesh::Read() {
 					if (edim == 2)
 						nsup = 1;
 
-	    taille = nsup+typmai[i]%100;
+				taille = nsup + typmai[i] % 100;
 				//taille = typmai[i]%100;
 
 				/* allocation memoire */
-	    connectivite = (med_int*)malloc(sizeof(med_int)*
+				connectivite = (med_int *) malloc(sizeof(med_int) *
-					    taille*nmailles[i]);
+					taille * nmailles[i]);
-	    nomele = (char*)malloc(sizeof(char)*MED_TAILLE_PNOM*
+				nomele = (char *)malloc(sizeof(char) * MED_TAILLE_PNOM *
-				   nmailles[i]+1);
+					nmailles[i] + 1);
-	    numele = (med_int*)malloc(sizeof(med_int)*
+				numele = (med_int *) malloc(sizeof(med_int) * nmailles[i]);
-				      nmailles[i]);
+				nufael = (med_int *) malloc(sizeof(med_int) * nmailles[i]);
-	    nufael = (med_int*)malloc(sizeof(med_int)*
-				      nmailles[i]);
 
 				/* lecture des données */
-	    ret = MEDelementsLire(myFileId,nommaa,mdim,connectivite,mode_coo,
+				ret =
-				  nomele,&inoele,numele,&inuele,nufael,
+					MEDelementsLire(myFileId, nommaa, mdim, connectivite,
-				  nmailles[i],MED_MAILLE,typmai[i],
+					mode_coo, nomele, &inoele, numele, &inuele, nufael,
-				  typ_con);
+					nmailles[i], MED_MAILLE, typmai[i], typ_con);
 				SCRUTE(typmai[i]);
 				switch (typmai[i])
 				{
-	      case MED_SEG2  : {
+				case MED_SEG2:
-		if (inuele) {
+				{
-		  for (j=0;j<nmailles[i];j++) {
+					if (inuele)
-		    elem_id=*(numele+j);
+					{
-		    ok = myMesh->AddEdgeWithID(*(connectivite+j*(taille)),*(connectivite+j*(taille)+1),elem_id);
+						for (j = 0; j < nmailles[i]; j++)
+						{
+							elem_id = *(numele + j);
+							ok = myMesh->AddEdgeWithID(*(connectivite +
+									j * (taille)),
+								*(connectivite + j * (taille) + 1), elem_id);
 						}
 					}
-		else {
+					else
-		  for (j=0;j<nmailles[i];j++) {
+					{
+						for (j = 0; j < nmailles[i]; j++)
+						{
 							cmpt++;
-		    ok = myMesh->AddEdgeWithID(*(connectivite+j*(taille)),*(connectivite+j*(taille)+1),cmpt);
+							ok = myMesh->AddEdgeWithID(*(connectivite +
+									j * (taille)),
+								*(connectivite + j * (taille) + 1), cmpt);
 						}
 					}
 
 					break;
 				}
-	      case MED_TRIA3  : {
+				case MED_TRIA3:
-		if (inuele) {
+				{
-		  for (j=0;j<nmailles[i];j++) {
+					if (inuele)
-		    elem_id=*(numele+j);
+					{
-		    ok = myMesh->AddFaceWithID(*(connectivite+j*(taille)),*(connectivite+j*(taille)+1),*(connectivite+j*(taille)+2),elem_id);
+						for (j = 0; j < nmailles[i]; j++)
+						{
+							elem_id = *(numele + j);
+							ok = myMesh->AddFaceWithID(*(connectivite +
+									j * (taille)),
+								*(connectivite + j * (taille) + 1),
+								*(connectivite + j * (taille) + 2), elem_id);
 							//fprintf(Out,"%d %d %d %d\n",elem_id,*(connectivite+j*(taille-nsup)),*(connectivite+j*(taille-nsup)+1),*(connectivite+j*(taille-nsup)+2));
 						}
 					}
-		else {
+					else
-		  for (j=0;j<nmailles[i];j++) {
+					{
+						for (j = 0; j < nmailles[i]; j++)
+						{
 							cmpt++;
-		    ok = myMesh->AddFaceWithID(*(connectivite+j*(taille)),*(connectivite+j*(taille)+1),*(connectivite+j*(taille)+2),cmpt);
+							ok = myMesh->AddFaceWithID(*(connectivite +
+									j * (taille)),
+								*(connectivite + j * (taille) + 1),
+								*(connectivite + j * (taille) + 2), cmpt);
 							//fprintf(Out,"%d %d %d %d\n",j,*(connectivite+j*(taille)),*(connectivite+j*(taille)+1),*(connectivite+j*(taille)+2));
 						}
 					}
 
 					break;
 				}
-	      case MED_QUAD4  : {
+				case MED_QUAD4:
-		if (inuele) {
+				{
-		  for (j=0;j<nmailles[i];j++) {
+					if (inuele)
-		    elem_id=*(numele+j);
+					{
-		    ok = myMesh->AddFaceWithID(*(connectivite+j*(taille)),*(connectivite+j*(taille)+1),*(connectivite+j*(taille)+2),*(connectivite+j*(taille)+3),elem_id);
+						for (j = 0; j < nmailles[i]; j++)
+						{
+							elem_id = *(numele + j);
+							ok = myMesh->AddFaceWithID(*(connectivite +
+									j * (taille)),
+								*(connectivite + j * (taille) + 1),
+								*(connectivite + j * (taille) + 2),
+								*(connectivite + j * (taille) + 3), elem_id);
 							//fprintf(Out,"%d %d %d %d\n",elem_id,*(connectivite+j*(taille-nsup)),*(connectivite+j*(taille-nsup)+1),*(connectivite+j*(taille-nsup)+2),*(connectivite+j*(taille-nsup)+3));
 						}
 					}
-		else {
+					else
-		  for (j=0;j<nmailles[i];j++) {
+					{
+						for (j = 0; j < nmailles[i]; j++)
+						{
 							cmpt++;
-		    ok = myMesh->AddFaceWithID(*(connectivite+j*(taille)),*(connectivite+j*(taille)+1),*(connectivite+j*(taille)+2),*(connectivite+j*(taille)+3),cmpt);
+							ok = myMesh->AddFaceWithID(*(connectivite +
+									j * (taille)),
+								*(connectivite + j * (taille) + 1),
+								*(connectivite + j * (taille) + 2),
+								*(connectivite + j * (taille) + 3), cmpt);
 							//fprintf(Out,"%d %d %d %d\n",j,*(connectivite+j*(taille)),*(connectivite+j*(taille)+1),*(connectivite+j*(taille)+2),*(connectivite+j*(taille)+3));
 						}
 					}
 					break;
 				}
-	      case MED_HEXA8  : {
+				case MED_HEXA8:
-		if (inuele) {
+				{
-		  for (j=0;j<nmailles[i];j++) {
+					if (inuele)
-		    elem_id=*(numele+j);
+					{
-		    ok = myMesh->AddVolumeWithID(*(connectivite+j*(taille)),*(connectivite+j*(taille)+1),*(connectivite+j*(taille)+2),*(connectivite+j*(taille)+3),*(connectivite+j*(taille)+4),*(connectivite+j*(taille)+5),*(connectivite+j*(taille)+6),*(connectivite+j*(taille)+7),elem_id);
+						for (j = 0; j < nmailles[i]; j++)
+						{
+							elem_id = *(numele + j);
+							ok = myMesh->AddVolumeWithID(*(connectivite +
+									j * (taille)),
+								*(connectivite + j * (taille) + 1),
+								*(connectivite + j * (taille) + 2),
+								*(connectivite + j * (taille) + 3),
+								*(connectivite + j * (taille) + 4),
+								*(connectivite + j * (taille) + 5),
+								*(connectivite + j * (taille) + 6),
+								*(connectivite + j * (taille) + 7), elem_id);
 							//fprintf(Out,"%d %d %d %d\n",elem_id,*(connectivite+j*(taille-nsup)),*(connectivite+j*(taille-nsup)+1),*(connectivite+j*(taille-nsup)+2),*(connectivite+j*(taille-nsup)+3),*(connectivite+j*(taille-nsup)+4),*(connectivite+j*(taille-nsup)+5),*(connectivite+j*(taille-nsup)+6),*(connectivite+j*(taille-nsup)+7));
 						}
 					}
-		else {
+					else
-		  for (j=0;j<nmailles[i];j++) {
+					{
+						for (j = 0; j < nmailles[i]; j++)
+						{
 							cmpt++;
-		    ok = myMesh->AddVolumeWithID(*(connectivite+j*(taille)),*(connectivite+j*(taille)+1),*(connectivite+j*(taille)+2),*(connectivite+j*(taille)+3),*(connectivite+j*(taille)+4),*(connectivite+j*(taille)+5),*(connectivite+j*(taille)+6),*(connectivite+j*(taille)+7),cmpt);
+							ok = myMesh->AddVolumeWithID(*(connectivite +
+									j * (taille)),
+								*(connectivite + j * (taille) + 1),
+								*(connectivite + j * (taille) + 2),
+								*(connectivite + j * (taille) + 3),
+								*(connectivite + j * (taille) + 4),
+								*(connectivite + j * (taille) + 5),
+								*(connectivite + j * (taille) + 6),
+								*(connectivite + j * (taille) + 7), cmpt);
 							//fprintf(Out,"%d %d %d %d\n",j,*(connectivite+j*(taille)),*(connectivite+j*(taille)+1),*(connectivite+j*(taille)+2),*(connectivite+j*(taille)+3),*(connectivite+j*(taille)+4),*(connectivite+j*(taille)+5),*(connectivite+j*(taille)+6),*(connectivite+j*(taille)+7));
 						}
 					}
 					break;
 				}
-	      default : {
+				default:
-		break ;
+				{
+					break;
 				}
 				}
 
@@ -439,11 +521,11 @@ void DriverMED_R_SMDS_Mesh::Read() {
 	printf("(* FAMILLES DU MAILLAGE : *)\n");
 	printf("(*************************)\n");
 	if (ret == 0)
-    for (i=0;i<nfam;i++)
+		for (i = 0; i < nfam; i++)
 		{
 
 			/* nombre de groupes */
-	ngro = MEDnFam(myFileId,nommaa,i+1,MED_GROUPE);
+			ngro = MEDnFam(myFileId, nommaa, i + 1, MED_GROUPE);
 			if (ngro < 0)
 			{
 				ret = -1;
@@ -454,7 +536,7 @@ void DriverMED_R_SMDS_Mesh::Read() {
 			/* nombre d'attributs */
 			if (ret == 0)
 			{
-	    natt = MEDnFam(myFileId,nommaa,i+1,MED_ATTR);
+				natt = MEDnFam(myFileId, nommaa, i + 1, MED_ATTR);
 				if (natt < 0)
 				{
 					ret = -1;
@@ -464,35 +546,39 @@ void DriverMED_R_SMDS_Mesh::Read() {
 			}
 
 			if (ret == 0)
-	  fprintf(stdout,"- Famille %d a %d attributs et %d groupes \n",i+1,natt,ngro); 
+				fprintf(stdout, "- Famille %d a %d attributs et %d groupes \n",
+					i + 1, natt, ngro);
 
 			/* nom,numero,attributs,groupes */
 			if (ret == 0)
 			{
-	    attide = (med_int*) malloc(sizeof(med_int)*natt);
+				attide = (med_int *) malloc(sizeof(med_int) * natt);
-	    attval = (med_int*) malloc(sizeof(med_int)*natt);	    
+				attval = (med_int *) malloc(sizeof(med_int) * natt);
-	    attdes = (char *) malloc(MED_TAILLE_DESC*natt+1);
+				attdes = (char *)malloc(MED_TAILLE_DESC * natt + 1);
-	    gro = (char*) malloc(MED_TAILLE_LNOM*ngro+1);
+				gro = (char *)malloc(MED_TAILLE_LNOM * ngro + 1);
-	    ret = MEDfamInfo(myFileId,nommaa,i+1,nomfam,&numfam,attide,attval,
+				ret =
-			     attdes,&natt,gro,&ngro);
+					MEDfamInfo(myFileId, nommaa, i + 1, nomfam, &numfam, attide,
-	    fprintf(stdout,"  - Famille de nom %s et de numero %d : \n",nomfam,numfam);
+					attval, attdes, &natt, gro, &ngro);
-	    fprintf(stdout,"  - Attributs : \n");
+				fprintf(stdout, "  - Famille de nom %s et de numero %d : \n",
-	    for (j=0;j<natt;j++)
+					nomfam, numfam);
+				fprintf(stdout, "  - Attributs : \n");
+				for (j = 0; j < natt; j++)
 				{
-		strncpy(str1,attdes+j*MED_TAILLE_DESC,MED_TAILLE_DESC);
+					strncpy(str1, attdes + j * MED_TAILLE_DESC,
+						MED_TAILLE_DESC);
 					str1[MED_TAILLE_DESC] = '\0';
-		fprintf(stdout,"   ide = %d - val = %d - des = %s\n",*(attide+j),
+					fprintf(stdout, "   ide = %d - val = %d - des = %s\n",
-		       *(attval+j),str1);
+						*(attide + j), *(attval + j), str1);
 				}
 				free(attide);
 				free(attval);
 				free(attdes);
-            fprintf(stdout,"  - Groupes :\n");
+				fprintf(stdout, "  - Groupes :\n");
-	    for (j=0;j<ngro;j++)
+				for (j = 0; j < ngro; j++)
 				{
-		strncpy(str2,gro+j*MED_TAILLE_LNOM,MED_TAILLE_LNOM);
+					strncpy(str2, gro + j * MED_TAILLE_LNOM, MED_TAILLE_LNOM);
 					str2[MED_TAILLE_LNOM] = '\0';
-		fprintf(stdout,"   gro = %s\n",str2);
+					fprintf(stdout, "   gro = %s\n", str2);
 				}
 				free(gro);
 			}

src/DriverMED/DriverMED_R_SMDS_Mesh.h

@@ -35,22 +35,21 @@ extern "C"
 #include <med.h>
 }
 
-class DriverMED_R_SMDS_Mesh : public Mesh_Reader {
+class DriverMED_R_SMDS_Mesh:public Mesh_Reader
+{
 
-  public :
+  public:DriverMED_R_SMDS_Mesh();
-    DriverMED_R_SMDS_Mesh();
 	~DriverMED_R_SMDS_Mesh();
 
 	void Add();
 	void Read();
-    void SetMesh(Handle(SMDS_Mesh)& aMesh);
+	void SetMesh(SMDS_Mesh * aMesh);
 	void SetFile(string);
 
 	void SetFileId(med_idt);
 	void SetMeshId(int);
 
-private :
+  private:  SMDS_Mesh * myMesh;
-    Handle_SMDS_Mesh myMesh;
 	string myFile;
 	med_idt myFileId;
 	int myMeshId;

src/DriverMED/DriverMED_R_SMESHDS_Document.cxx

@@ -29,42 +29,47 @@ using namespace std;
 #include "DriverMED_R_SMESHDS_Mesh.h"
 #include "utilities.h"
 
-extern "C" {
+extern "C"
-  Document_Reader* maker() {
+{
+	Document_Reader *maker()
+	{
 		return new DriverMED_R_SMESHDS_Document;
 	}
 }
 
-DriverMED_R_SMESHDS_Document::DriverMED_R_SMESHDS_Document() {
+DriverMED_R_SMESHDS_Document::DriverMED_R_SMESHDS_Document()
-;
+{
+	;
 }
 
-DriverMED_R_SMESHDS_Document::~DriverMED_R_SMESHDS_Document() {
+DriverMED_R_SMESHDS_Document::~DriverMED_R_SMESHDS_Document()
-;
+{
+	;
 }
 
 //void DriverMED_R_SMESHDS_Document::SetFile(string aFile) {
 //  myFile = aFile;
 //}
 
-void DriverMED_R_SMESHDS_Document::Read() {
+void DriverMED_R_SMESHDS_Document::Read()
+{
 
 	med_err ret = 0;
 	med_idt fid;
 	med_int nmaa;
 
-  Standard_Integer myMeshId;
+	int myMeshId;
 
 	//string myFile = string("/home/home_users/cai/projects/salome_prev04/SALOME_ROOT/data/fra1.med");
 
 /****************************************************************************
   *                      OUVERTURE DU FICHIER EN LECTURE                      *
   ****************************************************************************/
-  char* file2Read = (char*)myFile.c_str();
+	char *file2Read = (char *)myFile.c_str();
-  fid = MEDouvrir(file2Read,MED_LECT);
+	fid = MEDouvrir(file2Read, MED_LECT);
 	if (fid < 0)
 	{
-      fprintf(stderr,">> ERREUR : ouverture du fichier %s \n",file2Read);
+		fprintf(stderr, ">> ERREUR : ouverture du fichier %s \n", file2Read);
 		exit(EXIT_FAILURE);
 	}
 
@@ -74,26 +79,26 @@ void DriverMED_R_SMESHDS_Document::Read() {
 	nmaa = MEDnMaa(fid);
 	if (nmaa < 0)
 	{
-      fprintf(stderr,">> ERREUR : lecture du nombre de maillages \n");
+		fprintf(stderr, ">> ERREUR : lecture du nombre de maillages \n");
 		exit(EXIT_FAILURE);
 	}
-  printf("Nombre de maillages = %d\n",nmaa);
+	printf("Nombre de maillages = %d\n", nmaa);
 
 	string myClass = string("SMESHDS_Mesh");
 	string myExtension = string("MED");
 
-
+	for (int meshIt = 1; meshIt <= nmaa; meshIt++)
-  for (int meshIt=1;meshIt<=nmaa;meshIt++) {
+	{
 		myMeshId = myDocument->NewMesh();
-    printf("MeshId = %d\n",myMeshId);
+		printf("MeshId = %d\n", myMeshId);
 
-    Handle(SMDS_Mesh) myMesh = myDocument->GetMesh(myMeshId);
+		SMDS_Mesh * myMesh = myDocument->GetMesh(myMeshId);
 		SCRUTE(myMesh);
 
 		// Handle (SMDS_Mesh) MMM =.........
-    //ex Handle(SMESHDS_Mesh) myMesh2 =Handle(SMESHDS_Mesh)::DownCast(MMM);
+		//ex SMESHDS_Mesh * myMesh2 =SMESHDS_Mesh *::DownCast(MMM);
 
-    DriverMED_R_SMESHDS_Mesh* myReader = new DriverMED_R_SMESHDS_Mesh;
+		DriverMED_R_SMESHDS_Mesh *myReader = new DriverMED_R_SMESHDS_Mesh;
 
 		myReader->SetMesh(myMesh);
 		myReader->SetMeshId(myMeshId);
@@ -112,7 +117,7 @@ void DriverMED_R_SMESHDS_Document::Read() {
 	ret = MEDfermer(fid);
 
 	if (ret != 0)
-    fprintf(stderr,">> ERREUR : erreur a la fermeture du fichier %s\n",file2Read);
+		fprintf(stderr, ">> ERREUR : erreur a la fermeture du fichier %s\n",
-
+			file2Read);
 
 }

src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx

@@ -31,37 +31,44 @@ using namespace std;
 
 #include <stdlib.h>
 
-DriverMED_R_SMESHDS_Mesh::DriverMED_R_SMESHDS_Mesh() {
+DriverMED_R_SMESHDS_Mesh::DriverMED_R_SMESHDS_Mesh()
-  myFileId=-1;
+{
+	myFileId = -1;
 }
 
-DriverMED_R_SMESHDS_Mesh::~DriverMED_R_SMESHDS_Mesh() {
+DriverMED_R_SMESHDS_Mesh::~DriverMED_R_SMESHDS_Mesh()
-;
+{
+	;
 }
 
-void DriverMED_R_SMESHDS_Mesh::SetMesh(Handle(SMDS_Mesh)& aMesh) {
+void DriverMED_R_SMESHDS_Mesh::SetMesh(SMDS_Mesh * aMesh)
-  //myMesh = Handle(SMESHDS_Mesh)::DownCast(aMesh);
+{
+	//myMesh = SMESHDS_Mesh *::DownCast(aMesh);
 	myMesh = aMesh;
 }
 
-void DriverMED_R_SMESHDS_Mesh::SetFile(string aFile) {
+void DriverMED_R_SMESHDS_Mesh::SetFile(string aFile)
+{
 	myFile = aFile;
 }
 
-void DriverMED_R_SMESHDS_Mesh::SetFileId(med_idt aFileId) {
+void DriverMED_R_SMESHDS_Mesh::SetFileId(med_idt aFileId)
+{
 	myFileId = aFileId;
 }
 
-void DriverMED_R_SMESHDS_Mesh::SetMeshId(int aMeshId) {
+void DriverMED_R_SMESHDS_Mesh::SetMeshId(int aMeshId)
+{
 	myMeshId = aMeshId;
 }
 
-void DriverMED_R_SMESHDS_Mesh::Read() {
+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;
+	DriverMED_R_SMDS_Mesh *myReader = new DriverMED_R_SMDS_Mesh;
 
 	myReader->SetMesh(myMesh);
 	myReader->SetMeshId(myMeshId);
@@ -72,12 +79,13 @@ void DriverMED_R_SMESHDS_Mesh::Read() {
 
 }
 
-void DriverMED_R_SMESHDS_Mesh::Add() {
+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;
+	DriverMED_R_SMDS_Mesh *myReader = new DriverMED_R_SMDS_Mesh;
 
 	myReader->SetMesh(myMesh);
 	myReader->SetMeshId(myMeshId);
@@ -89,35 +97,36 @@ void DriverMED_R_SMESHDS_Mesh::Add() {
 
 }
 
-void DriverMED_R_SMESHDS_Mesh::ReadMySelf() {
+void DriverMED_R_SMESHDS_Mesh::ReadMySelf()
+{
 
 	med_err ret = 0;
-  int i,j,k,l;
+	int i, j, k, l;
 	int numero;
 	char message[200];
-  Standard_Boolean ok;
+	bool ok;
 	/* nombre d'objets MED */
-  char nom_universel[MED_TAILLE_LNOM+1];
+	char nom_universel[MED_TAILLE_LNOM + 1];
 	med_int long_fichier_en_tete;
 	char *fichier_en_tete;
 	char version_hdf[10];
 	char version_med[10];
-  med_int nmaa,mdim,nnoe;
+	med_int nmaa, mdim, nnoe;
-  med_int nmai[MED_NBR_GEOMETRIE_MAILLE],nfac[MED_NBR_GEOMETRIE_FACE];
+	med_int nmai[MED_NBR_GEOMETRIE_MAILLE], nfac[MED_NBR_GEOMETRIE_FACE];
 	med_int nare[MED_NBR_GEOMETRIE_ARETE];
 	/* nom du maillage */
-  char nommaa[MED_TAILLE_NOM+1];
+	char nommaa[MED_TAILLE_NOM + 1];
 	/* noeuds */
 	med_float *coo;
-  char nomcoo[3*MED_TAILLE_PNOM+1];
+	char nomcoo[3 * MED_TAILLE_PNOM + 1];
-  char unicoo[3*MED_TAILLE_PNOM+1];
+	char unicoo[3 * MED_TAILLE_PNOM + 1];
 	char *nomnoe;
 	med_int *numnoe;
 	med_int *nufano;
 	med_repere rep;
-  med_booleen inonoe,inunoe;
+	med_booleen inonoe, inunoe;
 	med_mode_switch mode_coo;
-  char str[MED_TAILLE_PNOM+1];
+	char str[MED_TAILLE_PNOM + 1];
 	/* elements */
 	med_int nsup;
 	med_int edim;
@@ -131,17 +140,20 @@ void DriverMED_R_SMESHDS_Mesh::ReadMySelf() {
 	med_booleen inoele, inuele;
 	med_connectivite typ_con;
 	med_geometrie_element typgeo;
-  med_geometrie_element typmai[MED_NBR_GEOMETRIE_MAILLE] = {MED_POINT1,MED_SEG2, 
+	med_geometrie_element typmai[MED_NBR_GEOMETRIE_MAILLE] =
-						   MED_SEG3,MED_TRIA3,
+		{ MED_POINT1, MED_SEG2,
-						   MED_TRIA6,MED_QUAD4,
+		MED_SEG3, MED_TRIA3,
-						   MED_QUAD8,MED_TETRA4,
+		MED_TRIA6, MED_QUAD4,
-						   MED_TETRA10,MED_HEXA8,
+		MED_QUAD8, MED_TETRA4,
-						   MED_HEXA20,MED_PENTA6,
+		MED_TETRA10, MED_HEXA8,
-						   MED_PENTA15,MED_PYRA5,
+		MED_HEXA20, MED_PENTA6,
-						   MED_PYRA13};
+		MED_PENTA15, MED_PYRA5,
-  med_int desmai[MED_NBR_GEOMETRIE_MAILLE] = {0,2,3,3,3,4,4,4,4,6,6,5,5,5,5};
+		MED_PYRA13
+	};
+	med_int desmai[MED_NBR_GEOMETRIE_MAILLE] =
+		{ 0, 2, 3, 3, 3, 4, 4, 4, 4, 6, 6, 5, 5, 5, 5 };
 	med_int nmailles[MED_NBR_GEOMETRIE_MAILLE];
-  char nommai[MED_NBR_GEOMETRIE_MAILLE] [MED_TAILLE_NOM+1] = {"MED_POINT1",
+	char nommai[MED_NBR_GEOMETRIE_MAILLE][MED_TAILLE_NOM + 1] = { "MED_POINT1",
 		"MED_SEG2",
 		"MED_SEG3",
 		"MED_TRIA3",
@@ -155,186 +167,205 @@ void DriverMED_R_SMESHDS_Mesh::ReadMySelf() {
 		"MED_PENTA6",
 		"MED_PENTA15",
 		"MED_PYRA5",
-							  "MED_PYRA13"};
+		"MED_PYRA13"
-  med_geometrie_element typfac[MED_NBR_GEOMETRIE_FACE] = {MED_TRIA3,MED_TRIA6,
+	};
-						 MED_QUAD4,MED_QUAD8};
+	med_geometrie_element typfac[MED_NBR_GEOMETRIE_FACE] =
-  med_int desfac[MED_NBR_GEOMETRIE_FACE] = {3,3,4,4};
+		{ MED_TRIA3, MED_TRIA6,
+		MED_QUAD4, MED_QUAD8
+	};
+	med_int desfac[MED_NBR_GEOMETRIE_FACE] = { 3, 3, 4, 4 };
 	med_int nfaces[MED_NBR_GEOMETRIE_FACE];
-  char nomfac[MED_NBR_GEOMETRIE_FACE][MED_TAILLE_NOM+1] = {"MED_TRIA3","MED_TRIA6",
+	char nomfac[MED_NBR_GEOMETRIE_FACE][MED_TAILLE_NOM + 1] =
-						       "MED_QUAD4","MED_QUAD8"};
+		{ "MED_TRIA3", "MED_TRIA6",
-  med_geometrie_element typare[MED_NBR_GEOMETRIE_ARETE] = {MED_SEG2,MED_SEG3};
+		"MED_QUAD4", "MED_QUAD8"
-  med_int desare[MED_NBR_GEOMETRIE_ARETE] = {2,3};
+	};
+	med_geometrie_element typare[MED_NBR_GEOMETRIE_ARETE] =
+		{ MED_SEG2, MED_SEG3 };
+	med_int desare[MED_NBR_GEOMETRIE_ARETE] = { 2, 3 };
 	med_int naretes[MED_NBR_GEOMETRIE_ARETE];
-  char nomare[MED_NBR_GEOMETRIE_ARETE] [MED_TAILLE_NOM+1] = {"MED_SEG2","MED_SEG3"};
+	char nomare[MED_NBR_GEOMETRIE_ARETE][MED_TAILLE_NOM + 1] =
+		{ "MED_SEG2", "MED_SEG3" };
 	/* familles */
 	med_int nfam;
-  med_int natt,ngro;
+	med_int natt, ngro;
-  char *attdes,*gro;
+	char *attdes, *gro;
-  med_int *attval,*attide;
+	med_int *attval, *attide;
-  char nomfam[MED_TAILLE_NOM+1];
+	char nomfam[MED_TAILLE_NOM + 1];
 	med_int numfam;
-  char str1[MED_TAILLE_DESC+1];
+	char str1[MED_TAILLE_DESC + 1];
-  char str2[MED_TAILLE_LNOM+1];
+	char str2[MED_TAILLE_LNOM + 1];
 	string fam;
 	string fam_type;
 	string fam_id;
 
-  char* file2Read;
+	char *file2Read;
 	bool locally_managed;
 
-  if (myFileId==-1) 
+	if (myFileId == -1)
 		locally_managed = true;
 	else
 		locally_managed = false;
 
 	if (locally_managed)
 	{
-    file2Read = (char*)myFile.c_str();
+		file2Read = (char *)myFile.c_str();
-    myFileId = MEDouvrir(file2Read,MED_LECT);
+		myFileId = MEDouvrir(file2Read, MED_LECT);
 		if (myFileId < 0)
 		{
-	fprintf(stderr,">> ERREUR : ouverture du fichier %s \n",file2Read);
+			fprintf(stderr, ">> ERREUR : ouverture du fichier %s \n",
+				file2Read);
 			exit(EXIT_FAILURE);
 		}
 		numero = 1;
 	}
 	else
 		numero = myMeshId;
-  sprintf(nommaa,"Mesh %d",myMeshId);//pour load
+	sprintf(nommaa, "Mesh %d", myMeshId);	//pour load
 	SCRUTE(nommaa);
 
 	typ_con = MED_NOD;
 	mode_coo = MED_FULL_INTERLACE;
 	mdim = 3;
 
-  Handle(SMESHDS_Mesh) mySMESHDSMesh = Handle(SMESHDS_Mesh)::DownCast(myMesh);
+	SMESHDS_Mesh * mySMESHDSMesh = dynamic_cast<SMESHDS_Mesh *>(myMesh);
 
 	//TopoDS_Shape myShape = mySMESHDSMesh->ShapeToMesh();
 
   /****************************************************************************
   *                       NOMBRES D'OBJETS MED                                *
   ****************************************************************************/
-  fprintf(stdout,"\n(****************************)\n");
+	fprintf(stdout, "\n(****************************)\n");
-  fprintf(stdout,"(* INFORMATIONS GENERALES : *)\n");
+	fprintf(stdout, "(* INFORMATIONS GENERALES : *)\n");
-  fprintf(stdout,"(****************************)\n");
+	fprintf(stdout, "(****************************)\n");
 
 	/* lecture du nom et de la dimension du maillage */
 	/*!  fprintf(stdout,"%d %d\n",myFileId,numero);
-  ret = MEDmaaInfo(myFileId,numero,nommaa,&mdim);
+	 * ret = MEDmaaInfo(myFileId,numero,nommaa,&mdim);
-  fprintf(stdout,"%d\n",ret);
+	 * fprintf(stdout,"%d\n",ret);
-  if (ret < 0)
+	 * if (ret < 0)
-    {
+	 * {
-      fprintf(stderr,">> ERREUR : lecture du nom du maillage \n");
+	 * fprintf(stderr,">> ERREUR : lecture du nom du maillage \n");
-      exit(EXIT_FAILURE);
+	 * exit(EXIT_FAILURE);
-    }
+	 * }
-  fprintf(stdout,"- Nom du maillage : <<%s>>\n",nommaa);
+	 * fprintf(stdout,"- Nom du maillage : <<%s>>\n",nommaa);
-  fprintf(stdout,"- Dimension du maillage : %d\n",mdim);
+	 * fprintf(stdout,"- Dimension du maillage : %d\n",mdim);
 	 */
 	/* Combien de noeuds ? */
-  nnoe = MEDnEntMaa(myFileId,nommaa,MED_COOR,MED_NOEUD,MED_POINT1,typ_con);
+	nnoe =
+		MEDnEntMaa(myFileId, nommaa, MED_COOR, MED_NOEUD, MED_POINT1, typ_con);
 	if (nnoe < 0)
 	{
-      fprintf(stderr,">> ERREUR : lecture du nombre de noeuds \n");
+		fprintf(stderr, ">> ERREUR : lecture du nombre de noeuds \n");
 		exit(EXIT_FAILURE);
 	}
-  fprintf(stdout,"- Nombre de noeuds : %d \n",nnoe);
+	fprintf(stdout, "- Nombre de noeuds : %d \n", nnoe);
 
 	/* Combien de mailles, faces ou aretes ? */
-  for (i=0;i<MED_NBR_GEOMETRIE_MAILLE;i++)
+	for (i = 0; i < MED_NBR_GEOMETRIE_MAILLE; i++)
 	{
-      nmailles[i] = MEDnEntMaa(myFileId,nommaa,MED_CONN,MED_MAILLE,typmai[i],
+		nmailles[i] =
+			MEDnEntMaa(myFileId, nommaa, MED_CONN, MED_MAILLE, typmai[i],
 			typ_con);
 		if (nmailles[i] < 0)
 		{
-	  fprintf(stderr,">> ERREUR : lecture du nombre de mailles \n");
+			fprintf(stderr, ">> ERREUR : lecture du nombre de mailles \n");
 			exit(EXIT_FAILURE);
 		}
-      fprintf (stdout,"- Nombre de mailles de type %s : %d \n",nommai[i],nmailles[i]);
+		fprintf(stdout, "- Nombre de mailles de type %s : %d \n", nommai[i],
+			nmailles[i]);
 	}
 
-  for (i=0;i<MED_NBR_GEOMETRIE_FACE;i++)
+	for (i = 0; i < MED_NBR_GEOMETRIE_FACE; i++)
 	{
-      nfaces[i] = MEDnEntMaa(myFileId,nommaa,MED_CONN,MED_FACE,typfac[i],
+		nfaces[i] = MEDnEntMaa(myFileId, nommaa, MED_CONN, MED_FACE, typfac[i],
 			typ_con);
 		if (nfaces[i] < 0)
 		{
-	  fprintf(stderr,">> ERREUR : lecture du nombre de faces \n");
+			fprintf(stderr, ">> ERREUR : lecture du nombre de faces \n");
 			exit(EXIT_FAILURE);
 		}
-      fprintf (stdout,"- Nombre de faces de type %s : %d \n",nomfac[i],nfaces[i]);
+		fprintf(stdout, "- Nombre de faces de type %s : %d \n", nomfac[i],
+			nfaces[i]);
 	}
 
-  for (i=0;i<MED_NBR_GEOMETRIE_ARETE;i++)
+	for (i = 0; i < MED_NBR_GEOMETRIE_ARETE; i++)
 	{
-      naretes[i] = MEDnEntMaa(myFileId,nommaa,MED_CONN,MED_ARETE,typare[i],
+		naretes[i] =
+			MEDnEntMaa(myFileId, nommaa, MED_CONN, MED_ARETE, typare[i],
 			typ_con);
 		if (naretes[i] < 0)
 		{
-	  fprintf(stderr,">> ERREUR : lecture du nombre d'aretes \n");
+			fprintf(stderr, ">> ERREUR : lecture du nombre d'aretes \n");
 			exit(EXIT_FAILURE);
 		}
-      fprintf (stdout,"- Nombre d'aretes de type %s : %d \n",nomare[i],naretes[i]);
+		fprintf(stdout, "- Nombre d'aretes de type %s : %d \n", nomare[i],
+			naretes[i]);
 	}
 
 	/* nombre de familles */
-  nfam = MEDnFam(myFileId,nommaa,0,MED_FAMILLE);
+	nfam = MEDnFam(myFileId, nommaa, 0, MED_FAMILLE);
 	if (nfam < 0)
 	{
-      fprintf(stderr,">> ERREUR : lecture du nombre de familles \n");
+		fprintf(stderr, ">> ERREUR : lecture du nombre de familles \n");
 		exit(EXIT_FAILURE);
 	}
-  fprintf(stdout,"- Nombre de familles : %d \n",nfam);
+	fprintf(stdout, "- Nombre de familles : %d \n", nfam);
 
-  vector<int> family[nfam];
+	vector < int >family[nfam];
 
   /****************************************************************************
   *                       LECTURE DES NOEUDS                                  *
   ****************************************************************************/
-  fprintf(stdout,"\n(************************)\n");
+	fprintf(stdout, "\n(************************)\n");
-  fprintf(stdout,"(* NOEUDS DU MAILLAGE : *)\n");
+	fprintf(stdout, "(* NOEUDS DU MAILLAGE : *)\n");
-  fprintf(stdout,"(************************)\n");
+	fprintf(stdout, "(************************)\n");
 
 	/* Allocations memoires */
 	/* table des coordonnees 
-     profil : (dimension * nombre de noeuds ) */
+	 * profil : (dimension * nombre de noeuds ) */
-  coo = (med_float*) malloc(sizeof(med_float)*nnoe*mdim);
+	coo = (med_float *) malloc(sizeof(med_float) * nnoe * mdim);
 	/* table  des numeros, des numeros de familles des noeuds
-     profil : (nombre de noeuds) */
+	 * profil : (nombre de noeuds) */
-  numnoe = (med_int*) malloc(sizeof(med_int)*nnoe);
+	numnoe = (med_int *) malloc(sizeof(med_int) * nnoe);
-  nufano = (med_int*) malloc(sizeof(med_int)*nnoe);
+	nufano = (med_int *) malloc(sizeof(med_int) * nnoe);
 	/* table des noms des noeuds 
-     profil : (nnoe*MED_TAILLE_PNOM+1) */
+	 * profil : (nnoe*MED_TAILLE_PNOM+1) */
-  nomnoe = (char*) malloc(MED_TAILLE_PNOM*nnoe+1);
+	nomnoe = (char *)malloc(MED_TAILLE_PNOM * nnoe + 1);
 
 	/* lecture des noeuds : 
-     - coordonnees
+	 * - coordonnees
-     - noms (optionnel dans un fichier MED) 
+	 * - noms (optionnel dans un fichier MED) 
-     - numeros (optionnel dans un fichier MED) 
+	 * - numeros (optionnel dans un fichier MED) 
-     - numeros des familles */
+	 * - numeros des familles */
-  ret = MEDnoeudsLire(myFileId,nommaa,mdim,coo,mode_coo,&rep,
+	ret = MEDnoeudsLire(myFileId, nommaa, mdim, coo, mode_coo, &rep,
-		      nomcoo,unicoo,nomnoe,&inonoe,numnoe,&inunoe,
+		nomcoo, unicoo, nomnoe, &inonoe, numnoe, &inunoe, nufano, nnoe);
-		      nufano,nnoe);
 	if (ret < 0)
-    strcpy(message,">> ERREUR : lecture des noeuds \n");
+		strcpy(message, ">> ERREUR : lecture des noeuds \n");
 
-  if (inunoe) {
+	if (inunoe)
-    for (int i=0;i<nnoe;i++) {
+	{
-      ok = mySMESHDSMesh->AddNodeWithID(coo[i*3],coo[i*3+1],coo[i*3+2],numnoe[i]);
+		for (int i = 0; i < nnoe; i++)
+		{
+			ok = mySMESHDSMesh->AddNodeWithID(coo[i * 3], coo[i * 3 + 1],
+				coo[i * 3 + 2], numnoe[i]);
 			//fprintf(Out,"%d %f %f %f\n",numnoe[i],coo[i*3],coo[i*3+1],coo[i*3+2]);
 		}
 	}
-  else {
+	else
-    for (int i=0;i<nnoe;i++) {
+	{
-      ok = mySMESHDSMesh->AddNodeWithID(coo[i*3],coo[i*3+1],coo[i*3+2],i+1);
+		for (int i = 0; i < nnoe; i++)
+		{
+			ok = mySMESHDSMesh->AddNodeWithID(coo[i * 3], coo[i * 3 + 1],
+				coo[i * 3 + 2], i + 1);
 			//fprintf(Out,"%d %f %f %f\n",numnoe[i],coo[i*3],coo[i*3+1],i);
-      family[*(nufano+i)].push_back(numnoe[i]);
+			family[*(nufano + i)].push_back(numnoe[i]);
 		}
 	}
 
-  fprintf(stdout,"\n- Numeros des familles des noeuds : \n");
+	fprintf(stdout, "\n- Numeros des familles des noeuds : \n");
-  for (i=0;i<nnoe;i++)
+	for (i = 0; i < nnoe; i++)
-    fprintf(stdout," %d ",*(nufano+i));
+		fprintf(stdout, " %d ", *(nufano + i));
-  fprintf(stdout,"\n");
+	fprintf(stdout, "\n");
 
 	/* liberation memoire */
 	free(coo);
@@ -345,15 +376,15 @@ void DriverMED_R_SMESHDS_Mesh::ReadMySelf() {
   /****************************************************************************
   *                       LECTURE DES ELEMENTS                                *
   ****************************************************************************/
-  fprintf(stdout,"\n(**************************)\n");
+	fprintf(stdout, "\n(**************************)\n");
-  fprintf(stdout,"(* ELEMENTS DU MAILLAGE : *)\n");
+	fprintf(stdout, "(* ELEMENTS DU MAILLAGE : *)\n");
-  fprintf(stdout,"(**************************)");
+	fprintf(stdout, "(**************************)");
 	//fprintf(Out,"CELLS\n");
 	/* Lecture des connectivites, noms, numeros des mailles */
 	//printf("%d %d %d %d\n",nmailles[3],nmailles[4],nmailles[5],nmailles[9]);
 
 	if (ret == 0)
-    for (i=0;i<MED_NBR_GEOMETRIE_MAILLE;i++)
+		for (i = 0; i < MED_NBR_GEOMETRIE_MAILLE; i++)
 		{
 			if (nmailles[i] > 0 && ret == 0)
 			{
@@ -367,87 +398,134 @@ void DriverMED_R_SMESHDS_Mesh::ReadMySelf() {
 					if (edim == 2)
 						nsup = 1;
 
-	    taille = nsup+typmai[i]%100;
+				taille = nsup + typmai[i] % 100;
 				//taille = typmai[i]%100;
 
 				/* allocation memoire */
-	    connectivite = (med_int*)malloc(sizeof(med_int)*
+				connectivite = (med_int *) malloc(sizeof(med_int) *
-					    taille*nmailles[i]);
+					taille * nmailles[i]);
-	    nomele = (char*)malloc(sizeof(char)*MED_TAILLE_PNOM*
+				nomele = (char *)malloc(sizeof(char) * MED_TAILLE_PNOM *
-				   nmailles[i]+1);
+					nmailles[i] + 1);
-	    numele = (med_int*)malloc(sizeof(med_int)*
+				numele = (med_int *) malloc(sizeof(med_int) * nmailles[i]);
-				      nmailles[i]);
+				nufael = (med_int *) malloc(sizeof(med_int) * nmailles[i]);
-	    nufael = (med_int*)malloc(sizeof(med_int)*
-				      nmailles[i]);
 
 				/* lecture des données */
-	    ret = MEDelementsLire(myFileId,nommaa,mdim,connectivite,mode_coo,
+				ret =
-				  nomele,&inoele,numele,&inuele,nufael,
+					MEDelementsLire(myFileId, nommaa, mdim, connectivite,
-				  nmailles[i],MED_MAILLE,typmai[i],
+					mode_coo, nomele, &inoele, numele, &inuele, nufael,
-				  typ_con);
+					nmailles[i], MED_MAILLE, typmai[i], typ_con);
 
 				switch (typmai[i])
 				{
-	      case MED_TRIA3  : {
+				case MED_TRIA3:
-		if (inuele) {
+				{
-		  for (j=0;j<nmailles[i];j++) {
+					if (inuele)
-		    elem_id=*(numele+j);
+					{
-		    ok = mySMESHDSMesh->AddFaceWithID(*(connectivite+j*(taille-nsup)),*(connectivite+j*(taille-nsup)+1),*(connectivite+j*(taille-nsup)+2),elem_id);
+						for (j = 0; j < nmailles[i]; j++)
+						{
+							elem_id = *(numele + j);
+							ok = mySMESHDSMesh->AddFaceWithID(*(connectivite +
+									j * (taille - nsup)),
+								*(connectivite + j * (taille - nsup) + 1),
+								*(connectivite + j * (taille - nsup) + 2),
+								elem_id);
 							//fprintf(Out,"%d %d %d %d\n",elem_id,*(connectivite+j*(taille-nsup)),*(connectivite+j*(taille-nsup)+1),*(connectivite+j*(taille-nsup)+2));
 						}
 					}
-		else {
+					else
-		  for (j=0;j<nmailles[i];j++) {
+					{
+						for (j = 0; j < nmailles[i]; j++)
+						{
 							cmpt++;
-		    ok = mySMESHDSMesh->AddFaceWithID(*(connectivite+j*(taille)),*(connectivite+j*(taille)+1),*(connectivite+j*(taille)+2),cmpt);
+							ok = mySMESHDSMesh->AddFaceWithID(*(connectivite +
+									j * (taille)),
+								*(connectivite + j * (taille) + 1),
+								*(connectivite + j * (taille) + 2), cmpt);
 							//fprintf(Out,"%d %d %d %d\n",j,*(connectivite+j*(taille)),*(connectivite+j*(taille)+1),*(connectivite+j*(taille)+2));
 						}
 					}
 
 					break;
 				}
-	      case MED_QUAD4  : {
+				case MED_QUAD4:
-		if (inuele) {
+				{
-		  for (j=0;j<nmailles[i];j++) {
+					if (inuele)
-		    elem_id=*(numele+j);
+					{
-		    ok = mySMESHDSMesh->AddFaceWithID(*(connectivite+j*(taille-nsup)),*(connectivite+j*(taille-nsup)+1),*(connectivite+j*(taille-nsup)+2),*(connectivite+j*(taille-nsup)+3),elem_id);
+						for (j = 0; j < nmailles[i]; j++)
+						{
+							elem_id = *(numele + j);
+							ok = mySMESHDSMesh->AddFaceWithID(*(connectivite +
+									j * (taille - nsup)),
+								*(connectivite + j * (taille - nsup) + 1),
+								*(connectivite + j * (taille - nsup) + 2),
+								*(connectivite + j * (taille - nsup) + 3),
+								elem_id);
 							//fprintf(Out,"%d %d %d %d\n",elem_id,*(connectivite+j*(taille-nsup)),*(connectivite+j*(taille-nsup)+1),*(connectivite+j*(taille-nsup)+2),*(connectivite+j*(taille-nsup)+3));
 						}
 					}
-		else {
+					else
-		  for (j=0;j<nmailles[i];j++) {
+					{
+						for (j = 0; j < nmailles[i]; j++)
+						{
 							cmpt++;
-		    ok = myMesh->AddFaceWithID(*(connectivite+j*(taille)),*(connectivite+j*(taille)+1),*(connectivite+j*(taille)+2),*(connectivite+j*(taille)+3),cmpt);
+							ok = myMesh->AddFaceWithID(*(connectivite +
+									j * (taille)),
+								*(connectivite + j * (taille) + 1),
+								*(connectivite + j * (taille) + 2),
+								*(connectivite + j * (taille) + 3), cmpt);
 							//fprintf(Out,"%d %d %d %d\n",j,*(connectivite+j*(taille)),*(connectivite+j*(taille)+1),*(connectivite+j*(taille)+2),*(connectivite+j*(taille)+3));
 						}
 					}
 					break;
 				}
-	      case MED_HEXA8  : {
+				case MED_HEXA8:
-		if (inuele) {
+				{
-		  for (j=0;j<nmailles[i];j++) {
+					if (inuele)
-		    elem_id=*(numele+j);
+					{
-		    ok = mySMESHDSMesh->AddVolumeWithID(*(connectivite+j*(taille-nsup)),*(connectivite+j*(taille-nsup)+1),*(connectivite+j*(taille-nsup)+2),*(connectivite+j*(taille-nsup)+3),*(connectivite+j*(taille-nsup)+4),*(connectivite+j*(taille-nsup)+5),*(connectivite+j*(taille-nsup)+6),*(connectivite+j*(taille-nsup)+7),elem_id);
+						for (j = 0; j < nmailles[i]; j++)
+						{
+							elem_id = *(numele + j);
+							ok = mySMESHDSMesh->AddVolumeWithID(*(connectivite +
+									j * (taille - nsup)),
+								*(connectivite + j * (taille - nsup) + 1),
+								*(connectivite + j * (taille - nsup) + 2),
+								*(connectivite + j * (taille - nsup) + 3),
+								*(connectivite + j * (taille - nsup) + 4),
+								*(connectivite + j * (taille - nsup) + 5),
+								*(connectivite + j * (taille - nsup) + 6),
+								*(connectivite + j * (taille - nsup) + 7),
+								elem_id);
 							//fprintf(Out,"%d %d %d %d\n",elem_id,*(connectivite+j*(taille-nsup)),*(connectivite+j*(taille-nsup)+1),*(connectivite+j*(taille-nsup)+2),*(connectivite+j*(taille-nsup)+3),*(connectivite+j*(taille-nsup)+4),*(connectivite+j*(taille-nsup)+5),*(connectivite+j*(taille-nsup)+6),*(connectivite+j*(taille-nsup)+7));
 						}
 					}
-		else {
+					else
-		  for (j=0;j<nmailles[i];j++) {
+					{
+						for (j = 0; j < nmailles[i]; j++)
+						{
 							cmpt++;
-		    ok = mySMESHDSMesh->AddVolumeWithID(*(connectivite+j*(taille)),*(connectivite+j*(taille)+1),*(connectivite+j*(taille)+2),*(connectivite+j*(taille)+3),*(connectivite+j*(taille)+4),*(connectivite+j*(taille)+5),*(connectivite+j*(taille)+6),*(connectivite+j*(taille)+7),cmpt);
+							ok = mySMESHDSMesh->AddVolumeWithID(*(connectivite +
+									j * (taille)),
+								*(connectivite + j * (taille) + 1),
+								*(connectivite + j * (taille) + 2),
+								*(connectivite + j * (taille) + 3),
+								*(connectivite + j * (taille) + 4),
+								*(connectivite + j * (taille) + 5),
+								*(connectivite + j * (taille) + 6),
+								*(connectivite + j * (taille) + 7), cmpt);
 							//fprintf(Out,"%d %d %d %d\n",j,*(connectivite+j*(taille)),*(connectivite+j*(taille)+1),*(connectivite+j*(taille)+2),*(connectivite+j*(taille)+3),*(connectivite+j*(taille)+4),*(connectivite+j*(taille)+5),*(connectivite+j*(taille)+6),*(connectivite+j*(taille)+7));
 						}
 					}
 					break;
 				}
-	      default : {
+				default:
-		break ;
+				{
+					break;
 				}
 				}
 
-	    fprintf(stdout,"\n  - Numéros de familles : \n");
+				fprintf(stdout, "\n  - Numéros de familles : \n");
-	    for (j=0;j<nmailles[i];j++)
+				for (j = 0; j < nmailles[i]; j++)
-	      fprintf(stdout," %d ",*(nufael+j));
+					fprintf(stdout, " %d ", *(nufael + j));
 
 				/* liberation memoire */
 				free(connectivite);
@@ -464,11 +542,11 @@ void DriverMED_R_SMESHDS_Mesh::ReadMySelf() {
 	printf("(* FAMILLES DU MAILLAGE : *)\n");
 	printf("(*************************)\n");
 	if (ret == 0)
-    for (i=0;i<nfam;i++)
+		for (i = 0; i < nfam; i++)
 		{
 
 			/* nombre de groupes */
-	ngro = MEDnFam(myFileId,nommaa,i+1,MED_GROUPE);
+			ngro = MEDnFam(myFileId, nommaa, i + 1, MED_GROUPE);
 			if (ngro < 0)
 			{
 				ret = -1;
@@ -479,7 +557,7 @@ void DriverMED_R_SMESHDS_Mesh::ReadMySelf() {
 			/* nombre d'attributs */
 			if (ret == 0)
 			{
-	    natt = MEDnFam(myFileId,nommaa,i+1,MED_ATTR);
+				natt = MEDnFam(myFileId, nommaa, i + 1, MED_ATTR);
 				if (natt < 0)
 				{
 					ret = -1;
@@ -489,42 +567,47 @@ void DriverMED_R_SMESHDS_Mesh::ReadMySelf() {
 			}
 
 			if (ret == 0)
-	  fprintf(stdout,"- Famille %d a %d attributs et %d groupes \n",i+1,natt,ngro); 
+				fprintf(stdout, "- Famille %d a %d attributs et %d groupes \n",
+					i + 1, natt, ngro);
 
 			/* nom,numero,attributs,groupes */
 			if (ret == 0)
 			{
-	    attide = (med_int*) malloc(sizeof(med_int)*natt);
+				attide = (med_int *) malloc(sizeof(med_int) * natt);
-	    attval = (med_int*) malloc(sizeof(med_int)*natt);	    
+				attval = (med_int *) malloc(sizeof(med_int) * natt);
-	    attdes = (char *) malloc(MED_TAILLE_DESC*natt+1);
+				attdes = (char *)malloc(MED_TAILLE_DESC * natt + 1);
-	    gro = (char*) malloc(MED_TAILLE_LNOM*ngro+1);
+				gro = (char *)malloc(MED_TAILLE_LNOM * ngro + 1);
-	    ret = MEDfamInfo(myFileId,nommaa,i+1,nomfam,&numfam,attide,attval,
+				ret =
-			     attdes,&natt,gro,&ngro);
+					MEDfamInfo(myFileId, nommaa, i + 1, nomfam, &numfam, attide,
+					attval, attdes, &natt, gro, &ngro);
 
 				fam = string(nomfam);
-	    fam_type = fam.substr(1,1);
+				fam_type = fam.substr(1, 1);
-	    fam_id = fam.substr(2,1);
+				fam_id = fam.substr(2, 1);
-	    if ((fam_type==string("V"))||(fam_type==string("A"))||(fam_type==string("F")))
+				if ((fam_type == string("V")) || (fam_type == string("A")) ||
+					(fam_type == string("F")))
 					LinkMeshToShape(fam_type, fam_id, family[i]);
 
-	    fprintf(stdout,"  - Famille de nom %s et de numero %d : \n",nomfam,numfam);
+				fprintf(stdout, "  - Famille de nom %s et de numero %d : \n",
-	    fprintf(stdout,"  - Attributs : \n");
+					nomfam, numfam);
-	    for (j=0;j<natt;j++)
+				fprintf(stdout, "  - Attributs : \n");
+				for (j = 0; j < natt; j++)
 				{
-		strncpy(str1,attdes+j*MED_TAILLE_DESC,MED_TAILLE_DESC);
+					strncpy(str1, attdes + j * MED_TAILLE_DESC,
+						MED_TAILLE_DESC);
 					str1[MED_TAILLE_DESC] = '\0';
-		fprintf(stdout,"   ide = %d - val = %d - des = %s\n",*(attide+j),
+					fprintf(stdout, "   ide = %d - val = %d - des = %s\n",
-		       *(attval+j),str1);
+						*(attide + j), *(attval + j), str1);
 				}
 				free(attide);
 				free(attval);
 				free(attdes);
-            fprintf(stdout,"  - Groupes :\n");
+				fprintf(stdout, "  - Groupes :\n");
-	    for (j=0;j<ngro;j++)
+				for (j = 0; j < ngro; j++)
 				{
-		strncpy(str2,gro+j*MED_TAILLE_LNOM,MED_TAILLE_LNOM);
+					strncpy(str2, gro + j * MED_TAILLE_LNOM, MED_TAILLE_LNOM);
 					str2[MED_TAILLE_LNOM] = '\0';
-		fprintf(stdout,"   gro = %s\n",str2);
+					fprintf(stdout, "   gro = %s\n", str2);
 				}
 				free(gro);
 			}
@@ -535,37 +618,39 @@ void DriverMED_R_SMESHDS_Mesh::ReadMySelf() {
 
 }
 
-void DriverMED_R_SMESHDS_Mesh::LinkMeshToShape(string fam_type, string fam_id, vector<int> myNodes) {
+void DriverMED_R_SMESHDS_Mesh::LinkMeshToShape(string fam_type, string fam_id,
+	vector < int >myNodes)
+{
 
-  Handle(SMESHDS_Mesh) mySMESHDSMesh = Handle(SMESHDS_Mesh)::DownCast(myMesh);
+	SMESHDS_Mesh * mySMESHDSMesh = dynamic_cast<SMESHDS_Mesh *>(myMesh);
 
 	int id = atoi(fam_id.c_str());
-  if (fam_type==string("V")) { //Linked to a vertex
+	if (fam_type == string("V"))
-    for (int i=0;i<myNodes.size();i++) {
+	{							//Linked to a vertex
-      Handle(SMDS_MeshElement) elem = mySMESHDSMesh->FindNode(myNodes[i]);
+		for (int i = 0; i < myNodes.size(); i++)
-      const Handle(SMDS_MeshNode)& node = mySMESHDSMesh->GetNode(1,elem);
+		{
+			const SMDS_MeshNode * node = mySMESHDSMesh->FindNode(myNodes[i]);
 			//const TopoDS_Vertex& S;//le recuperer !!!
 			//mySMESHDSMesh->SetNodeOnVertex (node,S);
 		}
 	}
-  else 
+	else if (fam_type == string("E"))
-  if (fam_type==string("E")) { //Linked to an edge
+	{							//Linked to an edge
-    for (int i=0;i<myNodes.size();i++) {
+		for (int i = 0; i < myNodes.size(); i++)
-      Handle(SMDS_MeshElement) elem = mySMESHDSMesh->FindNode(myNodes[i]);
+		{
-      const Handle(SMDS_MeshNode)& node = mySMESHDSMesh->GetNode(1,elem);
+			const SMDS_MeshNode * node = mySMESHDSMesh->FindNode(myNodes[i]);
 			//const TopoDS_Edge& S;//le recuperer !!!
 			//mySMESHDSMesh->SetNodeOnEdge (node,S);
 		}
 	}
-  else 
+	else if (fam_type == string("F"))
-  if (fam_type==string("F")) { //Linked to a face
+	{							//Linked to a face
-    for (int i=0;i<myNodes.size();i++) {
+		for (int i = 0; i < myNodes.size(); i++)
-      Handle(SMDS_MeshElement) elem = mySMESHDSMesh->FindNode(myNodes[i]);
+		{
-      const Handle(SMDS_MeshNode)& node = mySMESHDSMesh->GetNode(1,elem);
+			const SMDS_MeshNode * node = mySMESHDSMesh->FindNode(myNodes[i]);
 			//const TopoDS_Face& S;//le recuperer !!!
 			//mySMESHDSMesh->SetNodeOnFace (node,S);
 		}
 	}
 
 }
-

src/DriverMED/DriverMED_R_SMESHDS_Mesh.h

@@ -36,25 +36,24 @@ extern "C"
 #include <med.h>
 }
 
-class DriverMED_R_SMESHDS_Mesh : public Mesh_Reader {
+class DriverMED_R_SMESHDS_Mesh:public Mesh_Reader
+{
 
-  public :
+  public:DriverMED_R_SMESHDS_Mesh();
-    DriverMED_R_SMESHDS_Mesh();
 	~DriverMED_R_SMESHDS_Mesh();
 
 	void Read();
 	void ReadMySelf();
 	void Add();
 
-    void SetMesh(Handle(SMDS_Mesh)& aMesh);
+	void SetMesh(SMDS_Mesh * aMesh);
 	void SetFile(string);
 	void SetFileId(med_idt);
 	void SetMeshId(int);
 
-    void LinkMeshToShape(string , string , vector<int>);
+	void LinkMeshToShape(string, string, vector < int >);
 
-private :
+  private:  SMDS_Mesh * myMesh;
-    Handle_SMDS_Mesh myMesh;
 	string myFile;
 	med_idt myFileId;
 	int myMeshId;

src/DriverMED/DriverMED_W_SMDS_Mesh.cxx

@@ -29,76 +29,84 @@ using namespace std;
 
 #include "SMDS_MeshElement.hxx"
 #include "SMDS_MeshNode.hxx"
-#include "SMDS_MeshFacesIterator.hxx"
+
-#include "SMDS_MeshNodesIterator.hxx"
+
-#include "SMDS_MeshVolumesIterator.hxx"
+
 
 #include "utilities.h"
 #include <vector>
 
-DriverMED_W_SMDS_Mesh::DriverMED_W_SMDS_Mesh() {
+DriverMED_W_SMDS_Mesh::DriverMED_W_SMDS_Mesh()
-;
+{
-}
-
-DriverMED_W_SMDS_Mesh::~DriverMED_W_SMDS_Mesh() {
-;
-}
-
-void DriverMED_W_SMDS_Mesh::SetMesh(Handle(SMDS_Mesh)& aMesh) {
-  myMesh = aMesh;
-}
-
-void DriverMED_W_SMDS_Mesh::SetFile(string aFile) {
-  myFile = aFile;
-}
-
-void DriverMED_W_SMDS_Mesh::SetFileId(med_idt aFileId) {
-  myFileId = aFileId;
-}
-
-void DriverMED_W_SMDS_Mesh::SetMeshId(int aMeshId) {
-  myMeshId = aMeshId;
-}
-
-void DriverMED_W_SMDS_Mesh::Add() {
 	;
 }
 
-void DriverMED_W_SMDS_Mesh::Write() {
+DriverMED_W_SMDS_Mesh::~DriverMED_W_SMDS_Mesh()
+{
+	;
+}
+
+void DriverMED_W_SMDS_Mesh::SetMesh(SMDS_Mesh * aMesh)
+{
+	myMesh = aMesh;
+}
+
+void DriverMED_W_SMDS_Mesh::SetFile(string aFile)
+{
+	myFile = aFile;
+}
+
+void DriverMED_W_SMDS_Mesh::SetFileId(med_idt aFileId)
+{
+	myFileId = aFileId;
+}
+
+void DriverMED_W_SMDS_Mesh::SetMeshId(int aMeshId)
+{
+	myMeshId = aMeshId;
+}
+
+void DriverMED_W_SMDS_Mesh::Add()
+{
+	;
+}
+
+void DriverMED_W_SMDS_Mesh::Write()
+{
 
 	med_err ret = 0;
-  int i,j,k,l;
+	int i, j, k, l;
 	int numero;
 	char message[200];
-  Standard_Boolean ok;
+	bool ok;
 	/* nombre d'objets MED */
-  char nom_universel[MED_TAILLE_LNOM+1];
+	char nom_universel[MED_TAILLE_LNOM + 1];
 	med_int long_fichier_en_tete;
 	char *fichier_en_tete;
 	char version_hdf[10];
 	char version_med[10];
-  med_int nmaa,mdim,nnoe;
+	med_int nmaa, mdim, nnoe;
-  med_int nmai[MED_NBR_GEOMETRIE_MAILLE],nfac[MED_NBR_GEOMETRIE_FACE];
+	med_int nmai[MED_NBR_GEOMETRIE_MAILLE], nfac[MED_NBR_GEOMETRIE_FACE];
 	med_int nare[MED_NBR_GEOMETRIE_ARETE];
 	/* nom du maillage */
-  char nommaa[MED_TAILLE_NOM+1];
+	char nommaa[MED_TAILLE_NOM + 1];
 	/* noeuds */
 	med_float *coo;
-  char nomcoo[3*MED_TAILLE_PNOM+1];
+	char nomcoo[3 * MED_TAILLE_PNOM + 1];
-  char unicoo[3*MED_TAILLE_PNOM+1];
+	char unicoo[3 * MED_TAILLE_PNOM + 1];
 	char *nomnoe;
 	med_int *numnoe;
 	med_int *nufano;
 	med_repere rep;
-  med_booleen inonoe,inunoe;
+	med_booleen inonoe, inunoe;
 	med_mode_switch mode_coo;
-  char str[MED_TAILLE_PNOM+1];
+	char str[MED_TAILLE_PNOM + 1];
 	med_int nbNodes;
 	/* elements */
 	med_int nsup;
 	med_int edim;
 	med_int taille;
-  med_int elem_id,myId;
+	med_int elem_id, myId;
 	med_int *connectivite;
 	char *nomele;
 	med_int *numele;
@@ -106,17 +114,20 @@ void DriverMED_W_SMDS_Mesh::Write() {
 	med_booleen inoele, inuele;
 	med_connectivite typ_con;
 	med_geometrie_element typgeo;
-  med_geometrie_element typmai[MED_NBR_GEOMETRIE_MAILLE] = {MED_POINT1,MED_SEG2, 
+	med_geometrie_element typmai[MED_NBR_GEOMETRIE_MAILLE] =
-						   MED_SEG3,MED_TRIA3,
+		{ MED_POINT1, MED_SEG2,
-						   MED_TRIA6,MED_QUAD4,
+		MED_SEG3, MED_TRIA3,
-						   MED_QUAD8,MED_TETRA4,
+		MED_TRIA6, MED_QUAD4,
-						   MED_TETRA10,MED_HEXA8,
+		MED_QUAD8, MED_TETRA4,
-						   MED_HEXA20,MED_PENTA6,
+		MED_TETRA10, MED_HEXA8,
-						   MED_PENTA15,MED_PYRA5,
+		MED_HEXA20, MED_PENTA6,
-						   MED_PYRA13};
+		MED_PENTA15, MED_PYRA5,
-  med_int desmai[MED_NBR_GEOMETRIE_MAILLE] = {0,2,3,3,3,4,4,4,4,6,6,5,5,5,5};
+		MED_PYRA13
+	};
+	med_int desmai[MED_NBR_GEOMETRIE_MAILLE] =
+		{ 0, 2, 3, 3, 3, 4, 4, 4, 4, 6, 6, 5, 5, 5, 5 };
 	med_int nmailles[MED_NBR_GEOMETRIE_MAILLE];
-  char nommai[MED_NBR_GEOMETRIE_MAILLE] [MED_TAILLE_NOM+1] = {"MED_POINT1",
+	char nommai[MED_NBR_GEOMETRIE_MAILLE][MED_TAILLE_NOM + 1] = { "MED_POINT1",
 		"MED_SEG2",
 		"MED_SEG3",
 		"MED_TRIA3",
@@ -130,37 +141,44 @@ void DriverMED_W_SMDS_Mesh::Write() {
 		"MED_PENTA6",
 		"MED_PENTA15",
 		"MED_PYRA5",
-							  "MED_PYRA13"};
+		"MED_PYRA13"
-  med_geometrie_element typfac[MED_NBR_GEOMETRIE_FACE] = {MED_TRIA3,MED_TRIA6,
+	};
-						 MED_QUAD4,MED_QUAD8};
+	med_geometrie_element typfac[MED_NBR_GEOMETRIE_FACE] =
-  med_int desfac[MED_NBR_GEOMETRIE_FACE] = {3,3,4,4};
+		{ MED_TRIA3, MED_TRIA6,
+		MED_QUAD4, MED_QUAD8
+	};
+	med_int desfac[MED_NBR_GEOMETRIE_FACE] = { 3, 3, 4, 4 };
 	med_int nfaces[MED_NBR_GEOMETRIE_FACE];
-  char nomfac[MED_NBR_GEOMETRIE_FACE][MED_TAILLE_NOM+1] = {"MED_TRIA3","MED_TRIA6",
+	char nomfac[MED_NBR_GEOMETRIE_FACE][MED_TAILLE_NOM + 1] =
-						       "MED_QUAD4","MED_QUAD8"};
+		{ "MED_TRIA3", "MED_TRIA6",
-  med_geometrie_element typare[MED_NBR_GEOMETRIE_ARETE] = {MED_SEG2,MED_SEG3};
+		"MED_QUAD4", "MED_QUAD8"
-  med_int desare[MED_NBR_GEOMETRIE_ARETE] = {2,3};
+	};
+	med_geometrie_element typare[MED_NBR_GEOMETRIE_ARETE] =
+		{ MED_SEG2, MED_SEG3 };
+	med_int desare[MED_NBR_GEOMETRIE_ARETE] = { 2, 3 };
 	med_int naretes[MED_NBR_GEOMETRIE_ARETE];
-  char nomare[MED_NBR_GEOMETRIE_ARETE] [MED_TAILLE_NOM+1] = {"MED_SEG2","MED_SEG3"};
+	char nomare[MED_NBR_GEOMETRIE_ARETE][MED_TAILLE_NOM + 1] =
+		{ "MED_SEG2", "MED_SEG3" };
 	/* familles */
 	med_int nfam;
-  med_int natt,ngro;
+	med_int natt, ngro;
-  char *attdes,*gro;
+	char *attdes, *gro;
-  med_int *attval,*attide;
+	med_int *attval, *attide;
-  char nomfam[MED_TAILLE_NOM+1];
+	char nomfam[MED_TAILLE_NOM + 1];
 	med_int numfam;
-  char str1[MED_TAILLE_DESC+1];
+	char str1[MED_TAILLE_DESC + 1];
-  char str2[MED_TAILLE_LNOM+1];
+	char str2[MED_TAILLE_LNOM + 1];
 
   /****************************************************************************
   *                      OUVERTURE DU FICHIER EN ECRITURE                      *
   ****************************************************************************/
 	/*!  char* file2Read = (char*)myFile.c_str();
-  myFileId = MEDouvrir(file2Read,MED_REMP);
+	 * myFileId = MEDouvrir(file2Read,MED_REMP);
-  if (myFileId < 0)
+	 * if (myFileId < 0)
-    {
+	 * {
-      fprintf(stderr,">> ERREUR : ouverture du fichier %s \n",file2Read);
+	 * fprintf(stderr,">> ERREUR : ouverture du fichier %s \n",file2Read);
-      exit(EXIT_FAILURE);
+	 * exit(EXIT_FAILURE);
-    }
+	 * }
 	 */
 	typ_con = MED_NOD;
 	mode_coo = MED_FULL_INTERLACE;
@@ -169,29 +187,28 @@ void DriverMED_W_SMDS_Mesh::Write() {
   /****************************************************************************
   *                       NOMBRES D'OBJETS MED                                *
   ****************************************************************************/
-  fprintf(stdout,"\n(****************************)\n");
+	fprintf(stdout, "\n(****************************)\n");
-  fprintf(stdout,"(* INFORMATIONS GENERALES : *)\n");
+	fprintf(stdout, "(* INFORMATIONS GENERALES : *)\n");
-  fprintf(stdout,"(****************************)\n");
+	fprintf(stdout, "(****************************)\n");
 
 	/* creation du maillage */
-  mdim=3;
+	mdim = 3;
 	//nommaa = QString("Mesh "+myMeshId).latin1();
 	//nommaa = "";
 	//plutot recuperer le nom du maillage dans l'etude
 	if (ret == 0)
-    ret = MEDmaaCr(myFileId,nommaa,mdim);
+		ret = MEDmaaCr(myFileId, nommaa, mdim);
-  printf("%d\n",ret);
+	printf("%d\n", ret);
-
 
 	/* Combien de noeuds ? */
 	nnoe = myMesh->NbNodes();
 	//SCRUTE(nnoe);
 	/* Combien de mailles, faces ou aretes ? */
-  for (i=0;i<MED_NBR_GEOMETRIE_MAILLE;i++)
+	for (i = 0; i < MED_NBR_GEOMETRIE_MAILLE; i++)
-    nmailles[i]=0;
+		nmailles[i] = 0;
 
-  SMDS_MeshFacesIterator itFaces(myMesh);
+	SMDS_Iterator<const SMDS_MeshFace *> * itFaces=myMesh->facesIterator();
-  Standard_Integer nb_of_nodes, nb_of_faces;
+	int nb_of_nodes, nb_of_faces;
 	nb_of_faces = myMesh->NbFaces();
 	//SCRUTE(nb_of_faces);
 
@@ -201,25 +218,30 @@ void DriverMED_W_SMDS_Mesh::Write() {
 	//vector<Integer_vector> elem_Id;
 	//elem_Id.resize(MED_NBR_GEOMETRIE_MAILLE);
 
-  for (;itFaces.More();itFaces.Next()) {
+	while(itFaces->more())
-    const Handle(SMDS_MeshElement)& elem = itFaces.Value();
+	{
+		const SMDS_MeshFace * elem = itFaces->next();
 
 		nb_of_nodes = elem->NbNodes();
 
-    switch (nb_of_nodes) {
+		switch (nb_of_nodes)
-    case 3 : {
+		{
+		case 3:
+		{
 			//elem_Id[3][nmailles[3]] = elem->GetID();
 			elem_Id[3].push_back(elem->GetID());
 			nmailles[3]++;
 			break;
 		}
-    case 4 : {
+		case 4:
+		{
 			//elem_Id[5][nmailles[5]] = elem->GetID();
 			elem_Id[5].push_back(elem->GetID());
 			nmailles[5]++;
 			break;
 		}
-    case 6 : {
+		case 6:
+		{
 			//elem_Id[4][nmailles[4]] = elem->GetID();
 			elem_Id[4].push_back(elem->GetID());
 			nmailles[4]++;
@@ -229,14 +251,16 @@ void DriverMED_W_SMDS_Mesh::Write() {
 
 	}
 
-  SMDS_MeshVolumesIterator itVolumes(myMesh);
+	SMDS_Iterator<const SMDS_MeshVolume*> * itVolumes=myMesh->volumesIterator();
-   
+	while(itVolumes->more())
-  for (;itVolumes.More();itVolumes.Next()) {
+	{
-    const Handle(SMDS_MeshElement)& elem = itVolumes.Value();
+		const SMDS_MeshVolume * elem = itVolumes->next();
 
 		nb_of_nodes = elem->NbNodes();
-    switch (nb_of_nodes) {
+		switch (nb_of_nodes)
-    case 8 : {
+		{
+		case 8:
+		{
 			//elem_Id[9][nmailles[9]] = elem->GetID();
 			elem_Id[9].push_back(elem->GetID());
 			nmailles[9]++;
@@ -248,44 +272,43 @@ void DriverMED_W_SMDS_Mesh::Write() {
   /****************************************************************************
   *                       ECRITURE DES NOEUDS                                  *
   ****************************************************************************/
-  fprintf(stdout,"\n(************************)\n");
+	fprintf(stdout, "\n(************************)\n");
-  fprintf(stdout,"(* NOEUDS DU MAILLAGE : *)\n");
+	fprintf(stdout, "(* NOEUDS DU MAILLAGE : *)\n");
-  fprintf(stdout,"(************************)\n");
+	fprintf(stdout, "(************************)\n");
 
 	/* Allocations memoires */
 	/* table des coordonnees 
-     profil : (dimension * nombre de noeuds ) */
+	 * profil : (dimension * nombre de noeuds ) */
-  coo = (med_float*) malloc(sizeof(med_float)*nnoe*mdim);
+	coo = (med_float *) malloc(sizeof(med_float) * nnoe * mdim);
 	/* table  des numeros, des numeros de familles des noeuds
-     profil : (nombre de noeuds) */
+	 * profil : (nombre de noeuds) */
-  numnoe = (med_int*) malloc(sizeof(med_int)*nnoe);
+	numnoe = (med_int *) malloc(sizeof(med_int) * nnoe);
-  nufano = (med_int*) malloc(sizeof(med_int)*nnoe);
+	nufano = (med_int *) malloc(sizeof(med_int) * nnoe);
 	/* table des noms des noeuds 
-     profil : (nnoe*MED_TAILLE_PNOM+1) */
+	 * profil : (nnoe*MED_TAILLE_PNOM+1) */
-  nomnoe ="";
+	nomnoe = "";
 
 	i = 0;
-  SMDS_MeshNodesIterator itNodes(myMesh);
+	SMDS_Iterator<const SMDS_MeshNode *> * itNodes=myMesh->nodesIterator();
-  for (;itNodes.More();itNodes.Next()) {
+	while(itNodes->more())
-    const Handle(SMDS_MeshElement)& elem = itNodes.Value();
+	{		
-    const Handle(SMDS_MeshNode)& node = myMesh->GetNode(1,elem);
+		const SMDS_MeshNode * node = itNodes->next();
- 
+		coo[i * 3] = node->X();
-    coo[i*3]=node->X();
+		coo[i * 3 + 1] = node->Y();
-    coo[i*3+1]=node->Y();
+		coo[i * 3 + 2] = node->Z();
-    coo[i*3+2]=node->Z();
+		numnoe[i] = node->GetID();
-    numnoe[i]=node->GetID();
+		nufano[i] = 0;
-    nufano[i]=0;
 		i++;
 	}
 
 	/* ecriture des noeuds : 
-     - coordonnees
+	 * - coordonnees
-     - noms (optionnel dans un fichier MED) 
+	 * - noms (optionnel dans un fichier MED) 
-     - numeros (optionnel dans un fichier MED) 
+	 * - numeros (optionnel dans un fichier MED) 
-     - numeros des familles */
+	 * - numeros des familles */
-  ret = MEDnoeudsEcr(myFileId,nommaa,mdim,coo,mode_coo,MED_CART,
+	ret = MEDnoeudsEcr(myFileId, nommaa, mdim, coo, mode_coo, MED_CART,
-		       nomcoo,unicoo,nomnoe,MED_FAUX,numnoe,MED_VRAI,
+		nomcoo, unicoo, nomnoe, MED_FAUX, numnoe, MED_VRAI,
-		       nufano,nnoe,MED_REMP);
+		nufano, nnoe, MED_REMP);
 
 	/* liberation memoire */
 	free(coo);
@@ -296,18 +319,18 @@ void DriverMED_W_SMDS_Mesh::Write() {
   /****************************************************************************
   *                       ECRITURE DES ELEMENTS                                *
   ****************************************************************************/
-  fprintf(stdout,"\n(**************************)\n");
+	fprintf(stdout, "\n(**************************)\n");
-  fprintf(stdout,"(* ELEMENTS DU MAILLAGE : *)\n");
+	fprintf(stdout, "(* ELEMENTS DU MAILLAGE : *)\n");
-  fprintf(stdout,"(**************************)");
+	fprintf(stdout, "(**************************)");
 	//fprintf(Out,"CELLS\n");
 	/* Ecriture des connectivites, noms, numeros des mailles */
 
 	if (ret == 0)
-    for (i=0;i<MED_NBR_GEOMETRIE_MAILLE;i++)
+		for (i = 0; i < MED_NBR_GEOMETRIE_MAILLE; i++)
 		{
 			if (nmailles[i] > 0 && ret == 0)
 			{
-	    MESSAGE ( " Start "<<typmai[i]);
+				MESSAGE(" Start " << typmai[i]);
 				/* dimension de la maille */
 				edim = typmai[i] / 100;
 				nsup = 0;
@@ -318,41 +341,49 @@ void DriverMED_W_SMDS_Mesh::Write() {
 					if (edim == 2)
 						nsup = 1;
 
-	    taille = nsup+typmai[i]%100;
+				taille = nsup + typmai[i] % 100;
 				//taille = typmai[i]%100;
 
 				/* allocation memoire */
-	    connectivite = (med_int*)malloc(sizeof(med_int)*
+				connectivite = (med_int *) malloc(sizeof(med_int) *
-					    taille*nmailles[i]);
+					taille * nmailles[i]);
-	    nomele = (char*)malloc(sizeof(char)*MED_TAILLE_PNOM*
+				nomele = (char *)malloc(sizeof(char) * MED_TAILLE_PNOM *
-				   nmailles[i]+1);
+					nmailles[i] + 1);
-	    numele = (med_int*)malloc(sizeof(med_int)*
+				numele = (med_int *) malloc(sizeof(med_int) * nmailles[i]);
-				      nmailles[i]);
+				nufael = (med_int *) malloc(sizeof(med_int) * nmailles[i]);
-	    nufael = (med_int*)malloc(sizeof(med_int)*
+				nomele = "";
-				      nmailles[i]);
+				nbNodes = typmai[i] % 100;
-	    nomele="";
-	    nbNodes=typmai[i]%100;
 
 				//penser a mater les (taille-nsup)
-	    for (j=0;j<nmailles[i];j++) {
+				for (j = 0; j < nmailles[i]; j++)
+				{
 					myId = elem_Id[i][j];
-	      const Handle(SMDS_MeshElement)& elem = myMesh->FindElement(myId);
+					const SMDS_MeshElement * elem =
-	      *(numele+j) = myId;
+						myMesh->FindElement(myId);
+					*(numele + j) = myId;
 					//elem_id=*(numele+j);
 					//fprintf(stdout,"%d \n",myId);
 
-	      for (k=0; k<nbNodes; k++) {
+					SMDS_Iterator<const SMDS_MeshElement *> * itNode=
+						elem->nodesIterator();
+
+					while(itNode->more())
+					{
 						//*(connectivite+j*(taille-1)+k)=cnx[k];
-		*(connectivite+j*(taille-nsup)+k) = elem->GetConnection(k+1);
+						*(connectivite + j * (taille - nsup) + k) =
+							itNode->next()->GetID();
 						//fprintf(stdout,"%d ",*(connectivite+j*(taille-nsup)+k));
 					}
-	      nufael[j]=0;
+					nufael[j] = 0;
 					//fprintf(stdout,"\n");
 				}
 
 				/* ecriture des données */
 
-	    ret=MEDelementsEcr(myFileId,nommaa,mdim,connectivite,mode_coo,nomele,MED_FAUX,numele,MED_VRAI,nufael,nmailles[i],MED_MAILLE,typmai[i],typ_con,MED_REMP);
+				ret =
+					MEDelementsEcr(myFileId, nommaa, mdim, connectivite,
+					mode_coo, nomele, MED_FAUX, numele, MED_VRAI, nufael,
+					nmailles[i], MED_MAILLE, typmai[i], typ_con, MED_REMP);
 
 				if (ret < 0)
 					MESSAGE(">> ERREUR : lecture des mailles \n");
@@ -362,7 +393,7 @@ void DriverMED_W_SMDS_Mesh::Write() {
 				//free(nomele);
 				free(numele);
 				free(nufael);
-	    MESSAGE ( " End "<<typmai[i]);
+				MESSAGE(" End " << typmai[i]);
 			}
 		}
 
@@ -371,9 +402,9 @@ void DriverMED_W_SMDS_Mesh::Write() {
   ****************************************************************************/
 
 	/*!  ret = MEDfermer(myFileId);
-
+	 * 
-  if (ret != 0)
+	 * if (ret != 0)
-    fprintf(stderr,">> ERREUR : erreur a la fermeture du fichier %s\n",file2Read);
+	 * fprintf(stderr,">> ERREUR : erreur a la fermeture du fichier %s\n",file2Read);
 	 */
 
 }

src/DriverMED/DriverMED_W_SMDS_Mesh.h

@@ -37,22 +37,21 @@ extern "C"
 #include <med.h>
 }
 
-class DriverMED_W_SMDS_Mesh : public Mesh_Writer {
+class DriverMED_W_SMDS_Mesh:public Mesh_Writer
+{
 
-  public :
+  public:DriverMED_W_SMDS_Mesh();
-    DriverMED_W_SMDS_Mesh();
 	~DriverMED_W_SMDS_Mesh();
 
 	void Add();
 	void Write();
-    void SetMesh(Handle(SMDS_Mesh)& aMesh);
+	void SetMesh(SMDS_Mesh * aMesh);
 	void SetFile(string);
 
 	void SetFileId(med_idt);
 	void SetMeshId(int);
 
-private :
+  private:  SMDS_Mesh * myMesh;
-    Handle_SMDS_Mesh myMesh;
 	string myFile;
 	med_idt myFileId;
 	int myMeshId;

src/DriverMED/DriverMED_W_SMESHDS_Document.cxx

@@ -33,17 +33,20 @@ using namespace std;
 
 extern "C"
 {
-  Document_Writer* Wmaker() {
+	Document_Writer *Wmaker()
+	{
 		return new DriverMED_W_SMESHDS_Document;
 	}
 }
 
-DriverMED_W_SMESHDS_Document::DriverMED_W_SMESHDS_Document() {
+DriverMED_W_SMESHDS_Document::DriverMED_W_SMESHDS_Document()
-;
+{
+	;
 }
 
-DriverMED_W_SMESHDS_Document::~DriverMED_W_SMESHDS_Document() {
+DriverMED_W_SMESHDS_Document::~DriverMED_W_SMESHDS_Document()
-;
+{
+	;
 }
 
 //void DriverMED_W_SMESHDS_Document::SetFile(string aFile) {
@@ -54,20 +57,21 @@ DriverMED_W_SMESHDS_Document::~DriverMED_W_SMESHDS_Document() {
 //myDocument = aDocument;
 //}
 
-void DriverMED_W_SMESHDS_Document::Write() {
+void DriverMED_W_SMESHDS_Document::Write()
+{
 
 	med_err ret = 0;
 	med_idt fid;
-  med_int nmaa,numero,nb_of_meshes;
+	med_int nmaa, numero, nb_of_meshes;
 	med_mode_switch mode_coo;
 	med_connectivite typ_con;
 
 	SCRUTE(myFile);
-  Handle(SMESHDS_Mesh) myMesh;
+	SMESHDS_Mesh * myMesh;
 
   /******** Nombre de maillages ********/
 	nb_of_meshes = myDocument->NbMeshes();	//voir avec Yves
-  MESSAGE("nb_of_meshes = "<<nb_of_meshes<<"\n");
+	MESSAGE("nb_of_meshes = " << nb_of_meshes << "\n");
 	SCRUTE(nb_of_meshes);
 	//nb_of_meshes = 1;
 	numero = 0;
@@ -80,12 +84,13 @@ void DriverMED_W_SMESHDS_Document::Write() {
 	//myMesh = myDocument->GetMesh(numero);
 
 	myDocument->InitMeshesIterator();
-  if (nb_of_meshes!=0)
+	if (nb_of_meshes != 0)
-  for (;myDocument->MoreMesh();myDocument->NextMesh()) {
+		while(myDocument->MoreMesh())
+		{
 			numero++;
-    myMesh = myDocument->CurrentMesh();
+			myMesh = myDocument->NextMesh();
 
-    DriverMED_W_SMESHDS_Mesh* myWriter = new DriverMED_W_SMESHDS_Mesh;
+			DriverMED_W_SMESHDS_Mesh *myWriter = new DriverMED_W_SMESHDS_Mesh;
 
 			myWriter->SetMesh(myMesh);
 			myWriter->SetFile(myFile);
@@ -95,6 +100,4 @@ void DriverMED_W_SMESHDS_Document::Write() {
 			//myWriter->Write();
 			myWriter->Add();
 		}
-
-
 }

src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx

@@ -27,70 +27,49 @@
 using namespace std;
 #include "DriverMED_W_SMESHDS_Mesh.h"
 #include "DriverMED_W_SMDS_Mesh.h"
-
 #include "SMDS_MeshElement.hxx"
 #include "SMDS_MeshNode.hxx"
-#include "SMDS_MeshFacesIterator.hxx"
-#include "SMDS_MeshEdgesIterator.hxx"
-#include "SMDS_MeshNodesIterator.hxx"
-#include "SMDS_MeshVolumesIterator.hxx"
-#include "SMESHDS_SubMesh.hxx"
-#include "SMDS_MapIteratorOfExtendedMap.hxx"
-#include "SMDS_MapOfMeshElement.hxx"
-#include "SMDS_Position.hxx"
-
 #include <TopExp.hxx>
-#include <TopExp_Explorer.hxx>
-#include <TopoDS.hxx>
-#include <TopoDS_Iterator.hxx>
-#include <TopoDS_Compound.hxx>
-#include <TopoDS_CompSolid.hxx>
-#include <TopoDS_Solid.hxx>
-#include <TopoDS_Shell.hxx>
-#include <TopoDS_Face.hxx>
-#include <TopoDS_Wire.hxx>
-#include <TopoDS_Edge.hxx>
-#include <TopoDS_Vertex.hxx>
-#include <TopoDS_Shape.hxx>
-#include <TopTools_MapOfShape.hxx>
-#include <TColStd_ListIteratorOfListOfInteger.hxx>
-
-
-#include <map>
-#include <set>
 #include <vector>
 #include "utilities.h"
 
-DriverMED_W_SMESHDS_Mesh::DriverMED_W_SMESHDS_Mesh() {
+DriverMED_W_SMESHDS_Mesh::DriverMED_W_SMESHDS_Mesh()
+{
 	;
 }
 
-DriverMED_W_SMESHDS_Mesh::~DriverMED_W_SMESHDS_Mesh() {
+DriverMED_W_SMESHDS_Mesh::~DriverMED_W_SMESHDS_Mesh()
+{
 	;
 }
 
-void DriverMED_W_SMESHDS_Mesh::SetMesh(Handle(SMDS_Mesh)& aMesh) {
+void DriverMED_W_SMESHDS_Mesh::SetMesh(SMDS_Mesh * aMesh)
+{
 	myMesh = aMesh;
 }
 
-void DriverMED_W_SMESHDS_Mesh::SetFile(string aFile) {
+void DriverMED_W_SMESHDS_Mesh::SetFile(string aFile)
+{
 	myFile = aFile;
 }
 
-void DriverMED_W_SMESHDS_Mesh::SetFileId(med_idt aFileId) {
+void DriverMED_W_SMESHDS_Mesh::SetFileId(med_idt aFileId)
+{
 	myFileId = aFileId;
 }
 
-void DriverMED_W_SMESHDS_Mesh::SetMeshId(int aMeshId) {
+void DriverMED_W_SMESHDS_Mesh::SetMeshId(int aMeshId)
+{
 	myMeshId = aMeshId;
 }
 
-void DriverMED_W_SMESHDS_Mesh::Write() {
+void DriverMED_W_SMESHDS_Mesh::Write()
+{
 
 	string myClass = string("SMDS_Mesh");
 	string myExtension = string("MED");
 
-  DriverMED_W_SMDS_Mesh* myWriter = new DriverMED_W_SMDS_Mesh;
+	DriverMED_W_SMDS_Mesh *myWriter = new DriverMED_W_SMDS_Mesh;
 
 	myWriter->SetMesh(myMesh);
 	//  myWriter->SetFile(myFile);
@@ -99,45 +78,45 @@ void DriverMED_W_SMESHDS_Mesh::Write() {
 
 	myWriter->Write();
 
-
 }
 
-void DriverMED_W_SMESHDS_Mesh::Add() {
+void DriverMED_W_SMESHDS_Mesh::Add()
+{
 
 	med_err ret = 0;
-  int i,j,k,l;
+	int i, j, k, l;
 	int numero;
 	char message[200];
-  Standard_Boolean ok;
+	bool ok;
 	/* nombre d'objets MED */
-  char nom_universel[MED_TAILLE_LNOM+1];
+	char nom_universel[MED_TAILLE_LNOM + 1];
 	med_int long_fichier_en_tete;
 	char *fichier_en_tete;
 	char version_hdf[10];
 	char version_med[10];
-  med_int nmaa,mdim,nnoe;
+	med_int nmaa, mdim, nnoe;
-  med_int nmai[MED_NBR_GEOMETRIE_MAILLE],nfac[MED_NBR_GEOMETRIE_FACE];
+	med_int nmai[MED_NBR_GEOMETRIE_MAILLE], nfac[MED_NBR_GEOMETRIE_FACE];
 	med_int nare[MED_NBR_GEOMETRIE_ARETE];
 	/* nom du maillage */
-  char nommaa[MED_TAILLE_NOM+1];
+	char nommaa[MED_TAILLE_NOM + 1];
 	/* noeuds */
 	med_float *coo;
 	// PN : Initilialisation de nomcoo et unicoo pour lisibilite du maillage
-  char nomcoo[3*MED_TAILLE_PNOM+1]="x       y        z      ";
+	char nomcoo[3 * MED_TAILLE_PNOM + 1] = "x       y        z      ";
-  char unicoo[3*MED_TAILLE_PNOM+1]="m       m        m     ";
+	char unicoo[3 * MED_TAILLE_PNOM + 1] = "m       m        m     ";
 	char *nomnoe;
 	med_int *numnoe;
 	med_int *nufano;
 	med_repere rep;
-  med_booleen inonoe,inunoe;
+	med_booleen inonoe, inunoe;
 	med_mode_switch mode_coo;
-  char str[MED_TAILLE_PNOM+1];
+	char str[MED_TAILLE_PNOM + 1];
 	med_int nbNodes;
 	/* elements */
 	med_int nsup;
 	med_int edim;
 	med_int taille;
-  med_int elem_id,myId;
+	med_int elem_id, myId;
 	med_int *connectivite;
 	char *nomele;
 	med_int *numele;
@@ -145,17 +124,20 @@ void DriverMED_W_SMESHDS_Mesh::Add() {
 	med_booleen inoele, inuele;
 	med_connectivite typ_con;
 	med_geometrie_element typgeo;
-  med_geometrie_element typmai[MED_NBR_GEOMETRIE_MAILLE] = {MED_POINT1,MED_SEG2,
+	med_geometrie_element typmai[MED_NBR_GEOMETRIE_MAILLE] =
-							    MED_SEG3,MED_TRIA3,
+		{ MED_POINT1, MED_SEG2,
-							    MED_TRIA6,MED_QUAD4,
+		MED_SEG3, MED_TRIA3,
-							    MED_QUAD8,MED_TETRA4,
+		MED_TRIA6, MED_QUAD4,
-							    MED_TETRA10,MED_HEXA8,
+		MED_QUAD8, MED_TETRA4,
-							    MED_HEXA20,MED_PENTA6,
+		MED_TETRA10, MED_HEXA8,
-							    MED_PENTA15,MED_PYRA5,
+		MED_HEXA20, MED_PENTA6,
-							    MED_PYRA13};
+		MED_PENTA15, MED_PYRA5,
-  med_int desmai[MED_NBR_GEOMETRIE_MAILLE] = {0,2,3,3,3,4,4,4,4,6,6,5,5,5,5};
+		MED_PYRA13
+	};
+	med_int desmai[MED_NBR_GEOMETRIE_MAILLE] =
+		{ 0, 2, 3, 3, 3, 4, 4, 4, 4, 6, 6, 5, 5, 5, 5 };
 	med_int nmailles[MED_NBR_GEOMETRIE_MAILLE];
-  char nommai[MED_NBR_GEOMETRIE_MAILLE] [MED_TAILLE_NOM+1] = {"MED_POINT1",
+	char nommai[MED_NBR_GEOMETRIE_MAILLE][MED_TAILLE_NOM + 1] = { "MED_POINT1",
 		"MED_SEG2",
 		"MED_SEG3",
 		"MED_TRIA3",
@@ -169,37 +151,43 @@ void DriverMED_W_SMESHDS_Mesh::Add() {
 		"MED_PENTA6",
 		"MED_PENTA15",
 		"MED_PYRA5",
-							      "MED_PYRA13"};
+		"MED_PYRA13"
-  med_geometrie_element typfac[MED_NBR_GEOMETRIE_FACE] = {MED_TRIA3,MED_TRIA6,
+	};
-							  MED_QUAD4,MED_QUAD8};
+	med_geometrie_element typfac[MED_NBR_GEOMETRIE_FACE] =
-  med_int desfac[MED_NBR_GEOMETRIE_FACE] = {3,3,4,4};
+		{ MED_TRIA3, MED_TRIA6,
+		MED_QUAD4, MED_QUAD8
+	};
+	med_int desfac[MED_NBR_GEOMETRIE_FACE] = { 3, 3, 4, 4 };
 	med_int nfaces[MED_NBR_GEOMETRIE_FACE];
-  char nomfac[MED_NBR_GEOMETRIE_FACE][MED_TAILLE_NOM+1] = {"MED_TRIA3","MED_TRIA6",
+	char nomfac[MED_NBR_GEOMETRIE_FACE][MED_TAILLE_NOM + 1] =
-							   "MED_QUAD4","MED_QUAD8"};
+		{ "MED_TRIA3", "MED_TRIA6",
-  med_geometrie_element typare[MED_NBR_GEOMETRIE_ARETE] = {MED_SEG2,MED_SEG3};
+		"MED_QUAD4", "MED_QUAD8"
-  med_int desare[MED_NBR_GEOMETRIE_ARETE] = {2,3};
+	};
+	med_geometrie_element typare[MED_NBR_GEOMETRIE_ARETE] =
+		{ MED_SEG2, MED_SEG3 };
+	med_int desare[MED_NBR_GEOMETRIE_ARETE] = { 2, 3 };
 	med_int naretes[MED_NBR_GEOMETRIE_ARETE];
-  char nomare[MED_NBR_GEOMETRIE_ARETE] [MED_TAILLE_NOM+1] = {"MED_SEG2","MED_SEG3"};
+	char nomare[MED_NBR_GEOMETRIE_ARETE][MED_TAILLE_NOM + 1] =
+		{ "MED_SEG2", "MED_SEG3" };
 
 	typ_con = MED_NOD;
 	mode_coo = MED_FULL_INTERLACE;
 	numero = myMeshId;
 
 	//---- provisoire : switch pour ecrire les familles de mailles
-  int besoinfamilledemaille=1;
+	int besoinfamilledemaille = 1;
 	//---- provisoire : switch pour ecrire les familles de mailles
 
   /****************************************************************************
    *                      OUVERTURE DU FICHIER EN ECRITURE                    *
    ****************************************************************************/
-  char* file2Read = (char*)myFile.c_str();
+	char *file2Read = (char *)myFile.c_str();
 
-  MESSAGE ( " file2Read " << file2Read )
+	MESSAGE(" file2Read " << file2Read)
-
+		myFileId = MEDouvrir(file2Read, MED_REMP);
-    myFileId = MEDouvrir(file2Read,MED_REMP);
 	if (myFileId < 0)
 	{
-      fprintf(stderr,">> ERREUR : ouverture du fichier %s \n",file2Read);
+		fprintf(stderr, ">> ERREUR : ouverture du fichier %s \n", file2Read);
 		exit(EXIT_FAILURE);
 	}
 
@@ -211,8 +199,8 @@ void DriverMED_W_SMESHDS_Mesh::Add() {
 	MESSAGE("(****************************)");
 
 	/* calcul de la dimension */
-  mdim=2;
+	mdim = 2;
-  double epsilon=0.00001;
+	double epsilon = 0.00001;
 	double nodeRefX;
 	double nodeRefY;
 	double nodeRefZ;
@@ -221,92 +209,105 @@ void DriverMED_W_SMESHDS_Mesh::Add() {
 	bool dimY = true;
 	bool dimZ = true;
 
-  SMDS_MeshNodesIterator myItNodes(myMesh);
 	int inode = 0;
-  for (;myItNodes.More();myItNodes.Next()) {
+	SMDS_Iterator<const SMDS_MeshNode *> * myItNodes=myMesh->nodesIterator();
-    const Handle(SMDS_MeshElement)& elem = myItNodes.Value();
+	while(myItNodes->more())
-    const Handle(SMDS_MeshNode)& node = myMesh->GetNode(1,elem);
+	{
-    if ( inode == 0 ) {
+		const SMDS_MeshNode * node = myItNodes->next();
+		if (inode == 0)
+		{
 			nodeRefX = fabs(node->X());
 			nodeRefY = fabs(node->Y());
 			nodeRefZ = fabs(node->Z());
 		}
-    SCRUTE( inode );
+		SCRUTE(inode);
-    SCRUTE( nodeRefX );
+		SCRUTE(nodeRefX);
-    SCRUTE( nodeRefY );
+		SCRUTE(nodeRefY);
-    SCRUTE( nodeRefZ );
+		SCRUTE(nodeRefZ);
 
-    if ( inode !=0 ) {
+		if (inode != 0)
-      if ( (fabs(fabs(node->X()) - nodeRefX) > epsilon ) && dimX )
+		{
+			if ((fabs(fabs(node->X()) - nodeRefX) > epsilon) && dimX)
 				dimX = false;
-      if ( (fabs(fabs(node->Y()) - nodeRefY) > epsilon ) && dimY )
+			if ((fabs(fabs(node->Y()) - nodeRefY) > epsilon) && dimY)
 				dimY = false;
-      if ( (fabs(fabs(node->Z()) - nodeRefZ) > epsilon ) && dimZ )
+			if ((fabs(fabs(node->Z()) - nodeRefZ) > epsilon) && dimZ)
 				dimZ = false;
 		}
-    if ( !dimX && !dimY && !dimZ ) {
+		if (!dimX && !dimY && !dimZ)
+		{
 			mdim = 3;
 			break;
 		}
 		inode++;
 	}
 
-  if ( mdim != 3 ) {
+	if (mdim != 3)
-    if ( dimX && dimY && dimZ )
+	{
+		if (dimX && dimY && dimZ)
 			mdim = 0;
-    else if ( !dimX ) {
+		else if (!dimX)
-      if ( dimY && dimZ )
+		{
+			if (dimY && dimZ)
 				mdim = 1;
-      else if (( dimY && !dimZ ) || ( !dimY && dimZ ) )
+			else if ((dimY && !dimZ) || (!dimY && dimZ))
 				mdim = 2;
-    } else if ( !dimY ) {
+		}
-      if ( dimX && dimZ )
+		else if (!dimY)
+		{
+			if (dimX && dimZ)
 				mdim = 1;
-      else if (( dimX && !dimZ ) || ( !dimX && dimZ ) )
+			else if ((dimX && !dimZ) || (!dimX && dimZ))
 				mdim = 2;
-    } else if ( !dimZ ) {
+		}
-      if ( dimY && dimX )
+		else if (!dimZ)
+		{
+			if (dimY && dimX)
 				mdim = 1;
-      else if (( dimY && !dimX ) || ( !dimY && dimX ) )
+			else if ((dimY && !dimX) || (!dimY && dimX))
 				mdim = 2;
 		}
 	}
 
-  MESSAGE ( " mdim " << mdim );
+	MESSAGE(" mdim " << mdim);
 
 	/* creation du maillage */
 	//mdim=3;
-  sprintf(nommaa,"Mesh %d",numero);
+	sprintf(nommaa, "Mesh %d", numero);
 	SCRUTE(nommaa);
-  ret = MEDmaaCr(myFileId,nommaa,mdim);
+	ret = MEDmaaCr(myFileId, nommaa, mdim);
 
 	ASSERT(ret == 0);
-  SCRUTE( ret );
+	SCRUTE(ret);
 
 	/* Combien de noeuds ? */
 	nnoe = myMesh->NbNodes();
 	//SCRUTE(nnoe);
 	/* Combien de mailles, faces ou aretes ? */
-  for (i=0;i<MED_NBR_GEOMETRIE_MAILLE;i++)
+	for (i = 0; i < MED_NBR_GEOMETRIE_MAILLE; i++)
-    nmailles[i]=0;
+		nmailles[i] = 0;
 
-  Standard_Integer nb_of_nodes, nb_of_faces, nb_of_edges;
+	int nb_of_nodes, nb_of_faces, nb_of_edges;
-  vector<int> elem_Id[MED_NBR_GEOMETRIE_MAILLE];
+	vector < int >elem_Id[MED_NBR_GEOMETRIE_MAILLE];
 
-  SMDS_MeshEdgesIterator itEdges(myMesh);
 	nb_of_edges = myMesh->NbEdges();
-  for (;itEdges.More();itEdges.Next()) {
+	SMDS_Iterator<const SMDS_MeshEdge *> * itEdges=myMesh->edgesIterator();
-    const Handle(SMDS_MeshElement)& elem = itEdges.Value();
+	while(itEdges->more())
+	{
+		const SMDS_MeshEdge * elem = itEdges->next();
 
 		nb_of_nodes = elem->NbNodes();
 
-    switch (nb_of_nodes) {
+		switch (nb_of_nodes)
-    case 2 : {
+		{
+		case 2:
+		{
 			elem_Id[1].push_back(elem->GetID());
 			nmailles[1]++;
 			break;
 		}
-    case 3 : {
+		case 3:
+		{
 			elem_Id[2].push_back(elem->GetID());
 			nmailles[2]++;
 			break;
@@ -314,26 +315,30 @@ void DriverMED_W_SMESHDS_Mesh::Add() {
 		}
 	}
 
-
-  SMDS_MeshFacesIterator itFaces(myMesh);
 	nb_of_faces = myMesh->NbFaces();
-  for (;itFaces.More();itFaces.Next()) {
+	SMDS_Iterator<const SMDS_MeshFace *> * itFaces=myMesh->facesIterator();
-    const Handle(SMDS_MeshElement)& elem = itFaces.Value();
+	while(itFaces->more())
+	{
+		const SMDS_MeshElement * elem = itFaces->next();
 
 		nb_of_nodes = elem->NbNodes();
 
-    switch (nb_of_nodes) {
+		switch (nb_of_nodes)
-    case 3 : {
+		{
+		case 3:
+		{
 			elem_Id[3].push_back(elem->GetID());
 			nmailles[3]++;
 			break;
 		}
-    case 4 : {
+		case 4:
+		{
 			elem_Id[5].push_back(elem->GetID());
 			nmailles[5]++;
 			break;
 		}
-    case 6 : {
+		case 6:
+		{
 			elem_Id[4].push_back(elem->GetID());
 			nmailles[4]++;
 			break;
@@ -342,13 +347,16 @@ void DriverMED_W_SMESHDS_Mesh::Add() {
 
 	}
 
-  SMDS_MeshVolumesIterator itVolumes(myMesh);
+	SMDS_Iterator<const SMDS_MeshVolume *> * itVolumes=myMesh->volumesIterator();
-  for (;itVolumes.More();itVolumes.Next()) {
+	while(itVolumes->more())
-    const Handle(SMDS_MeshElement)& elem = itVolumes.Value();
+	{
+		const SMDS_MeshElement * elem = itVolumes->next();
 
 		nb_of_nodes = elem->NbNodes();
-    switch (nb_of_nodes) {
+		switch (nb_of_nodes)
-    case 8 : {
+		{
+		case 8:
+		{
 			elem_Id[9].push_back(elem->GetID());
 			nmailles[9]++;
 			break;
@@ -356,8 +364,6 @@ void DriverMED_W_SMESHDS_Mesh::Add() {
 		}
 	}
 
-
-
   /****************************************************************************
    *                       ECRITURE DES NOEUDS                                *
    ****************************************************************************/
@@ -367,113 +373,124 @@ void DriverMED_W_SMESHDS_Mesh::Add() {
 
 	/* Allocations memoires */
 	/* table des coordonnees
-     profil : (dimension * nombre de noeuds ) */
+	 * profil : (dimension * nombre de noeuds ) */
-  coo = (med_float*) malloc(sizeof(med_float)*nnoe*mdim);
+	coo = (med_float *) malloc(sizeof(med_float) * nnoe * mdim);
 	/* table  des numeros, des numeros de familles des noeuds
-     profil : (nombre de noeuds) */
+	 * profil : (nombre de noeuds) */
-  numnoe = (med_int*) malloc(sizeof(med_int)*nnoe);
+	numnoe = (med_int *) malloc(sizeof(med_int) * nnoe);
-  nufano = (med_int*) malloc(sizeof(med_int)*nnoe);
+	nufano = (med_int *) malloc(sizeof(med_int) * nnoe);
 	/* table des noms des noeuds
-     profil : (nnoe*MED_TAILLE_PNOM+1) */
+	 * profil : (nnoe*MED_TAILLE_PNOM+1) */
-  nomnoe ="";
+	nomnoe = "";
 
-  /* PN  pour aster, il faut une famille 0 pour les noeuds et une autre pour les elements*/
+	/* PN  pour aster, il faut une famille 0 pour les noeuds et une autre pour les elements */
 	/* PN : Creation de la famille 0 */
-  char * nomfam="FAMILLE_0";
+	char *nomfam = "FAMILLE_0";
-  char *attdes="";
+	char *attdes = "";
-  char *gro=0;
+	char *gro = 0;
-  med_int ngro=0;
+	med_int ngro = 0;
-  med_int natt=1;
+	med_int natt = 1;
 	med_int attide = 0;
-  med_int attval=0;
+	med_int attval = 0;
 	med_int numfam = 0;
-  med_int attvalabs=1;
+	med_int attvalabs = 1;
-  ret = MEDfamCr(myFileId,nommaa,nomfam,numfam, &attide,&attval,attdes,natt,gro,ngro);
+	ret =
+		MEDfamCr(myFileId, nommaa, nomfam, numfam, &attide, &attval, attdes,
+		natt, gro, ngro);
 	ASSERT(ret == 0);
 
-
 	/* PN : FIN Creation de la famille 0 */
 
-  map < int, int > mapNoeud;
+	map < int, int >mapNoeud;
-  typedef pair<set<int>::iterator, bool> IsFamily;
+	typedef pair < set < int >::iterator, bool > IsFamily;
 	int nbFamillesNoeud;
 
-
 	i = 0;
-  set<int> FamilySet;
+	set < int >FamilySet;
 	nbFamillesNoeud = 0;
 	int verifienbnoeuds = 0;
-  med_int* rien=0;
+	med_int *rien = 0;
 
-  SMDS_MeshNodesIterator itNodes(myMesh);
+	SMDS_Iterator<const SMDS_MeshNode *> * itNodes=myMesh->nodesIterator();
-  for (;itNodes.More();itNodes.Next())
+	while(itNodes->more())
 	{
-      const Handle(SMDS_MeshElement)& elem = itNodes.Value();
+		const SMDS_MeshNode * node = itNodes->next();
-      const Handle(SMDS_MeshNode)& node = myMesh->GetNode(1,elem);
 
-      if(mdim==3){
+		if (mdim == 3)
-	coo[i*3]=node->X();
+		{
-	coo[i*3+1]=node->Y();
+			coo[i * 3] = node->X();
-	coo[i*3+2]=node->Z();
+			coo[i * 3 + 1] = node->Y();
-      } else if(mdim==2) {
+			coo[i * 3 + 2] = node->Z();
-	if ( dimX ) {
-	  coo[i*2]=node->Y();
-	  coo[i*2+1]=node->Z();
 		}
-	if ( dimY ) {
+		else if (mdim == 2)
-	  coo[i*2]=node->X();
+		{
-	  coo[i*2+1]=node->Z();
+			if (dimX)
+			{
+				coo[i * 2] = node->Y();
+				coo[i * 2 + 1] = node->Z();
 			}
-	if ( dimZ ) {
+			if (dimY)
-	  coo[i*2]=node->X();
+			{
-	  coo[i*2+1]=node->Y();
+				coo[i * 2] = node->X();
+				coo[i * 2 + 1] = node->Z();
 			}
-      } else {
+			if (dimZ)
-	if ( dimX ) {
+			{
-	  coo[i*2]=node->Y();
+				coo[i * 2] = node->X();
-	  coo[i*2+1]=node->Z();
+				coo[i * 2 + 1] = node->Y();
-	} 
-	if ( dimY ) {
-	  coo[i*2]=node->X();
-	  coo[i*2+1]=node->Z();
-	} 
-	if ( dimZ ) {
-	  coo[i*2]=node->X();
-	  coo[i*2+1]=node->Y();
 			}
 		}
-      mapNoeud[node->GetID()] = i+1;
+		else
+		{
+			if (dimX)
+			{
+				coo[i * 2] = node->Y();
+				coo[i * 2 + 1] = node->Z();
+			}
+			if (dimY)
+			{
+				coo[i * 2] = node->X();
+				coo[i * 2 + 1] = node->Z();
+			}
+			if (dimZ)
+			{
+				coo[i * 2] = node->X();
+				coo[i * 2 + 1] = node->Y();
+			}
+		}
+		mapNoeud[node->GetID()] = i + 1;
 
 		// renvoie 0 pour les noeuds internes du volume
-      int numfamille=node->GetPosition()->GetShapeId();
+		int numfamille = node->GetPosition()->GetShapeId();
-      nufano[i]=numfamille;
+		nufano[i] = numfamille;
 
 		//SCRUTE(i);
 		//SCRUTE(nufano[i]);
 		//SCRUTE(coo[i*3]);
 		//SCRUTE(coo[i*3+1]);
 		//SCRUTE(coo[i*3+2]);
-      if ( nufano[i] != 0 )
+		if (nufano[i] != 0)
 		{
 			IsFamily deja = FamilySet.insert(nufano[i]);	// insert if new, or gives existant
 			if (deja.second)	// actually inserted
 			{
-	      char famille[MED_TAILLE_NOM+1];
+				char famille[MED_TAILLE_NOM + 1];
-	      sprintf(famille,"F%d",nufano[i]);
+				sprintf(famille, "F%d", nufano[i]);
 				//          CreateFamily(strdup(nommaa),strdup(famille),nufano[i],attvalabs++);
 				attvalabs++;
-	      CreateFamily(strdup(nommaa),strdup(famille),nufano[i],numfamille);
+				CreateFamily(strdup(nommaa), strdup(famille), nufano[i],
+					numfamille);
 				//MESSAGE("---famille-noeud--- "<<nbFamillesNoeud<<" "<<nufano[i]);
 				nbFamillesNoeud++;
 			}
 		}
 
 		i++;
-      verifienbnoeuds ++;
+		verifienbnoeuds++;
 	}
-  ret = MEDnoeudsEcr(myFileId,nommaa,mdim,coo,mode_coo,MED_CART,
+	ret = MEDnoeudsEcr(myFileId, nommaa, mdim, coo, mode_coo, MED_CART,
-		     nomcoo,unicoo,nomnoe,MED_FAUX,rien,MED_FAUX,
+		nomcoo, unicoo, nomnoe, MED_FAUX, rien, MED_FAUX,
-		     nufano,nnoe,MED_REMP);
+		nufano, nnoe, MED_REMP);
 	ASSERT(ret == 0);
 	MESSAGE("--- Creation de " << verifienbnoeuds << " noeuds");
 	ASSERT(verifienbnoeuds == nnoe);
@@ -495,100 +512,111 @@ void DriverMED_W_SMESHDS_Mesh::Add() {
 
 	if (ret == 0)
 	{
-      int nbFamillesElts =0;
+		int nbFamillesElts = 0;
-      Handle(SMESHDS_Mesh) mySMESHDSMesh = Handle(SMESHDS_Mesh)::DownCast(myMesh);
+		SMESHDS_Mesh * mySMESHDSMesh = dynamic_cast<SMESHDS_Mesh *>(myMesh);
 		TopTools_IndexedMapOfShape myIndexToShape;
-      TopExp::MapShapes(mySMESHDSMesh->ShapeToMesh(),myIndexToShape);
+		TopExp::MapShapes(mySMESHDSMesh->ShapeToMesh(), myIndexToShape);
 
-      map < int, int > mapFamille;
+		map<int,int> mapFamille;
 
 		if (besoinfamilledemaille == 1)
 		{
 			int t;
-	  for (t =1; t <= myIndexToShape.Extent(); t++)
+			for (t = 1; t <= myIndexToShape.Extent(); t++)
 			{
 				const TopoDS_Shape S = myIndexToShape(t);
 				if (mySMESHDSMesh->HasMeshElements(S))
 				{
 					//MESSAGE ("********* Traitement de la Famille "<<-t);
 
-		  Handle(SMESHDS_SubMesh) SM = mySMESHDSMesh->MeshElements(S);
+					SMESHDS_SubMesh * SM = mySMESHDSMesh->MeshElements(S);
-		  const TColStd_ListOfInteger& indElt = SM->GetIDElements();
+					const vector<int>& indElt = SM->GetIDElements();
-		  TColStd_ListIteratorOfListOfInteger ite(indElt);
+					vector<int>::const_iterator ite=indElt.begin();
 
-		  bool plein=false;
+					bool plein = false;
-		  for (; ite.More(); ite.Next())
+					for (; ite!=indElt.end(); ite++)
 					{
-		      int eltId = ite.Value();
+						int eltId = *ite;
-		      mapFamille [eltId] = - t;
+						mapFamille[eltId] = -t;
-		      plein=true;
+						plein = true;
 					}
 					if (plein)
 					{
 						nbFamillesElts++;
-		      char famille[MED_TAILLE_NOM+1];
+						char famille[MED_TAILLE_NOM + 1];
-		      sprintf(famille,"E%d",t);
+						sprintf(famille, "E%d", t);
-		      CreateFamily(strdup(nommaa),strdup(famille),-t,attvalabs++);
+						CreateFamily(strdup(nommaa), strdup(famille), -t,
+							attvalabs++);
 					}
 				}
 			}
 		}
 
-      int indice=1;
+		int indice = 1;
-      for (i=0;i<MED_NBR_GEOMETRIE_MAILLE;i++)
+		for (i = 0; i < MED_NBR_GEOMETRIE_MAILLE; i++)
 		{
 			if (nmailles[i] > 0 && ret == 0)
 			{
-	      MESSAGE ( " Start "<<typmai[i]);
+				MESSAGE(" Start " << typmai[i]);
 
 				/* dimension de la maille */
 				edim = typmai[i] / 100;
 				nsup = 0;
 				if (mdim == 2 || mdim == 3)
-		if (edim == 1) nsup = 1;
+					if (edim == 1)
+						nsup = 1;
 				if (mdim == 3)
-		if (edim == 2) nsup = 1;
+					if (edim == 2)
+						nsup = 1;
 				//SCRUTE(nsup);
 
-	      taille = nsup+typmai[i]%100;
+				taille = nsup + typmai[i] % 100;
 				//SCRUTE(taille);
 
 				/* allocation memoire */
-	      connectivite = (med_int*)malloc(sizeof(med_int)* taille*nmailles[i]);
+				connectivite =
-	      nomele = (char*)malloc(sizeof(char)*MED_TAILLE_PNOM* nmailles[i]+1);
+					(med_int *) malloc(sizeof(med_int) * taille * nmailles[i]);
-	      numele = (med_int*)malloc(sizeof(med_int)* nmailles[i]);
+				nomele =
-	      nufael = (med_int*)malloc(sizeof(med_int)* nmailles[i]);
+					(char *)malloc(sizeof(char) * MED_TAILLE_PNOM *
-	      nomele="";
+					nmailles[i] + 1);
-	      nbNodes=typmai[i]%100;
+				numele = (med_int *) malloc(sizeof(med_int) * nmailles[i]);
+				nufael = (med_int *) malloc(sizeof(med_int) * nmailles[i]);
+				nomele = "";
+				nbNodes = typmai[i] % 100;
 
-	      for (j=0;j<nmailles[i];j++)
+				for (j = 0; j < nmailles[i]; j++)
 				{
 					myId = elem_Id[i][j];
-		  const Handle(SMDS_MeshElement)& elem = myMesh->FindElement(myId);
+					const SMDS_MeshElement * elem =
+						myMesh->FindElement(myId);
 					//*(numele+j) = myId;
-		  *(numele+j) = indice ++;
+					*(numele + j) = indice++;
 
-		  for (k=0; k<nbNodes; k++)
+					SMDS_Iterator<const SMDS_MeshElement *> * itk=elem->nodesIterator();
+					for (k = 0; itk->more(); k++)
 					{
-		      *(connectivite+j*taille+k) = mapNoeud[elem->GetConnection(k+1)];
+						*(connectivite + j * taille + k) =
-		      //SCRUTE(*(connectivite+j*taille+k));
+							mapNoeud[itk->next()->GetID()];
 					}
-		  if (nsup) *(connectivite+j*taille + nbNodes) = 0;
+					delete itk;
+
+					if (nsup)
+						*(connectivite + j * taille + nbNodes) = 0;
 
 					if (besoinfamilledemaille == 1)
 					{
-		      if (mapFamille.find(myId)!=mapFamille.end())
+						if (mapFamille.find(myId) != mapFamille.end())
 						{
-			  nufael[j]=mapFamille[myId];
+							nufael[j] = mapFamille[myId];
 						}
 						else
 						{
-			  nufael[j]=0;
+							nufael[j] = 0;
 						}
 					}
 					else
 					{
-		      nufael[j]=0;
+						nufael[j] = 0;
 					}
 
 					//SCRUTE(myId);
@@ -598,19 +626,22 @@ void DriverMED_W_SMESHDS_Mesh::Add() {
 
 				/* ecriture des données */
 
-		    med_int* rien=0;
+				med_int *rien = 0;
-		    ret=MEDelementsEcr( myFileId,nommaa,mdim,connectivite,mode_coo,nomele,MED_FAUX,numele,
+				ret =
-					MED_VRAI,nufael,nmailles[i],MED_MAILLE,typmai[i],typ_con,MED_REMP);
+					MEDelementsEcr(myFileId, nommaa, mdim, connectivite,
+					mode_coo, nomele, MED_FAUX, numele, MED_VRAI, nufael,
+					nmailles[i], MED_MAILLE, typmai[i], typ_con, MED_REMP);
 				ASSERT(ret == 0);
 				//SCRUTE(ret);
 
-		    if (ret < 0) MESSAGE(">> ERREUR : ecriture des mailles \n");
+				if (ret < 0)
+					MESSAGE(">> ERREUR : ecriture des mailles \n");
 
 				/* liberation memoire */
 				free(connectivite);
 				free(numele);
 				free(nufael);
-		    MESSAGE ( " End "<<typmai[i]);
+				MESSAGE(" End " << typmai[i]);
 			}
 		};
 		MESSAGE("--- Creation de " << nbFamillesElts << " familles d elements");
@@ -624,39 +655,39 @@ void DriverMED_W_SMESHDS_Mesh::Add() {
 	ret = MEDfermer(myFileId);
 
 	if (ret != 0)
-	fprintf(stderr,">> ERREUR : erreur a la fermeture du fichier %s\n",file2Read);
+		fprintf(stderr, ">> ERREUR : erreur a la fermeture du fichier %s\n",
-      MESSAGE ("fichier ferme");
+			file2Read);
-
+	MESSAGE("fichier ferme");
 
 }
 
-void DriverMED_W_SMESHDS_Mesh::CreateFamily(char* nommaa, char* famille, int i,med_int k) {
+void DriverMED_W_SMESHDS_Mesh::CreateFamily(char *nommaa, char *famille, int i,
+	med_int k)
+{
 
-  med_int ngro=0;
+	med_int ngro = 0;
 	med_int natt;
 
-  natt=1;
+	natt = 1;
-  char attdes[MED_TAILLE_DESC+1];
+	char attdes[MED_TAILLE_DESC + 1];
-  char gro[MED_TAILLE_LNOM+1];
+	char gro[MED_TAILLE_LNOM + 1];
-  char fam2[MED_TAILLE_LNOM+1];
+	char fam2[MED_TAILLE_LNOM + 1];
 
-  strcpy(attdes,"");
+	strcpy(attdes, "");
-  strcpy(gro,"");
+	strcpy(gro, "");
-  strcpy(fam2,famille);
+	strcpy(fam2, famille);
 
-  med_int * attide=new med_int[1];
+	med_int *attide = new med_int[1];
-  med_int * attval=new med_int[1];
+	med_int *attval = new med_int[1];
 	attide[0] = k;
 	attval[0] = k;
 
-
 	//MESSAGE("-------- Creation de la Famille : "<< famille << "numero " << i << " --------------");
-  med_int ret = MEDfamCr(myFileId, nommaa, fam2, i, attide, attval, attdes, natt, gro, ngro);
+	med_int ret =
-  ASSERT(ret==0);
+		MEDfamCr(myFileId, nommaa, fam2, i, attide, attval, attdes, natt, gro,
-  delete [] attide;
+		ngro);
-  delete [] attval;
+	ASSERT(ret == 0);
+	delete[]attide;
+	delete[]attval;
 
 }
-
-
-

src/DriverMED/DriverMED_W_SMESHDS_Mesh.h

@@ -37,24 +37,23 @@ extern "C"
 #include <med.h>
 }
 
-class DriverMED_W_SMESHDS_Mesh : public Mesh_Writer {
+class DriverMED_W_SMESHDS_Mesh:public Mesh_Writer
+{
 
-  public :
+  public:DriverMED_W_SMESHDS_Mesh();
-    DriverMED_W_SMESHDS_Mesh();
 	~DriverMED_W_SMESHDS_Mesh();
 
 	void Add();
 	void Write();
-    void SetMesh(Handle(SMDS_Mesh)& aMesh);
+	void SetMesh(SMDS_Mesh * aMesh);
 	void SetFile(string);
 
 	void SetFileId(med_idt);
 	void SetMeshId(int);
 
-    void CreateFamily(char*, char*, int, med_int);
+	void CreateFamily(char *, char *, int, med_int);
 
-private :
+  private:  SMDS_Mesh * myMesh;
-    Handle_SMDS_Mesh myMesh;
 	string myFile;
 	med_idt myFileId;
 	int myMeshId;

src/DriverUNV/DriverUNV_R_SMDS_Mesh.cxx

@@ -3,144 +3,177 @@ using namespace std;
 
 #include "utilities.h"
 
-DriverUNV_R_SMDS_Mesh::DriverUNV_R_SMDS_Mesh() {
+DriverUNV_R_SMDS_Mesh::DriverUNV_R_SMDS_Mesh()
-;
+{
-}
-
-DriverUNV_R_SMDS_Mesh::~DriverUNV_R_SMDS_Mesh() {
-;
-}
-
-void DriverUNV_R_SMDS_Mesh::SetMesh(Handle(SMDS_Mesh)& aMesh) {
-  myMesh = aMesh;
-}
-
-void DriverUNV_R_SMDS_Mesh::SetFile(string aFile) {
-  myFile = aFile;
-}
-
-void DriverUNV_R_SMDS_Mesh::SetFileId(FILE* aFileId) {
-  myFileId = aFileId;
-}
-
-void DriverUNV_R_SMDS_Mesh::SetMeshId(int aMeshId) {
-  myMeshId = aMeshId;
-}
-
-void DriverUNV_R_SMDS_Mesh::Add() {
 	;
 }
 
-void DriverUNV_R_SMDS_Mesh::Read() {
+DriverUNV_R_SMDS_Mesh::~DriverUNV_R_SMDS_Mesh()
+{
+	;
+}
 
-  int cell=0,node=0,n1,n2,n3,n4,n_nodes,nodes[6],blockId,i;
+void DriverUNV_R_SMDS_Mesh::SetMesh(SMDS_Mesh * aMesh)
-  char *s1,*s2,*s3;
+{
-  string str1,str2,str3;
+	myMesh = aMesh;
-  int i1=0;
+}
+
+void DriverUNV_R_SMDS_Mesh::SetFile(string aFile)
+{
+	myFile = aFile;
+}
+
+void DriverUNV_R_SMDS_Mesh::SetFileId(FILE * aFileId)
+{
+	myFileId = aFileId;
+}
+
+void DriverUNV_R_SMDS_Mesh::SetMeshId(int aMeshId)
+{
+	myMeshId = aMeshId;
+}
+
+void DriverUNV_R_SMDS_Mesh::Add()
+{
+	;
+}
+
+void DriverUNV_R_SMDS_Mesh::Read()
+{
+
+	int cell = 0, node = 0, n1, n2, n3, n4, n_nodes, nodes[6], blockId, i;
+	char *s1, *s2, *s3;
+	string str1, str2, str3;
+	int i1 = 0;
 	bool ok, found_block2411, found_block2412;
 
   /****************************************************************************
   *                      OUVERTURE DU FICHIER EN LECTURE                      *
   ****************************************************************************/
-  char* file2Read = (char*)myFile.c_str();
+	char *file2Read = (char *)myFile.c_str();
-  myFileId = fopen(file2Read,"r");
+	myFileId = fopen(file2Read, "r");
 	if (myFileId < 0)
 	{
-      fprintf(stderr,">> ERREUR : ouverture du fichier %s \n",file2Read);
+		fprintf(stderr, ">> ERREUR : ouverture du fichier %s \n", file2Read);
 		exit(EXIT_FAILURE);
 	}
 
-  s1 = (char*) malloc(sizeof(char)*100);
+	s1 = (char *)malloc(sizeof(char) * 100);
-  s2 = (char*) malloc(sizeof(char)*100);
+	s2 = (char *)malloc(sizeof(char) * 100);
-  s3 = (char*) malloc(sizeof(char)*100);
+	s3 = (char *)malloc(sizeof(char) * 100);
 
 	found_block2411 = false;
 	found_block2412 = false;
 
-  do {
+	do
+	{
 
-    while (i1==-1) {
+		while (i1 == -1)
-      fscanf(myFileId,"%d\n",&blockId);
+		{
-      switch (blockId) {
+			fscanf(myFileId, "%d\n", &blockId);
-      case 2411 : {
+			switch (blockId)
-      MESSAGE("BlockId "<<blockId);
+			{
-	fscanf(myFileId,"%d",&node);
+			case 2411:
+			{
+				MESSAGE("BlockId " << blockId);
+				fscanf(myFileId, "%d", &node);
 				//MESSAGE("Node "<<node);
-	while (node!=-1) {
+				while (node != -1)
-	  fscanf(myFileId,"%d %d %d\n",&n1,&n2,&n3);
+				{
-	  fscanf(myFileId,"%s %s %s\n",s1,s2,s3);
+					fscanf(myFileId, "%d %d %d\n", &n1, &n2, &n3);
-	  str1=string(s1);
+					fscanf(myFileId, "%s %s %s\n", s1, s2, s3);
-	  str2=string(s2);
+					str1 = string(s1);
-	  str3=string(s3);
+					str2 = string(s2);
-	  if (str1.find("D")!=string::npos) str1.replace(str1.find("D"),1,"E");
+					str3 = string(s3);
-	  if (str2.find("D")!=string::npos) str2.replace(str2.find("D"),1,"E");
+					if (str1.find("D") != string::npos)
-	  if (str3.find("D")!=string::npos) str3.replace(str3.find("D"),1,"E");
+						str1.replace(str1.find("D"), 1, "E");
-	  ok = myMesh->AddNodeWithID(atof(str1.c_str()),atof(str2.c_str()),atof(str3.c_str()),node);
+					if (str2.find("D") != string::npos)
-	  fscanf(myFileId,"%d",&node);
+						str2.replace(str2.find("D"), 1, "E");
+					if (str3.find("D") != string::npos)
+						str3.replace(str3.find("D"), 1, "E");
+					ok = myMesh->AddNodeWithID(atof(str1.c_str()),
+						atof(str2.c_str()), atof(str3.c_str()), node);
+					fscanf(myFileId, "%d", &node);
 				}
-	i1=0;
+				i1 = 0;
 				found_block2411 = true;
 				break;
 			}
-      case 2412 : {
+			case 2412:
-      MESSAGE("BlockId "<<blockId);
+			{
-	fscanf(myFileId,"%d",&cell);
+				MESSAGE("BlockId " << blockId);
+				fscanf(myFileId, "%d", &cell);
 				//MESSAGE("Cell "<<cell);
-	while (cell!=-1) {
+				while (cell != -1)
-	  fscanf(myFileId,"%d %d %d %d %d\n",&n1,&n2,&n3,&n4,&n_nodes);
+				{
+					fscanf(myFileId, "%d %d %d %d %d\n", &n1, &n2, &n3, &n4,
+						&n_nodes);
 
-	  if ((n1==71)||(n1==72)||(n1==74)||(n1==91)||(n1==92)) {//203
+					if ((n1 == 71) || (n1 == 72) || (n1 == 74) || (n1 == 91) ||
-	    if (n_nodes==3) {
+						(n1 == 92))
-	      for (i=1;i<=n_nodes;i++)
+					{			//203
-		fscanf(myFileId,"%d",&nodes[i-1]);
+						if (n_nodes == 3)
-	      ok = myMesh->AddFaceWithID(nodes[0],nodes[1],nodes[2],cell);
+						{
+							for (i = 1; i <= n_nodes; i++)
+								fscanf(myFileId, "%d", &nodes[i - 1]);
+							ok = myMesh->AddFaceWithID(nodes[0], nodes[1],
+								nodes[2], cell);
 						}
-	    else if (n_nodes==6) {//206
+						else if (n_nodes == 6)
-	      for (i=1;i<=n_nodes;i++)
+						{		//206
-		fscanf(myFileId,"%d",&nodes[i-1]);
+							for (i = 1; i <= n_nodes; i++)
-	      ok = myMesh->AddFaceWithID(nodes[0],nodes[2],nodes[4],cell);
+								fscanf(myFileId, "%d", &nodes[i - 1]);
+							ok = myMesh->AddFaceWithID(nodes[0], nodes[2],
+								nodes[4], cell);
 						}
 					}
 
-	  else if ((n1==11)||(n1==21)||(n1==24)||(n1==25)) {//103
+					else if ((n1 == 11) || (n1 == 21) || (n1 == 24) ||
-	    fgets(s2,100,myFileId);
+						(n1 == 25))
-	    if (n_nodes==3) {
+					{			//103
-	      for (i=1;i<=n_nodes;i++)
+						fgets(s2, 100, myFileId);
-		fscanf(myFileId,"%d",&nodes[i-1]);
+						if (n_nodes == 3)
-	      ok = myMesh->AddEdgeWithID(nodes[0],nodes[1],cell);
+						{
+							for (i = 1; i <= n_nodes; i++)
+								fscanf(myFileId, "%d", &nodes[i - 1]);
+							ok = myMesh->AddEdgeWithID(nodes[0], nodes[1],
+								cell);
 							//MESSAGE("in 103 "<<cell);
 						}
-	    else if (n_nodes==2) {//102
+						else if (n_nodes == 2)
-	      for (i=1;i<=n_nodes;i++)
+						{		//102
-		fscanf(myFileId,"%d",&nodes[i-1]);
+							for (i = 1; i <= n_nodes; i++)
-	      ok = myMesh->AddEdgeWithID(nodes[0],nodes[1],cell);
+								fscanf(myFileId, "%d", &nodes[i - 1]);
+							ok = myMesh->AddEdgeWithID(nodes[0], nodes[1],
+								cell);
 							//MESSAGE("in 102 "<<cell);
 						}
 					}
 
-	  fscanf(myFileId,"\n");
+					fscanf(myFileId, "\n");
-	  fscanf(myFileId,"%d",&cell);
+					fscanf(myFileId, "%d", &cell);
 				}
 
-	i1=0;
+				i1 = 0;
 				found_block2412 = true;
 				break;
 			}
-      case -1 : {
+			case -1:
+			{
 				break;
 			}
 			default:
-	MESSAGE("BlockId "<<blockId);
+				MESSAGE("BlockId " << blockId);
-	i1=0;
+				i1 = 0;
 				break;
 			}
 		}
 
-    fscanf(myFileId,"%s\n",s1);
+		fscanf(myFileId, "%s\n", s1);
 		i1 = atoi(s1);
 
 	}
-  while ((!feof(myFileId))&&((!found_block2411)||(!found_block2412)));
+	while ((!feof(myFileId)) && ((!found_block2411) || (!found_block2412)));
 
   /****************************************************************************
   *                      FERMETURE DU FICHIER                      *

src/DriverUNV/DriverUNV_R_SMDS_Mesh.h

@@ -6,24 +6,23 @@
 #include "SMDS_Mesh.hxx"
 #include "Mesh_Reader.h"
 
-class DriverUNV_R_SMDS_Mesh : public Mesh_Reader {
+class DriverUNV_R_SMDS_Mesh:public Mesh_Reader
+{
 
-  public :
+  public:DriverUNV_R_SMDS_Mesh();
-    DriverUNV_R_SMDS_Mesh();
 	~DriverUNV_R_SMDS_Mesh();
 
 	void Add();
 	void Read();
-    void SetMesh(Handle(SMDS_Mesh)& aMesh);
+	void SetMesh(SMDS_Mesh * aMesh);
 	void SetFile(string);
 
-    void SetFileId(FILE*);
+	void SetFileId(FILE *);
 	void SetMeshId(int);
 
-  private :
+  private:  SMDS_Mesh * myMesh;
-    Handle_SMDS_Mesh myMesh;
 	string myFile;
-    FILE* myFileId;
+	FILE *myFileId;
 	int myMeshId;
 
 };

src/DriverUNV/DriverUNV_R_SMESHDS_Document.cxx

@@ -4,25 +4,30 @@ using namespace std;
 
 #include "utilities.h"
 
-int getOne() {
+int getOne()
+{
 	printf("in getOne");
 	return (1);
 }
 
-extern "C" {
+extern "C"
+{
 	//  Document_Reader* maker() {
-  DriverUNV_R_SMESHDS_Document* maker() {
+	DriverUNV_R_SMESHDS_Document *maker()
-    fprintf(stdout,"here in maker\n");
+	{
+		fprintf(stdout, "here in maker\n");
 		return new DriverUNV_R_SMESHDS_Document;
 	}
 }
 
-DriverUNV_R_SMESHDS_Document::DriverUNV_R_SMESHDS_Document() {
+DriverUNV_R_SMESHDS_Document::DriverUNV_R_SMESHDS_Document()
+{
 	myFile = string("");
 }
 
-DriverUNV_R_SMESHDS_Document::~DriverUNV_R_SMESHDS_Document() {
+DriverUNV_R_SMESHDS_Document::~DriverUNV_R_SMESHDS_Document()
-;
+{
+	;
 }
 
 //void DriverUNV_R_SMESHDS_Document::SetFile(string aFile) {
@@ -33,7 +38,8 @@ DriverUNV_R_SMESHDS_Document::~DriverUNV_R_SMESHDS_Document() {
 //myDocument = aDoc;
 //}
 
-void DriverUNV_R_SMESHDS_Document::Read() {
+void DriverUNV_R_SMESHDS_Document::Read()
+{
 
 	int myMeshId;
 	SCRUTE(myFile);
@@ -42,11 +48,11 @@ void DriverUNV_R_SMESHDS_Document::Read() {
   /****************************************************************************
   *                      OUVERTURE DU FICHIER EN LECTURE                      *
   ****************************************************************************/
-  char* file2Read = (char*)myFile.c_str();
+	char *file2Read = (char *)myFile.c_str();
-  FILE* fid = fopen(file2Read,"r");
+	FILE *fid = fopen(file2Read, "r");
 	if (fid < 0)
 	{
-      fprintf(stderr,">> ERREUR : ouverture du fichier %s \n",file2Read);
+		fprintf(stderr, ">> ERREUR : ouverture du fichier %s \n", file2Read);
 		exit(EXIT_FAILURE);
 	}
 
@@ -60,18 +66,18 @@ void DriverUNV_R_SMESHDS_Document::Read() {
   ****************************************************************************/
 	fclose(fid);
 
-  printf("Nombre de maillages = %d\n",nmaa);
+	printf("Nombre de maillages = %d\n", nmaa);
 
 	string myClass = string("SMESHDS_Mesh");
 	string myExtension = string("UNV");
 
-  for (int meshIt=1;meshIt<=nmaa;meshIt++) {
+	for (int meshIt = 1; meshIt <= nmaa; meshIt++)
+	{
 		myMeshId = myDocument->NewMesh();
 
-    Handle(SMDS_Mesh) myMesh = myDocument->GetMesh(myMeshId);
+		SMDS_Mesh * myMesh = myDocument->GetMesh(myMeshId);
-
-    DriverUNV_R_SMESHDS_Mesh* myReader = new DriverUNV_R_SMESHDS_Mesh;
 
+		DriverUNV_R_SMESHDS_Mesh *myReader = new DriverUNV_R_SMESHDS_Mesh;
 
 		myReader->SetMesh(myMesh);
 		myReader->SetFile(myFile);
@@ -81,5 +87,4 @@ void DriverUNV_R_SMESHDS_Document::Read() {
 
 	}
 
-
 }

src/DriverUNV/DriverUNV_R_SMESHDS_Mesh.cxx

@@ -4,40 +4,48 @@ using namespace std;
 
 #include "utilities.h"
 
-DriverUNV_R_SMESHDS_Mesh::DriverUNV_R_SMESHDS_Mesh() {
+DriverUNV_R_SMESHDS_Mesh::DriverUNV_R_SMESHDS_Mesh()
-;
+{
-}
-
-DriverUNV_R_SMESHDS_Mesh::~DriverUNV_R_SMESHDS_Mesh() {
-;
-}
-
-void DriverUNV_R_SMESHDS_Mesh::SetMesh(Handle(SMDS_Mesh)& aMesh) {
-  //myMesh = Handle(SMESHDS_Mesh)::DownCast(aMesh);
-  myMesh = aMesh;
-}
-
-void DriverUNV_R_SMESHDS_Mesh::SetFile(string aFile) {
-  myFile = aFile;
-}
-
-void DriverUNV_R_SMESHDS_Mesh::SetFileId(FILE* aFileId) {
-  myFileId = aFileId;
-}
-
-void DriverUNV_R_SMESHDS_Mesh::SetMeshId(int aMeshId) {
-  myMeshId = aMeshId;
-}
-
-void DriverUNV_R_SMESHDS_Mesh::Add() {
 	;
 }
 
-void DriverUNV_R_SMESHDS_Mesh::Read() {
+DriverUNV_R_SMESHDS_Mesh::~DriverUNV_R_SMESHDS_Mesh()
+{
+	;
+}
+
+void DriverUNV_R_SMESHDS_Mesh::SetMesh(SMDS_Mesh * aMesh)
+{
+	//myMesh = SMESHDS_Mesh *::DownCast(aMesh);
+	myMesh = aMesh;
+}
+
+void DriverUNV_R_SMESHDS_Mesh::SetFile(string aFile)
+{
+	myFile = aFile;
+}
+
+void DriverUNV_R_SMESHDS_Mesh::SetFileId(FILE * aFileId)
+{
+	myFileId = aFileId;
+}
+
+void DriverUNV_R_SMESHDS_Mesh::SetMeshId(int aMeshId)
+{
+	myMeshId = aMeshId;
+}
+
+void DriverUNV_R_SMESHDS_Mesh::Add()
+{
+	;
+}
+
+void DriverUNV_R_SMESHDS_Mesh::Read()
+{
 	string myClass = string("SMDS_Mesh");
 	string myExtension = string("UNV");
 
-  DriverUNV_R_SMDS_Mesh* myReader = new DriverUNV_R_SMDS_Mesh;
+	DriverUNV_R_SMDS_Mesh *myReader = new DriverUNV_R_SMDS_Mesh;
 
 	myReader->SetMesh(myMesh);
 	myReader->SetFile(myFile);

src/DriverUNV/DriverUNV_R_SMESHDS_Mesh.h

@@ -6,24 +6,23 @@
 #include "SMESHDS_Mesh.hxx"
 #include "Mesh_Reader.h"
 
-class DriverUNV_R_SMESHDS_Mesh : public Mesh_Reader {
+class DriverUNV_R_SMESHDS_Mesh:public Mesh_Reader
+{
 
-  public :
+  public:DriverUNV_R_SMESHDS_Mesh();
-    DriverUNV_R_SMESHDS_Mesh();
 	~DriverUNV_R_SMESHDS_Mesh();
 
 	void Add();
 	void Read();
-    void SetMesh(Handle(SMDS_Mesh)& aMesh);
+	void SetMesh(SMDS_Mesh * aMesh);
 	void SetFile(string);
 
-    void SetFileId(FILE*);
+	void SetFileId(FILE *);
 	void SetMeshId(int);
 
-private :
+  private:  SMDS_Mesh * myMesh;
-    Handle_SMDS_Mesh myMesh;
 	string myFile;
-    FILE* myFileId;
+	FILE *myFileId;
 	int myMeshId;
 
 };

src/DriverUNV/DriverUNV_W_SMDS_Mesh.cxx

@@ -3,10 +3,10 @@ using namespace std;
 
 #include "SMDS_MeshElement.hxx"
 #include "SMDS_MeshNode.hxx"
-#include "SMDS_MeshEdgesIterator.hxx"
+
-#include "SMDS_MeshFacesIterator.hxx"
+
-#include "SMDS_MeshNodesIterator.hxx"
+
-#include "SMDS_MeshVolumesIterator.hxx"
+
 
 #include <utilities.h>
 
@@ -19,59 +19,67 @@ using namespace std;
 #define sELT_BEAM_DESC1 "%10d        %2d         1         1         7         %1d\n"
 #define sELT_BEAM_DESC2 "         0         1         1\n"
 
-DriverUNV_W_SMDS_Mesh::DriverUNV_W_SMDS_Mesh() {
+DriverUNV_W_SMDS_Mesh::DriverUNV_W_SMDS_Mesh()
-;
+{
-}
-
-DriverUNV_W_SMDS_Mesh::~DriverUNV_W_SMDS_Mesh() {
-;
-}
-
-void DriverUNV_W_SMDS_Mesh::SetMesh(Handle(SMDS_Mesh)& aMesh) {
-  myMesh = aMesh;
-}
-
-void DriverUNV_W_SMDS_Mesh::SetFile(string aFile) {
-  myFile = aFile;
-}
-
-void DriverUNV_W_SMDS_Mesh::SetFileId(FILE* aFileId) {
-  myFileId = aFileId;
-}
-
-void DriverUNV_W_SMDS_Mesh::SetMeshId(int aMeshId) {
-  myMeshId = aMeshId;
-}
-
-void DriverUNV_W_SMDS_Mesh::Add() {
 	;
 }
 
-void DriverUNV_W_SMDS_Mesh::Write() {
+DriverUNV_W_SMDS_Mesh::~DriverUNV_W_SMDS_Mesh()
+{
+	;
+}
 
-  int nbNodes,nbCells;
+void DriverUNV_W_SMDS_Mesh::SetMesh(SMDS_Mesh * aMesh)
+{
+	myMesh = aMesh;
+}
+
+void DriverUNV_W_SMDS_Mesh::SetFile(string aFile)
+{
+	myFile = aFile;
+}
+
+void DriverUNV_W_SMDS_Mesh::SetFileId(FILE * aFileId)
+{
+	myFileId = aFileId;
+}
+
+void DriverUNV_W_SMDS_Mesh::SetMeshId(int aMeshId)
+{
+	myMeshId = aMeshId;
+}
+
+void DriverUNV_W_SMDS_Mesh::Add()
+{
+	;
+}
+
+void DriverUNV_W_SMDS_Mesh::Write()
+{
+
+	int nbNodes, nbCells;
 	int i;
 
-  char* file2Read = (char*)myFile.c_str();
+	char *file2Read = (char *)myFile.c_str();
-  myFileId = fopen(file2Read,"w+");
+	myFileId = fopen(file2Read, "w+");
 	if (myFileId < 0)
 	{
-      fprintf(stderr,">> ERREUR : ouverture du fichier %s \n",file2Read);
+		fprintf(stderr, ">> ERREUR : ouverture du fichier %s \n", file2Read);
 		exit(EXIT_FAILURE);
 	}
 	SCRUTE(myMesh);
   /****************************************************************************
   *                       NOMBRES D'OBJETS                                    *
   ****************************************************************************/
-  fprintf(stdout,"\n(****************************)\n");
+	fprintf(stdout, "\n(****************************)\n");
-  fprintf(stdout,"(* INFORMATIONS GENERALES : *)\n");
+	fprintf(stdout, "(* INFORMATIONS GENERALES : *)\n");
-  fprintf(stdout,"(****************************)\n");
+	fprintf(stdout, "(****************************)\n");
 
 	/* Combien de noeuds ? */
 	nbNodes = myMesh->NbNodes();
 
 	/* Combien de mailles, faces ou aretes ? */
-  Standard_Integer nb_of_nodes, nb_of_edges,nb_of_faces, nb_of_volumes;
+	int nb_of_nodes, nb_of_edges, nb_of_faces, nb_of_volumes;
 	nb_of_edges = myMesh->NbEdges();
 	nb_of_faces = myMesh->NbFaces();
 	nb_of_volumes = myMesh->NbVolumes();
@@ -80,117 +88,143 @@ void DriverUNV_W_SMDS_Mesh::Write() {
 	SCRUTE(nb_of_faces);
 	SCRUTE(nb_of_volumes);
 
-  fprintf(stdout,"%d %d\n",nbNodes,nbCells);
+	fprintf(stdout, "%d %d\n", nbNodes, nbCells);
-  fprintf(myFileId,"%d %d\n",nbNodes,nbCells);
+	fprintf(myFileId, "%d %d\n", nbNodes, nbCells);
 
   /****************************************************************************
   *                       ECRITURE DES NOEUDS                                 *
   ****************************************************************************/
-  fprintf(stdout,"\n(************************)\n");
+	fprintf(stdout, "\n(************************)\n");
-  fprintf(stdout,"(* NOEUDS DU MAILLAGE : *)\n");
+	fprintf(stdout, "(* NOEUDS DU MAILLAGE : *)\n");
-  fprintf(stdout,"(************************)\n");
+	fprintf(stdout, "(************************)\n");
 
-  SMDS_MeshNodesIterator itNodes(myMesh);
+	fprintf(myFileId, "%s\n", sUNV_SEPARATOR);
+	fprintf(myFileId, "%s\n", sNODE_UNV_ID);
 
-  fprintf(myFileId,"%s\n", sUNV_SEPARATOR);
+	SMDS_Iterator<const SMDS_MeshNode *> * itNodes=myMesh->nodesIterator();
-  fprintf(myFileId,"%s\n", sNODE_UNV_ID  );
+	while(itNodes->more())
-
+	{
-  for (;itNodes.More();itNodes.Next()) {
+		const SMDS_MeshNode * node = itNodes->next();
-    const Handle(SMDS_MeshElement)& elem = itNodes.Value();
-    const Handle(SMDS_MeshNode   )& node = myMesh->GetNode(1, elem);
 
 		fprintf(myFileId, sNODE_UNV_DESCR, node->GetID());
-    fprintf(myFileId, "%25.16E%25.16E%25.16E\n", node->X(), node->Y(), node->Z());
+		fprintf(myFileId, "%25.16E%25.16E%25.16E\n", node->X(), node->Y(),
+			node->Z());
 	}
-  fprintf(myFileId,"%s\n", sUNV_SEPARATOR);
+	delete itNodes;
+	fprintf(myFileId, "%s\n", sUNV_SEPARATOR);
 
   /****************************************************************************
   *                       ECRITURE DES ELEMENTS                                *
   ****************************************************************************/
-  fprintf(stdout,"\n(**************************)\n");
+	fprintf(stdout, "\n(**************************)\n");
-  fprintf(stdout,"(* ELEMENTS DU MAILLAGE : *)\n");
+	fprintf(stdout, "(* ELEMENTS DU MAILLAGE : *)\n");
-  fprintf(stdout,"(**************************)");
+	fprintf(stdout, "(**************************)");
 	/* Ecriture des connectivites, noms, numeros des mailles */
 
-  fprintf(myFileId,"%s\n", sUNV_SEPARATOR);
+	fprintf(myFileId, "%s\n", sUNV_SEPARATOR);
-  fprintf(myFileId,"%s\n", sELT_UNV_ID   );
+	fprintf(myFileId, "%s\n", sELT_UNV_ID);
 
-  SMDS_MeshEdgesIterator itEdges(myMesh);
+	SMDS_Iterator<const SMDS_MeshEdge *> * itEdges=myMesh->edgesIterator();
-  for (;itEdges.More();itEdges.Next()) {
+	while(itEdges->more())
-    const Handle(SMDS_MeshElement)& elem = itEdges.Value();
+	{
+		const SMDS_MeshElement * elem = itEdges->next();
+		SMDS_Iterator<const SMDS_MeshElement*> *itn=elem->nodesIterator();
 
-    switch (elem->NbNodes()) {
+		switch (elem->NbNodes())
-      case 2 : {
+		{
-        fprintf(myFileId, sELT_BEAM_DESC1, elem->GetID(), 21, elem->NbNodes());
+		case 2:
+			fprintf(myFileId, sELT_BEAM_DESC1, elem->GetID(), 21,
+				elem->NbNodes());
 			fprintf(myFileId, sELT_BEAM_DESC2);
-        fprintf(myFileId, "%10d%10d\n", elem->GetConnection(1), elem->GetConnection(2));
+			fprintf(myFileId, "%10d%10d\n", itn->next()->GetID(),
+				itn->next()->GetID());
+			break;
+
+		case 3:
+			fprintf(myFileId, sELT_BEAM_DESC1, elem->GetID(), 24,
+				elem->NbNodes());
+			fprintf(myFileId, sELT_BEAM_DESC2);
+			fprintf(myFileId, "%10d%10d%10d\n", itn->next()->GetID(),
+				itn->next()->GetID(), itn->next()->GetID());
+
 			break;
 		}
-      case 3 : {
+		delete itn;
-        fprintf(myFileId, sELT_BEAM_DESC1, elem->GetID(), 24, elem->NbNodes());
-        fprintf(myFileId, sELT_BEAM_DESC2);
-        fprintf(myFileId, "%10d%10d%10d\n",elem->GetConnection(1), elem->GetConnection(2), elem->GetConnection(3));
-        break;
-      }
-    }
 	}
+	delete itEdges;
 
-  SMDS_MeshFacesIterator itFaces(myMesh);
+	SMDS_Iterator<const SMDS_MeshFace*> * itFaces=myMesh->facesIterator();
-  for (;itFaces.More();itFaces.Next()) {
+	while(itFaces->more())
-    const Handle(SMDS_MeshElement)& elem = itFaces.Value();
+	{
+		const SMDS_MeshElement * elem = itFaces->next();
 
-    switch (elem->NbNodes()) {
+		switch (elem->NbNodes())
-      case 3 :
+		{
+		case 3:
 			// linear triangle
-        fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 74, elem->NbNodes());
+			fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 74,
+				elem->NbNodes());
 			break;
-      case 4 :
+		case 4:
 			// linear quadrilateral
-        fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 71, elem->NbNodes());
+			fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 71,
+				elem->NbNodes());
 			break;
-      case 6 :
+		case 6:
 			// parabolic triangle
-        fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 72, elem->NbNodes());
+			fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 72,
+				elem->NbNodes());
 			break;
-      case 8 :
+		case 8:
 			// parabolic quadrilateral
-        fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 75, elem->NbNodes());
+			fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 75,
+				elem->NbNodes());
 			break;
 		default:
 			fprintf(myFileId, "element not registered\n");
 		}
 
-    for (i=0;i<elem->NbNodes();i++)
+		SMDS_Iterator<const SMDS_MeshElement*> *itn=elem->nodesIterator();
-      fprintf(myFileId,"%10d",elem->GetConnection(i+1));
+		while(itn->more()) fprintf(myFileId, "%10d", itn->next()->GetID());
+		delete itn;
 
-    fprintf(myFileId,"\n");
+		fprintf(myFileId, "\n");
 	}
+	delete itFaces;
 
-  SMDS_MeshVolumesIterator itVolumes(myMesh);
+	SMDS_Iterator<const SMDS_MeshVolume*> * itVolumes=myMesh->volumesIterator();
-  for (;itVolumes.More();itVolumes.Next()) {
+	while(itVolumes->more())
-    const Handle(SMDS_MeshElement)& elem = itVolumes.Value();
+	{
+		const SMDS_MeshElement * elem = itVolumes->next();
 
-    switch (elem->NbNodes()) {
+		switch (elem->NbNodes())
-      case 4 : 
+		{
+		case 4:
 			// linear tetrahedron
-        fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 111, elem->NbNodes());
+			fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 111,
+				elem->NbNodes());
 			break;
-      case 6 : 
+		case 6:
 			// linear tetrahedron
-        fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 112, elem->NbNodes());
+			fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 112,
+				elem->NbNodes());
 			break;
-      case 8 : 
+		case 8:
 			// linear brick
-        fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 115, elem->NbNodes());
+			fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 115,
+				elem->NbNodes());
 			break;
 		}
 
-    for (i=0;i<elem->NbNodes();i++)
+		SMDS_Iterator<const SMDS_MeshElement*> *itn=elem->nodesIterator();
-      fprintf(myFileId,"%10d",elem->GetConnection(i+1));
+		while(itn->more()) fprintf(myFileId, "%10d", itn->next()->GetID());
+		delete itn;
 
-    fprintf(myFileId,"\n");
+		fprintf(myFileId, "\n");
 	}
-  fprintf(myFileId,"%s\n", sUNV_SEPARATOR);
+	delete itVolumes;
 
-  fclose (myFileId);
+	fprintf(myFileId, "%s\n", sUNV_SEPARATOR);
+
+	fclose(myFileId);
 }

src/DriverUNV/DriverUNV_W_SMDS_Mesh.h

@@ -7,24 +7,23 @@
 #include "SMDS_Mesh.hxx"
 #include "Mesh_Writer.h"
 
-class DriverUNV_W_SMDS_Mesh : public Mesh_Writer {
+class DriverUNV_W_SMDS_Mesh:public Mesh_Writer
+{
 
-  public :
+  public:DriverUNV_W_SMDS_Mesh();
-    DriverUNV_W_SMDS_Mesh();
 	~DriverUNV_W_SMDS_Mesh();
 
 	void Add();
 	void Write();
-    void SetMesh(Handle(SMDS_Mesh)& aMesh);
+	void SetMesh(SMDS_Mesh * aMesh);
 	void SetFile(string);
 
-    void SetFileId(FILE*);
+	void SetFileId(FILE *);
 	void SetMeshId(int);
 
-private :
+  private:  SMDS_Mesh * myMesh;
-    Handle_SMDS_Mesh myMesh;
 	string myFile;
-    FILE* myFileId;
+	FILE *myFileId;
 	int myMeshId;
 
 };

src/DriverUNV/DriverUNV_W_SMESHDS_Document.cxx

@@ -6,17 +6,20 @@ using namespace std;
 
 extern "C"
 {
-  Document_Writer* Wmaker() {
+	Document_Writer *Wmaker()
+	{
 		return new DriverUNV_W_SMESHDS_Document;
 	}
 }
 
-DriverUNV_W_SMESHDS_Document::DriverUNV_W_SMESHDS_Document() {
+DriverUNV_W_SMESHDS_Document::DriverUNV_W_SMESHDS_Document()
-;
+{
+	;
 }
 
-DriverUNV_W_SMESHDS_Document::~DriverUNV_W_SMESHDS_Document() {
+DriverUNV_W_SMESHDS_Document::~DriverUNV_W_SMESHDS_Document()
-;
+{
+	;
 }
 
 //void DriverUNV_W_SMESHDS_Document::SetFile(string aFile) {
@@ -27,18 +30,19 @@ DriverUNV_W_SMESHDS_Document::~DriverUNV_W_SMESHDS_Document() {
 //myDocument = aDocument;
 //}
 
-void DriverUNV_W_SMESHDS_Document::Write() {
+void DriverUNV_W_SMESHDS_Document::Write()
+{
 
-  Handle(SMESHDS_Mesh) myMesh;
+	SMESHDS_Mesh * myMesh;
 
   /****************************************************************************
   *                      OUVERTURE DU FICHIER EN ECRITURE                      *
   ****************************************************************************/
-  char* file2Write = (char*)myFile.c_str();
+	char *file2Write = (char *)myFile.c_str();
-  FILE* fid = fopen(file2Write,"w+");
+	FILE *fid = fopen(file2Write, "w+");
 	if (fid < 0)
 	{
-      fprintf(stderr,">> ERREUR : ouverture du fichier %s \n",file2Write);
+		fprintf(stderr, ">> ERREUR : ouverture du fichier %s \n", file2Write);
 		exit(EXIT_FAILURE);
 	}
 
@@ -60,11 +64,12 @@ void DriverUNV_W_SMESHDS_Document::Write() {
 	//numero++;
 	//myMesh = myDocument->GetMesh(numero);
 	myDocument->InitMeshesIterator();
-  for (;myDocument->MoreMesh();myDocument->NextMesh()) {
+	while(myDocument->MoreMesh())
+	{
 		numero++;
-    myMesh = myDocument->CurrentMesh();
+		myMesh = myDocument->NextMesh();
 
-    DriverUNV_W_SMESHDS_Mesh* myWriter = new DriverUNV_W_SMESHDS_Mesh;
+		DriverUNV_W_SMESHDS_Mesh *myWriter = new DriverUNV_W_SMESHDS_Mesh;
 		//Mesh_Writer* myWriter = Driver::GetMeshWriter(myExtension, myClass);
 
 		myWriter->SetMesh(myMesh);

src/DriverUNV/DriverUNV_W_SMESHDS_Mesh.cxx

@@ -4,10 +4,10 @@ using namespace std;
 
 #include "SMDS_MeshElement.hxx"
 #include "SMDS_MeshNode.hxx"
-#include "SMDS_MeshEdgesIterator.hxx"
+
-#include "SMDS_MeshFacesIterator.hxx"
+
-#include "SMDS_MeshNodesIterator.hxx"
+
-#include "SMDS_MeshVolumesIterator.hxx"
+
 
 #include "utilities.h"
 
@@ -20,37 +20,44 @@ using namespace std;
 #define sELT_BEAM_DESC1 "%10d        %2d         1         1         7         %1d\n"
 #define sELT_BEAM_DESC2 "         0         1         1\n"
 
-DriverUNV_W_SMESHDS_Mesh::DriverUNV_W_SMESHDS_Mesh() {
+DriverUNV_W_SMESHDS_Mesh::DriverUNV_W_SMESHDS_Mesh()
-;
+{
+	;
 }
 
-DriverUNV_W_SMESHDS_Mesh::~DriverUNV_W_SMESHDS_Mesh() {
+DriverUNV_W_SMESHDS_Mesh::~DriverUNV_W_SMESHDS_Mesh()
-;
+{
+	;
 }
 
-void DriverUNV_W_SMESHDS_Mesh::SetMesh(Handle(SMDS_Mesh)& aMesh) {
+void DriverUNV_W_SMESHDS_Mesh::SetMesh(SMDS_Mesh * aMesh)
-  //myMesh = Handle(SMESHDS_Mesh)::DownCast(aMesh);
+{
+	//myMesh = SMESHDS_Mesh *::DownCast(aMesh);
 	myMesh = aMesh;
 }
 
-void DriverUNV_W_SMESHDS_Mesh::SetFile(string aFile) {
+void DriverUNV_W_SMESHDS_Mesh::SetFile(string aFile)
+{
 	myFile = aFile;
 }
 
-void DriverUNV_W_SMESHDS_Mesh::SetFileId(FILE* aFileId) {
+void DriverUNV_W_SMESHDS_Mesh::SetFileId(FILE * aFileId)
+{
 	myFileId = aFileId;
 }
 
-void DriverUNV_W_SMESHDS_Mesh::SetMeshId(int aMeshId) {
+void DriverUNV_W_SMESHDS_Mesh::SetMeshId(int aMeshId)
+{
 	myMeshId = aMeshId;
 }
 
-void DriverUNV_W_SMESHDS_Mesh::Write() {
+void DriverUNV_W_SMESHDS_Mesh::Write()
+{
 
 	string myClass = string("SMDS_Mesh");
 	string myExtension = string("UNV");
 
-  DriverUNV_W_SMDS_Mesh* myWriter = new DriverUNV_W_SMDS_Mesh;
+	DriverUNV_W_SMDS_Mesh *myWriter = new DriverUNV_W_SMDS_Mesh;
 
 	myWriter->SetMesh(myMesh);
 	myWriter->SetFile(myFile);
@@ -59,149 +66,174 @@ void DriverUNV_W_SMESHDS_Mesh::Write() {
 
 	myWriter->Write();
 
-
 }
-void DriverUNV_W_SMESHDS_Mesh::Add() {
+
-  int nbNodes,nbCells;
+void DriverUNV_W_SMESHDS_Mesh::Add()
+{
+	int nbNodes, nbCells;
 	int i;
 
-  char* file2Read = (char*)myFile.c_str();
+	char *file2Read = (char *)myFile.c_str();
-  myFileId = fopen(file2Read,"w+");
+	myFileId = fopen(file2Read, "w+");
 	if (myFileId < 0)
 	{
-      fprintf(stderr,">> ERREUR : ouverture du fichier %s \n",file2Read);
+		fprintf(stderr, ">> ERREUR : ouverture du fichier %s \n", file2Read);
 		exit(EXIT_FAILURE);
 	}
 
   /****************************************************************************
   *                       NOMBRES D'OBJETS                                    *
   ****************************************************************************/
-  fprintf(stdout,"\n(****************************)\n");
+	fprintf(stdout, "\n(****************************)\n");
-  fprintf(stdout,"(* INFORMATIONS GENERALES : *)\n");
+	fprintf(stdout, "(* INFORMATIONS GENERALES : *)\n");
-  fprintf(stdout,"(****************************)\n");
+	fprintf(stdout, "(****************************)\n");
 
 	/* Combien de noeuds ? */
 	nbNodes = myMesh->NbNodes();
 
 	/* Combien de mailles, faces ou aretes ? */
-  Standard_Integer nb_of_nodes, nb_of_edges,nb_of_faces, nb_of_volumes;
+	int nb_of_nodes, nb_of_edges, nb_of_faces, nb_of_volumes;
 	nb_of_edges = myMesh->NbEdges();
 	nb_of_faces = myMesh->NbFaces();
 	nb_of_volumes = myMesh->NbVolumes();
 	nbCells = nb_of_edges + nb_of_faces + nb_of_volumes;
 
-  fprintf(stdout,"%d %d\n",nbNodes,nbCells);
+	fprintf(stdout, "%d %d\n", nbNodes, nbCells);
 //fprintf(myFileId,"%d %d\n",nbNodes,nbCells);
 
   /****************************************************************************
   *                       ECRITURE DES NOEUDS                                 *
   ****************************************************************************/
-  fprintf(stdout,"\n(************************)\n");
+	fprintf(stdout, "\n(************************)\n");
-  fprintf(stdout,"(* NOEUDS DU MAILLAGE : *)\n");
+	fprintf(stdout, "(* NOEUDS DU MAILLAGE : *)\n");
-  fprintf(stdout,"(************************)\n");
+	fprintf(stdout, "(************************)\n");
 
-  SMDS_MeshNodesIterator itNodes(myMesh);
 
-  fprintf(myFileId,"%s\n", sUNV_SEPARATOR);
+	fprintf(myFileId, "%s\n", sUNV_SEPARATOR);
-  fprintf(myFileId,"%s\n", sNODE_UNV_ID  );
+	fprintf(myFileId, "%s\n", sNODE_UNV_ID);
 
-  for (;itNodes.More();itNodes.Next()) {
+	SMDS_Iterator<const SMDS_MeshNode *> * itNodes=myMesh->nodesIterator();
-    const Handle(SMDS_MeshElement)& elem = itNodes.Value();
+	while(itNodes->more())
-    const Handle(SMDS_MeshNode   )& node = myMesh->GetNode(1, elem);
+	{
+		const SMDS_MeshNode * node = itNodes->next(); 
 
 		fprintf(myFileId, sNODE_UNV_DESCR, node->GetID());
-    fprintf(myFileId, "%25.16E%25.16E%25.16E\n", node->X(), node->Y(), node->Z());
+		fprintf(myFileId, "%25.16E%25.16E%25.16E\n", node->X(), node->Y(),
+			node->Z());
 	}
-  fprintf(myFileId,"%s\n", sUNV_SEPARATOR);
+	delete itNodes;
+	fprintf(myFileId, "%s\n", sUNV_SEPARATOR);
 
   /****************************************************************************
   *                       ECRITURE DES ELEMENTS                                *
   ****************************************************************************/
-  fprintf(stdout,"\n(**************************)\n");
+	fprintf(stdout, "\n(**************************)\n");
-  fprintf(stdout,"(* ELEMENTS DU MAILLAGE : *)\n");
+	fprintf(stdout, "(* ELEMENTS DU MAILLAGE : *)\n");
-  fprintf(stdout,"(**************************)");
+	fprintf(stdout, "(**************************)");
 	/* Ecriture des connectivites, noms, numeros des mailles */
 
-  fprintf(myFileId,"%s\n", sUNV_SEPARATOR);
+	fprintf(myFileId, "%s\n", sUNV_SEPARATOR);
-  fprintf(myFileId,"%s\n", sELT_UNV_ID   );
+	fprintf(myFileId, "%s\n", sELT_UNV_ID);
 
-  SMDS_MeshEdgesIterator itEdges(myMesh);
+	SMDS_Iterator<const SMDS_MeshEdge *> * itEdges=myMesh->edgesIterator();
-  for (;itEdges.More();itEdges.Next()) {
+	while(itEdges->more())
-    const Handle(SMDS_MeshElement)& elem = itEdges.Value();
+	{
+		const SMDS_MeshEdge * elem = itEdges->next();
+		SMDS_Iterator<const SMDS_MeshElement*> *itn=elem->nodesIterator();
 
-    switch (elem->NbNodes()) {
+		switch (elem->NbNodes())
-      case 2 : {
+		{
-        fprintf(myFileId, sELT_BEAM_DESC1, elem->GetID(), 21, elem->NbNodes());
+		case 2:
+			fprintf(myFileId, sELT_BEAM_DESC1, elem->GetID(), 21,
+				elem->NbNodes());
 			fprintf(myFileId, sELT_BEAM_DESC2);
-        fprintf(myFileId, "%10d%10d\n", elem->GetConnection(1), elem->GetConnection(2));
+			fprintf(myFileId, "%10d%10d\n", itn->next()->GetID(),
+				itn->next()->GetID());
+			break;
+
+		case 3:
+			fprintf(myFileId, sELT_BEAM_DESC1, elem->GetID(), 24,
+				elem->NbNodes());
+			fprintf(myFileId, sELT_BEAM_DESC2);
+			fprintf(myFileId, "%10d%10d%10d\n", itn->next()->GetID(),
+				itn->next()->GetID(), itn->next()->GetID());
 			break;
 		}
-      case 3 : {
+		delete itn;
-        fprintf(myFileId, sELT_BEAM_DESC1, elem->GetID(), 24, elem->NbNodes());
-        fprintf(myFileId, sELT_BEAM_DESC2);
-        fprintf(myFileId, "%10d%10d%10d\n",elem->GetConnection(1), elem->GetConnection(2), elem->GetConnection(3));
-        break;
-      }
-    }
 	}
+	delete itEdges;
 
-  SMDS_MeshFacesIterator itFaces(myMesh);
+	SMDS_Iterator<const SMDS_MeshFace*> * itFaces=myMesh->facesIterator();
-  for (;itFaces.More();itFaces.Next()) {
+	while(itFaces->more())
-    const Handle(SMDS_MeshElement)& elem = itFaces.Value();
+	{
+		const SMDS_MeshElement * elem = itFaces->next();
 
-    switch (elem->NbNodes()) {
+		switch (elem->NbNodes())
-      case 3 :
+		{
+		case 3:
 			// linear triangle
-        fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 74, elem->NbNodes());
+			fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 74,
+				elem->NbNodes());
 			break;
-      case 4 :
+		case 4:
 			// linear quadrilateral
-        fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 71, elem->NbNodes());
+			fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 71,
+				elem->NbNodes());
 			break;
-      case 6 :
+		case 6:
 			// parabolic triangle
-        fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 72, elem->NbNodes());
+			fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 72,
+				elem->NbNodes());
 			break;
-      case 8 :
+		case 8:
 			// parabolic quadrilateral
-        fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 75, elem->NbNodes());
+			fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 75,
+				elem->NbNodes());
 			break;
 		default:
 			fprintf(myFileId, "element not registered\n");
 		}
 
-    for (i=0;i<elem->NbNodes();i++)
+		SMDS_Iterator<const SMDS_MeshElement*> *itn=elem->nodesIterator();
-      fprintf(myFileId,"%10d",elem->GetConnection(i+1));
+		while(itn->more()) fprintf(myFileId, "%10d", itn->next()->GetID());
+		delete itn;
 
-    fprintf(myFileId,"\n");
+		fprintf(myFileId, "\n");
 	}
+	delete itFaces;
 
-  SMDS_MeshVolumesIterator itVolumes(myMesh);
+	SMDS_Iterator<const SMDS_MeshVolume*> * itVolumes=myMesh->volumesIterator();
-  for (;itVolumes.More();itVolumes.Next()) {
+	while(itVolumes->more())
-    const Handle(SMDS_MeshElement)& elem = itVolumes.Value();
+	{
+		const SMDS_MeshElement * elem = itVolumes->next();
 
-    switch (elem->NbNodes()) {
+		switch (elem->NbNodes())
-      case 4 :
+		{
+		case 4:
 			// linear tetrahedron
-        fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 111, elem->NbNodes());
+			fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 111,
+				elem->NbNodes());
 			break;
-      case 6 :
+		case 6:
 			// linear tetrahedron
-        fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 112, elem->NbNodes());
+			fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 112,
+				elem->NbNodes());
 			break;
-      case 8 :
+		case 8:
 			// linear brick
-        fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 115, elem->NbNodes());
+			fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 115,
+				elem->NbNodes());
 			break;
 		}
 
-    for (i=0;i<elem->NbNodes();i++)
+		SMDS_Iterator<const SMDS_MeshElement*> *itn=elem->nodesIterator();
-      fprintf(myFileId,"%10d",elem->GetConnection(i+1));
+		while(itn->more()) fprintf(myFileId, "%10d", itn->next()->GetID());
+		delete itn;
 
-    fprintf(myFileId,"\n");
+		fprintf(myFileId, "\n");
 	}
-  fprintf(myFileId,"%s\n", sUNV_SEPARATOR);
+	delete itVolumes;
+	fprintf(myFileId, "%s\n", sUNV_SEPARATOR);
 
-  fclose (myFileId);
+	fclose(myFileId);
 }
-

src/DriverUNV/DriverUNV_W_SMESHDS_Mesh.h

@@ -7,24 +7,23 @@
 #include "SMESHDS_Mesh.hxx"
 #include "Mesh_Writer.h"
 
-class DriverUNV_W_SMESHDS_Mesh : public Mesh_Writer {
+class DriverUNV_W_SMESHDS_Mesh:public Mesh_Writer
+{
 
-  public :
+  public:DriverUNV_W_SMESHDS_Mesh();
-    DriverUNV_W_SMESHDS_Mesh();
 	~DriverUNV_W_SMESHDS_Mesh();
 
 	void Add();
 	void Write();
-    void SetMesh(Handle(SMDS_Mesh)& aMesh);
+	void SetMesh(SMDS_Mesh * aMesh);
 	void SetFile(string);
 
-    void SetFileId(FILE*);
+	void SetFileId(FILE *);
 	void SetMeshId(int);
 
-private :
+  private:  SMDS_Mesh * myMesh;
-    Handle_SMDS_Mesh myMesh;
 	string myFile;
-    FILE* myFileId;
+	FILE *myFileId;
 	int myMeshId;
 
 };