Salome HOME
PR: merged from V5_1_4rc1
[modules/smesh.git] / src / DriverUNV / DriverUNV_R_SMDS_Mesh.cxx
index 617cb6dfb2cf437c518976dff43a13ee01b5316c..bfb1d63945cb1080ba96989163be3bdea11b7057 100644 (file)
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  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
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #include "DriverUNV_R_SMDS_Mesh.h"
 #include "SMDS_Mesh.hxx"
 #include "SMDS_MeshGroup.hxx"
@@ -62,9 +63,9 @@ Driver_Mesh::Status DriverUNV_R_SMDS_Mesh::Perform()
       if(MYDEBUG) MESSAGE("Perform - aDataSet2411.size() = "<<aDataSet2411.size());
       TDataSet::const_iterator anIter = aDataSet2411.begin();
       for(; anIter != aDataSet2411.end(); anIter++){
-       const TNodeLab& aLabel = anIter->first;
-       const TRecord& aRec = anIter->second;
-       myMesh->AddNodeWithID(aRec.coord[0],aRec.coord[1],aRec.coord[2],aLabel);
+        const TNodeLab& aLabel = anIter->first;
+        const TRecord& aRec = anIter->second;
+        myMesh->AddNodeWithID(aRec.coord[0],aRec.coord[1],aRec.coord[2],aLabel);
       }
     }
     {
@@ -75,10 +76,10 @@ Driver_Mesh::Status DriverUNV_R_SMDS_Mesh::Perform()
       TDataSet::const_iterator anIter = aDataSet2412.begin();
       if(MYDEBUG) MESSAGE("Perform - aDataSet2412.size() = "<<aDataSet2412.size());
       for(; anIter != aDataSet2412.end(); anIter++){
-       SMDS_MeshElement* anElement = NULL;
-       const TElementLab& aLabel = anIter->first;
-       const TRecord& aRec = anIter->second;
-       if(IsBeam(aRec.fe_descriptor_id)) {
+        SMDS_MeshElement* anElement = NULL;
+        const TElementLab& aLabel = anIter->first;
+        const TRecord& aRec = anIter->second;
+        if(IsBeam(aRec.fe_descriptor_id)) {
           switch ( aRec.node_labels.size() ) {
           case 2: // edge with two nodes
             anElement = myMesh->AddEdgeWithID(aRec.node_labels[0],
@@ -91,178 +92,178 @@ Driver_Mesh::Status DriverUNV_R_SMDS_Mesh::Perform()
                                               aRec.node_labels[1],
                                               aLabel);
           }
-       }
+        }
         else if(IsFace(aRec.fe_descriptor_id)) {
-         switch(aRec.fe_descriptor_id){
-         case 71: // TRI3
-         case 72:
-         case 74:
-           
-         case 41: // Plane Stress Linear Triangle - TRI3
-         case 91: // Thin Shell Linear Triangle - TRI3
-           anElement = myMesh->AddFaceWithID(aRec.node_labels[0],
-                                             aRec.node_labels[1],
-                                             aRec.node_labels[2],
-                                             aLabel);
-           break;
-           
-         case 42: // Plane Stress Quadratic Triangle - TRI6
-         case 92: // Thin Shell Quadratic Triangle - TRI6
-           anElement = myMesh->AddFaceWithID(aRec.node_labels[0],
-                                             aRec.node_labels[2],
-                                             aRec.node_labels[4],
-                                             aRec.node_labels[1],
-                                             aRec.node_labels[3],
-                                             aRec.node_labels[5],
-                                             aLabel);
-           break;
-           
-         case 44: // Plane Stress Linear Quadrilateral - QUAD4
-         case 94: // Thin Shell   Linear Quadrilateral -  QUAD4
-           anElement = myMesh->AddFaceWithID(aRec.node_labels[0],
-                                             aRec.node_labels[1],
-                                             aRec.node_labels[2],
-                                             aRec.node_labels[3],
-                                             aLabel);
-           break;
-           
-         case 45: // Plane Stress Quadratic Quadrilateral - QUAD8
-         case 95: // Thin Shell   Quadratic Quadrilateral - QUAD8
-           anElement = myMesh->AddFaceWithID(aRec.node_labels[0],
-                                             aRec.node_labels[2],
-                                             aRec.node_labels[4],
-                                             aRec.node_labels[6],
-                                             aRec.node_labels[1],
-                                             aRec.node_labels[3],
-                                             aRec.node_labels[5],
-                                             aRec.node_labels[7],
-                                             aLabel);
-           break;
-         }
-       }
+          switch(aRec.fe_descriptor_id){
+          case 71: // TRI3
+          case 72:
+          case 74:
+            
+          case 41: // Plane Stress Linear Triangle - TRI3
+          case 91: // Thin Shell Linear Triangle - TRI3
+            anElement = myMesh->AddFaceWithID(aRec.node_labels[0],
+                                              aRec.node_labels[1],
+                                              aRec.node_labels[2],
+                                              aLabel);
+            break;
+            
+          case 42: // Plane Stress Quadratic Triangle - TRI6
+          case 92: // Thin Shell Quadratic Triangle - TRI6
+            anElement = myMesh->AddFaceWithID(aRec.node_labels[0],
+                                              aRec.node_labels[2],
+                                              aRec.node_labels[4],
+                                              aRec.node_labels[1],
+                                              aRec.node_labels[3],
+                                              aRec.node_labels[5],
+                                              aLabel);
+            break;
+            
+          case 44: // Plane Stress Linear Quadrilateral - QUAD4
+          case 94: // Thin Shell   Linear Quadrilateral -  QUAD4
+            anElement = myMesh->AddFaceWithID(aRec.node_labels[0],
+                                              aRec.node_labels[1],
+                                              aRec.node_labels[2],
+                                              aRec.node_labels[3],
+                                              aLabel);
+            break;
+            
+          case 45: // Plane Stress Quadratic Quadrilateral - QUAD8
+          case 95: // Thin Shell   Quadratic Quadrilateral - QUAD8
+            anElement = myMesh->AddFaceWithID(aRec.node_labels[0],
+                                              aRec.node_labels[2],
+                                              aRec.node_labels[4],
+                                              aRec.node_labels[6],
+                                              aRec.node_labels[1],
+                                              aRec.node_labels[3],
+                                              aRec.node_labels[5],
+                                              aRec.node_labels[7],
+                                              aLabel);
+            break;
+          }
+        }
         else if(IsVolume(aRec.fe_descriptor_id)){
-         switch(aRec.fe_descriptor_id){
-           
-         case 111: // Solid Linear Tetrahedron - TET4
-           anElement = myMesh->AddVolumeWithID(aRec.node_labels[0],
-                                               aRec.node_labels[2],
-                                               aRec.node_labels[1],
-                                               aRec.node_labels[3],
-                                               aLabel);
-           break;
+          switch(aRec.fe_descriptor_id){
+            
+          case 111: // Solid Linear Tetrahedron - TET4
+            anElement = myMesh->AddVolumeWithID(aRec.node_labels[0],
+                                                aRec.node_labels[2],
+                                                aRec.node_labels[1],
+                                                aRec.node_labels[3],
+                                                aLabel);
+            break;
 
-         case 118: // Solid Quadratic Tetrahedron - TET10
-           anElement = myMesh->AddVolumeWithID(aRec.node_labels[0],
-                                               aRec.node_labels[4],
-                                               aRec.node_labels[2],
+          case 118: // Solid Quadratic Tetrahedron - TET10
+            anElement = myMesh->AddVolumeWithID(aRec.node_labels[0],
+                                                aRec.node_labels[4],
+                                                aRec.node_labels[2],
 
-                                               aRec.node_labels[9],
+                                                aRec.node_labels[9],
 
-                                               aRec.node_labels[5],
-                                               aRec.node_labels[3],
+                                                aRec.node_labels[5],
+                                                aRec.node_labels[3],
                                                 aRec.node_labels[1],
 
                                                 aRec.node_labels[6],
-                                               aRec.node_labels[8],
-                                               aRec.node_labels[7],
-                                               aLabel);
-           break;
-           
-         case 112: // Solid Linear Prism - PRISM6
-           anElement = myMesh->AddVolumeWithID(aRec.node_labels[0],
-                                               aRec.node_labels[2],
-                                               aRec.node_labels[1],
-                                               aRec.node_labels[3],
-                                               aRec.node_labels[5],
-                                               aRec.node_labels[4],
-                                               aLabel);
-           break;
-           
-         case 113: // Solid Quadratic Prism - PRISM15
-           anElement = myMesh->AddVolumeWithID(aRec.node_labels[0],
-                                               aRec.node_labels[4],
-                                               aRec.node_labels[2],
+                                                aRec.node_labels[8],
+                                                aRec.node_labels[7],
+                                                aLabel);
+            break;
+            
+          case 112: // Solid Linear Prism - PRISM6
+            anElement = myMesh->AddVolumeWithID(aRec.node_labels[0],
+                                                aRec.node_labels[2],
+                                                aRec.node_labels[1],
+                                                aRec.node_labels[3],
+                                                aRec.node_labels[5],
+                                                aRec.node_labels[4],
+                                                aLabel);
+            break;
+            
+          case 113: // Solid Quadratic Prism - PRISM15
+            anElement = myMesh->AddVolumeWithID(aRec.node_labels[0],
+                                                aRec.node_labels[4],
+                                                aRec.node_labels[2],
 
-                                               aRec.node_labels[9],
-                                               aRec.node_labels[13],
-                                               aRec.node_labels[11],
+                                                aRec.node_labels[9],
+                                                aRec.node_labels[13],
+                                                aRec.node_labels[11],
 
-                                               aRec.node_labels[5],
-                                               aRec.node_labels[3],
+                                                aRec.node_labels[5],
+                                                aRec.node_labels[3],
                                                 aRec.node_labels[1],
 
-                                               aRec.node_labels[14],
-                                               aRec.node_labels[12],
+                                                aRec.node_labels[14],
+                                                aRec.node_labels[12],
                                                 aRec.node_labels[10],
 
                                                 aRec.node_labels[6],
-                                               aRec.node_labels[8],
-                                               aRec.node_labels[7],
-                                               aLabel);
-           break;
-           
-         case 115: // Solid Linear Brick - HEX8
-           anElement = myMesh->AddVolumeWithID(aRec.node_labels[0],
-                                               aRec.node_labels[3],
-                                               aRec.node_labels[2],
-                                               aRec.node_labels[1],
-                                               aRec.node_labels[4],
-                                               aRec.node_labels[7],
-                                               aRec.node_labels[6],
-                                               aRec.node_labels[5],
-                                               aLabel);
-           break;
+                                                aRec.node_labels[8],
+                                                aRec.node_labels[7],
+                                                aLabel);
+            break;
+            
+          case 115: // Solid Linear Brick - HEX8
+            anElement = myMesh->AddVolumeWithID(aRec.node_labels[0],
+                                                aRec.node_labels[3],
+                                                aRec.node_labels[2],
+                                                aRec.node_labels[1],
+                                                aRec.node_labels[4],
+                                                aRec.node_labels[7],
+                                                aRec.node_labels[6],
+                                                aRec.node_labels[5],
+                                                aLabel);
+            break;
 
-         case 116: // Solid Quadratic Brick - HEX20
-           anElement = myMesh->AddVolumeWithID(aRec.node_labels[0],
-                                               aRec.node_labels[6],
-                                               aRec.node_labels[4],
-                                               aRec.node_labels[2],
+          case 116: // Solid Quadratic Brick - HEX20
+            anElement = myMesh->AddVolumeWithID(aRec.node_labels[0],
+                                                aRec.node_labels[6],
+                                                aRec.node_labels[4],
+                                                aRec.node_labels[2],
 
-                                               aRec.node_labels[12],
-                                               aRec.node_labels[18],
-                                               aRec.node_labels[16],
-                                               aRec.node_labels[14],
+                                                aRec.node_labels[12],
+                                                aRec.node_labels[18],
+                                                aRec.node_labels[16],
+                                                aRec.node_labels[14],
 
-                                               aRec.node_labels[7],
-                                               aRec.node_labels[5],
-                                               aRec.node_labels[3],
-                                               aRec.node_labels[1],
+                                                aRec.node_labels[7],
+                                                aRec.node_labels[5],
+                                                aRec.node_labels[3],
+                                                aRec.node_labels[1],
 
-                                               aRec.node_labels[19],
-                                               aRec.node_labels[17],
-                                               aRec.node_labels[15],
+                                                aRec.node_labels[19],
+                                                aRec.node_labels[17],
+                                                aRec.node_labels[15],
                                                 aRec.node_labels[13],
 
                                                 aRec.node_labels[8],
-                                               aRec.node_labels[11],
-                                               aRec.node_labels[10],
-                                               aRec.node_labels[9],
-                                               aLabel);
-           break;
+                                                aRec.node_labels[11],
+                                                aRec.node_labels[10],
+                                                aRec.node_labels[9],
+                                                aLabel);
+            break;
 
-         case 114: // pyramid of 13 nodes (quadratic) - PIRA13
-           anElement = myMesh->AddVolumeWithID(aRec.node_labels[0],
-                                               aRec.node_labels[6],
-                                               aRec.node_labels[4],
-                                               aRec.node_labels[2],
-                                               aRec.node_labels[7],
-                                               aRec.node_labels[5],
-                                               aRec.node_labels[3],
-                                               aRec.node_labels[1],
+          case 114: // pyramid of 13 nodes (quadratic) - PIRA13
+            anElement = myMesh->AddVolumeWithID(aRec.node_labels[0],
+                                                aRec.node_labels[6],
+                                                aRec.node_labels[4],
+                                                aRec.node_labels[2],
+                                                aRec.node_labels[7],
+                                                aRec.node_labels[5],
+                                                aRec.node_labels[3],
+                                                aRec.node_labels[1],
 
-                                               aRec.node_labels[8],
-                                               aRec.node_labels[11],
-                                               aRec.node_labels[10],
-                                               aRec.node_labels[9],
-                                               aRec.node_labels[12],
-                                               aLabel);
-           break;
+                                                aRec.node_labels[8],
+                                                aRec.node_labels[11],
+                                                aRec.node_labels[10],
+                                                aRec.node_labels[9],
+                                                aRec.node_labels[12],
+                                                aLabel);
+            break;
 
-         }
-       }
-       //      if(!anElement)
-       //        MESSAGE("DriverUNV_R_SMDS_Mesh::Perform - can not add element with ID = "<<aLabel<<" and type = "<<aRec.fe_descriptor_id);
+          }
+        }
+        //      if(!anElement)
+        //        MESSAGE("DriverUNV_R_SMDS_Mesh::Perform - can not add element with ID = "<<aLabel<<" and type = "<<aRec.fe_descriptor_id);
       }
     }
     {
@@ -272,89 +273,89 @@ Driver_Mesh::Status DriverUNV_R_SMDS_Mesh::Perform()
       UNV2417::Read(in_stream,aDataSet2417);
       if(MYDEBUG) MESSAGE("Perform - aDataSet2417.size() = "<<aDataSet2417.size());
       if  (aDataSet2417.size() > 0) {
-       myGroup = new SMDS_MeshGroup(myMesh);
-       TDataSet::const_iterator anIter = aDataSet2417.begin();
-       for(; anIter != aDataSet2417.end(); anIter++){
-         const TGroupId& aLabel = anIter->first;
-         const TRecord& aRec = anIter->second;
+        myGroup = new SMDS_MeshGroup(myMesh);
+        TDataSet::const_iterator anIter = aDataSet2417.begin();
+        for(; anIter != aDataSet2417.end(); anIter++){
+          const TGroupId& aLabel = anIter->first;
+          const TRecord& aRec = anIter->second;
 
-         int aNodesNb = aRec.NodeList.size();
-         int aElementsNb = aRec.ElementList.size();
+          int aNodesNb = aRec.NodeList.size();
+          int aElementsNb = aRec.ElementList.size();
 
-         bool useSuffix = ((aNodesNb > 0) && (aElementsNb > 0));
-         int i;
-         if (aNodesNb > 0) {
-           SMDS_MeshGroup* aNodesGroup = (SMDS_MeshGroup*) myGroup->AddSubGroup(SMDSAbs_Node);
-           std::string aGrName = (useSuffix) ? aRec.GroupName + "_Nodes" : aRec.GroupName;
-           int i = aGrName.find( "\r" );
-           if (i > 0)
-             aGrName.erase (i, 2);
-           myGroupNames.insert(TGroupNamesMap::value_type(aNodesGroup, aGrName));
-           myGroupId.insert(TGroupIdMap::value_type(aNodesGroup, aLabel));
+          bool useSuffix = ((aNodesNb > 0) && (aElementsNb > 0));
+          int i;
+          if (aNodesNb > 0) {
+            SMDS_MeshGroup* aNodesGroup = (SMDS_MeshGroup*) myGroup->AddSubGroup(SMDSAbs_Node);
+            std::string aGrName = (useSuffix) ? aRec.GroupName + "_Nodes" : aRec.GroupName;
+            int i = aGrName.find( "\r" );
+            if (i > 0)
+              aGrName.erase (i, 2);
+            myGroupNames.insert(TGroupNamesMap::value_type(aNodesGroup, aGrName));
+            myGroupId.insert(TGroupIdMap::value_type(aNodesGroup, aLabel));
 
-           for (i = 0; i < aNodesNb; i++) {
-             const SMDS_MeshNode* aNode = myMesh->FindNode(aRec.NodeList[i]);
-             if (aNode)
-               aNodesGroup->Add(aNode);
-           }
-         }
-         if (aElementsNb > 0){
-           SMDS_MeshGroup* aEdgesGroup = 0;
-           SMDS_MeshGroup* aFacesGroup = 0;
-           SMDS_MeshGroup* aVolumeGroup = 0;
-           bool createdGroup = false;
+            for (i = 0; i < aNodesNb; i++) {
+              const SMDS_MeshNode* aNode = myMesh->FindNode(aRec.NodeList[i]);
+              if (aNode)
+                aNodesGroup->Add(aNode);
+            }
+          }
+          if (aElementsNb > 0){
+            SMDS_MeshGroup* aEdgesGroup = 0;
+            SMDS_MeshGroup* aFacesGroup = 0;
+            SMDS_MeshGroup* aVolumeGroup = 0;
+            bool createdGroup = false;
 
-           for (i = 0; i < aElementsNb; i++) {
-             const SMDS_MeshElement* aElement = myMesh->FindElement(aRec.ElementList[i]);
-             if (aElement) {
-               switch (aElement->GetType()) {
-               case SMDSAbs_Edge:
-                 if (!aEdgesGroup) {
-                   aEdgesGroup = (SMDS_MeshGroup*) myGroup->AddSubGroup(SMDSAbs_Edge);
-                   if (!useSuffix && createdGroup) useSuffix = true;
-                   std::string aEdgesGrName = (useSuffix) ? aRec.GroupName + "_Edges" : aRec.GroupName;
-                   int i = aEdgesGrName.find( "\r" );
-                   if (i > 0)
-                     aEdgesGrName.erase (i, 2);
-                   myGroupNames.insert(TGroupNamesMap::value_type(aEdgesGroup, aEdgesGrName));
-                   myGroupId.insert(TGroupIdMap::value_type(aEdgesGroup, aLabel));
-                   createdGroup = true;
-                 }
-                 aEdgesGroup->Add(aElement);
-                 break;
-               case SMDSAbs_Face:
-                 if (!aFacesGroup) {
-                   aFacesGroup = (SMDS_MeshGroup*) myGroup->AddSubGroup(SMDSAbs_Face);
-                   if (!useSuffix && createdGroup) useSuffix = true;
-                   std::string aFacesGrName = (useSuffix) ? aRec.GroupName + "_Faces" : aRec.GroupName;
-                   int i = aFacesGrName.find( "\r" );
-                   if (i > 0)
-                     aFacesGrName.erase (i, 2);
-                   myGroupNames.insert(TGroupNamesMap::value_type(aFacesGroup, aFacesGrName));
-                   myGroupId.insert(TGroupIdMap::value_type(aFacesGroup, aLabel));
-                   createdGroup = true;
-                 }
-                 aFacesGroup->Add(aElement);
-                 break;
-               case SMDSAbs_Volume:
-                 if (!aVolumeGroup) {
-                   aVolumeGroup = (SMDS_MeshGroup*) myGroup->AddSubGroup(SMDSAbs_Volume);
-                   if (!useSuffix && createdGroup) useSuffix = true;
-                   std::string aVolumeGrName = (useSuffix) ? aRec.GroupName + "_Volumes" : aRec.GroupName;
-                   int i = aVolumeGrName.find( "\r" );
-                   if (i > 0)
-                     aVolumeGrName.erase (i, 2);
-                   myGroupNames.insert(TGroupNamesMap::value_type(aVolumeGroup, aVolumeGrName));
-                   myGroupId.insert(TGroupIdMap::value_type(aVolumeGroup, aLabel));
-                   createdGroup = true;
-                 }
-                 aVolumeGroup->Add(aElement);
-                 break;
-               }
-             } 
-           }
-         }
-       }
+            for (i = 0; i < aElementsNb; i++) {
+              const SMDS_MeshElement* aElement = myMesh->FindElement(aRec.ElementList[i]);
+              if (aElement) {
+                switch (aElement->GetType()) {
+                case SMDSAbs_Edge:
+                  if (!aEdgesGroup) {
+                    aEdgesGroup = (SMDS_MeshGroup*) myGroup->AddSubGroup(SMDSAbs_Edge);
+                    if (!useSuffix && createdGroup) useSuffix = true;
+                    std::string aEdgesGrName = (useSuffix) ? aRec.GroupName + "_Edges" : aRec.GroupName;
+                    int i = aEdgesGrName.find( "\r" );
+                    if (i > 0)
+                      aEdgesGrName.erase (i, 2);
+                    myGroupNames.insert(TGroupNamesMap::value_type(aEdgesGroup, aEdgesGrName));
+                    myGroupId.insert(TGroupIdMap::value_type(aEdgesGroup, aLabel));
+                    createdGroup = true;
+                  }
+                  aEdgesGroup->Add(aElement);
+                  break;
+                case SMDSAbs_Face:
+                  if (!aFacesGroup) {
+                    aFacesGroup = (SMDS_MeshGroup*) myGroup->AddSubGroup(SMDSAbs_Face);
+                    if (!useSuffix && createdGroup) useSuffix = true;
+                    std::string aFacesGrName = (useSuffix) ? aRec.GroupName + "_Faces" : aRec.GroupName;
+                    int i = aFacesGrName.find( "\r" );
+                    if (i > 0)
+                      aFacesGrName.erase (i, 2);
+                    myGroupNames.insert(TGroupNamesMap::value_type(aFacesGroup, aFacesGrName));
+                    myGroupId.insert(TGroupIdMap::value_type(aFacesGroup, aLabel));
+                    createdGroup = true;
+                  }
+                  aFacesGroup->Add(aElement);
+                  break;
+                case SMDSAbs_Volume:
+                  if (!aVolumeGroup) {
+                    aVolumeGroup = (SMDS_MeshGroup*) myGroup->AddSubGroup(SMDSAbs_Volume);
+                    if (!useSuffix && createdGroup) useSuffix = true;
+                    std::string aVolumeGrName = (useSuffix) ? aRec.GroupName + "_Volumes" : aRec.GroupName;
+                    int i = aVolumeGrName.find( "\r" );
+                    if (i > 0)
+                      aVolumeGrName.erase (i, 2);
+                    myGroupNames.insert(TGroupNamesMap::value_type(aVolumeGroup, aVolumeGrName));
+                    myGroupId.insert(TGroupIdMap::value_type(aVolumeGroup, aLabel));
+                    createdGroup = true;
+                  }
+                  aVolumeGroup->Add(aElement);
+                  break;
+                }
+              
+            }
+          }
+        }
       }
     } 
   }