Update to match the changes in SMDS

src/DriverDAT/DriverDAT_R_SMDS_Mesh.cxx

@@ -29,173 +29,197 @@ 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() {
+DriverDAT_R_SMDS_Mesh::~DriverDAT_R_SMDS_Mesh()
-;
+{
+	;
 }
 
-void DriverDAT_R_SMDS_Mesh::SetMesh(Handle(SMDS_Mesh)& aMesh) {
+void DriverDAT_R_SMDS_Mesh::SetMesh(SMDS_Mesh * aMesh)
-  myMesh = aMesh;
+{
+	myMesh = aMesh;
 }
 
-void DriverDAT_R_SMDS_Mesh::SetFile(string aFile) {
+void DriverDAT_R_SMDS_Mesh::SetFile(string aFile)
-  myFile = aFile;
+{
+	myFile = aFile;
 }
 
-void DriverDAT_R_SMDS_Mesh::SetFileId(FILE* aFileId) {
+void DriverDAT_R_SMDS_Mesh::SetFileId(FILE * aFileId)
-  myFileId = aFileId;
+{
+	myFileId = aFileId;
 }
 
-void DriverDAT_R_SMDS_Mesh::SetMeshId(int aMeshId) {
+void DriverDAT_R_SMDS_Mesh::SetMeshId(int aMeshId)
-  myMeshId = aMeshId;
+{
+	myMeshId = aMeshId;
 }
 
-void DriverDAT_R_SMDS_Mesh::Add() {
+void DriverDAT_R_SMDS_Mesh::Add()
-  ;
+{
+	;
 }
 
-void DriverDAT_R_SMDS_Mesh::Read() {
+void DriverDAT_R_SMDS_Mesh::Read()
+{
 
-  int i,j;
+	int i, j;
-  int nbNodes,nbCells;
+	int nbNodes, nbCells;
-  int intNumPoint;
+	int intNumPoint;
-  float coordX, coordY, coordZ;
+	float coordX, coordY, coordZ;
-  int nbNoeuds;
+	int nbNoeuds;
 
-  int intNumMaille,Degre;
+	int intNumMaille, Degre;
-  int ValElement;
+	int ValElement;
-  int ValDegre;
+	int ValDegre;
-  int NoeudsMaille[20];
+	int NoeudsMaille[20];
-  int NoeudMaille;
+	int NoeudMaille;
 
-  bool ok;
+	bool ok;
 
-  MESSAGE("in DriverDAT_R_SMDS_Mesh::Read()");
+	MESSAGE("in 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)
+	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);
-    }
+	}
 
-  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
+		// 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
+		// Analyse des cas de cellules
-    switch (ValElement) {
+		switch (ValElement)
-    case 102 : ;
+		{
-    case 103 : ;
+		case 102:;
-      {
+		case 103:;
-      ValDegre=3;
+			{
-      nbNoeuds=2;
+				ValDegre = 3;
-      ok = myMesh->AddEdgeWithID(NoeudsMaille[0],NoeudsMaille[1],intNumMaille);
+				nbNoeuds = 2;
-      break;
+				ok = myMesh->AddEdgeWithID(NoeudsMaille[0], NoeudsMaille[1],
-    }
+					intNumMaille);
-    case 204 : ;
+				break;
-    case 208 : ;
+			}
-      {
+		case 204:;
-      ValDegre=9;
+		case 208:;
-      nbNoeuds=4;
+			{
-      ok = myMesh->AddFaceWithID(NoeudsMaille[0],NoeudsMaille[1],NoeudsMaille[2],NoeudsMaille[3],intNumMaille);
+				ValDegre = 9;
-      break;
+				nbNoeuds = 4;
-    }
+				ok = myMesh->AddFaceWithID(NoeudsMaille[0], NoeudsMaille[1],
-    case 203 : ;
+					NoeudsMaille[2], NoeudsMaille[3], intNumMaille);
-    case 206 : ;
+				break;
-      {
+			}
-      ValDegre=5;
+		case 203:;
-      nbNoeuds=3;
+		case 206:;
-      ok = myMesh->AddFaceWithID(NoeudsMaille[0],NoeudsMaille[1],NoeudsMaille[2],intNumMaille);
+			{
-      break;
+				ValDegre = 5;
-    }
+				nbNoeuds = 3;
-    case 308 : ;
+				ok = myMesh->AddFaceWithID(NoeudsMaille[0], NoeudsMaille[1],
-    case 320 : ;
+					NoeudsMaille[2], intNumMaille);
-      {
+				break;
-      ValDegre=12;
+			}
-      nbNoeuds=8;
+		case 308:;
-      if (ValElement==320) {
+		case 320:;
-	//A voir, correspondance VTK
+			{
-	NoeudsMaille[4]=NoeudsMaille[8];
+				ValDegre = 12;
-	NoeudsMaille[5]=NoeudsMaille[9];
+				nbNoeuds = 8;
-	NoeudsMaille[6]=NoeudsMaille[10];
+				if (ValElement == 320)
-	NoeudsMaille[7]=NoeudsMaille[11];
+				{
-      }
+					//A voir, correspondance VTK
-      ok = myMesh->AddVolumeWithID(NoeudsMaille[0],NoeudsMaille[1],NoeudsMaille[2],NoeudsMaille[3],NoeudsMaille[4],NoeudsMaille[5],NoeudsMaille[6],NoeudsMaille[7],intNumMaille);
+					NoeudsMaille[4] = NoeudsMaille[8];
-     break;
+					NoeudsMaille[5] = NoeudsMaille[9];
-    }
+					NoeudsMaille[6] = NoeudsMaille[10];
-    case 304 : ;
+					NoeudsMaille[7] = NoeudsMaille[11];
-    case 310 : ;
+				}
-      {
+				ok = myMesh->AddVolumeWithID(NoeudsMaille[0], NoeudsMaille[1],
-      ValDegre=10;
+					NoeudsMaille[2], NoeudsMaille[3], NoeudsMaille[4],
-      nbNoeuds=4;
+					NoeudsMaille[5], NoeudsMaille[6], NoeudsMaille[7],
-      if (ValElement==310)
+					intNumMaille);
-	NoeudsMaille[3]=NoeudsMaille[6];
+				break;
-      ok = myMesh->AddVolumeWithID(NoeudsMaille[0],NoeudsMaille[1],NoeudsMaille[2],NoeudsMaille[3],intNumMaille);
+			}
-     break;
+		case 304:;
-    }
+		case 310:;
-    case 306 : ;
+			{
-    case 315 : ;
+				ValDegre = 10;
-      {
+				nbNoeuds = 4;
-      ValDegre=12;
+				if (ValElement == 310)
-      nbNoeuds=8;
+					NoeudsMaille[3] = NoeudsMaille[6];
-      if (ValElement==315) {
+				ok = myMesh->AddVolumeWithID(NoeudsMaille[0], NoeudsMaille[1],
-	NoeudsMaille[3]=NoeudsMaille[6];
+					NoeudsMaille[2], NoeudsMaille[3], intNumMaille);
-	NoeudsMaille[4]=NoeudsMaille[7];
+				break;
-	NoeudsMaille[5]=NoeudsMaille[8];
+			}
-      }
+		case 306:;
-      NoeudsMaille[7]=NoeudsMaille[5];
+		case 315:;
-      NoeudsMaille[6]=NoeudsMaille[5];
+			{
-      NoeudsMaille[5]=NoeudsMaille[4];
+				ValDegre = 12;
-      NoeudsMaille[4]=NoeudsMaille[3];
+				nbNoeuds = 8;
-      NoeudsMaille[3]=NoeudsMaille[2];
+				if (ValElement == 315)
-      ok = myMesh->AddVolumeWithID(NoeudsMaille[0],NoeudsMaille[1],NoeudsMaille[2],NoeudsMaille[3],NoeudsMaille[4],NoeudsMaille[5],intNumMaille);
+				{
-      break;
+					NoeudsMaille[3] = NoeudsMaille[6];
-    }
+					NoeudsMaille[4] = NoeudsMaille[7];
+					NoeudsMaille[5] = NoeudsMaille[8];
+				}
+				NoeudsMaille[7] = NoeudsMaille[5];
+				NoeudsMaille[6] = NoeudsMaille[5];
+				NoeudsMaille[5] = NoeudsMaille[4];
+				NoeudsMaille[4] = NoeudsMaille[3];
+				NoeudsMaille[3] = NoeudsMaille[2];
+				ok = myMesh->AddVolumeWithID(NoeudsMaille[0], NoeudsMaille[1],
+					NoeudsMaille[2], NoeudsMaille[3], NoeudsMaille[4],
+					NoeudsMaille[5], intNumMaille);
+				break;
+			}
 
-    }
+		}
-  }
+	}
 
   /****************************************************************************
   *                      FERMETURE DU FICHIER                      *
   ****************************************************************************/
-  fclose(myFileId);
+	fclose(myFileId);
 
 }

src/DriverDAT/DriverDAT_R_SMDS_Mesh.h

@@ -32,25 +32,24 @@
 #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();
-    ~DriverDAT_R_SMDS_Mesh();
 
-    void Add();
+	void Add();
-    void Read();
+	void Read();
-    void SetMesh(Handle(SMDS_Mesh)& aMesh);
+	void SetMesh(SMDS_Mesh * aMesh);
-    void SetFile(string);
+	void SetFile(string);
 
-    void SetFileId(FILE*);
+	void SetFileId(FILE *);
-    void SetMeshId(int);
+	void SetMeshId(int);
 
-  private :
+  private:  SMDS_Mesh * myMesh;
-    Handle_SMDS_Mesh myMesh;
+	string myFile;
-    string myFile; 
+	FILE *myFileId;
-    FILE* myFileId;
+	int myMeshId;
-    int myMeshId;
 
 };
 #endif

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);
+	printf("in getOne");
+	return (1);
 }
 
