X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FDriverUNV%2FDriverUNV_W_SMESHDS_Mesh.cxx;h=2923f9fa561780af10d8eccb9a076f8c2c0d09df;hb=0aec6215ad14ec7743951aa68bbbc8f7369b7deb;hp=231bba3dbd3dcdfe4fc47d9d99bfb21d9c6f1256;hpb=bef9beee88cac57394b8dc3bc914381c1a2fff83;p=modules%2Fsmesh.git

diff --git a/src/DriverUNV/DriverUNV_W_SMESHDS_Mesh.cxx b/src/DriverUNV/DriverUNV_W_SMESHDS_Mesh.cxx
index 231bba3db..2923f9fa5 100644
--- a/src/DriverUNV/DriverUNV_W_SMESHDS_Mesh.cxx
+++ b/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) {
-  //myMesh = Handle(SMESHDS_Mesh)::DownCast(aMesh);
-  myMesh = aMesh;
+void DriverUNV_W_SMESHDS_Mesh::SetMesh(SMDS_Mesh * aMesh)
+{
+	//myMesh = SMESHDS_Mesh *::DownCast(aMesh);
+	myMesh = aMesh;
 }
 
-void DriverUNV_W_SMESHDS_Mesh::SetFile(string aFile) {
-  myFile = aFile;
+void DriverUNV_W_SMESHDS_Mesh::SetFile(string aFile)
+{
+	myFile = aFile;
 }
 
-void DriverUNV_W_SMESHDS_Mesh::SetFileId(FILE* aFileId) {
-  myFileId = aFileId;
+void DriverUNV_W_SMESHDS_Mesh::SetFileId(FILE * aFileId)
+{
+	myFileId = aFileId;
 }
 
-void DriverUNV_W_SMESHDS_Mesh::SetMeshId(int aMeshId) {
-  myMeshId = aMeshId;
+void DriverUNV_W_SMESHDS_Mesh::SetMeshId(int aMeshId)
+{
+	myMeshId = aMeshId;
 }
 
-void DriverUNV_W_SMESHDS_Mesh::Write() {
-
-  string myClass = string("SMDS_Mesh");
-  string myExtension = string("UNV");
+void DriverUNV_W_SMESHDS_Mesh::Write()
+{
 
-  DriverUNV_W_SMDS_Mesh* myWriter = new DriverUNV_W_SMDS_Mesh;
+	string myClass = string("SMDS_Mesh");
+	string myExtension = string("UNV");
 
-  myWriter->SetMesh(myMesh);
-  myWriter->SetFile(myFile);
-  myWriter->SetMeshId(myMeshId);
-  //myWriter->SetFileId(myFileId);
+	DriverUNV_W_SMDS_Mesh *myWriter = new DriverUNV_W_SMDS_Mesh;
 
-  myWriter->Write();
+	myWriter->SetMesh(myMesh);
+	myWriter->SetFile(myFile);
+	myWriter->SetMeshId(myMeshId);
+	//myWriter->SetFileId(myFileId);
 
+	myWriter->Write();
 
 }
-void DriverUNV_W_SMESHDS_Mesh::Add() {
-  int nbNodes,nbCells;
-  int i;
-
-  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);
-    }
-  
+
+void DriverUNV_W_SMESHDS_Mesh::Add()
+{
+	int nbNodes, nbCells;
+	int i;
+
+	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,"(* INFORMATIONS GENERALES : *)\n");
-  fprintf(stdout,"(****************************)\n");
+	fprintf(stdout, "\n(****************************)\n");
+	fprintf(stdout, "(* INFORMATIONS GENERALES : *)\n");
+	fprintf(stdout, "(****************************)\n");
 
-  /* Combien de noeuds ? */
-  nbNodes = myMesh->NbNodes();
+	/* Combien de noeuds ? */
+	nbNodes = myMesh->NbNodes();
 
-  /* Combien de mailles, faces ou aretes ? */
-  Standard_Integer nb_of_nodes, nb_of_edges,nb_of_faces, nb_of_volumes;
-  nb_of_edges = myMesh->NbEdges();
-  nb_of_faces = myMesh->NbFaces();
-  nb_of_volumes = myMesh->NbVolumes();
-  nbCells = nb_of_edges + nb_of_faces + nb_of_volumes;
+	/* Combien de mailles, faces ou aretes ? */
+	int nb_of_nodes, nb_of_edges, nb_of_faces, nb_of_volumes;
+	nb_of_edges = myMesh->NbEdges();
+	nb_of_faces = myMesh->NbFaces();
+	nb_of_volumes = myMesh->NbVolumes();
+	nbCells = nb_of_edges + nb_of_faces + nb_of_volumes;
 
-  fprintf(stdout,"%d %d\n",nbNodes,nbCells);
+	fprintf(stdout, "%d %d\n", nbNodes, nbCells);
 //fprintf(myFileId,"%d %d\n",nbNodes,nbCells);
 
   /****************************************************************************
   *                       ECRITURE DES NOEUDS                                 *
   ****************************************************************************/
-  fprintf(stdout,"\n(************************)\n");
-  fprintf(stdout,"(* NOEUDS DU MAILLAGE : *)\n");
-  fprintf(stdout,"(************************)\n");
+	fprintf(stdout, "\n(************************)\n");
+	fprintf(stdout, "(* NOEUDS DU MAILLAGE : *)\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);
+	fprintf(myFileId, "%s\n", sNODE_UNV_ID);
 
-  for (;itNodes.More();itNodes.Next()) {
-    const Handle(SMDS_MeshElement)& elem = itNodes.Value();
-    const Handle(SMDS_MeshNode   )& node = myMesh->GetNode(1, elem);
+	SMDS_Iterator<const SMDS_MeshNode *> * itNodes=myMesh->nodesIterator();
+	while(itNodes->more())
+	{
+		const SMDS_MeshNode * node = itNodes->next(); 
 
-    fprintf(myFileId, sNODE_UNV_DESCR, node->GetID());
-    fprintf(myFileId, "%25.16E%25.16E%25.16E\n", node->X(), node->Y(), node->Z());
-  }
-  fprintf(myFileId,"%s\n", sUNV_SEPARATOR);
+		fprintf(myFileId, sNODE_UNV_DESCR, node->GetID());
+		fprintf(myFileId, "%25.16E%25.16E%25.16E\n", node->X(), node->Y(),
+			node->Z());
+	}
+	delete itNodes;
+	fprintf(myFileId, "%s\n", sUNV_SEPARATOR);
 
   /****************************************************************************
   *                       ECRITURE DES ELEMENTS                                *
   ****************************************************************************/
-  fprintf(stdout,"\n(**************************)\n");
-  fprintf(stdout,"(* ELEMENTS DU MAILLAGE : *)\n");
-  fprintf(stdout,"(**************************)");
-  /* Ecriture des connectivites, noms, numeros des mailles */
-
-  fprintf(myFileId,"%s\n", sUNV_SEPARATOR);
-  fprintf(myFileId,"%s\n", sELT_UNV_ID   );
-
-  SMDS_MeshEdgesIterator itEdges(myMesh);
-  for (;itEdges.More();itEdges.Next()) {
-    const Handle(SMDS_MeshElement)& elem = itEdges.Value();
-
-    switch (elem->NbNodes()) {
-      case 2 : {
-        fprintf(myFileId, sELT_BEAM_DESC1, elem->GetID(), 21, elem->NbNodes());
-        fprintf(myFileId, sELT_BEAM_DESC2);
-        fprintf(myFileId, "%10d%10d\n", elem->GetConnection(1), elem->GetConnection(2));
-        break;
-      }
-      case 3 : {
-        fprintf(myFileId, sELT_BEAM_DESC1, elem->GetID(), 24, elem->NbNodes());
-        fprintf(myFileId, sELT_BEAM_DESC2);
-        fprintf(myFileId, "%10d%10d%10d\n",elem->GetConnection(1), elem->GetConnection(2), elem->GetConnection(3));
-        break;
-      }
-    }
-  }
-
-  SMDS_MeshFacesIterator itFaces(myMesh);
-  for (;itFaces.More();itFaces.Next()) {
-    const Handle(SMDS_MeshElement)& elem = itFaces.Value();
-
-    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");
-    }
-
-    for (i=0;i<elem->NbNodes();i++)
-      fprintf(myFileId,"%10d",elem->GetConnection(i+1));
-
-    fprintf(myFileId,"\n");
-  }
-
-  SMDS_MeshVolumesIterator itVolumes(myMesh);
-  for (;itVolumes.More();itVolumes.Next()) {
-    const Handle(SMDS_MeshElement)& elem = itVolumes.Value();
-
-    switch (elem->NbNodes()) {
-      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;
-    }
-
-    for (i=0;i<elem->NbNodes();i++)
-      fprintf(myFileId,"%10d",elem->GetConnection(i+1));
-
-    fprintf(myFileId,"\n");
-  }
-  fprintf(myFileId,"%s\n", sUNV_SEPARATOR);
-
-  fclose (myFileId);
+	fprintf(stdout, "\n(**************************)\n");
+	fprintf(stdout, "(* ELEMENTS DU MAILLAGE : *)\n");
+	fprintf(stdout, "(**************************)");
+	/* Ecriture des connectivites, noms, numeros des mailles */
+
+	fprintf(myFileId, "%s\n", sUNV_SEPARATOR);
+	fprintf(myFileId, "%s\n", sELT_UNV_ID);
+
+	SMDS_Iterator<const SMDS_MeshEdge *> * itEdges=myMesh->edgesIterator();
+	while(itEdges->more())
+	{
+		const SMDS_MeshEdge * elem = itEdges->next();
+		SMDS_Iterator<const SMDS_MeshElement*> *itn=elem->nodesIterator();
+
+		switch (elem->NbNodes())
+		{
+		case 2:
+			fprintf(myFileId, sELT_BEAM_DESC1, elem->GetID(), 21,
+				elem->NbNodes());
+			fprintf(myFileId, sELT_BEAM_DESC2);
+			fprintf(myFileId, "%10d%10d\n", itn->next()->GetID(),
+				itn->next()->GetID());
+			break;
+
+		case 3:
+			fprintf(myFileId, sELT_BEAM_DESC1, elem->GetID(), 24,
+				elem->NbNodes());
+			fprintf(myFileId, sELT_BEAM_DESC2);
+			fprintf(myFileId, "%10d%10d%10d\n", itn->next()->GetID(),
+				itn->next()->GetID(), itn->next()->GetID());
+			break;
+		}
+		delete itn;
+	}
+	delete itEdges;
+
+	SMDS_Iterator<const SMDS_MeshFace*> * itFaces=myMesh->facesIterator();
+	while(itFaces->more())
+	{
+		const SMDS_MeshElement * elem = itFaces->next();
+
+		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_Iterator<const SMDS_MeshElement*> *itn=elem->nodesIterator();
+		while(itn->more()) fprintf(myFileId, "%10d", itn->next()->GetID());
+		delete itn;
+
+		fprintf(myFileId, "\n");
+	}
+	delete itFaces;
+
+	SMDS_Iterator<const SMDS_MeshVolume*> * itVolumes=myMesh->volumesIterator();
+	while(itVolumes->more())
+	{
+		const SMDS_MeshElement * elem = itVolumes->next();
+
+		switch (elem->NbNodes())
+		{
+		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;
+		}
+
+		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);
 }
-