0021480: EDF 2084 SMESH: SIGSEGV when validating Netgen3D hypothesis

[modules/smesh.git] / src / SMESH / SMESH_Mesh.cxx

diff --git a/src/SMESH/SMESH_Mesh.cxx b/src/SMESH/SMESH_Mesh.cxx
index 7bc5b7ceb790197abb5578a0cc4fabf338713a33..aa36feb281a41279b87d5607dc842025674dc701 100644 (file)
--- a/src/SMESH/SMESH_Mesh.cxx
+++ b/src/SMESH/SMESH_Mesh.cxx
@@ -48,8 +48,10 @@
 #include "DriverMED_R_SMESHDS_Mesh.h"
 #include "DriverUNV_R_SMDS_Mesh.h"
 #include "DriverSTL_R_SMDS_Mesh.h"
+#ifdef WITH_CGNS
 #include "DriverCGNS_Read.hxx"
 #include "DriverCGNS_Write.hxx"
+#endif
 
 #undef _Precision_HeaderFile
 #include <BRepBndLib.hxx>
@@ -455,16 +457,20 @@ int SMESH_Mesh::CGNSToMesh(const char*  theFileName,
                            const int    theMeshIndex,
                            std::string& theMeshName)
 {
+  int res = Driver_Mesh::DRS_FAIL;
+#ifdef WITH_CGNS
+
   DriverCGNS_Read myReader;
   myReader.SetMesh(_myMeshDS);
   myReader.SetFile(theFileName);
   myReader.SetMeshId(theMeshIndex);
-  int res = myReader.Perform();
+  res = myReader.Perform();
   theMeshName = myReader.GetMeshName();
 
   // create groups
   SynchronizeGroups();
 
+#endif
   return res;
 }
 
@@ -522,7 +528,7 @@ SMESH_Hypothesis::Hypothesis_Status
 
   SMESH_Hypothesis::Hypothesis_Status ret = subMesh->AlgoStateEngine(event, anHyp);
 
-  // subShapes
+  // sub-shapes
   if (!SMESH_Hypothesis::IsStatusFatal(ret) &&
       anHyp->GetDim() <= SMESH_Gen::GetShapeDim(aSubShape)) // is added on father
   {
@@ -596,7 +602,7 @@ SMESH_Hypothesis::Hypothesis_Status
       subMesh->CheckConcurentHypothesis( anHyp->GetType() ) != SMESH_Hypothesis::HYP_OK)
     ret = SMESH_Hypothesis::HYP_CONCURENT;
 
-  // subShapes
+  // sub-shapes
   if (!SMESH_Hypothesis::IsStatusFatal(ret) &&
       anHyp->GetDim() <= SMESH_Gen::GetShapeDim(aSubShape)) // is removed from father
   {
@@ -878,7 +884,7 @@ throw(SALOME_Exception)
 }
 //================================================================================
 /*!
- * \brief Return submeshes of groups containing the given subshape
+ * \brief Return submeshes of groups containing the given sub-shape
  */
 //================================================================================
 
