Another minor correction

[modules/smesh.git] / src / DriverUNV / DriverUNV_W_SMDS_Mesh.cxx

diff --git a/src/DriverUNV/DriverUNV_W_SMDS_Mesh.cxx b/src/DriverUNV/DriverUNV_W_SMDS_Mesh.cxx
index 7e640d5cfcb5d91b6576efed6e6ea80703209b35..a33d10b3886a00cf8f056aaedd05632c1932f294 100644 (file)
--- a/src/DriverUNV/DriverUNV_W_SMDS_Mesh.cxx
+++ b/src/DriverUNV/DriverUNV_W_SMDS_Mesh.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  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,9 +32,11 @@
 
 #include "utilities.h"
 
+#include "UNV164_Structure.hxx"
 #include "UNV2411_Structure.hxx"
 #include "UNV2412_Structure.hxx"
 #include "UNV2417_Structure.hxx"
+#include "UNV2420_Structure.hxx"
 #include "UNV_Utilities.hxx"
 
 #include <Basics_Utils.hxx>
@@ -64,6 +66,10 @@ Driver_Mesh::Status DriverUNV_W_SMDS_Mesh::Perform()
   Status aResult = DRS_OK;
   std::ofstream out_stream(myFile.c_str());
   try{
+
+    UNV164::Write( out_stream ); // unit system
+    UNV2420::Write( out_stream, myMeshName ); // Coordinate system
+
     {
       using namespace UNV2411;
       TDataSet aDataSet2411;
@@ -71,14 +77,15 @@ Driver_Mesh::Status DriverUNV_W_SMDS_Mesh::Perform()
       //-----------------------------------
       MESSAGE("Perform - myMesh->NbNodes() = "<<myMesh->NbNodes());
       SMDS_NodeIteratorPtr aNodesIter = myMesh->nodesIterator();
-      for(; aNodesIter->more();){
+      TRecord aRec;
+      while ( aNodesIter->more() )
+      {
         const SMDS_MeshNode* aNode = aNodesIter->next();
-        TRecord aRec;
+        aRec.label    = aNode->GetID();
         aRec.coord[0] = aNode->X();
         aRec.coord[1] = aNode->Y();
         aRec.coord[2] = aNode->Z();
-        const TNodeLab& aLabel = aNode->GetID();
-        aDataSet2411.insert(TDataSet::value_type(aLabel,aRec));
+        aDataSet2411.push_back( aRec );
       }
       MESSAGE("Perform - aDataSet2411.size() = "<<aDataSet2411.size());
       UNV2411::Write(out_stream,aDataSet2411);
@@ -92,11 +99,12 @@ Driver_Mesh::Status DriverUNV_W_SMDS_Mesh::Perform()
       MESSAGE("Perform - myMesh->NbEdges() = "<<myMesh->NbEdges());
       if(myMesh->NbEdges()){
         SMDS_EdgeIteratorPtr anIter = myMesh->edgesIterator();
-        for(; anIter->more();){
+        while( anIter->more() )
+        {
           const SMDS_MeshEdge* anElem = anIter->next();
-          TElementLab aLabel = anElem->GetID();
           int aNbNodes = anElem->NbNodes();
           TRecord aRec;
+          aRec.label = anElem->GetID();
           aRec.node_labels.reserve(aNbNodes);
           SMDS_ElemIteratorPtr aNodesIter;
           aNodesIter = anElem->nodesIteratorToUNV();
@@ -105,23 +113,27 @@ Driver_Mesh::Status DriverUNV_W_SMDS_Mesh::Perform()
           } else {
             aRec.fe_descriptor_id = 11;
           }
-          for(; aNodesIter->more();){
+          while( aNodesIter->more())
+          {
             const SMDS_MeshElement* aNode = aNodesIter->next();
             aRec.node_labels.push_back(aNode->GetID());
           }
-          aDataSet2412.insert(TDataSet::value_type(aLabel,aRec));
+          aDataSet2412.push_back(aRec);
         }
         MESSAGE("Perform - aDataSet2412.size() = "<<aDataSet2412.size());
       }
 
       MESSAGE("Perform - myMesh->NbFaces() = "<<myMesh->NbFaces());
-      if(myMesh->NbFaces()){
+      if ( myMesh->NbFaces() )
+      {
         SMDS_FaceIteratorPtr anIter = myMesh->facesIterator();
-        for(; anIter->more();){
+        while ( anIter->more())
+        {
           const SMDS_MeshFace* anElem = anIter->next();
-          TElementLab aLabel = anElem->GetID();
+          if ( anElem->IsPoly() ) continue;
           int aNbNodes = anElem->NbNodes();
           TRecord aRec;
+          aRec.label = anElem->GetID();
           aRec.node_labels.reserve(aNbNodes);
           SMDS_ElemIteratorPtr aNodesIter;
           aNodesIter = anElem->nodesIteratorToUNV();
@@ -142,77 +154,54 @@ Driver_Mesh::Status DriverUNV_W_SMDS_Mesh::Perform()
           case 8:
             aRec.fe_descriptor_id = 45;
             break;
+          case 9:
+            aRec.fe_descriptor_id = 45;
+            aRec.node_labels.resize( 8 );
+            break;
           default:
             continue;
           }
-          aDataSet2412.insert(TDataSet::value_type(aLabel,aRec));
+          aDataSet2412.push_back(aRec);
         }
         MESSAGE("Perform - aDataSet2412.size() = "<<aDataSet2412.size());
       }
 
       MESSAGE("Perform - myMesh->NbVolumes() = "<<myMesh->NbVolumes());
-      if(myMesh->NbVolumes()){
+      if ( myMesh->NbVolumes() )
+      {
         SMDS_VolumeIteratorPtr anIter = myMesh->volumesIterator();
-        for(; anIter->more();){
+        while ( anIter->more())
+        {
           const SMDS_MeshVolume* anElem = anIter->next();
-          TElementLab aLabel = anElem->GetID();
-
           int aNbNodes = anElem->NbNodes();
-          //MESSAGE("aNbNodes="<<aNbNodes);
-          SMDS_ElemIteratorPtr aNodesIter;
-          aNodesIter = anElem->nodesIteratorToUNV();
+          SMDS_ElemIteratorPtr aNodesIter = anElem->nodesIteratorToUNV();
           if ( anElem->IsPoly() ) {
-            MESSAGE("anElem->IsPoly");
-            if ( const SMDS_VtkVolume* ph =
-                 dynamic_cast<const SMDS_VtkVolume*> (anElem))
-            {
-              aNbNodes = ph->NbUniqueNodes();
-              aNodesIter = ph->uniqueNodesIterator();
-            }
+            continue;
           }
-
           int anId = -1;
-          switch(aNbNodes){
-          case 4: {
-            anId = 111;
-            break;
-          }
-          case 6: {
-            anId = 112;
-            break;
-          }
-          case 8: {
-            anId = 115;
-            break;
-          }
-          case 10: {
-            anId = 118;
-            break;
-          }
-          case 13: {
-            anId = 114;
-            break;
-          }
-          case 15: {
-            anId = 113;
-            break;
-          }
-          case 20: {
-            anId = 116;
-            break;
-          }
+          switch(aNbNodes) {
+          case 4:  anId = 111; break;
+          case 6:  anId = 112; break;
+          case 8:  anId = 115; break;
+          case 10: anId = 118; break;
+          case 13: anId = 114; break;
+          case 15: anId = 113; break;
+          case 20:
+          case 27: anId = 116; aNbNodes = 20; break;
           default:
             continue;
           }
           if(anId>0){
             TRecord aRec;
+            aRec.label = anElem->GetID();
             aRec.fe_descriptor_id = anId;
             aRec.node_labels.reserve(aNbNodes);
-            for(; aNodesIter->more();){
+            while ( aNodesIter->more() && aRec.node_labels.size() < aNbNodes )
+            {
               const SMDS_MeshElement* aNode = aNodesIter->next();
               aRec.node_labels.push_back(aNode->GetID());
             }
-            aDataSet2412.insert(TDataSet::value_type(aLabel,aRec));
+            aDataSet2412.push_back(aRec);
           }
         }
         MESSAGE("Perform - aDataSet2412.size() = "<<aDataSet2412.size());