Element 21 is a simple linear edge

diff --git a/src/DriverUNV/DriverUNV_R_SMDS_Mesh.cxx b/src/DriverUNV/DriverUNV_R_SMDS_Mesh.cxx
index a8402172ef2140b3394d9a15467161904b38471c..bc38d269bc9000a0f6cadf66f6de1b752d3c04d9 100644 (file)
--- a/src/DriverUNV/DriverUNV_R_SMDS_Mesh.cxx
+++ b/src/DriverUNV/DriverUNV_R_SMDS_Mesh.cxx
@@ -24,6 +24,7 @@
 
 #include "UNV2411_Structure.hxx"
 #include "UNV2412_Structure.hxx"
+#include "UNV2417_Structure.hxx"
 #include "UNV_Utilities.hxx"
 
 using namespace std;
@@ -65,13 +66,14 @@ 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) {
+          if((aRec.fe_descriptor_id == 11) || (aRec.fe_descriptor_id == 21)) {
             // edge with two nodes
             anElement = myMesh->AddEdgeWithID(aRec.node_labels[0],
                                               aRec.node_labels[1],
                                               aLabel);
           }
           else {
+           cout<<"### Id of element = "<<aRec.fe_descriptor_id<<endl;
             // quadratic edge (with 3 nodes)
             anElement = myMesh->AddEdgeWithID(aRec.node_labels[0],
                                               aRec.node_labels[1],
@@ -240,10 +242,15 @@ Driver_Mesh::Status DriverUNV_R_SMDS_Mesh::Perform()
 
          }
        }
-       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;      
+      TDataSet aDataSet2417;
+      UNV2417::Read(in_stream,aDataSet2417);
+    }
   }
   catch(const std::exception& exc){
     INFOS("Follow exception was cought:\n\t"<<exc.what());

diff --git a/src/DriverUNV/UNV2412_Structure.cxx b/src/DriverUNV/UNV2412_Structure.cxx
index 2be3319f3e4e8013a4472204654f9b07a33fdf7c..4bbc859363c304c282d38e015c39a7710c87a852 100644 (file)
--- a/src/DriverUNV/UNV2412_Structure.cxx
+++ b/src/DriverUNV/UNV2412_Structure.cxx
@@ -143,8 +143,8 @@ void UNV2412::Write(std::ofstream& out_stream, const TDataSet& theDataSet)
 bool UNV2412::IsBeam(int theFeDescriptorId){
   switch (theFeDescriptorId){
   case 11: // edge with 2 nodes
-  case 21: // edge with 3 nodes (quadratic)
-  case 22:
+  case 21: 
+  case 22: // edge with 3 nodes
   case 24:
   case 25:
     return true;