X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FDriverUNV%2FDriverUNV_R_SMDS_Mesh.cxx;h=173339ac3a02cd57fdbab2bb1fc05b07d5f4cb19;hp=a8402172ef2140b3394d9a15467161904b38471c;hb=572ca07c09b332ddadd2d60da5176ec6d07430c0;hpb=f7ffd4bc0271ea6b04c96a748961acb3d61562c0

diff --git a/src/DriverUNV/DriverUNV_R_SMDS_Mesh.cxx b/src/DriverUNV/DriverUNV_R_SMDS_Mesh.cxx
index a8402172e..173339ac3 100644
--- a/src/DriverUNV/DriverUNV_R_SMDS_Mesh.cxx
+++ b/src/DriverUNV/DriverUNV_R_SMDS_Mesh.cxx
@@ -19,11 +19,13 @@
 //
 #include "DriverUNV_R_SMDS_Mesh.h"
 #include "SMDS_Mesh.hxx"
+#include "SMDS_MeshGroup.hxx"
 
 #include "utilities.h"
 
 #include "UNV2411_Structure.hxx"
 #include "UNV2412_Structure.hxx"
+#include "UNV2417_Structure.hxx"
 #include "UNV_Utilities.hxx"
 
 using namespace std;
@@ -36,6 +38,13 @@ static int MYDEBUG = 0;
 #endif
 
 
+DriverUNV_R_SMDS_Mesh::~DriverUNV_R_SMDS_Mesh()
+{
+  if (myGroup != 0) 
+    delete myGroup;
+}
+
+
 Driver_Mesh::Status DriverUNV_R_SMDS_Mesh::Perform()
 {
   Status aResult = DRS_OK;
@@ -65,17 +74,16 @@ Driver_Mesh::Status DriverUNV_R_SMDS_Mesh::Perform()
 	const TElementLab& aLabel = anIter->first;
 	const TRecord& aRec = anIter->second;
 	if(IsBeam(aRec.fe_descriptor_id)) {
-          if(aRec.fe_descriptor_id == 11) {
-            // edge with two nodes
+          switch ( aRec.node_labels.size() ) {
+          case 2: // edge with two nodes
             anElement = myMesh->AddEdgeWithID(aRec.node_labels[0],
                                               aRec.node_labels[1],
                                               aLabel);
-          }
-          else {
-            // quadratic edge (with 3 nodes)
+            break;
+          case 3: // quadratic edge (with 3 nodes)
             anElement = myMesh->AddEdgeWithID(aRec.node_labels[0],
-                                              aRec.node_labels[1],
                                               aRec.node_labels[2],
+                                              aRec.node_labels[1],
                                               aLabel);
           }
 	}
@@ -96,10 +104,10 @@ Driver_Mesh::Status DriverUNV_R_SMDS_Mesh::Perform()
 	  case 42: // Plane Stress Quadratic Triangle - TRI6
 	  case 92: // Thin Shell Quadratic Triangle - TRI6
 	    anElement = myMesh->AddFaceWithID(aRec.node_labels[0],
-					      aRec.node_labels[1],
 					      aRec.node_labels[2],
-					      aRec.node_labels[3],
 					      aRec.node_labels[4],
+					      aRec.node_labels[1],
+					      aRec.node_labels[3],
 					      aRec.node_labels[5],
 					      aLabel);
 	    break;
@@ -116,12 +124,12 @@ Driver_Mesh::Status DriverUNV_R_SMDS_Mesh::Perform()
 	  case 45: // Plane Stress Quadratic Quadrilateral - QUAD8
 	  case 95: // Thin Shell   Quadratic Quadrilateral - QUAD8
 	    anElement = myMesh->AddFaceWithID(aRec.node_labels[0],
-					      aRec.node_labels[1],
 					      aRec.node_labels[2],
-					      aRec.node_labels[3],
 					      aRec.node_labels[4],
-					      aRec.node_labels[5],
 					      aRec.node_labels[6],
+					      aRec.node_labels[1],
+					      aRec.node_labels[3],
+					      aRec.node_labels[5],
 					      aRec.node_labels[7],
 					      aLabel);
 	    break;
@@ -140,15 +148,18 @@ Driver_Mesh::Status DriverUNV_R_SMDS_Mesh::Perform()
 
 	  case 118: // Solid Quadratic Tetrahedron - TET10
 	    anElement = myMesh->AddVolumeWithID(aRec.node_labels[0],
-						aRec.node_labels[2],
-						aRec.node_labels[1],
-						aRec.node_labels[3],
-						aRec.node_labels[6],
-						aRec.node_labels[5],
 						aRec.node_labels[4],
-						aRec.node_labels[7],
+						aRec.node_labels[2],
+
 						aRec.node_labels[9],
+
+						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;
 	    
@@ -164,20 +175,24 @@ Driver_Mesh::Status DriverUNV_R_SMDS_Mesh::Perform()
 	    
 	  case 113: // Solid Quadratic Prism - PRISM15
 	    anElement = myMesh->AddVolumeWithID(aRec.node_labels[0],
+						aRec.node_labels[4],
 						aRec.node_labels[2],
-						aRec.node_labels[1],
-						aRec.node_labels[3],
+
+						aRec.node_labels[9],
+						aRec.node_labels[13],
+						aRec.node_labels[11],
+
 						aRec.node_labels[5],
-						aRec.node_labels[4],
+						aRec.node_labels[3],
+                                                aRec.node_labels[1],
+
+						aRec.node_labels[14],
+						aRec.node_labels[12],
+                                                aRec.node_labels[10],
+
+                                                aRec.node_labels[6],
 						aRec.node_labels[8],
 						aRec.node_labels[7],
-						aRec.node_labels[6],
-						aRec.node_labels[11],
-						aRec.node_labels[10],
-						aRec.node_labels[9],
-						aRec.node_labels[12],
-						aRec.node_labels[14],
-						aRec.node_labels[13],
 						aLabel);
 	    break;
 	    
@@ -223,27 +238,108 @@ Driver_Mesh::Status DriverUNV_R_SMDS_Mesh::Perform()
 
 	  case 114: // pyramid of 13 nodes (quadratic) - PIRA13
 	    anElement = myMesh->AddVolumeWithID(aRec.node_labels[0],
-						aRec.node_labels[3],
-						aRec.node_labels[2],
-						aRec.node_labels[1],
+						aRec.node_labels[6],
 						aRec.node_labels[4],
-						aRec.node_labels[8],
+						aRec.node_labels[2],
 						aRec.node_labels[7],
-						aRec.node_labels[6],
 						aRec.node_labels[5],
-						aRec.node_labels[9],
-						aRec.node_labels[12],
+						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;
 
 	  }
 	}
-	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);
       }
     }
+    {
+      using namespace UNV2417;      
+      in_stream.seekg(0);
+      TDataSet aDataSet2417;
+      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;
+
+	  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;
+	    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 < 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;
+		    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;
+		    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;
+		    myGroupNames.insert(TGroupNamesMap::value_type(aVolumeGroup, aVolumeGrName));
+		    myGroupId.insert(TGroupIdMap::value_type(aVolumeGroup, aLabel));
+		    createdGroup = true;
+		  }
+		  aVolumeGroup->Add(aElement);
+		  break;
+		}
+	      } 
+	    }
+	  }
+	}
+      }
+    } 
   }
   catch(const std::exception& exc){
     INFOS("Follow exception was cought:\n\t"<<exc.what());