@@ -982,6 +988,9 @@ void SMESH_Mesh::NotifySubMeshesHypothesisModification(const SMESH_Hypothesis* h
 {
   Unexpect aCatch(SalomeException);
 
+  if ( !GetMeshDS()->IsUsedHypothesis( hyp ))
+    return;
+
   const SMESH_Algo *foundAlgo = 0;
   SMESH_HypoFilter algoKind, compatibleHypoKind;
   list <const SMESHDS_Hypothesis * > usedHyps;
@@ -1090,7 +1099,7 @@ bool SMESH_Mesh::HasModificationsToDiscard() const
         return true;
     }
 
-  if ( !hasComputed )
+  if ( NbNodes() < 1 )
     const_cast<SMESH_Mesh*>(this)->_isModified = false;
 
   return false;
@@ -1180,6 +1189,44 @@ void SMESH_Mesh::ExportMED(const char *        file,
   myWriter.Perform();
 }
 
+void SMESH_Mesh::ExportSAUV(const char *file, 
+                            const char* theMeshName, 
+                            bool theAutoGroups)
+  throw(SALOME_Exception)
+{
+  std::string medfilename(file);
+  medfilename += ".med";
+  std::string cmd;
+#ifdef WNT
+  cmd = "%PYTHONBIN% ";
+#else
+  cmd = "python ";
+#endif
+  cmd += "-c \"";
+  cmd += "from medutilities import my_remove ; my_remove(r'" + medfilename + "')";
+  cmd += "\"";
+  system(cmd.c_str());
+  ExportMED(medfilename.c_str(), theMeshName, theAutoGroups, 1);
+#ifdef WNT
+  cmd = "%PYTHONBIN% ";
+#else
+  cmd = "python ";
+#endif
+  cmd += "-c \"";
+  cmd += "from medutilities import convert ; convert(r'" + medfilename + "', 'MED', 'GIBI', 1, r'" + file + "')";
+  cmd += "\"";
+  system(cmd.c_str());
+#ifdef WNT
+  cmd = "%PYTHONBIN% ";
+#else
+  cmd = "python ";
+#endif
+  cmd += "-c \"";
+  cmd += "from medutilities import my_remove ; my_remove(r'" + medfilename + "')";
+  cmd += "\"";
+  system(cmd.c_str());
+}
+
 //================================================================================
 /*!
  * \brief Export the mesh to a DAT file
@@ -1256,11 +1303,15 @@ void SMESH_Mesh::ExportSTL(const char *        file,
 void SMESH_Mesh::ExportCGNS(const char *        file,
                             const SMESHDS_Mesh* meshDS)
 {
+  int res = Driver_Mesh::DRS_FAIL;
+#ifdef WITH_CGNS
   DriverCGNS_Write myWriter;
   myWriter.SetFile( file );
   myWriter.SetMesh( const_cast<SMESHDS_Mesh*>( meshDS ));
   myWriter.SetMeshName( SMESH_Comment("Mesh_") << meshDS->GetPersistentId());
-  if ( myWriter.Perform() != Driver_Mesh::DRS_OK )
+  res = myWriter.Perform();
+#endif
+  if ( res != Driver_Mesh::DRS_OK )
     throw SALOME_Exception("Export failed");
 }
 
@@ -1336,6 +1387,18 @@ int SMESH_Mesh::NbQuadrangles(SMDSAbs_ElementOrder order) const throw(SALOME_Exc
   return _myMeshDS->GetMeshInfo().NbQuadrangles(order);
 }
 
+//================================================================================
+/*!
+ * \brief Return number of biquadratic quadrangles in the mesh
+ */
+//================================================================================
+
+int SMESH_Mesh::NbBiQuadQuadrangles() const throw(SALOME_Exception)
+{
+  Unexpect aCatch(SalomeException);
+  return _myMeshDS->GetMeshInfo().NbBiQuadQuadrangles();
+}
+
 //================================================================================
 /*!
  * \brief Return the number of polygonal faces in the mesh
@@ -1384,6 +1447,18 @@ int SMESH_Mesh::NbHexas(SMDSAbs_ElementOrder order) const throw(SALOME_Exception
   return _myMeshDS->GetMeshInfo().NbHexas(order);
 }
 
+//================================================================================
+/*!
+ * \brief  Return number of triquadratic hexahedrons in the mesh
+ */
+//================================================================================
+
+int SMESH_Mesh::NbTriQuadraticHexas() const throw(SALOME_Exception)
+{
+  Unexpect aCatch(SalomeException);
+  return _myMeshDS->GetMeshInfo().NbTriQuadHexas();
+}
+
 //================================================================================
 /*!
  * \brief  Return number of pyramids of given order in the mesh
@@ -1408,6 +1483,18 @@ int SMESH_Mesh::NbPrisms(SMDSAbs_ElementOrder order) const throw(SALOME_Exceptio
   return _myMeshDS->GetMeshInfo().NbPrisms(order);
 }
 
+//================================================================================
+/*!
+ * \brief  Return number of hexagonal prisms in the mesh
+ */
+//================================================================================
+
+int SMESH_Mesh::NbHexagonalPrisms() const throw(SALOME_Exception)
+{
+  Unexpect aCatch(SalomeException);
+  return _myMeshDS->GetMeshInfo().NbHexPrisms();
+}
+
 //================================================================================
 /*!
  * \brief  Return number of polyhedrons in the mesh
@@ -1703,6 +1790,9 @@ SMESH_Group* SMESH_Mesh::ConvertToStandalone ( int theGroupID )
   while ( anItr->more() )
     aNewGrpDS->Add( (anItr->next())->GetID() );
 
+  // set color
+  aNewGrpDS->SetColor( anOldGrpDS->GetColor() );
+
   // remove old group
   delete anOldGrp;
 
@@ -1820,7 +1910,7 @@ bool SMESH_Mesh::SortByMeshOrder(list<SMESH_subMesh*>& theListToSort) const
   list<SMESH_subMesh*>::iterator onlyBIt = onlyOrderedList.begin();
   list<SMESH_subMesh*>::iterator onlyEIt = onlyOrderedList.end();
 
-  // iterates on ordered submeshes and insert them in detected positions
+  // iterate on ordered submeshes and insert them in detected positions
   map< int, TPosInList >::iterator i_pos = sortedPos.begin();
   for ( ; onlyBIt != onlyEIt; ++onlyBIt, ++i_pos )
     *(i_pos->second) = *onlyBIt;