X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FDriverDAT%2FDriverDAT_W_SMDS_Mesh.cxx;h=119f8f9a0efc023b73656c18763c0b6d759efa79;hb=d9f4b53e489dd5857db264ede6acded7b076c9f1;hp=1cf4667b5283a65fb30f04778b1df0872d6f963c;hpb=0b4f557c95428aa7025773eef95eef5796a1e74a;p=modules%2Fsmesh.git

diff --git a/src/DriverDAT/DriverDAT_W_SMDS_Mesh.cxx b/src/DriverDAT/DriverDAT_W_SMDS_Mesh.cxx
index 1cf4667b5..119f8f9a0 100644
--- a/src/DriverDAT/DriverDAT_W_SMDS_Mesh.cxx
+++ b/src/DriverDAT/DriverDAT_W_SMDS_Mesh.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2019  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2022  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -32,12 +32,20 @@
 
 using namespace std;
 
+//================================================================================
+/*!
+ * \brief Write mesh data to a file
+ *  \param [in] renumber - if true, renumber nodes and cell starting from 1
+ *  \return Driver_Mesh::Status - Ok or not
+ */
+//================================================================================
+
 Driver_Mesh::Status DriverDAT_W_SMDS_Mesh::Perform()
 {
   Kernel_Utils::Localizer loc;
   Status aResult = DRS_OK;
 
-  int nbNodes, nbCells;
+  smIdType nbNodes, nbCells;
 #if defined(WIN32) && defined(UNICODE)
   std::wstring file2Read = Kernel_Utils::utf8_decode_s(myFile);
   FILE* aFileId = _wfopen(file2Read.c_str(), L"w+");
@@ -60,7 +68,7 @@ Driver_Mesh::Status DriverDAT_W_SMDS_Mesh::Perform()
   nbNodes = myMesh->NbNodes();
 
   /* Combien de mailles, faces ou aretes ? */
-  int nb_of_edges, nb_of_faces, nb_of_volumes;
+  smIdType nb_of_edges, nb_of_faces, nb_of_volumes;
   nb_of_edges = myMesh->NbEdges();
   nb_of_faces = myMesh->NbFaces();
   nb_of_volumes = myMesh->NbVolumes();
@@ -70,17 +78,28 @@ Driver_Mesh::Status DriverDAT_W_SMDS_Mesh::Perform()
   SCRUTE(nb_of_volumes);
 
   //fprintf(stdout, "%d %d\n", nbNodes, nbCells);
-  fprintf(aFileId, "%d %d\n", nbNodes, nbCells);
+  fprintf(aFileId, "%ld %ld\n", static_cast< long >( nbNodes ), static_cast< long >( nbCells ));
 
   /****************************************************************************
    *                       ECRITURE DES NOEUDS                                 *
    ****************************************************************************/
 
+  std::vector< size_t > nodeNumByID;
+  if ( myRenumber && myMesh->HasNumerationHoles() )
+    nodeNumByID.resize( myMesh->MaxNodeID() + 1 );
+
+  smIdType num;
   SMDS_NodeIteratorPtr itNodes=myMesh->nodesIterator();
-  while(itNodes->more())
+  for ( num = 1; itNodes->more(); ++num )
   {
     const SMDS_MeshNode * node = itNodes->next();
-    fprintf(aFileId, "%d %.14e %.14e %.14e\n", node->GetID(), node->X(), node->Y(), node->Z());
+    if ( !myRenumber )
+      num = node->GetID();
+
+    fprintf(aFileId, "%d %.14e %.14e %.14e\n", num, node->X(), node->Y(), node->Z());
+
+    if ( !nodeNumByID.empty() )
+      nodeNumByID[ node->GetID() ] = num;
   }
 
   /****************************************************************************
@@ -88,47 +107,54 @@ Driver_Mesh::Status DriverDAT_W_SMDS_Mesh::Perform()
    ****************************************************************************/
   /* Ecriture des connectivites, noms, numeros des mailles */
 
-  SMDS_EdgeIteratorPtr itEdges=myMesh->edgesIterator();
-  while(itEdges->more())
+  num = 1;
+  for ( SMDS_EdgeIteratorPtr itEdges = myMesh->edgesIterator(); itEdges->more(); ++num )
   {
     const SMDS_MeshElement * elem = itEdges->next();
-    switch (elem->NbNodes())
+    if ( !myRenumber )
+      num = elem->GetID();
+
+    fprintf(aFileId, "%d %d ", num, 100 + elem->NbNodes());
+
+    for ( SMDS_ElemIteratorPtr it = elem->nodesIterator(); it->more(); )
     {
-    case 2:
-      fprintf(aFileId, "%d %d ", elem->GetID(), 102);
-      break;
-    case 3:
-      fprintf(aFileId, "%d %d ", elem->GetID(), 103);
-      break;
+      smIdType nodeID = it->next()->GetID();
+      if ( !nodeNumByID.empty() )
+        nodeID = nodeNumByID[ nodeID ];
+      fprintf(aFileId, "%ld ", static_cast< long >( nodeID ));
     }
-    SMDS_ElemIteratorPtr it=elem->nodesIterator();
-    while(it->more())
-      fprintf(aFileId, "%d ", it->next()->GetID());
     fprintf(aFileId, "\n");
   }
 
-  SMDS_FaceIteratorPtr itFaces=myMesh->facesIterator();
-  while(itFaces->more())
+  for ( SMDS_FaceIteratorPtr itFaces = myMesh->facesIterator(); itFaces->more(); ++num )
   {
     const SMDS_MeshElement * elem = itFaces->next();
-    if ( elem->IsPoly() )
-      fprintf(aFileId, "%d %d ", elem->GetID(), 400+elem->NbNodes());
-    else
-      fprintf(aFileId, "%d %d ", elem->GetID(), 200+elem->NbNodes());
-    SMDS_ElemIteratorPtr it=elem->nodesIterator();
-    while(it->more())
-      fprintf(aFileId, "%d ", it->next()->GetID());
+    if ( !myRenumber )
+      num = elem->GetID();
+
+    fprintf(aFileId, "%d %d ", num, (elem->IsPoly() ? 400 : 200 ) + elem->NbNodes() );
+
+    for( SMDS_ElemIteratorPtr it = elem->nodesIterator(); it->more(); )
+    {
+      smIdType nodeID = it->next()->GetID();
+      if ( !nodeNumByID.empty() )
+        nodeID = nodeNumByID[ nodeID ];
+      fprintf(aFileId, "%ld ", static_cast< long >( nodeID ));
+    }
     fprintf(aFileId, "\n");
   }
 
-  SMDS_VolumeIteratorPtr itVolumes=myMesh->volumesIterator();
+
   const SMDS_MeshVolume* v;
-  while(itVolumes->more())
+  for ( SMDS_VolumeIteratorPtr itVolumes=myMesh->volumesIterator(); itVolumes->more(); ++num )
   {
     const SMDS_MeshElement * elem = itVolumes->next();
+    if ( !myRenumber )
+      num = elem->GetID();
+
     if ( elem->IsPoly() )
     {
-      fprintf(aFileId, "%d %d ", elem->GetID(), 500+elem->NbNodes());
+      fprintf(aFileId, "%d %d ", num, 500 + elem->NbNodes());
 
       if (( v = myMesh->DownCast< SMDS_MeshVolume >( elem )))
       {
@@ -143,11 +169,16 @@ Driver_Mesh::Status DriverDAT_W_SMDS_Mesh::Perform()
     }
     else
     {
-      fprintf(aFileId, "%d %d ", elem->GetID(), 300+elem->NbNodes());
+      fprintf(aFileId, "%d %d ", num, 300 + elem->NbNodes());
+    }
+
+    for( SMDS_ElemIteratorPtr it = elem->nodesIterator(); it->more(); )
+    {
+      smIdType nodeID = it->next()->GetID();
+      if ( !nodeNumByID.empty() )
+        nodeID = nodeNumByID[ nodeID ];
+      fprintf(aFileId, "%ld ", static_cast< long >( nodeID ));
     }
-    SMDS_ElemIteratorPtr it=elem->nodesIterator();
-    while(it->more())
-      fprintf(aFileId, "%d ", it->next()->GetID());
 
     fprintf(aFileId, "\n");
   }