-extern "C" {
+extern "C"
-  //  Document_Reader* maker() {
+{
-  DriverDAT_R_SMESHDS_Document* maker() {
+	//  Document_Reader* maker() {
-    fprintf(stdout,"here in maker\n");
+	DriverDAT_R_SMESHDS_Document *maker()
-    return new DriverDAT_R_SMESHDS_Document;
+	{
-  }
+		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("");
+{
+	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,54 +64,54 @@ DriverDAT_R_SMESHDS_Document::~DriverDAT_R_SMESHDS_Document() {
 //myDocument = aDoc;
 //}
 
-void DriverDAT_R_SMESHDS_Document::Read() {
+void DriverDAT_R_SMESHDS_Document::Read()
+{
 
-  int myMeshId;
+	int myMeshId;
-  MESSAGE("in read");
+	MESSAGE("in read");
-  SCRUTE(myFile);
+	SCRUTE(myFile);
-  //Handle(SMESHDS_Document) myDocument = new SMESHDS_Document(1);
+	//Handle(SMESHDS_Document) myDocument = new SMESHDS_Document(1);
 
   /****************************************************************************
   *                      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)
+	if (fid < 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);
-    }
+	}
 
   /****************************************************************************
   *                      COMBIEN DE MAILLAGES ?                               *
   ****************************************************************************/
-  int nmaa = 1;
+	int nmaa = 1;
 
   /****************************************************************************
   *                      FERMETURE DU FICHIER                                 *
   ****************************************************************************/
-  fclose(fid);
+	fclose(fid);
 
-  printf("Nombre de maillages = %d\n",nmaa);
+	printf("Nombre de maillages = %d\n", nmaa);
 
-  string myClass = string("SMESHDS_Mesh");
+	string myClass = string("SMESHDS_Mesh");
-  string myExtension = string("DAT");
+	string myExtension = string("DAT");
 
-  for (int meshIt=1;meshIt<=nmaa;meshIt++) {
+	for (int meshIt = 1; meshIt <= nmaa; meshIt++)
-    myMeshId = myDocument->NewMesh();
+	{
+		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);
+		//myReader->SetFileId(fid);
 
-    myReader->SetMesh(myMesh);
+		myReader->Read();
-    myReader->SetFile(myFile);
-    //myReader->SetFileId(fid);
-
-    myReader->Read();
-
-  }
 
+	}
 
 }

src/DriverDAT/DriverDAT_R_SMESHDS_Mesh.cxx

@@ -30,49 +30,57 @@ 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() {
+DriverDAT_R_SMESHDS_Mesh::~DriverDAT_R_SMESHDS_Mesh()
-;
+{
+	;
 }
 
-void DriverDAT_R_SMESHDS_Mesh::SetMesh(Handle(SMDS_Mesh)& aMesh) {
+void DriverDAT_R_SMESHDS_Mesh::SetMesh(SMDS_Mesh * aMesh)
-  //myMesh = Handle(SMESHDS_Mesh)::DownCast(aMesh);
+{
-  myMesh = aMesh;
+	//myMesh = SMESHDS_Mesh *::DownCast(aMesh);
+	myMesh = aMesh;
 }
 
-void DriverDAT_R_SMESHDS_Mesh::SetFile(string aFile) {
+void DriverDAT_R_SMESHDS_Mesh::SetFile(string aFile)
-  myFile = aFile;
+{
+	myFile = aFile;
 }
 
-void DriverDAT_R_SMESHDS_Mesh::SetFileId(FILE* aFileId) {
+void DriverDAT_R_SMESHDS_Mesh::SetFileId(FILE * aFileId)
-  myFileId = aFileId;
+{
+	myFileId = aFileId;
 }
 
-void DriverDAT_R_SMESHDS_Mesh::SetMeshId(int aMeshId) {
+void DriverDAT_R_SMESHDS_Mesh::SetMeshId(int aMeshId)
-  myMeshId = aMeshId;
+{
+	myMeshId = aMeshId;
 }
 
-void DriverDAT_R_SMESHDS_Mesh::Add() {
+void DriverDAT_R_SMESHDS_Mesh::Add()
-  ;
+{
+	;
 }
 
-void DriverDAT_R_SMESHDS_Mesh::Read() {
+void DriverDAT_R_SMESHDS_Mesh::Read()
-  string myClass = string("SMDS_Mesh");
+{
-  string myExtension = string("DAT");
+	string myClass = string("SMDS_Mesh");
+	string myExtension = string("DAT");
 
-  MESSAGE("in DriverDAT_R_SMESHDS_Mesh::Read() 1");
+	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");
+	MESSAGE("in DriverDAT_R_SMESHDS_Mesh::Read() 2");
-  myReader->SetMesh(myMesh);
+	myReader->SetMesh(myMesh);
-  MESSAGE("in DriverDAT_R_SMESHDS_Mesh::Read() 3");
+	MESSAGE("in DriverDAT_R_SMESHDS_Mesh::Read() 3");
-  myReader->SetFile(myFile);
+	myReader->SetFile(myFile);
-  //myReader->SetFileId(myFileId);
+	//myReader->SetFileId(myFileId);
 
-  MESSAGE("in DriverDAT_R_SMESHDS_Mesh::Read() 4");
+	MESSAGE("in DriverDAT_R_SMESHDS_Mesh::Read() 4");
-  myReader->Read();
+	myReader->Read();
 
 }

src/DriverDAT/DriverDAT_R_SMESHDS_Mesh.h

@@ -32,25 +32,24 @@
 #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();
-    ~DriverDAT_R_SMESHDS_Mesh();
 
-    void Add();
+	void Add();
-    void Read();
+	void Read();
-    void SetMesh(Handle(SMDS_Mesh)& aMesh);
+	void SetMesh(SMDS_Mesh * aMesh);
-    void SetFile(string);
+	void SetFile(string);
 
-    void SetFileId(FILE*);
+	void SetFileId(FILE *);
-    void SetMeshId(int);
+	void SetMeshId(int);
 
-private :
+  private:  SMDS_Mesh * myMesh;
-    Handle_SMDS_Mesh myMesh;
+	string myFile;
-    string myFile; 
+	FILE *myFileId;
-    FILE* myFileId;
+	int myMeshId;
-    int myMeshId;
 
 };
 #endif

src/DriverDAT/DriverDAT_W_SMDS_Mesh.cxx

@@ -29,162 +29,178 @@ 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() {
+DriverDAT_W_SMDS_Mesh::~DriverDAT_W_SMDS_Mesh()
-;
+{
+	;
 }
 
-void DriverDAT_W_SMDS_Mesh::SetMesh(Handle(SMDS_Mesh)& aMesh) {
+void DriverDAT_W_SMDS_Mesh::SetMesh(SMDS_Mesh * aMesh)
-  myMesh = aMesh;
+{
+	myMesh = aMesh;
 }
 
-void DriverDAT_W_SMDS_Mesh::SetFile(string aFile) {
+void DriverDAT_W_SMDS_Mesh::SetFile(string aFile)
-  myFile = aFile;
+{
+	myFile = aFile;
 }
 
-void DriverDAT_W_SMDS_Mesh::SetFileId(FILE* aFileId) {
+void DriverDAT_W_SMDS_Mesh::SetFileId(FILE * aFileId)
-  myFileId = aFileId;
+{
+	myFileId = aFileId;
 }
 
-void DriverDAT_W_SMDS_Mesh::SetMeshId(int aMeshId) {
+void DriverDAT_W_SMDS_Mesh::SetMeshId(int aMeshId)
-  myMeshId = aMeshId;
+{
+	myMeshId = aMeshId;
 }
 
-void DriverDAT_W_SMDS_Mesh::Add() {
+void DriverDAT_W_SMDS_Mesh::Add()
-  ;
+{
+	;
 }
 
-void DriverDAT_W_SMDS_Mesh::Write() {
+void DriverDAT_W_SMDS_Mesh::Write()
+{
 
-  int nbNodes,nbCells;
+	int nbNodes, nbCells;
-  int i;
+	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)
+	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);
-    }
+	}
-  SCRUTE(myMesh);
+	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 ? */
+	/* Combien de noeuds ? */
-  nbNodes = myMesh->NbNodes();
+	nbNodes = myMesh->NbNodes();
 
-  /* Combien de mailles, faces ou aretes ? */
+	/* 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_edges = myMesh->NbEdges();
-  nb_of_faces = myMesh->NbFaces();
+	nb_of_faces = myMesh->NbFaces();
-  nb_of_volumes = myMesh->NbVolumes();
+	nb_of_volumes = myMesh->NbVolumes();
-  nbCells = nb_of_edges + nb_of_faces + nb_of_volumes;
+	nbCells = nb_of_edges + nb_of_faces + nb_of_volumes;
-  SCRUTE(nb_of_edges);
+	SCRUTE(nb_of_edges);
-  SCRUTE(nb_of_faces);
+	SCRUTE(nb_of_faces);
-  SCRUTE(nb_of_volumes);
+	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 */
+	/* 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:
-      break;
+		{
-    } 
+			fprintf(myFileId, "%d %d ", elem->GetID(), 102);
-    case 3 : {
+			break;
-      fprintf(myFileId,"%d %d ",elem->GetID(),103);
+		}
-      break;
+		case 3:
-    }
+		{
-    }
+			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:
-      break;
+		{
-    }
+			fprintf(myFileId, "%d %d ", elem->GetID(), 203);
-    case 4 : {
+			break;
-      fprintf(myFileId,"%d %d ",elem->GetID(),204);
+		}
-      break;
+		case 4:
-    }
+		{
-    case 6 : {
+			fprintf(myFileId, "%d %d ", elem->GetID(), 204);
-      fprintf(myFileId,"%d %d ",elem->GetID(),206);
+			break;
-      break;
+		}
-    }
+		case 6:
-    }
+		{
+			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:
-      break;
+		{
-    }
+			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,25 +33,24 @@
 #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();
-    ~DriverDAT_W_SMDS_Mesh();
 
-    void Add();
+	void Add();
-    void Write();
+	void Write();
-    void SetMesh(Handle(SMDS_Mesh)& aMesh);
+	void SetMesh(SMDS_Mesh * aMesh);
-    void SetFile(string);
+	void SetFile(string);
 
-    void SetFileId(FILE*);
+	void SetFileId(FILE *);
-    void SetMeshId(int);
+	void SetMeshId(int);
 
-private :
+  private:  SMDS_Mesh * myMesh;
-    Handle_SMDS_Mesh myMesh;
+	string myFile;
-    string myFile; 
+	FILE *myFileId;
-    FILE* myFileId;
+	int myMeshId;
-    int myMeshId;
 
 };
 #endif

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;
+	{
-  }
+		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,52 +56,54 @@ 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)
+	if (fid < 0)
-    {
+	{
-      fprintf(stderr,">> ERREUR : ouverture du fichier %s \n",file2Write);
+		fprintf(stderr, ">> ERREUR : ouverture du fichier %s \n", file2Write);
-      exit(EXIT_FAILURE);
+		exit(EXIT_FAILURE);
-    }
+	}
 
   /****************************************************************************
   *                      FERMETURE DU FICHIER                                 *
   ****************************************************************************/
 
-  fclose(fid);
+	fclose(fid);
 
   /******** Nombre de maillages ********/
-  int nb_of_meshes = myDocument->NbMeshes(); //voir avec Yves
+	int nb_of_meshes = myDocument->NbMeshes();	//voir avec Yves
-  //nb_of_meshes = 1;
+	//nb_of_meshes = 1;
-  int numero = 0;
+	int numero = 0;
 
-  string myClass = string("SMESHDS_Mesh");
+	string myClass = string("SMESHDS_Mesh");
-  string myExtension = string("DAT");
+	string myExtension = string("DAT");
 
-  //while (numero<nb_of_meshes) {
+	//while (numero<nb_of_meshes) {
-  //numero++;
+	//numero++;
-  //myMesh = myDocument->GetMesh(numero);
+	//myMesh = myDocument->GetMesh(numero);
-  myDocument->InitMeshesIterator();
+	myDocument->InitMeshesIterator();
-  for (;myDocument->MoreMesh();myDocument->NextMesh()) {
+	while(myDocument->MoreMesh())
-    numero++;
+	{
-    myMesh = myDocument->CurrentMesh();
+		numero++;
+		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);
+		//Mesh_Writer* myWriter = Driver::GetMeshWriter(myExtension, myClass);
 
-    myWriter->SetMesh(myMesh);
+		myWriter->SetMesh(myMesh);
-    myWriter->SetFile(myFile);
+		myWriter->SetFile(myFile);
-  SCRUTE(myMesh);
+		SCRUTE(myMesh);
-    //myWriter->SetFileId(fid);
+		//myWriter->SetFileId(fid);
-    myWriter->SetMeshId(numero);
+		myWriter->SetMeshId(numero);
-    myWriter->Write();
+		myWriter->Write();
-  }
+	}
 
 }

src/DriverDAT/DriverDAT_W_SMESHDS_Mesh.cxx

@@ -30,172 +30,198 @@ 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 = 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;
+{
+	myFile = aFile;
 }
 
-void DriverDAT_W_SMESHDS_Mesh::SetFileId(FILE* aFileId) {
+void DriverDAT_W_SMESHDS_Mesh::SetFileId(FILE * aFileId)
-  myFileId = aFileId;
+{
+	myFileId = aFileId;
 }
 
-void DriverDAT_W_SMESHDS_Mesh::SetMeshId(int aMeshId) {
+void DriverDAT_W_SMESHDS_Mesh::SetMeshId(int aMeshId)
-  myMeshId = aMeshId;
+{
+	myMeshId = aMeshId;
 }
 
-void DriverDAT_W_SMESHDS_Mesh::Write() {
+void DriverDAT_W_SMESHDS_Mesh::Write()
+{
 
-  string myClass = string("SMDS_Mesh");
+	string myClass = string("SMDS_Mesh");
-  string myExtension = string("DAT");
+	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->SetMesh(myMesh);
-  myWriter->SetFile(myFile);
+	myWriter->SetFile(myFile);
-  myWriter->SetMeshId(myMeshId);
+	myWriter->SetMeshId(myMeshId);
-  //myWriter->SetFileId(myFileId);
+	//myWriter->SetFileId(myFileId);
-
-  myWriter->Write();
 
+	myWriter->Write();
 
 }
-void DriverDAT_W_SMESHDS_Mesh::Add() {
-  int nbNodes,nbCells;
-  int i;
 
-  char* file2Read = (char*)myFile.c_str();
+void DriverDAT_W_SMESHDS_Mesh::Add()
-  myFileId = fopen(file2Read,"w+");
+{
-  if (myFileId < 0)
+	int nbNodes, nbCells;
-    {
+	int i;
-      fprintf(stderr,">> ERREUR : ouverture du fichier %s \n",file2Read);
+
-      exit(EXIT_FAILURE);
+	char *file2Read = (char *)myFile.c_str();
-    }
+	myFileId = fopen(file2Read, "w+");
+	if (myFileId < 0)
+	{
+		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 ? */
+	/* Combien de noeuds ? */
-  nbNodes = myMesh->NbNodes();
+	nbNodes = myMesh->NbNodes();
 
-  /* Combien de mailles, faces ou aretes ? */
+	/* 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_edges = myMesh->NbEdges();
-  nb_of_faces = myMesh->NbFaces();
+	nb_of_faces = myMesh->NbFaces();
-  nb_of_volumes = myMesh->NbVolumes();
+	nb_of_volumes = myMesh->NbVolumes();
-  nbCells = nb_of_edges + nb_of_faces + nb_of_volumes;
+	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 */
+	/* 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:
-      break;
+		{
-    } 
+			fprintf(myFileId, "%d %d ", elem->GetID(), 102);
-    case 3 : {
+			break;
-      fprintf(myFileId,"%d %d ",elem->GetID(),103);
+		}
-      break;
+		case 3:
-    }
+		{
-    }
+			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:
-      break;
+		{
-    }
+			fprintf(myFileId, "%d %d ", elem->GetID(), 203);
-    case 4 : {
+			break;
-      fprintf(myFileId,"%d %d ",elem->GetID(),204);
+		}
-      break;
+		case 4:
-    }
+		{
-    case 6 : {
+			fprintf(myFileId, "%d %d ", elem->GetID(), 204);
-      fprintf(myFileId,"%d %d ",elem->GetID(),206);
+			break;
-      break;
+		}
-    }
+		case 6:
-    }
+		{
+			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:
-      break;
+		{
-    }
+			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,25 +33,24 @@
 #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();
-    ~DriverDAT_W_SMESHDS_Mesh();
 
-    void Add();
+	void Add();
-    void Write();
+	void Write();
-    void SetMesh(Handle(SMDS_Mesh)& aMesh);
+	void SetMesh(SMDS_Mesh * aMesh);
-    void SetFile(string);
+	void SetFile(string);
 
-    void SetFileId(FILE*);
+	void SetFileId(FILE *);
-    void SetMeshId(int);
+	void SetMeshId(int);
 
-private :
+  private:  SMDS_Mesh * myMesh;
-    Handle_SMDS_Mesh myMesh;
+	string myFile;
-    string myFile; 
+	FILE *myFileId;
-    FILE* myFileId;
+	int myMeshId;
-    int myMeshId;
 
 };
 #endif

src/DriverMED/DriverMED_R_SMDS_Mesh.cxx

@@ -28,477 +28,563 @@ 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;
+{
+	myMesh = aMesh;
 }
 
-void DriverMED_R_SMDS_Mesh::SetFile(string aFile) {
+void DriverMED_R_SMDS_Mesh::SetFile(string aFile)
-  myFileId = -1;
+{
-  myFile = 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;
+{
+	myFileId = aFileId;
 }
 
-void DriverMED_R_SMDS_Mesh::SetMeshId(int aMeshId) {
+void DriverMED_R_SMDS_Mesh::SetMeshId(int aMeshId)
-  myMeshId = 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;
+	med_err ret = 0;
-  int i,j,k,l;
+	int i, j, k, l;
-  int numero;
+	int numero;
-  char message[200];
+	char message[200];
-  Standard_Boolean ok;
+	bool ok;
-  /* nombre d'objets MED */
+	/* nombre d'objets MED */
-  char nom_universel[MED_TAILLE_LNOM+1];
+	char nom_universel[MED_TAILLE_LNOM + 1];
-  med_int long_fichier_en_tete; 
+	med_int long_fichier_en_tete;
-  char *fichier_en_tete;
+	char *fichier_en_tete;
-  char version_hdf[10];
+	char version_hdf[10];
-  char version_med[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];
+	med_int nare[MED_NBR_GEOMETRIE_ARETE];
-  /* nom du maillage */
+	/* nom du maillage */
-  char nommaa[MED_TAILLE_NOM+1];
+	char nommaa[MED_TAILLE_NOM + 1];
-  /* noeuds */
+	/* noeuds */
-  med_float *coo;
+	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;
+	char *nomnoe;
-  med_int *numnoe;
+	med_int *numnoe;
-  med_int *nufano; 
+	med_int *nufano;
-  med_repere rep;
+	med_repere rep;
-  med_booleen inonoe,inunoe;
+	med_booleen inonoe, inunoe;
-  med_mode_switch mode_coo;
+	med_mode_switch mode_coo;
-  char str[MED_TAILLE_PNOM+1];
+	char str[MED_TAILLE_PNOM + 1];
-  /* elements */
+	/* elements */
-  med_int nsup;
+	med_int nsup;
-  med_int edim;
+	med_int edim;
-  med_int taille;
+	med_int taille;
-  med_int elem_id;
+	med_int elem_id;
-  med_int cmpt = 0;
+	med_int cmpt = 0;
-  med_int *connectivite;
+	med_int *connectivite;
-  char *nomele;
+	char *nomele;
-  med_int *numele;
+	med_int *numele;
-  med_int *nufael;
+	med_int *nufael;
-  med_booleen inoele, inuele;
+	med_booleen inoele, inuele;
-  med_connectivite typ_con;
+	med_connectivite typ_con;
-  med_geometrie_element typgeo;
+	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 nmailles[MED_NBR_GEOMETRIE_MAILLE];
+	};
-  char nommai[MED_NBR_GEOMETRIE_MAILLE] [MED_TAILLE_NOM+1] = {"MED_POINT1",
+	med_int desmai[MED_NBR_GEOMETRIE_MAILLE] =
-							  "MED_SEG2", 
+		{ 0, 2, 3, 3, 3, 4, 4, 4, 4, 6, 6, 5, 5, 5, 5 };
-							  "MED_SEG3",
+	med_int nmailles[MED_NBR_GEOMETRIE_MAILLE];
-							  "MED_TRIA3",
+	char nommai[MED_NBR_GEOMETRIE_MAILLE][MED_TAILLE_NOM + 1] = { "MED_POINT1",
-							  "MED_TRIA6",
+		"MED_SEG2",
-							  "MED_QUAD4",
+		"MED_SEG3",
-							  "MED_QUAD8",
+		"MED_TRIA3",
-							  "MED_TETRA4",
+		"MED_TRIA6",
-							  "MED_TETRA10",
+		"MED_QUAD4",
-							  "MED_HEXA8",
+		"MED_QUAD8",
-							  "MED_HEXA20",
+		"MED_TETRA4",
-							  "MED_PENTA6",
+		"MED_TETRA10",
-							  "MED_PENTA15",
+		"MED_HEXA8",
-							  "MED_PYRA5",
+		"MED_HEXA20",
-							  "MED_PYRA13"};
+		"MED_PENTA6",
-  med_geometrie_element typfac[MED_NBR_GEOMETRIE_FACE] = {MED_TRIA3,MED_TRIA6,
+		"MED_PENTA15",
-						 MED_QUAD4,MED_QUAD8};
+		"MED_PYRA5",
-  med_int desfac[MED_NBR_GEOMETRIE_FACE] = {3,3,4,4};
+		"MED_PYRA13"
-  med_int nfaces[MED_NBR_GEOMETRIE_FACE];
+	};
-  char nomfac[MED_NBR_GEOMETRIE_FACE][MED_TAILLE_NOM+1] = {"MED_TRIA3","MED_TRIA6",
+	med_geometrie_element typfac[MED_NBR_GEOMETRIE_FACE] =
-						       "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_int naretes[MED_NBR_GEOMETRIE_ARETE];
+	med_int desfac[MED_NBR_GEOMETRIE_FACE] = { 3, 3, 4, 4 };
-  char nomare[MED_NBR_GEOMETRIE_ARETE] [MED_TAILLE_NOM+1] = {"MED_SEG2","MED_SEG3"};
+	med_int nfaces[MED_NBR_GEOMETRIE_FACE];
-  /* familles */
+	char nomfac[MED_NBR_GEOMETRIE_FACE][MED_TAILLE_NOM + 1] =
-  med_int nfam;
+		{ "MED_TRIA3", "MED_TRIA6",
-  med_int natt,ngro;
+		"MED_QUAD4", "MED_QUAD8"
-  char *attdes,*gro;
+	};
-  med_int *attval,*attide;
+	med_geometrie_element typare[MED_NBR_GEOMETRIE_ARETE] =
-  char nomfam[MED_TAILLE_NOM+1];
+		{ MED_SEG2, MED_SEG3 };
-  med_int numfam;
+	med_int desare[MED_NBR_GEOMETRIE_ARETE] = { 2, 3 };
-  char str1[MED_TAILLE_DESC+1];
+	med_int naretes[MED_NBR_GEOMETRIE_ARETE];
-  char str2[MED_TAILLE_LNOM+1];
+	char nomare[MED_NBR_GEOMETRIE_ARETE][MED_TAILLE_NOM + 1] =
+		{ "MED_SEG2", "MED_SEG3" };
+	/* familles */
+	med_int nfam;
+	med_int natt, ngro;
+	char *attdes, *gro;
+	med_int *attval, *attide;
+	char nomfam[MED_TAILLE_NOM + 1];
+	med_int numfam;
+	char str1[MED_TAILLE_DESC + 1];
+	char str2[MED_TAILLE_LNOM + 1];
 
-  char* file2Read;
+	char *file2Read;
-  bool locally_managed;
+	bool locally_managed;
-  SCRUTE(myFileId);
+	SCRUTE(myFileId);
-  if (myFileId==-1) 
+	if (myFileId == -1)
-    locally_managed = true;
+		locally_managed = true;
-  else
+	else
-    locally_managed = false;
+		locally_managed = false;
 
-  if (locally_managed)
+	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)
+		if (myFileId < 0)
-      {
+		{
-	fprintf(stderr,">> ERREUR : ouverture du fichier %s \n",file2Read);
+			fprintf(stderr, ">> ERREUR : ouverture du fichier %s \n",
-	exit(EXIT_FAILURE);
+				file2Read);
-      }
+			exit(EXIT_FAILURE);
-    numero = 1;
+		}
-    }
+		numero = 1;
-  else
+	}
-    numero = myMeshId;
+	else
-    
+		numero = myMeshId;
-  typ_con = MED_NOD;
-  mode_coo = MED_FULL_INTERLACE;
 
+	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 */
+	/* 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)
+	if (ret < 0)
-    {
-      fprintf(stderr,">> ERREUR : lecture du nom du maillage \n");
-      exit(EXIT_FAILURE);
-    }
-  fprintf(stdout,"- Nom du maillage : <<%s>>\n",nommaa);
-  fprintf(stdout,"- Dimension du maillage : %d\n",mdim);
-
-  /* Combien de noeuds ? */
-  nnoe = MEDnEntMaa(myFileId,nommaa,MED_COOR,MED_NOEUD,MED_POINT1,typ_con);
-  if (nnoe < 0)
-    {
-      fprintf(stderr,">> ERREUR : lecture du nombre de noeuds \n");
-      exit(EXIT_FAILURE);
-    }
-  fprintf(stdout,"- Nombre de noeuds : %d \n",nnoe);
-
-  /* Combien de mailles, faces ou aretes ? */
-  for (i=0;i<MED_NBR_GEOMETRIE_MAILLE;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 nom du maillage \n");
-	  exit(EXIT_FAILURE);
+		exit(EXIT_FAILURE);
 	}
-      fprintf (stdout,"- Nombre de mailles de type %s : %d \n",nommai[i],nmailles[i]);
+	fprintf(stdout, "- Nom du maillage : <<%s>>\n", nommaa);
-    }
+	fprintf(stdout, "- Dimension du maillage : %d\n", mdim);
 
-  for (i=0;i<MED_NBR_GEOMETRIE_FACE;i++)
+	/* Combien de noeuds ? */
-    {
+	nnoe =
-      nfaces[i] = MEDnEntMaa(myFileId,nommaa,MED_CONN,MED_FACE,typfac[i],
+		MEDnEntMaa(myFileId, nommaa, MED_COOR, MED_NOEUD, MED_POINT1, typ_con);
-			     typ_con);
+	if (nnoe < 0)
-      if (nfaces[i] < 0)
 	{
-	  fprintf(stderr,">> ERREUR : lecture du nombre de faces \n");
+		fprintf(stderr, ">> ERREUR : lecture du nombre de noeuds \n");
-	  exit(EXIT_FAILURE);
+		exit(EXIT_FAILURE);
 	}
-      fprintf (stdout,"- Nombre de faces de type %s : %d \n",nomfac[i],nfaces[i]);
+	fprintf(stdout, "- Nombre de noeuds : %d \n", nnoe);
-    }    
 
-  for (i=0;i<MED_NBR_GEOMETRIE_ARETE;i++)
+	/* Combien de mailles, faces ou aretes ? */
-    {
+	for (i = 0; i < MED_NBR_GEOMETRIE_MAILLE; 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");
+		nmailles[i] =
-	  exit(EXIT_FAILURE);
+			MEDnEntMaa(myFileId, nommaa, MED_CONN, MED_MAILLE, typmai[i],
+			typ_con);
+		if (nmailles[i] < 0)
+		{
+			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 d'aretes de type %s : %d \n",nomare[i],naretes[i]);
-    }
 
-  /* nombre de familles */
+	for (i = 0; i < MED_NBR_GEOMETRIE_FACE; i++)
-  nfam = MEDnFam(myFileId,nommaa,0,MED_FAMILLE);
+	{
-  if (nfam < 0)
+		nfaces[i] = MEDnEntMaa(myFileId, nommaa, MED_CONN, MED_FACE, typfac[i],
-    {
+			typ_con);
-      fprintf(stderr,">> ERREUR : lecture du nombre de familles \n");
+		if (nfaces[i] < 0)
-      exit(EXIT_FAILURE);
+		{
-    }	
+			fprintf(stderr, ">> ERREUR : lecture du nombre de faces \n");
-  fprintf(stdout,"- Nombre de familles : %d \n",nfam);
+			exit(EXIT_FAILURE);
+		}
+		fprintf(stdout, "- Nombre de faces de type %s : %d \n", nomfac[i],
+			nfaces[i]);
+	}
+
+	for (i = 0; i < MED_NBR_GEOMETRIE_ARETE; 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");
+			exit(EXIT_FAILURE);
+		}
+		fprintf(stdout, "- Nombre d'aretes de type %s : %d \n", nomare[i],
+			naretes[i]);
+	}
+
+	/* nombre de familles */
+	nfam = MEDnFam(myFileId, nommaa, 0, MED_FAMILLE);
+	if (nfam < 0)
+	{
+		fprintf(stderr, ">> ERREUR : lecture du nombre de familles \n");
+		exit(EXIT_FAILURE);
+	}
+	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 */
+	/* Allocations memoires */
-  /* table des coordonnees 
+	/* 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
+	/* 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 
+	/* 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 : 
+	/* 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)
-  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++)
-      //fprintf(Out,"%d %f %f %f\n",numnoe[i],coo[i*3],coo[i*3+1],coo[i*3+2]);
+		{
-    }
+			ok = myMesh->AddNodeWithID(coo[i * 3], coo[i * 3 + 1],
-  }
+				coo[i * 3 + 2], numnoe[i]);
-  else {
+			//fprintf(Out,"%d %f %f %f\n",numnoe[i],coo[i*3],coo[i*3+1],coo[i*3+2]);
-    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);
+	else
-    }
+	{
-  }
+		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);
+		}
+	}
 
-  //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");
 
-  SCRUTE(myMesh->NbNodes());
+	SCRUTE(myMesh->NbNodes());
 
-  /* liberation memoire */
+	/* liberation memoire */
-  free(coo);
+	free(coo);
-  free(nomnoe);
+	free(nomnoe);
-  free(numnoe);
+	free(numnoe);
-  free(nufano);
+	free(nufano);
 
   /****************************************************************************
   *                       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");
+	//fprintf(Out,"CELLS\n");
-  /* Lecture des connectivites, noms, numeros des mailles */
+	/* Lecture des connectivites, noms, numeros des mailles */
-  //printf("%d %d %d %d\n",nmailles[3],nmailles[4],nmailles[5],nmailles[9]);
+	//printf("%d %d %d %d\n",nmailles[3],nmailles[4],nmailles[5],nmailles[9]);
 
-  if (ret == 0)
+	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)
+			if (nmailles[i] > 0 && ret == 0)
-	  {
+			{
-	    /* dimension de la maille */
+				/* dimension de la maille */
-	    edim = typmai[i] / 100;
+				edim = typmai[i] / 100;
-	    nsup = 0;
+				nsup = 0;
-	    if (mdim  == 2 || mdim == 3)
+				if (mdim == 2 || mdim == 3)
-	      if (edim == 1)
+					if (edim == 1)
-		nsup = 1;
+						nsup = 1;
-	    if (mdim == 3)
+				if (mdim == 3)
-	      if (edim == 2)
+					if (edim == 2)
-		nsup = 1;
+						nsup = 1;
 
-	    taille = nsup+typmai[i]%100;
+				taille = nsup + typmai[i] % 100;
-	    //taille = typmai[i]%100;
+				//taille = typmai[i]%100;
 
-	    /* allocation memoire */
+				/* 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 */
+				/* 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]);
+				SCRUTE(typmai[i]);
-	    switch (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);
-		else {
+							ok = myMesh->AddEdgeWithID(*(connectivite +
-		  for (j=0;j<nmailles[i];j++) {
+									j * (taille)),
-		    cmpt++;
+								*(connectivite + j * (taille) + 1), elem_id);
-		    ok = myMesh->AddEdgeWithID(*(connectivite+j*(taille)),*(connectivite+j*(taille)+1),cmpt);
+						}
-		  }
+					}
+					else
+					{
+						for (j = 0; j < nmailles[i]; j++)
+						{
+							cmpt++;
+							ok = myMesh->AddEdgeWithID(*(connectivite +
+									j * (taille)),
+								*(connectivite + j * (taille) + 1), cmpt);
+						}
+					}
+
+					break;
+				}
+				case MED_TRIA3:
+				{
+					if (inuele)
+					{
+						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
+					{
+						for (j = 0; j < nmailles[i]; j++)
+						{
+							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:
+				{
+					if (inuele)
+					{
+						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
+					{
+						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);
+							//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:
+				{
+					if (inuele)
+					{
+						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
+					{
+						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);
+							//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:
+				{
+					break;
+				}
+				}
+
+				//fprintf(stdout,"\n  - Numéros de familles : \n");
+				//for (j=0;j<nmailles[i];j++)
+				//fprintf(stdout," %d ",*(nufael+j));
+
+				/* liberation memoire */
+				free(connectivite);
+				free(nomele);
+				free(numele);
+				free(nufael);
+			}
 		}
 
-		break;
+	SCRUTE(myMesh->NbEdges());
-	      }
+	SCRUTE(myMesh->NbFaces());
-	      case MED_TRIA3  : {
-		if (inuele) {
-		  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 {
-		  for (j=0;j<nmailles[i];j++) {
-		    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  : {
-		if (inuele) {
-		  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 {
-		  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);
-		    //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  : {
-		if (inuele) {
-		  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 {
-		  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);
-		    //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 : {
-		break ;
-	      }
-	      }
-
-	    //fprintf(stdout,"\n  - Numéros de familles : \n");
-	    //for (j=0;j<nmailles[i];j++)
-	    //fprintf(stdout," %d ",*(nufael+j));
-	    
-	    /* liberation memoire */
-	    free(connectivite);
-	    free(nomele);
-	    free(numele);
-	    free(nufael);
-	  }
-      }
-
-  SCRUTE(myMesh->NbEdges());
-  SCRUTE(myMesh->NbFaces());
   /****************************************************************************
    *                       LECTURE DES FAMILLES                                *
    ****************************************************************************/
-  printf("\n(*************************)\n");
+	printf("\n(*************************)\n");
-  printf("(* FAMILLES DU MAILLAGE : *)\n");
+	printf("(* FAMILLES DU MAILLAGE : *)\n");
-  printf("(*************************)\n");
+	printf("(*************************)\n");
-  if (ret == 0)
-    for (i=0;i<nfam;i++)
-      {
-	
-	/* nombre de groupes */
-	ngro = MEDnFam(myFileId,nommaa,i+1,MED_GROUPE);
-	if (ngro < 0)  
-	  {
-	    ret = -1;
-	    strcpy(message,
-		   ">> ERREUR : lecture du nombre de groupes d'une famille \n");
-	  }
-	
-	/* nombre d'attributs */
 	if (ret == 0)
-	  {
+		for (i = 0; i < nfam; i++)
-	    natt = MEDnFam(myFileId,nommaa,i+1,MED_ATTR);
+		{
-	    if (natt < 0)
-	      {
-		ret = -1;
-		strcpy(message,
-		   ">> ERREUR : lecture du nombre d'attributs d'une famille\n");
-	      }
-	  }
 
-	if (ret == 0)
+			/* nombre de groupes */
-	  fprintf(stdout,"- Famille %d a %d attributs et %d groupes \n",i+1,natt,ngro); 
+			ngro = MEDnFam(myFileId, nommaa, i + 1, MED_GROUPE);
+			if (ngro < 0)
+			{
+				ret = -1;
+				strcpy(message,
+					">> ERREUR : lecture du nombre de groupes d'une famille \n");
+			}
 
-	/* nom,numero,attributs,groupes */
+			/* nombre d'attributs */
-	if (ret == 0)
+			if (ret == 0)
-	  {
+			{
-	    attide = (med_int*) malloc(sizeof(med_int)*natt);
+				natt = MEDnFam(myFileId, nommaa, i + 1, MED_ATTR);
-	    attval = (med_int*) malloc(sizeof(med_int)*natt);	    
+				if (natt < 0)
-	    attdes = (char *) malloc(MED_TAILLE_DESC*natt+1);
+				{
-	    gro = (char*) malloc(MED_TAILLE_LNOM*ngro+1);
+					ret = -1;
-	    ret = MEDfamInfo(myFileId,nommaa,i+1,nomfam,&numfam,attide,attval,
+					strcpy(message,
-			     attdes,&natt,gro,&ngro);
+						">> ERREUR : lecture du nombre d'attributs d'une famille\n");
-	    fprintf(stdout,"  - Famille de nom %s et de numero %d : \n",nomfam,numfam);
+				}
-	    fprintf(stdout,"  - Attributs : \n");
+			}
-	    for (j=0;j<natt;j++)
-	      {
-		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),
-		       *(attval+j),str1);
-	      }
-            free(attide);
-	    free(attval);
-            free(attdes);
-            fprintf(stdout,"  - Groupes :\n");
-	    for (j=0;j<ngro;j++)
-	      {
-		strncpy(str2,gro+j*MED_TAILLE_LNOM,MED_TAILLE_LNOM);
-		str2[MED_TAILLE_LNOM] = '\0';
-		fprintf(stdout,"   gro = %s\n",str2);
-	      }
-            free(gro);
-	  }
-      }
 
-  if (locally_managed)
+			if (ret == 0)
-    ret = MEDfermer(myFileId);
+				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);
+				attval = (med_int *) malloc(sizeof(med_int) * natt);
+				attdes = (char *)malloc(MED_TAILLE_DESC * natt + 1);
+				gro = (char *)malloc(MED_TAILLE_LNOM * ngro + 1);
+				ret =
+					MEDfamInfo(myFileId, nommaa, i + 1, nomfam, &numfam, attide,
+					attval, attdes, &natt, gro, &ngro);
+				fprintf(stdout, "  - Famille de nom %s et de numero %d : \n",
+					nomfam, numfam);
+				fprintf(stdout, "  - Attributs : \n");
+				for (j = 0; j < natt; j++)
+				{
+					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), *(attval + j), str1);
+				}
+				free(attide);
+				free(attval);
+				free(attdes);
+				fprintf(stdout, "  - Groupes :\n");
+				for (j = 0; j < ngro; j++)
+				{
+					strncpy(str2, gro + j * MED_TAILLE_LNOM, MED_TAILLE_LNOM);
+					str2[MED_TAILLE_LNOM] = '\0';
+					fprintf(stdout, "   gro = %s\n", str2);
+				}
+				free(gro);
+			}
+		}
+
+	if (locally_managed)
+		ret = MEDfermer(myFileId);
 
 }

src/DriverMED/DriverMED_R_SMDS_Mesh.h

@@ -35,25 +35,24 @@ 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();
-    ~DriverMED_R_SMDS_Mesh();
 
-    void Add();
+	void Add();
-    void Read();
+	void Read();
-    void SetMesh(Handle(SMDS_Mesh)& aMesh);
+	void SetMesh(SMDS_Mesh * aMesh);
-    void SetFile(string);
+	void SetFile(string);
 
-    void SetFileId(med_idt);
+	void SetFileId(med_idt);
-    void SetMeshId(int);
+	void SetMeshId(int);
 
-private :
+  private:  SMDS_Mesh * myMesh;
-    Handle_SMDS_Mesh myMesh;
+	string myFile;
-    string myFile; 
+	med_idt myFileId;
-    med_idt myFileId;
+	int myMeshId;
-    int myMeshId;
 
 };
 #endif

src/DriverMED/DriverMED_R_SMESHDS_Document.cxx

@@ -29,90 +29,95 @@ using namespace std;
 #include "DriverMED_R_SMESHDS_Mesh.h"
 #include "utilities.h"
 
-extern "C" {
+extern "C"
-  Document_Reader* maker() {
+{
-    return new DriverMED_R_SMESHDS_Document;
+	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_err ret = 0;
-  med_idt fid;
+	med_idt fid;
-  med_int nmaa;
+	med_int nmaa;
 
-  Standard_Integer myMeshId;
+	int myMeshId;
 
-  //string myFile = string("/home/home_users/cai/projects/salome_prev04/SALOME_ROOT/data/fra1.med");
+	//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)
+	if (fid < 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);
-    }
+	}
 
   /****************************************************************************
   *                      COMBIEN DE MAILLAGES ?                               *
   ****************************************************************************/
-  nmaa = MEDnMaa(fid);
+	nmaa = MEDnMaa(fid);
-  if (nmaa < 0)
+	if (nmaa < 0)
-    {
+	{
-      fprintf(stderr,">> ERREUR : lecture du nombre de maillages \n");
+		fprintf(stderr, ">> ERREUR : lecture du nombre de maillages \n");
-      exit(EXIT_FAILURE);
+		exit(EXIT_FAILURE);
-    }
+	}
-  printf("Nombre de maillages = %d\n",nmaa);
+	printf("Nombre de maillages = %d\n", nmaa);
 
-  string myClass = string("SMESHDS_Mesh");
+	string myClass = string("SMESHDS_Mesh");
-  string myExtension = string("MED");
+	string myExtension = string("MED");
 
+	for (int meshIt = 1; meshIt <= nmaa; meshIt++)
+	{
+		myMeshId = myDocument->NewMesh();
+		printf("MeshId = %d\n", myMeshId);
 
-  for (int meshIt=1;meshIt<=nmaa;meshIt++) {
+		SMDS_Mesh * myMesh = myDocument->GetMesh(myMeshId);
-    myMeshId = myDocument->NewMesh();
+		SCRUTE(myMesh);
-    printf("MeshId = %d\n",myMeshId);
 
-    Handle(SMDS_Mesh) myMesh = myDocument->GetMesh(myMeshId);
+		// Handle (SMDS_Mesh) MMM =.........
-  SCRUTE(myMesh);
+		//ex SMESHDS_Mesh * myMesh2 =SMESHDS_Mesh *::DownCast(MMM);
 
-    // Handle (SMDS_Mesh) MMM =.........
+		DriverMED_R_SMESHDS_Mesh *myReader = new DriverMED_R_SMESHDS_Mesh;
-    //ex Handle(SMESHDS_Mesh) myMesh2 =Handle(SMESHDS_Mesh)::DownCast(MMM);
 
-    DriverMED_R_SMESHDS_Mesh* myReader = new DriverMED_R_SMESHDS_Mesh;
+		myReader->SetMesh(myMesh);
+		myReader->SetMeshId(myMeshId);
 
-    myReader->SetMesh(myMesh);
+		//myReader->SetFile(myFile);
-    myReader->SetMeshId(myMeshId);
+		SCRUTE(fid);
+		myReader->SetFileId(fid);
 
-    //myReader->SetFile(myFile);
+		myReader->Add();
-  SCRUTE(fid);
-    myReader->SetFileId(fid);
 
-    myReader->Add();
+	}
-
-  }
 
   /****************************************************************************
   *                      FERMETURE DU FICHIER                                 *
   ****************************************************************************/
-  ret = MEDfermer(fid);
+	ret = MEDfermer(fid);
-  
-  if (ret != 0)
-    fprintf(stderr,">> ERREUR : erreur a la fermeture du fichier %s\n",file2Read);
 
+	if (ret != 0)
+		fprintf(stderr, ">> ERREUR : erreur a la fermeture du fichier %s\n",
+			file2Read);
 
 }

src/DriverMED/DriverMED_R_SMESHDS_Mesh.h

@@ -36,28 +36,27 @@ 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();
-    ~DriverMED_R_SMESHDS_Mesh();
 
-    void Read();
+	void Read();
-    void ReadMySelf();
+	void ReadMySelf();
-    void Add();
+	void Add();
 
-    void SetMesh(Handle(SMDS_Mesh)& aMesh);
+	void SetMesh(SMDS_Mesh * aMesh);
-    void SetFile(string);
+	void SetFile(string);
-    void SetFileId(med_idt);
+	void SetFileId(med_idt);
-    void SetMeshId(int);
+	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;
-    string myFile; 
+	med_idt myFileId;
-    med_idt myFileId;
+	int myMeshId;
-    int myMeshId;
 
 };
 #endif

src/DriverMED/DriverMED_W_SMDS_Mesh.cxx

@@ -29,351 +29,382 @@ 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() {
+DriverMED_W_SMDS_Mesh::~DriverMED_W_SMDS_Mesh()
-;
+{
+	;
 }
 
-void DriverMED_W_SMDS_Mesh::SetMesh(Handle(SMDS_Mesh)& aMesh) {
+void DriverMED_W_SMDS_Mesh::SetMesh(SMDS_Mesh * aMesh)
-  myMesh = aMesh;
+{
+	myMesh = aMesh;
 }
 
-void DriverMED_W_SMDS_Mesh::SetFile(string aFile) {
+void DriverMED_W_SMDS_Mesh::SetFile(string aFile)
-  myFile = aFile;
+{
+	myFile = aFile;
 }
 
-void DriverMED_W_SMDS_Mesh::SetFileId(med_idt aFileId) {
+void DriverMED_W_SMDS_Mesh::SetFileId(med_idt aFileId)
-  myFileId = aFileId;
+{
+	myFileId = aFileId;
 }
 
-void DriverMED_W_SMDS_Mesh::SetMeshId(int aMeshId) {
+void DriverMED_W_SMDS_Mesh::SetMeshId(int aMeshId)
-  myMeshId = aMeshId;
+{
+	myMeshId = aMeshId;
 }
 
-void DriverMED_W_SMDS_Mesh::Add() {
+void DriverMED_W_SMDS_Mesh::Add()
-  ;
+{
+	;
 }
 
-void DriverMED_W_SMDS_Mesh::Write() {
+void DriverMED_W_SMDS_Mesh::Write()
+{
 
-  med_err ret = 0;
+	med_err ret = 0;
-  int i,j,k,l;
+	int i, j, k, l;
-  int numero;
+	int numero;
-  char message[200];
+	char message[200];
-  Standard_Boolean ok;
+	bool ok;
-  /* nombre d'objets MED */
+	/* nombre d'objets MED */
-  char nom_universel[MED_TAILLE_LNOM+1];
+	char nom_universel[MED_TAILLE_LNOM + 1];
-  med_int long_fichier_en_tete; 
+	med_int long_fichier_en_tete;
-  char *fichier_en_tete;
+	char *fichier_en_tete;
-  char version_hdf[10];
+	char version_hdf[10];
-  char version_med[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];
+	med_int nare[MED_NBR_GEOMETRIE_ARETE];
-  /* nom du maillage */
+	/* nom du maillage */
-  char nommaa[MED_TAILLE_NOM+1];
+	char nommaa[MED_TAILLE_NOM + 1];
-  /* noeuds */
+	/* noeuds */
-  med_float *coo;
+	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;
+	char *nomnoe;
-  med_int *numnoe;
+	med_int *numnoe;
-  med_int *nufano; 
+	med_int *nufano;
-  med_repere rep;
+	med_repere rep;
-  med_booleen inonoe,inunoe;
+	med_booleen inonoe, inunoe;
-  med_mode_switch mode_coo;
+	med_mode_switch mode_coo;
-  char str[MED_TAILLE_PNOM+1];
+	char str[MED_TAILLE_PNOM + 1];
-  med_int nbNodes;
+	med_int nbNodes;
-  /* elements */
+	/* elements */
-  med_int nsup;
+	med_int nsup;
-  med_int edim;
+	med_int edim;
-  med_int taille;
+	med_int taille;
-  med_int elem_id,myId;
+	med_int elem_id, myId;
-  med_int *connectivite;
+	med_int *connectivite;
-  char *nomele;
+	char *nomele;
-  med_int *numele;
+	med_int *numele;
-  med_int *nufael;
+	med_int *nufael;
-  med_booleen inoele, inuele;
+	med_booleen inoele, inuele;
-  med_connectivite typ_con;
+	med_connectivite typ_con;
-  med_geometrie_element typgeo;
+	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 nmailles[MED_NBR_GEOMETRIE_MAILLE];
+	};
-  char nommai[MED_NBR_GEOMETRIE_MAILLE] [MED_TAILLE_NOM+1] = {"MED_POINT1",
+	med_int desmai[MED_NBR_GEOMETRIE_MAILLE] =
-							  "MED_SEG2", 
+		{ 0, 2, 3, 3, 3, 4, 4, 4, 4, 6, 6, 5, 5, 5, 5 };
-							  "MED_SEG3",
+	med_int nmailles[MED_NBR_GEOMETRIE_MAILLE];
-							  "MED_TRIA3",
+	char nommai[MED_NBR_GEOMETRIE_MAILLE][MED_TAILLE_NOM + 1] = { "MED_POINT1",
-							  "MED_TRIA6",
+		"MED_SEG2",
-							  "MED_QUAD4",
+		"MED_SEG3",
-							  "MED_QUAD8",
+		"MED_TRIA3",
-							  "MED_TETRA4",
+		"MED_TRIA6",
-							  "MED_TETRA10",
+		"MED_QUAD4",
-							  "MED_HEXA8",
+		"MED_QUAD8",
-							  "MED_HEXA20",
+		"MED_TETRA4",
-							  "MED_PENTA6",
+		"MED_TETRA10",
-							  "MED_PENTA15",
+		"MED_HEXA8",
-							  "MED_PYRA5",
+		"MED_HEXA20",
-							  "MED_PYRA13"};
+		"MED_PENTA6",
-  med_geometrie_element typfac[MED_NBR_GEOMETRIE_FACE] = {MED_TRIA3,MED_TRIA6,
+		"MED_PENTA15",
-						 MED_QUAD4,MED_QUAD8};
+		"MED_PYRA5",
-  med_int desfac[MED_NBR_GEOMETRIE_FACE] = {3,3,4,4};
+		"MED_PYRA13"
-  med_int nfaces[MED_NBR_GEOMETRIE_FACE];
+	};
-  char nomfac[MED_NBR_GEOMETRIE_FACE][MED_TAILLE_NOM+1] = {"MED_TRIA3","MED_TRIA6",
+	med_geometrie_element typfac[MED_NBR_GEOMETRIE_FACE] =
-						       "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_int naretes[MED_NBR_GEOMETRIE_ARETE];
+	med_int desfac[MED_NBR_GEOMETRIE_FACE] = { 3, 3, 4, 4 };
-  char nomare[MED_NBR_GEOMETRIE_ARETE] [MED_TAILLE_NOM+1] = {"MED_SEG2","MED_SEG3"};
+	med_int nfaces[MED_NBR_GEOMETRIE_FACE];
-  /* familles */
+	char nomfac[MED_NBR_GEOMETRIE_FACE][MED_TAILLE_NOM + 1] =
-  med_int nfam;
+		{ "MED_TRIA3", "MED_TRIA6",
-  med_int natt,ngro;
+		"MED_QUAD4", "MED_QUAD8"
-  char *attdes,*gro;
+	};
-  med_int *attval,*attide;
+	med_geometrie_element typare[MED_NBR_GEOMETRIE_ARETE] =
-  char nomfam[MED_TAILLE_NOM+1];
+		{ MED_SEG2, MED_SEG3 };
-  med_int numfam;
+	med_int desare[MED_NBR_GEOMETRIE_ARETE] = { 2, 3 };
-  char str1[MED_TAILLE_DESC+1];
+	med_int naretes[MED_NBR_GEOMETRIE_ARETE];
-  char str2[MED_TAILLE_LNOM+1];
+	char nomare[MED_NBR_GEOMETRIE_ARETE][MED_TAILLE_NOM + 1] =
+		{ "MED_SEG2", "MED_SEG3" };
+	/* familles */
+	med_int nfam;
+	med_int natt, ngro;
+	char *attdes, *gro;
+	med_int *attval, *attide;
+	char nomfam[MED_TAILLE_NOM + 1];
+	med_int numfam;
+	char str1[MED_TAILLE_DESC + 1];
+	char str2[MED_TAILLE_LNOM + 1];
 
   /****************************************************************************
   *                      OUVERTURE DU FICHIER EN ECRITURE                      *
   ****************************************************************************/
-  /*!  char* file2Read = (char*)myFile.c_str();
+	/*!  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;
+	typ_con = MED_NOD;
-  mode_coo = MED_FULL_INTERLACE;
+	mode_coo = MED_FULL_INTERLACE;
-  numero = myMeshId;
+	numero = myMeshId;
 
   /****************************************************************************
   *                       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 */
+	/* creation du maillage */
-  mdim=3;
+	mdim = 3;
-  //nommaa = QString("Mesh "+myMeshId).latin1();
+	//nommaa = QString("Mesh "+myMeshId).latin1();
-  //nommaa = "";
+	//nommaa = "";
-  //plutot recuperer le nom du maillage dans l'etude
+	//plutot recuperer le nom du maillage dans l'etude
-  if (ret == 0)
+	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++)
+		nmailles[i] = 0;
 
-  /* Combien de noeuds ? */
+	SMDS_Iterator<const SMDS_MeshFace *> * itFaces=myMesh->facesIterator();
-  nnoe = myMesh->NbNodes();
+	int nb_of_nodes, nb_of_faces;
-  //SCRUTE(nnoe);
+	nb_of_faces = myMesh->NbFaces();
-  /* Combien de mailles, faces ou aretes ? */
+	//SCRUTE(nb_of_faces);
-  for (i=0;i<MED_NBR_GEOMETRIE_MAILLE;i++)
-    nmailles[i]=0;
 
-  SMDS_MeshFacesIterator itFaces(myMesh);
+	//med_int elem_Id[MED_NBR_GEOMETRIE_FACE][nb_of_faces];
-  Standard_Integer nb_of_nodes, nb_of_faces;
+	vector<int> elem_Id[MED_NBR_GEOMETRIE_MAILLE];
-  nb_of_faces = myMesh->NbFaces();
+	//typedef vector<int> Integer_vector;
-  //SCRUTE(nb_of_faces);
+	//vector<Integer_vector> elem_Id;
+	//elem_Id.resize(MED_NBR_GEOMETRIE_MAILLE);
 
-  //med_int elem_Id[MED_NBR_GEOMETRIE_FACE][nb_of_faces];
+	while(itFaces->more())
-  vector<int> elem_Id[MED_NBR_GEOMETRIE_MAILLE];
+	{
-  //typedef vector<int> Integer_vector;
+		const SMDS_MeshFace * elem = itFaces->next();
-  //vector<Integer_vector> elem_Id;
-  //elem_Id.resize(MED_NBR_GEOMETRIE_MAILLE);
 
-  for (;itFaces.More();itFaces.Next()) {
+		nb_of_nodes = elem->NbNodes();
-    const Handle(SMDS_MeshElement)& elem = itFaces.Value();
 
-    nb_of_nodes = elem->NbNodes();
+		switch (nb_of_nodes)
+		{
+		case 3:
+		{
+			//elem_Id[3][nmailles[3]] = elem->GetID();
+			elem_Id[3].push_back(elem->GetID());
+			nmailles[3]++;
+			break;
+		}
+		case 4:
+		{
+			//elem_Id[5][nmailles[5]] = elem->GetID();
+			elem_Id[5].push_back(elem->GetID());
+			nmailles[5]++;
+			break;
+		}
+		case 6:
+		{
+			//elem_Id[4][nmailles[4]] = elem->GetID();
+			elem_Id[4].push_back(elem->GetID());
+			nmailles[4]++;
+			break;
+		}
+		}
 
-    switch (nb_of_nodes) {
+	}
-    case 3 : {
-      //elem_Id[3][nmailles[3]] = elem->GetID();
-      elem_Id[3].push_back(elem->GetID());
-      nmailles[3]++;
-      break;
-    }
-    case 4 : {
-      //elem_Id[5][nmailles[5]] = elem->GetID();
-      elem_Id[5].push_back(elem->GetID());
-      nmailles[5]++;
-      break;
-    }
-    case 6 : {
-      //elem_Id[4][nmailles[4]] = elem->GetID();
-      elem_Id[4].push_back(elem->GetID());
-      nmailles[4]++;
-      break;
-    }
-    }
 
-  }
+	SMDS_Iterator<const SMDS_MeshVolume*> * itVolumes=myMesh->volumesIterator();
+	while(itVolumes->more())
+	{
+		const SMDS_MeshVolume * elem = itVolumes->next();
 
-  SMDS_MeshVolumesIterator itVolumes(myMesh);
+		nb_of_nodes = elem->NbNodes();
-   
+		switch (nb_of_nodes)
-  for (;itVolumes.More();itVolumes.Next()) {
+		{
-    const Handle(SMDS_MeshElement)& elem = itVolumes.Value();
+		case 8:
-
+		{
-    nb_of_nodes = elem->NbNodes();
+			//elem_Id[9][nmailles[9]] = elem->GetID();
-    switch (nb_of_nodes) {
+			elem_Id[9].push_back(elem->GetID());
-    case 8 : {
+			nmailles[9]++;
-      //elem_Id[9][nmailles[9]] = elem->GetID();
+			break;
-      elem_Id[9].push_back(elem->GetID());
+		}
-      nmailles[9]++;
+		}
-      break;
+	}
-    }
-    }
-  }
 
   /****************************************************************************
   *                       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 */
+	/* Allocations memoires */
-  /* table des coordonnees 
+	/* 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
+	/* 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 
+	/* table des noms des noeuds 
-     profil : (nnoe*MED_TAILLE_PNOM+1) */
+	 * profil : (nnoe*MED_TAILLE_PNOM+1) */
-  nomnoe ="";
+	nomnoe = "";
 
-  i = 0;
+	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 + 1] = node->Y();
+		coo[i * 3 + 2] = node->Z();
+		numnoe[i] = node->GetID();
+		nufano[i] = 0;
+		i++;
+	}
 
-    coo[i*3]=node->X();
+	/* ecriture des noeuds : 
-    coo[i*3+1]=node->Y();
+	 * - coordonnees
-    coo[i*3+2]=node->Z();
+	 * - noms (optionnel dans un fichier MED) 
-    numnoe[i]=node->GetID();
+	 * - numeros (optionnel dans un fichier MED) 
-    nufano[i]=0;
+	 * - numeros des familles */
-    i++;
+	ret = MEDnoeudsEcr(myFileId, nommaa, mdim, coo, mode_coo, MED_CART,
-  }
+		nomcoo, unicoo, nomnoe, MED_FAUX, numnoe, MED_VRAI,
+		nufano, nnoe, MED_REMP);
 
-  /* ecriture des noeuds : 
+	/* liberation memoire */
-     - coordonnees
+	free(coo);
-     - noms (optionnel dans un fichier MED) 
+	//free(nomnoe);
-     - numeros (optionnel dans un fichier MED) 
+	free(numnoe);
-     - numeros des familles */
+	free(nufano);
-  ret = MEDnoeudsEcr(myFileId,nommaa,mdim,coo,mode_coo,MED_CART,
-		       nomcoo,unicoo,nomnoe,MED_FAUX,numnoe,MED_VRAI,
-		       nufano,nnoe,MED_REMP);
-
-  /* liberation memoire */
-  free(coo);
-  //free(nomnoe);
-  free(numnoe);
-  free(nufano);
 
   /****************************************************************************
   *                       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");
+	//fprintf(Out,"CELLS\n");
-  /* Ecriture des connectivites, noms, numeros des mailles */
+	/* Ecriture des connectivites, noms, numeros des mailles */
 
-  if (ret == 0)
+	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)
+			if (nmailles[i] > 0 && ret == 0)
-	  {
+			{
-	    MESSAGE ( " Start "<<typmai[i]);
+				MESSAGE(" Start " << typmai[i]);
-	    /* dimension de la maille */
+				/* dimension de la maille */
-	    edim = typmai[i] / 100;
+				edim = typmai[i] / 100;
-	    nsup = 0;
+				nsup = 0;
-	    if (mdim  == 2 || mdim == 3)
+				if (mdim == 2 || mdim == 3)
-	      if (edim == 1)
+					if (edim == 1)
-		nsup = 1;
+						nsup = 1;
-	    if (mdim == 3)
+				if (mdim == 3)
-	      if (edim == 2)
+					if (edim == 2)
-		nsup = 1;
+						nsup = 1;
 
-	    taille = nsup+typmai[i]%100;
+				taille = nsup + typmai[i] % 100;
-	    //taille = typmai[i]%100;
+				//taille = typmai[i]%100;
 
-	    /* allocation memoire */
+				/* 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)
+				//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);
+					myId = elem_Id[i][j];
-	      *(numele+j) = myId;
+					const SMDS_MeshElement * elem =
-	      //elem_id=*(numele+j);
+						myMesh->FindElement(myId);
-	      //fprintf(stdout,"%d \n",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=
-		//*(connectivite+j*(taille-1)+k)=cnx[k];
+						elem->nodesIterator();
-		*(connectivite+j*(taille-nsup)+k) = elem->GetConnection(k+1);
-		//fprintf(stdout,"%d ",*(connectivite+j*(taille-nsup)+k));
-	      }
-	      nufael[j]=0;
-	      //fprintf(stdout,"\n");
-	    }
 
-	    /* ecriture des données */
+					while(itNode->more())
+					{
+						//*(connectivite+j*(taille-1)+k)=cnx[k];
+						*(connectivite + j * (taille - nsup) + k) =
+							itNode->next()->GetID();
+						//fprintf(stdout,"%d ",*(connectivite+j*(taille-nsup)+k));
+					}
+					nufael[j] = 0;
+					//fprintf(stdout,"\n");
+				}
 
-	    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);
+				/* ecriture des données */
 
-	    if (ret < 0)
+				ret =
-	      MESSAGE(">> ERREUR : lecture des mailles \n");
+					MEDelementsEcr(myFileId, nommaa, mdim, connectivite,
+					mode_coo, nomele, MED_FAUX, numele, MED_VRAI, nufael,
+					nmailles[i], MED_MAILLE, typmai[i], typ_con, MED_REMP);
 
-	    /* liberation memoire */
+				if (ret < 0)
-	    free(connectivite);
+					MESSAGE(">> ERREUR : lecture des mailles \n");
-	    //free(nomele);
+
-	    free(numele);
+				/* liberation memoire */
-	    free(nufael);
+				free(connectivite);
-	    MESSAGE ( " End "<<typmai[i]);
+				//free(nomele);
-	  }
+				free(numele);
-      }
+				free(nufael);
+				MESSAGE(" End " << typmai[i]);
+			}
+		}
 
   /****************************************************************************
   *                      FERMETURE DU FICHIER                                 *
   ****************************************************************************/
 
-	    /*!  ret = MEDfermer(myFileId);
+	/*!  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,25 +37,24 @@ 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();
-    ~DriverMED_W_SMDS_Mesh();
 
-    void Add(); 
+	void Add();
-    void Write();
+	void Write();
-    void SetMesh(Handle(SMDS_Mesh)& aMesh);
+	void SetMesh(SMDS_Mesh * aMesh);
-    void SetFile(string);
+	void SetFile(string);
 
-    void SetFileId(med_idt);
+	void SetFileId(med_idt);
-    void SetMeshId(int);
+	void SetMeshId(int);
 
-private :
+  private:  SMDS_Mesh * myMesh;
-    Handle_SMDS_Mesh myMesh;
+	string myFile;
-    string myFile; 
+	med_idt myFileId;
-    med_idt myFileId;
+	int myMeshId;
-    int myMeshId;
 
 };
 #endif

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;
+	{
-  }
+		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,47 +57,47 @@ 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_err ret = 0;
-  med_idt fid;
+	med_idt fid;
-  med_int nmaa,numero,nb_of_meshes;
+	med_int nmaa, numero, nb_of_meshes;
-  med_mode_switch mode_coo;
+	med_mode_switch mode_coo;
-  med_connectivite typ_con;
+	med_connectivite typ_con;
 
-  SCRUTE(myFile);
+	SCRUTE(myFile);
-  Handle(SMESHDS_Mesh) myMesh;
+	SMESHDS_Mesh * myMesh;
 
   /******** Nombre de maillages ********/
-  nb_of_meshes = myDocument->NbMeshes(); //voir avec Yves
+	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);
+	SCRUTE(nb_of_meshes);
-  //nb_of_meshes = 1;
+	//nb_of_meshes = 1;
-  numero = 0;
+	numero = 0;
 
-  string myClass = string("SMESHDS_Mesh");
+	string myClass = string("SMESHDS_Mesh");
-  string myExtension = string("MED");
+	string myExtension = string("MED");
 
-  //while (numero<nb_of_meshes) {
+	//while (numero<nb_of_meshes) {
-  //numero++;
+	//numero++;
-  //myMesh = myDocument->GetMesh(numero);
+	//myMesh = myDocument->GetMesh(numero);
 
-  myDocument->InitMeshesIterator();
+	myDocument->InitMeshesIterator();
-  if (nb_of_meshes!=0)
+	if (nb_of_meshes != 0)
-  for (;myDocument->MoreMesh();myDocument->NextMesh()) {
+		while(myDocument->MoreMesh())
-    numero++;
+		{
-    myMesh = myDocument->CurrentMesh();
+			numero++;
+			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);
-    //myWriter->SetFileId(fid);
-    myWriter->SetMeshId(numero);
-
-    //myWriter->Write();
-    myWriter->Add();
-  }
 
+			myWriter->SetMesh(myMesh);
+			myWriter->SetFile(myFile);
+			//myWriter->SetFileId(fid);
+			myWriter->SetMeshId(numero);
 
+			//myWriter->Write();
+			myWriter->Add();
+		}
 }

src/DriverMED/DriverMED_W_SMESHDS_Mesh.h

@@ -37,27 +37,26 @@ 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();
-    ~DriverMED_W_SMESHDS_Mesh();
 
-    void Add(); 
+	void Add();
-    void Write();
+	void Write();
-    void SetMesh(Handle(SMDS_Mesh)& aMesh);
+	void SetMesh(SMDS_Mesh * aMesh);
-    void SetFile(string);
+	void SetFile(string);
 
-    void SetFileId(med_idt);
+	void SetFileId(med_idt);
-    void SetMeshId(int);
+	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;
-    string myFile; 
+	med_idt myFileId;
-    med_idt myFileId;
+	int myMeshId;
-    int myMeshId;
 
 };
 #endif

src/DriverUNV/DriverUNV_R_SMDS_Mesh.cxx

@@ -3,151 +3,184 @@ 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() {
+DriverUNV_R_SMDS_Mesh::~DriverUNV_R_SMDS_Mesh()
-;
+{
+	;
 }
 
-void DriverUNV_R_SMDS_Mesh::SetMesh(Handle(SMDS_Mesh)& aMesh) {
+void DriverUNV_R_SMDS_Mesh::SetMesh(SMDS_Mesh * aMesh)
-  myMesh = aMesh;
+{
+	myMesh = aMesh;
 }
 
-void DriverUNV_R_SMDS_Mesh::SetFile(string aFile) {
+void DriverUNV_R_SMDS_Mesh::SetFile(string aFile)
-  myFile = aFile;
+{
+	myFile = aFile;
 }
 
-void DriverUNV_R_SMDS_Mesh::SetFileId(FILE* aFileId) {
+void DriverUNV_R_SMDS_Mesh::SetFileId(FILE * aFileId)
-  myFileId = aFileId;
+{
+	myFileId = aFileId;
 }
 
-void DriverUNV_R_SMDS_Mesh::SetMeshId(int aMeshId) {
+void DriverUNV_R_SMDS_Mesh::SetMeshId(int aMeshId)
-  myMeshId = aMeshId;
+{
+	myMeshId = aMeshId;
 }
 
-void DriverUNV_R_SMDS_Mesh::Add() {
+void DriverUNV_R_SMDS_Mesh::Add()
-  ;
+{
+	;
 }
 
-void DriverUNV_R_SMDS_Mesh::Read() {
+void DriverUNV_R_SMDS_Mesh::Read()
+{
 
-  int cell=0,node=0,n1,n2,n3,n4,n_nodes,nodes[6],blockId,i;
+	int cell = 0, node = 0, n1, n2, n3, n4, n_nodes, nodes[6], blockId, i;
-  char *s1,*s2,*s3;
+	char *s1, *s2, *s3;
-  string str1,str2,str3;
+	string str1, str2, str3;
-  int i1=0;
+	int i1 = 0;
-  bool ok, found_block2411, found_block2412;
+	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)
+	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);
-    }
-
-  s1 = (char*) malloc(sizeof(char)*100);
-  s2 = (char*) malloc(sizeof(char)*100);
-  s3 = (char*) malloc(sizeof(char)*100);
-
-  found_block2411 = false;
-  found_block2412 = false;
-
-  do {
-
-    while (i1==-1) {
-      fscanf(myFileId,"%d\n",&blockId);
-      switch (blockId) {
-      case 2411 : {
-      MESSAGE("BlockId "<<blockId);
-	fscanf(myFileId,"%d",&node);
-	//MESSAGE("Node "<<node);
-	while (node!=-1) {
-	  fscanf(myFileId,"%d %d %d\n",&n1,&n2,&n3);
-	  fscanf(myFileId,"%s %s %s\n",s1,s2,s3);
-	  str1=string(s1);
-	  str2=string(s2);
-	  str3=string(s3);
-	  if (str1.find("D")!=string::npos) str1.replace(str1.find("D"),1,"E");
-	  if (str2.find("D")!=string::npos) 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;
-	found_block2411 = true;
-	break;
-      }	
-      case 2412 : {
-      MESSAGE("BlockId "<<blockId);
-	fscanf(myFileId,"%d",&cell);
-	//MESSAGE("Cell "<<cell);
-	while (cell!=-1) {
-	  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 (n_nodes==3) {
-	      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
-	      for (i=1;i<=n_nodes;i++)
-		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
-	    fgets(s2,100,myFileId);
-	    if (n_nodes==3) {
-	      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
-	      for (i=1;i<=n_nodes;i++)
-		fscanf(myFileId,"%d",&nodes[i-1]);
-	      ok = myMesh->AddEdgeWithID(nodes[0],nodes[1],cell);
-	      //MESSAGE("in 102 "<<cell);
-	    }
-	  }
-
-	  fscanf(myFileId,"\n");
-	  fscanf(myFileId,"%d",&cell);
 	}
 
-	i1=0;
+	s1 = (char *)malloc(sizeof(char) * 100);
-	found_block2412 = true;
+	s2 = (char *)malloc(sizeof(char) * 100);
-	break;
+	s3 = (char *)malloc(sizeof(char) * 100);
-      }
-      case -1 : {
-	break;
-      }
-      default:
-	MESSAGE("BlockId "<<blockId);
-	i1=0;
-	break;
-      }
-    }
 
-    fscanf(myFileId,"%s\n",s1);
+	found_block2411 = false;
-    i1 = atoi(s1);
+	found_block2412 = false;
 
-  }
+	do
-  while ((!feof(myFileId))&&((!found_block2411)||(!found_block2412)));
+	{
+
+		while (i1 == -1)
+		{
+			fscanf(myFileId, "%d\n", &blockId);
+			switch (blockId)
+			{
+			case 2411:
+			{
+				MESSAGE("BlockId " << blockId);
+				fscanf(myFileId, "%d", &node);
+				//MESSAGE("Node "<<node);
+				while (node != -1)
+				{
+					fscanf(myFileId, "%d %d %d\n", &n1, &n2, &n3);
+					fscanf(myFileId, "%s %s %s\n", s1, s2, s3);
+					str1 = string(s1);
+					str2 = string(s2);
+					str3 = string(s3);
+					if (str1.find("D") != string::npos)
+						str1.replace(str1.find("D"), 1, "E");
+					if (str2.find("D") != string::npos)
+						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;
+				found_block2411 = true;
+				break;
+			}
+			case 2412:
+			{
+				MESSAGE("BlockId " << blockId);
+				fscanf(myFileId, "%d", &cell);
+				//MESSAGE("Cell "<<cell);
+				while (cell != -1)
+				{
+					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 (n_nodes == 3)
+						{
+							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
+							for (i = 1; i <= n_nodes; i++)
+								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
+						fgets(s2, 100, myFileId);
+						if (n_nodes == 3)
+						{
+							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
+							for (i = 1; i <= n_nodes; i++)
+								fscanf(myFileId, "%d", &nodes[i - 1]);
+							ok = myMesh->AddEdgeWithID(nodes[0], nodes[1],
+								cell);
+							//MESSAGE("in 102 "<<cell);
+						}
+					}
+
+					fscanf(myFileId, "\n");
+					fscanf(myFileId, "%d", &cell);
+				}
+
+				i1 = 0;
+				found_block2412 = true;
+				break;
+			}
+			case -1:
+			{
+				break;
+			}
+			default:
+				MESSAGE("BlockId " << blockId);
+				i1 = 0;
+				break;
+			}
+		}
+
+		fscanf(myFileId, "%s\n", s1);
+		i1 = atoi(s1);
+
+	}
+	while ((!feof(myFileId)) && ((!found_block2411) || (!found_block2412)));
 
   /****************************************************************************
   *                      FERMETURE DU FICHIER                      *
   ****************************************************************************/
-  free(s1);
+	free(s1);
-  free(s2);
+	free(s2);
-  free(s3);
+	free(s3);
-  fclose(myFileId);
+	fclose(myFileId);
 
 }

src/DriverUNV/DriverUNV_R_SMDS_Mesh.h

@@ -6,25 +6,24 @@
 #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();
-    ~DriverUNV_R_SMDS_Mesh();
 
-    void Add();
+	void Add();
-    void Read();
+	void Read();
-    void SetMesh(Handle(SMDS_Mesh)& aMesh);
+	void SetMesh(SMDS_Mesh * aMesh);
-    void SetFile(string);
+	void SetFile(string);
 
-    void SetFileId(FILE*);
+	void SetFileId(FILE *);
-    void SetMeshId(int);
+	void SetMeshId(int);
 
-  private :
+  private:  SMDS_Mesh * myMesh;
-    Handle_SMDS_Mesh myMesh;
+	string myFile;
-    string myFile; 
+	FILE *myFileId;
-    FILE* myFileId;
+	int myMeshId;
-    int myMeshId;
 
 };
 #endif

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);
+	printf("in getOne");
+	return (1);
 }
 
-extern "C" {
+extern "C"
-  //  Document_Reader* maker() {
+{
-  DriverUNV_R_SMESHDS_Document* maker() {
+	//  Document_Reader* maker() {
-    fprintf(stdout,"here in maker\n");
+	DriverUNV_R_SMESHDS_Document *maker()
-    return new DriverUNV_R_SMESHDS_Document;
+	{
-  }
+		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("");
+{
+	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,53 +38,53 @@ DriverUNV_R_SMESHDS_Document::~DriverUNV_R_SMESHDS_Document() {
 //myDocument = aDoc;
 //}
 
-void DriverUNV_R_SMESHDS_Document::Read() {
+void DriverUNV_R_SMESHDS_Document::Read()
+{
 
-  int myMeshId;
+	int myMeshId;
-  SCRUTE(myFile);
+	SCRUTE(myFile);
-  //Handle(SMESHDS_Document) myDocument = new SMESHDS_Document(1);
+	//Handle(SMESHDS_Document) myDocument = new SMESHDS_Document(1);
 
   /****************************************************************************
   *                      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)
+	if (fid < 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);
-    }
+	}
 
   /****************************************************************************
   *                      COMBIEN DE MAILLAGES ?                               *
   ****************************************************************************/
-  int nmaa = 1;
+	int nmaa = 1;
 
   /****************************************************************************
   *                      FERMETURE DU FICHIER                                 *
   ****************************************************************************/
-  fclose(fid);
+	fclose(fid);
 
-  printf("Nombre de maillages = %d\n",nmaa);
+	printf("Nombre de maillages = %d\n", nmaa);
 
-  string myClass = string("SMESHDS_Mesh");
+	string myClass = string("SMESHDS_Mesh");
-  string myExtension = string("UNV");
+	string myExtension = string("UNV");
 
-  for (int meshIt=1;meshIt<=nmaa;meshIt++) {
+	for (int meshIt = 1; meshIt <= nmaa; meshIt++)
-    myMeshId = myDocument->NewMesh();
+	{
+		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);
+		//myReader->SetFileId(fid);
 
-    myReader->SetMesh(myMesh);
+		myReader->Read();
-    myReader->SetFile(myFile);
-    //myReader->SetFileId(fid);
-
-    myReader->Read();
-
-  }
 
+	}
 
 }

src/DriverUNV/DriverUNV_R_SMESHDS_Mesh.cxx

@@ -4,45 +4,53 @@ 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() {
+DriverUNV_R_SMESHDS_Mesh::~DriverUNV_R_SMESHDS_Mesh()
-;
+{
+	;
 }
 
-void DriverUNV_R_SMESHDS_Mesh::SetMesh(Handle(SMDS_Mesh)& aMesh) {
+void DriverUNV_R_SMESHDS_Mesh::SetMesh(SMDS_Mesh * aMesh)
-  //myMesh = Handle(SMESHDS_Mesh)::DownCast(aMesh);
+{
-  myMesh = aMesh;
+	//myMesh = SMESHDS_Mesh *::DownCast(aMesh);
+	myMesh = aMesh;
 }
 
-void DriverUNV_R_SMESHDS_Mesh::SetFile(string aFile) {
+void DriverUNV_R_SMESHDS_Mesh::SetFile(string aFile)
-  myFile = aFile;
+{
+	myFile = aFile;
 }
 
-void DriverUNV_R_SMESHDS_Mesh::SetFileId(FILE* aFileId) {
+void DriverUNV_R_SMESHDS_Mesh::SetFileId(FILE * aFileId)
-  myFileId = aFileId;
+{
+	myFileId = aFileId;
 }
 
-void DriverUNV_R_SMESHDS_Mesh::SetMeshId(int aMeshId) {
+void DriverUNV_R_SMESHDS_Mesh::SetMeshId(int aMeshId)
-  myMeshId = aMeshId;
+{
+	myMeshId = aMeshId;
 }
 
-void DriverUNV_R_SMESHDS_Mesh::Add() {
+void DriverUNV_R_SMESHDS_Mesh::Add()
-  ;
+{
+	;
 }
 
-void DriverUNV_R_SMESHDS_Mesh::Read() {
+void DriverUNV_R_SMESHDS_Mesh::Read()
-  string myClass = string("SMDS_Mesh");
+{
-  string myExtension = string("UNV");
+	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->SetMesh(myMesh);
-  myReader->SetFile(myFile);
+	myReader->SetFile(myFile);
-  //myReader->SetFileId(myFileId);
+	//myReader->SetFileId(myFileId);
 
-  myReader->Read();
+	myReader->Read();
 
 }

src/DriverUNV/DriverUNV_R_SMESHDS_Mesh.h

@@ -6,25 +6,24 @@
 #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();
-    ~DriverUNV_R_SMESHDS_Mesh();
 
-    void Add();
+	void Add();
-    void Read();
+	void Read();
-    void SetMesh(Handle(SMDS_Mesh)& aMesh);
+	void SetMesh(SMDS_Mesh * aMesh);
-    void SetFile(string);
+	void SetFile(string);
 
-    void SetFileId(FILE*);
+	void SetFileId(FILE *);
-    void SetMeshId(int);
+	void SetMeshId(int);
 
-private :
+  private:  SMDS_Mesh * myMesh;
-    Handle_SMDS_Mesh myMesh;
+	string myFile;
-    string myFile; 
+	FILE *myFileId;
-    FILE* myFileId;
+	int myMeshId;
-    int myMeshId;
 
 };
 #endif

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,178 +19,212 @@ 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() {
+DriverUNV_W_SMDS_Mesh::~DriverUNV_W_SMDS_Mesh()
-;
+{
+	;
 }
 
-void DriverUNV_W_SMDS_Mesh::SetMesh(Handle(SMDS_Mesh)& aMesh) {
+void DriverUNV_W_SMDS_Mesh::SetMesh(SMDS_Mesh * aMesh)
-  myMesh = aMesh;
+{
+	myMesh = aMesh;
 }
 
-void DriverUNV_W_SMDS_Mesh::SetFile(string aFile) {
+void DriverUNV_W_SMDS_Mesh::SetFile(string aFile)
-  myFile = aFile;
+{
+	myFile = aFile;
 }
 
-void DriverUNV_W_SMDS_Mesh::SetFileId(FILE* aFileId) {
+void DriverUNV_W_SMDS_Mesh::SetFileId(FILE * aFileId)
-  myFileId = aFileId;
+{
+	myFileId = aFileId;
 }
 
-void DriverUNV_W_SMDS_Mesh::SetMeshId(int aMeshId) {
+void DriverUNV_W_SMDS_Mesh::SetMeshId(int aMeshId)
-  myMeshId = aMeshId;
+{
+	myMeshId = aMeshId;
 }
 
-void DriverUNV_W_SMDS_Mesh::Add() {
+void DriverUNV_W_SMDS_Mesh::Add()
-  ;
+{
+	;
 }
 
-void DriverUNV_W_SMDS_Mesh::Write() {
+void DriverUNV_W_SMDS_Mesh::Write()
+{
 
-  int nbNodes,nbCells;
+	int nbNodes, nbCells;
-  int i;
+	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)
+	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);
-    }
+	}
-  SCRUTE(myMesh);
+	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 ? */
+	/* Combien de noeuds ? */
-  nbNodes = myMesh->NbNodes();
+	nbNodes = myMesh->NbNodes();
 
-  /* Combien de mailles, faces ou aretes ? */
+	/* 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_edges = myMesh->NbEdges();
-  nb_of_faces = myMesh->NbFaces();
+	nb_of_faces = myMesh->NbFaces();
-  nb_of_volumes = myMesh->NbVolumes();
+	nb_of_volumes = myMesh->NbVolumes();
-  nbCells = nb_of_edges + nb_of_faces + nb_of_volumes;
+	nbCells = nb_of_edges + nb_of_faces + nb_of_volumes;
-  SCRUTE(nb_of_edges);
+	SCRUTE(nb_of_edges);
-  SCRUTE(nb_of_faces);
+	SCRUTE(nb_of_faces);
-  SCRUTE(nb_of_volumes);
+	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())
+	{
+		const SMDS_MeshNode * node = itNodes->next();
 
-  for (;itNodes.More();itNodes.Next()) {
+		fprintf(myFileId, sNODE_UNV_DESCR, node->GetID());
-    const Handle(SMDS_MeshElement)& elem = itNodes.Value();
+		fprintf(myFileId, "%25.16E%25.16E%25.16E\n", node->X(), node->Y(),
-    const Handle(SMDS_MeshNode   )& node = myMesh->GetNode(1, elem);
+			node->Z());
-
+	}
-    fprintf(myFileId, sNODE_UNV_DESCR, node->GetID());
+	delete itNodes;
-    fprintf(myFileId, "%25.16E%25.16E%25.16E\n", node->X(), node->Y(), node->Z());
+	fprintf(myFileId, "%s\n", sUNV_SEPARATOR);
-  }
-  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 */
+	/* 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_DESC2);
+			fprintf(myFileId, sELT_BEAM_DESC1, elem->GetID(), 21,
-        fprintf(myFileId, "%10d%10d\n", elem->GetConnection(1), elem->GetConnection(2));
+				elem->NbNodes());
-        break;
+			fprintf(myFileId, sELT_BEAM_DESC2);
-      } 
+			fprintf(myFileId, "%10d%10d\n", itn->next()->GetID(),
-      case 3 : {
+				itn->next()->GetID());
-        fprintf(myFileId, sELT_BEAM_DESC1, elem->GetID(), 24, elem->NbNodes());
+			break;
-        fprintf(myFileId, sELT_BEAM_DESC2);
-        fprintf(myFileId, "%10d%10d%10d\n",elem->GetConnection(1), elem->GetConnection(2), elem->GetConnection(3));
-        break;
-      }
-    }
-  }
 
-  SMDS_MeshFacesIterator itFaces(myMesh);
+		case 3:
-  for (;itFaces.More();itFaces.Next()) {
+			fprintf(myFileId, sELT_BEAM_DESC1, elem->GetID(), 24,
-    const Handle(SMDS_MeshElement)& elem = itFaces.Value();
+				elem->NbNodes());
+			fprintf(myFileId, sELT_BEAM_DESC2);
+			fprintf(myFileId, "%10d%10d%10d\n", itn->next()->GetID(),
+				itn->next()->GetID(), itn->next()->GetID());
 
-    switch (elem->NbNodes()) {
+			break;
-      case 3 :
+		}
-        // linear triangle
+		delete itn;
-        fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 74, elem->NbNodes());
+	}
-        break;
+	delete itEdges;
-      case 4 :
-        // linear quadrilateral
-        fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 71, elem->NbNodes());
-        break;
-      case 6 :
-        // parabolic triangle
-        fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 72, elem->NbNodes());
-        break;
-      case 8 :
-        // parabolic quadrilateral
-        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_MeshFace*> * itFaces=myMesh->facesIterator();
-      fprintf(myFileId,"%10d",elem->GetConnection(i+1));
+	while(itFaces->more())
+	{
+		const SMDS_MeshElement * elem = itFaces->next();
 
-    fprintf(myFileId,"\n");
+		switch (elem->NbNodes())
-  }
+		{
+		case 3:
+			// linear triangle
+			fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 74,
+				elem->NbNodes());
+			break;
+		case 4:
+			// linear quadrilateral
+			fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 71,
+				elem->NbNodes());
+			break;
+		case 6:
+			// parabolic triangle
+			fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 72,
+				elem->NbNodes());
+			break;
+		case 8:
+			// parabolic quadrilateral
+			fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 75,
+				elem->NbNodes());
+			break;
+		default:
+			fprintf(myFileId, "element not registered\n");
+		}
 
-  SMDS_MeshVolumesIterator itVolumes(myMesh);
+		SMDS_Iterator<const SMDS_MeshElement*> *itn=elem->nodesIterator();
-  for (;itVolumes.More();itVolumes.Next()) {
+		while(itn->more()) fprintf(myFileId, "%10d", itn->next()->GetID());
-    const Handle(SMDS_MeshElement)& elem = itVolumes.Value();
+		delete itn;
 
-    switch (elem->NbNodes()) {
+		fprintf(myFileId, "\n");
-      case 4 : 
+	}
-        // linear tetrahedron
+	delete itFaces;
-        fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 111, elem->NbNodes());
-        break;
-      case 6 : 
-        // linear tetrahedron
-        fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 112, elem->NbNodes());
-        break;
-      case 8 : 
-        // linear brick
-        fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 115, elem->NbNodes());
-        break;
-    }
 
-    for (i=0;i<elem->NbNodes();i++)
+	SMDS_Iterator<const SMDS_MeshVolume*> * itVolumes=myMesh->volumesIterator();
-      fprintf(myFileId,"%10d",elem->GetConnection(i+1));
+	while(itVolumes->more())
+	{
+		const SMDS_MeshElement * elem = itVolumes->next();
 
-    fprintf(myFileId,"\n");
+		switch (elem->NbNodes())
-  }
+		{
-  fprintf(myFileId,"%s\n", sUNV_SEPARATOR);
+		case 4:
+			// linear tetrahedron
+			fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 111,
+				elem->NbNodes());
+			break;
+		case 6:
+			// linear tetrahedron
+			fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 112,
+				elem->NbNodes());
+			break;
+		case 8:
+			// linear brick
+			fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 115,
+				elem->NbNodes());
+			break;
+		}
 
-  fclose (myFileId);
+		SMDS_Iterator<const SMDS_MeshElement*> *itn=elem->nodesIterator();
+		while(itn->more()) fprintf(myFileId, "%10d", itn->next()->GetID());
+		delete itn;
+
+		fprintf(myFileId, "\n");
+	}
+	delete itVolumes;
+
+	fprintf(myFileId, "%s\n", sUNV_SEPARATOR);
+
+	fclose(myFileId);
 }

src/DriverUNV/DriverUNV_W_SMDS_Mesh.h

@@ -7,25 +7,24 @@
 #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();
-    ~DriverUNV_W_SMDS_Mesh();
 
-    void Add();
+	void Add();
-    void Write();
+	void Write();
-    void SetMesh(Handle(SMDS_Mesh)& aMesh);
+	void SetMesh(SMDS_Mesh * aMesh);
-    void SetFile(string);
+	void SetFile(string);
 
-    void SetFileId(FILE*);
+	void SetFileId(FILE *);
-    void SetMeshId(int);
+	void SetMeshId(int);
 
-private :
+  private:  SMDS_Mesh * myMesh;
-    Handle_SMDS_Mesh myMesh;
+	string myFile;
-    string myFile; 
+	FILE *myFileId;
-    FILE* myFileId;
+	int myMeshId;
-    int myMeshId;
 
 };
 #endif

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;
+	{
-  }
+		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,52 +30,54 @@ 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)
+	if (fid < 0)
-    {
+	{
-      fprintf(stderr,">> ERREUR : ouverture du fichier %s \n",file2Write);
+		fprintf(stderr, ">> ERREUR : ouverture du fichier %s \n", file2Write);
-      exit(EXIT_FAILURE);
+		exit(EXIT_FAILURE);
-    }
+	}
 
   /****************************************************************************
   *                      FERMETURE DU FICHIER                                 *
   ****************************************************************************/
 
-  fclose(fid);
+	fclose(fid);
 
   /******** Nombre de maillages ********/
-  int nb_of_meshes = myDocument->NbMeshes(); //voir avec Yves
+	int nb_of_meshes = myDocument->NbMeshes();	//voir avec Yves
-  //nb_of_meshes = 1;
+	//nb_of_meshes = 1;
-  int numero = 0;
+	int numero = 0;
 
-  string myClass = string("SMESHDS_Mesh");
+	string myClass = string("SMESHDS_Mesh");
-  string myExtension = string("UNV");
+	string myExtension = string("UNV");
 
-  //while (numero<nb_of_meshes) {
+	//while (numero<nb_of_meshes) {
-  //numero++;
+	//numero++;
-  //myMesh = myDocument->GetMesh(numero);
+	//myMesh = myDocument->GetMesh(numero);
-  myDocument->InitMeshesIterator();
+	myDocument->InitMeshesIterator();
-  for (;myDocument->MoreMesh();myDocument->NextMesh()) {
+	while(myDocument->MoreMesh())
-    numero++;
+	{
-    myMesh = myDocument->CurrentMesh();
+		numero++;
+		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);
+		//Mesh_Writer* myWriter = Driver::GetMeshWriter(myExtension, myClass);
 
-    myWriter->SetMesh(myMesh);
+		myWriter->SetMesh(myMesh);
-    myWriter->SetFile(myFile);
+		myWriter->SetFile(myFile);
-  SCRUTE(myMesh);
+		SCRUTE(myMesh);
-    //myWriter->SetFileId(fid);
+		//myWriter->SetFileId(fid);
-    myWriter->SetMeshId(numero);
+		myWriter->SetMeshId(numero);
-    myWriter->Write();
+		myWriter->Write();
-  }
+	}
 
 }

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,188 +20,220 @@ 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 = 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;
+{
+	myFile = aFile;
 }
 
-void DriverUNV_W_SMESHDS_Mesh::SetFileId(FILE* aFileId) {
+void DriverUNV_W_SMESHDS_Mesh::SetFileId(FILE * aFileId)
-  myFileId = aFileId;
+{
+	myFileId = aFileId;
 }
 
-void DriverUNV_W_SMESHDS_Mesh::SetMeshId(int aMeshId) {
+void DriverUNV_W_SMESHDS_Mesh::SetMeshId(int aMeshId)
-  myMeshId = aMeshId;
+{
+	myMeshId = aMeshId;
 }
 
-void DriverUNV_W_SMESHDS_Mesh::Write() {
+void DriverUNV_W_SMESHDS_Mesh::Write()
+{
 
-  string myClass = string("SMDS_Mesh");
+	string myClass = string("SMDS_Mesh");
-  string myExtension = string("UNV");
+	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->SetMesh(myMesh);
-  myWriter->SetFile(myFile);
+	myWriter->SetFile(myFile);
-  myWriter->SetMeshId(myMeshId);
+	myWriter->SetMeshId(myMeshId);
-  //myWriter->SetFileId(myFileId);
+	//myWriter->SetFileId(myFileId);
-
-  myWriter->Write();
 
+	myWriter->Write();
 
 }
-void DriverUNV_W_SMESHDS_Mesh::Add() {
-  int nbNodes,nbCells;
-  int i;
 
-  char* file2Read = (char*)myFile.c_str();
+void DriverUNV_W_SMESHDS_Mesh::Add()
-  myFileId = fopen(file2Read,"w+");
+{
-  if (myFileId < 0)
+	int nbNodes, nbCells;
-    {
+	int i;
-      fprintf(stderr,">> ERREUR : ouverture du fichier %s \n",file2Read);
+
-      exit(EXIT_FAILURE);
+	char *file2Read = (char *)myFile.c_str();
-    }
+	myFileId = fopen(file2Read, "w+");
+	if (myFileId < 0)
+	{
+		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 ? */
+	/* Combien de noeuds ? */
-  nbNodes = myMesh->NbNodes();
+	nbNodes = myMesh->NbNodes();
 
-  /* Combien de mailles, faces ou aretes ? */
+	/* 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_edges = myMesh->NbEdges();
-  nb_of_faces = myMesh->NbFaces();
+	nb_of_faces = myMesh->NbFaces();
-  nb_of_volumes = myMesh->NbVolumes();
+	nb_of_volumes = myMesh->NbVolumes();
-  nbCells = nb_of_edges + nb_of_faces + nb_of_volumes;
+	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, 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 */
+	/* 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_DESC2);
+			fprintf(myFileId, sELT_BEAM_DESC1, elem->GetID(), 21,
-        fprintf(myFileId, "%10d%10d\n", elem->GetConnection(1), elem->GetConnection(2));
+				elem->NbNodes());
-        break;
+			fprintf(myFileId, sELT_BEAM_DESC2);
-      }
+			fprintf(myFileId, "%10d%10d\n", itn->next()->GetID(),
-      case 3 : {
+				itn->next()->GetID());
-        fprintf(myFileId, sELT_BEAM_DESC1, elem->GetID(), 24, elem->NbNodes());
+			break;
-        fprintf(myFileId, sELT_BEAM_DESC2);
-        fprintf(myFileId, "%10d%10d%10d\n",elem->GetConnection(1), elem->GetConnection(2), elem->GetConnection(3));
-        break;
-      }
-    }
-  }
 
-  SMDS_MeshFacesIterator itFaces(myMesh);
+		case 3:
-  for (;itFaces.More();itFaces.Next()) {
+			fprintf(myFileId, sELT_BEAM_DESC1, elem->GetID(), 24,
-    const Handle(SMDS_MeshElement)& elem = itFaces.Value();
+				elem->NbNodes());
+			fprintf(myFileId, sELT_BEAM_DESC2);
+			fprintf(myFileId, "%10d%10d%10d\n", itn->next()->GetID(),
+				itn->next()->GetID(), itn->next()->GetID());
+			break;
+		}
+		delete itn;
+	}
+	delete itEdges;
 
-    switch (elem->NbNodes()) {
+	SMDS_Iterator<const SMDS_MeshFace*> * itFaces=myMesh->facesIterator();
-      case 3 :
+	while(itFaces->more())
-        // linear triangle
+	{
-        fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 74, elem->NbNodes());
+		const SMDS_MeshElement * elem = itFaces->next();
-        break;
-      case 4 :
-        // linear quadrilateral
-        fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 71, elem->NbNodes());
-        break;
-      case 6 :
-        // parabolic triangle
-        fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 72, elem->NbNodes());
-        break;
-      case 8 :
-        // parabolic quadrilateral
-        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++)
+		switch (elem->NbNodes())
-      fprintf(myFileId,"%10d",elem->GetConnection(i+1));
+		{
+		case 3:
+			// linear triangle
+			fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 74,
+				elem->NbNodes());
+			break;
+		case 4:
+			// linear quadrilateral
+			fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 71,
+				elem->NbNodes());
+			break;
+		case 6:
+			// parabolic triangle
+			fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 72,
+				elem->NbNodes());
+			break;
+		case 8:
+			// parabolic quadrilateral
+			fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 75,
+				elem->NbNodes());
+			break;
+		default:
+			fprintf(myFileId, "element not registered\n");
+		}
 
-    fprintf(myFileId,"\n");
+		SMDS_Iterator<const SMDS_MeshElement*> *itn=elem->nodesIterator();
-  }
+		while(itn->more()) fprintf(myFileId, "%10d", itn->next()->GetID());
+		delete itn;
 
-  SMDS_MeshVolumesIterator itVolumes(myMesh);
+		fprintf(myFileId, "\n");
-  for (;itVolumes.More();itVolumes.Next()) {
+	}
-    const Handle(SMDS_MeshElement)& elem = itVolumes.Value();
+	delete itFaces;
 
-    switch (elem->NbNodes()) {
+	SMDS_Iterator<const SMDS_MeshVolume*> * itVolumes=myMesh->volumesIterator();
-      case 4 :
+	while(itVolumes->more())
-        // linear tetrahedron
+	{
-        fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 111, elem->NbNodes());
+		const SMDS_MeshElement * elem = itVolumes->next();
-        break;
-      case 6 :
-        // linear tetrahedron
-        fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 112, elem->NbNodes());
-        break;
-      case 8 :
-        // linear brick
-        fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 115, elem->NbNodes());
-        break;
-    }
 
-    for (i=0;i<elem->NbNodes();i++)
+		switch (elem->NbNodes())
-      fprintf(myFileId,"%10d",elem->GetConnection(i+1));
+		{
+		case 4:
+			// linear tetrahedron
+			fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 111,
+				elem->NbNodes());
+			break;
+		case 6:
+			// linear tetrahedron
+			fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 112,
+				elem->NbNodes());
+			break;
+		case 8:
+			// linear brick
+			fprintf(myFileId, sELT_SURF_DESC, elem->GetID(), 115,
+				elem->NbNodes());
+			break;
+		}
 
-    fprintf(myFileId,"\n");
+		SMDS_Iterator<const SMDS_MeshElement*> *itn=elem->nodesIterator();
-  }
+		while(itn->more()) fprintf(myFileId, "%10d", itn->next()->GetID());
-  fprintf(myFileId,"%s\n", sUNV_SEPARATOR);
+		delete itn;
 
-  fclose (myFileId);
+		fprintf(myFileId, "\n");
+	}
+	delete itVolumes;
+	fprintf(myFileId, "%s\n", sUNV_SEPARATOR);
+
+	fclose(myFileId);
 }
-

src/DriverUNV/DriverUNV_W_SMESHDS_Mesh.h

@@ -7,25 +7,24 @@
 #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();
-    ~DriverUNV_W_SMESHDS_Mesh();
 
-    void Add();
+	void Add();
-    void Write();
+	void Write();
-    void SetMesh(Handle(SMDS_Mesh)& aMesh);
+	void SetMesh(SMDS_Mesh * aMesh);
-    void SetFile(string);
+	void SetFile(string);
 
-    void SetFileId(FILE*);
+	void SetFileId(FILE *);
-    void SetMeshId(int);
+	void SetMeshId(int);
 
-private :
+  private:  SMDS_Mesh * myMesh;
-    Handle_SMDS_Mesh myMesh;
+	string myFile;
-    string myFile; 
+	FILE *myFileId;
-    FILE* myFileId;
+	int myMeshId;
-    int myMeshId;
 
 };
 #endif