-// Copyright (C) 2007-2019 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2020 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
/*!
* SetShape
*
- * Associates <this> mesh with <theShape> and puts a reference
+ * Associate <this> mesh with <theShape> and put a reference
* to <theShape> into the current study;
* the previous shape is substituted by the new one.
*/
//================================================================================
/*!
- * \brief return true if mesh has a shape to build a shape on
+ * \brief Return true if mesh has a shape to build a shape on
*/
//================================================================================
return res;
}
-//=======================================================================
-//function : GetShapeToMesh
-//purpose :
-//=======================================================================
+//================================================================================
+/*!
+ * \brief Return the shape to mesh
+ */
+//================================================================================
GEOM::GEOM_Object_ptr SMESH_Mesh_i::GetShapeToMesh()
throw (SALOME::SALOME_Exception)
return aShapeObj._retn();
}
-//================================================================================
-/*!
-* \brief Replaces a shape in the mesh
-*/
-//================================================================================
-void SMESH_Mesh_i::ReplaceShape(GEOM::GEOM_Object_ptr theNewGeom)
- throw (SALOME::SALOME_Exception)
-{
- TopoDS_Shape S = _impl->GetShapeToMesh();
- GEOM_Client* geomClient = _gen_i->GetShapeReader();
- TCollection_AsciiString aIOR;
- if (geomClient->Find(S, aIOR)) {
- geomClient->RemoveShapeFromBuffer(aIOR);
- }
- // clear buffer also for sub-groups
- const std::set<SMESHDS_GroupBase*>& groups = _impl->GetMeshDS()->GetGroups();
- std::set<SMESHDS_GroupBase*>::const_iterator g = groups.begin();
- for (; g != groups.end(); ++g)
- if (const SMESHDS_GroupOnGeom* group = dynamic_cast<SMESHDS_GroupOnGeom*>(*g))
- {
- const TopoDS_Shape& s = group->GetShape();
- if (geomClient->Find(s, aIOR))
- geomClient->RemoveShapeFromBuffer(aIOR);
- }
-
- // update the reference to theNewGeom (needed for correct execution of a dumped python script)
- SMESH::SMESH_Mesh_var me = _this();
- SALOMEDS::SObject_wrap aSO = _gen_i->ObjectToSObject( me );
- CORBA::String_var entry = theNewGeom->GetStudyEntry();
- if ( !aSO->_is_nil() )
- {
- SALOMEDS::SObject_wrap aShapeRefSO;
- if ( aSO->FindSubObject( _gen_i->GetRefOnShapeTag(), aShapeRefSO.inout() ))
- {
- SALOMEDS::SObject_wrap aShapeSO = _gen_i->getStudyServant()->FindObjectID( entry );
- SALOMEDS::StudyBuilder_var builder = _gen_i->getStudyServant()->NewBuilder();
- builder->Addreference( aShapeRefSO, aShapeSO );
- }
- }
-
- // re-assign global hypotheses to the new shape
- _mainShapeTick = -1;
- CheckGeomModif( true );
-
- TPythonDump() << "SHAPERSTUDY.breakLinkForSubElements(salome.ObjectToSObject("
- << me <<".GetMesh()), " << entry.in() << ")";
-
- TPythonDump() << me << ".ReplaceShape( " << entry.in() << " )";
-
-}
-
//================================================================================
/*!
* \brief Return false if the mesh is not yet fully loaded from the study file
/*!
* ImportMEDFile
*
- * Imports mesh data from MED file
+ * Import mesh data from MED file
*/
//=============================================================================
//================================================================================
/*!
- * \brief Imports mesh data from the CGNS file
+ * \brief Import mesh data from the CGNS file
*/
//================================================================================
* encoded in 10*major+minor (for instance, code for med 3.2.1 is 32)
*/
//================================================================================
+
SMESH::long_array* SMESH_Mesh_i::GetMEDVersionsCompatibleForAppend()
{
SMESH::long_array_var aResult = new SMESH::long_array();
/*!
* ImportUNVFile
*
- * Imports mesh data from MED file
+ * Import mesh data from MED file
*/
//=============================================================================
/*!
* ImportSTLFile
*
- * Imports mesh data from STL file
+ * Import mesh data from STL file
*/
//=============================================================================
+
int SMESH_Mesh_i::ImportSTLFile( const char* theFileName )
throw ( SALOME::SALOME_Exception )
{
//================================================================================
/*!
- * \brief Imports data from a GMF file and returns an error description
+ * \brief Import data from a GMF file and return an error description
*/
//================================================================================
//=============================================================================
/*!
- *
+ * \brief Convert SMESH_Hypothesis::Hypothesis_Status into SMESH::Hypothesis_Status
*/
//=============================================================================
/*!
* AddHypothesis
*
- *
calls internal addHypothesis() and then adds a reference to <anHyp> under
+ *
Call internal addHypothesis() and then add a reference to <anHyp> under
* the SObject actually having a reference to <aSubShape>.
* NB: For this method to work, it is necessary to add a reference to sub-shape first.
*/
{
_gen_i->AddHypothesisToShape( mesh, aSubShape, anHyp );
- int newNbMeshEnt = _impl->NbNodes() + _impl->GetMeshDS()->NbElements();
- if ( newNbMeshEnt != prevNbMeshEnt )
+ //int newNbMeshEnt = _impl->NbNodes() + _impl->GetMeshDS()->NbElements();
+ if ( prevNbMeshEnt > 0 /*newNbMeshEnt != prevNbMeshEnt*/ )
_gen_i->UpdateIcons( mesh );
}
if(MYDEBUG) MESSAGE( " AddHypothesis(): status = " << status );
return ConvertHypothesisStatus(status);
}
-//=============================================================================
+//================================================================================
/*!
- *
+ * \brief Create a sub-mesh and add a hypothesis to it
*/
-//=============================================================================
+//================================================================================
SMESH_Hypothesis::Hypothesis_Status
SMESH_Mesh_i::addHypothesis(GEOM::GEOM_Object_ptr aSubShape,
return status;
}
-//=============================================================================
+//================================================================================
/*!
- *
+ * \brief Un-assign a hypothesis from a sub-mesh dedicate to the given sub-shape
*/
-//=============================================================================
+//================================================================================
-SMESH::Hypothesis_Status SMESH_Mesh_i::RemoveHypothesis(GEOM::GEOM_Object_ptr aSubShape,
+SMESH::Hypothesis_Status SMESH_Mesh_i::RemoveHypothesis(GEOM::GEOM_Object_ptr aSubShape,
SMESH::SMESH_Hypothesis_ptr anHyp)
throw(SALOME::SALOME_Exception)
{
//=============================================================================
/*!
- *
+ * \brief Un-assign a hypothesis from a sub-mesh dedicate to the given sub-shape
*/
//=============================================================================
return status;
}
-//=============================================================================
+//================================================================================
/*!
- *
+ * \brief Return hypotheses assigned to a given sub-shape
*/
-//=============================================================================
+//================================================================================
SMESH::ListOfHypothesis *
SMESH_Mesh_i::GetHypothesisList(GEOM::GEOM_Object_ptr aSubShape)
return aList._retn();
}
+//================================================================================
+/*!
+ * \brief Return sub-meshes
+ */
+//================================================================================
+
SMESH::submesh_array* SMESH_Mesh_i::GetSubMeshes() throw (SALOME::SALOME_Exception)
{
Unexpect aCatch(SALOME_SalomeException);
return aList._retn();
}
-//=============================================================================
+//================================================================================
/*!
- *
+ * \brief Create and return a sub-mesh on the given sub-shape
*/
-//=============================================================================
+//================================================================================
SMESH::SMESH_subMesh_ptr SMESH_Mesh_i::GetSubMesh(GEOM::GEOM_Object_ptr aSubShape,
const char* theName )
return subMesh._retn();
}
-//=============================================================================
+//================================================================================
/*!
- *
+ * \brief Remove a sub-mesh
*/
-//=============================================================================
+//================================================================================
void SMESH_Mesh_i::RemoveSubMesh( SMESH::SMESH_subMesh_ptr theSubMesh )
throw (SALOME::SALOME_Exception)
SMESH_CATCH( SMESH::throwCorbaException );
}
-//=============================================================================
+//================================================================================
/*!
- *
+ * \brief Create a standalone group
*/
-//=============================================================================
+//================================================================================
SMESH::SMESH_Group_ptr SMESH_Mesh_i::CreateGroup( SMESH::ElementType theElemType,
const char* theName )
return aNewGroup._retn();
}
-//=============================================================================
+//================================================================================
/*!
- *
+ * \brief Create a group based on the given geometry
*/
-//=============================================================================
+//================================================================================
+
SMESH::SMESH_GroupOnGeom_ptr
SMESH_Mesh_i::CreateGroupFromGEOM (SMESH::ElementType theElemType,
const char* theName,
return aNewGroup._retn();
}
-//=============================================================================
+//================================================================================
/*!
- *
+ * \brief Remove a group
*/
-//=============================================================================
+//================================================================================
void SMESH_Mesh_i::RemoveGroup( SMESH::SMESH_GroupBase_ptr theGroup )
throw (SALOME::SALOME_Exception)
\return pointer on the group
*/
//=============================================================================
+
SMESH::SMESH_Group_ptr
SMESH_Mesh_i::IntersectListOfGroups(const SMESH::ListOfGroups& theGroups,
const char* theName )
\return pointer on the group
*/
//=============================================================================
+
SMESH::SMESH_Group_ptr
SMESH_Mesh_i::CutListOfGroups(const SMESH::ListOfGroups& theMainGroups,
const SMESH::ListOfGroups& theToolGroups,
}
}
+//================================================================================
+/*!
+* \brief Replace a shape in the mesh upon Break Link
+*/
+//================================================================================
+
+void SMESH_Mesh_i::ReplaceShape(GEOM::GEOM_Object_ptr theNewGeom)
+ throw (SALOME::SALOME_Exception)
+{
+ // check if geometry changed
+ bool geomChanged = true;
+ GEOM::GEOM_Object_var oldGeom = GetShapeToMesh();
+ if ( !theNewGeom->_is_nil() && !oldGeom->_is_nil() )
+ geomChanged = ( //oldGeom->_is_equivalent( theNewGeom ) ||
+ oldGeom->GetTick() < theNewGeom->GetTick() );
+
+ TopoDS_Shape S = _impl->GetShapeToMesh();
+ GEOM_Client* geomClient = _gen_i->GetShapeReader();
+ TCollection_AsciiString aIOR;
+ CORBA::String_var ior;
+ if ( geomClient->Find( S, aIOR ))
+ geomClient->RemoveShapeFromBuffer( aIOR );
+
+ // clear buffer also for sub-groups
+ const std::set<SMESHDS_GroupBase*>& groups = _impl->GetMeshDS()->GetGroups();
+ std::set<SMESHDS_GroupBase*>::const_iterator g = groups.begin();
+ for (; g != groups.end(); ++g)
+ if (const SMESHDS_GroupOnGeom* group = dynamic_cast<SMESHDS_GroupOnGeom*>(*g))
+ {
+ const TopoDS_Shape& s = group->GetShape();
+ if ( geomClient->Find( s, aIOR ))
+ geomClient->RemoveShapeFromBuffer( aIOR );
+ }
+
+ typedef struct {
+ int shapeID, fromID, toID; // indices of elements of a sub-mesh
+ } TRange;
+ std::vector< TRange > elemRanges, nodeRanges; // elements of sub-meshes
+ std::vector< SMDS_PositionPtr > positions; // node positions
+ SMESHDS_Mesh* meshDS = _impl->GetMeshDS();
+ if ( !geomChanged )
+ {
+ // store positions of elements on geometry
+ Load();
+ if ( meshDS->MaxNodeID() > meshDS->NbNodes() ||
+ meshDS->MaxElementID() > meshDS->NbElements() )
+ {
+ meshDS->Modified();
+ meshDS->CompactMesh();
+ }
+ positions.resize( meshDS->NbNodes() + 1 );
+ for ( SMDS_NodeIteratorPtr nodeIt = meshDS->nodesIterator(); nodeIt->more(); )
+ {
+ const SMDS_MeshNode* n = nodeIt->next();
+ positions[ n->GetID() ] = n->GetPosition();
+ }
+
+ // remove elements from sub-meshes to avoid their removal at hypotheses addition
+ for ( int isNode = 0; isNode < 2; ++isNode )
+ {
+ std::vector< TRange > & ranges = isNode ? nodeRanges : elemRanges;
+ ranges.reserve( meshDS->MaxShapeIndex() + 10 );
+ ranges.push_back( TRange{ 0,0,0 });
+ SMDS_ElemIteratorPtr elemIt = meshDS->elementsIterator( isNode ? SMDSAbs_Node : SMDSAbs_All );
+ while ( elemIt->more() )
+ {
+ const SMDS_MeshElement* e = elemIt->next();
+ const int elemID = e->GetID();
+ const int shapeID = e->GetShapeID();
+ TRange & lastRange = ranges.back();
+ if ( lastRange.shapeID != shapeID ||
+ lastRange.toID != elemID )
+ ranges.push_back( TRange{ shapeID, elemID, elemID + 1 });
+ else
+ lastRange.toID = elemID + 1;
+
+ if ( SMESHDS_SubMesh* sm = meshDS->MeshElements( shapeID ))
+ {
+ if ( isNode ) sm->RemoveNode( static_cast< const SMDS_MeshNode *>( e ));
+ else sm->RemoveElement( e );
+ }
+ }
+ }
+ }
+
+
+ // update the reference to theNewGeom (needed for correct execution of a dumped python script)
+ SMESH::SMESH_Mesh_var me = _this();
+ SALOMEDS::SObject_wrap aSO = _gen_i->ObjectToSObject( me );
+ CORBA::String_var entry = theNewGeom->GetStudyEntry();
+ if ( !aSO->_is_nil() )
+ {
+ SALOMEDS::SObject_wrap aShapeRefSO;
+ if ( aSO->FindSubObject( _gen_i->GetRefOnShapeTag(), aShapeRefSO.inout() ))
+ {
+ SALOMEDS::SObject_wrap aShapeSO = _gen_i->getStudyServant()->FindObjectID( entry );
+ SALOMEDS::StudyBuilder_var builder = _gen_i->getStudyServant()->NewBuilder();
+ builder->Addreference( aShapeRefSO, aShapeSO );
+ }
+ }
+
+ // re-assign global hypotheses to the new shape
+ _mainShapeTick = geomChanged ? -1 : theNewGeom->GetTick();
+ CheckGeomModif( true );
+
+ if ( !geomChanged )
+ {
+ // restore positions of elements on geometry
+ for ( int isNode = 0; isNode < 2; ++isNode )
+ {
+ std::vector< TRange > & ranges = isNode ? nodeRanges : elemRanges;
+ for ( size_t i = 1; i < ranges.size(); ++i )
+ {
+ int elemID = ranges[ i ].fromID;
+ int toID = ranges[ i ].toID;
+ SMESHDS_SubMesh * smDS = meshDS->NewSubMesh( ranges[ i ].shapeID );
+ if ( isNode )
+ for ( ; elemID < toID; ++elemID )
+ smDS->AddNode( meshDS->FindNode( elemID ));
+ else
+ for ( ; elemID < toID; ++elemID )
+ smDS->AddElement( meshDS->FindElement( elemID ));
+
+ if ( SMESH_subMesh* sm = _impl->GetSubMeshContaining( ranges[ i ].shapeID ))
+ sm->ComputeStateEngine( SMESH_subMesh::CHECK_COMPUTE_STATE );
+ }
+ }
+ for ( unsigned int nodeID = 1; nodeID < positions.size(); ++nodeID )
+ if ( positions[ nodeID ])
+ if ( SMDS_MeshNode* n = const_cast< SMDS_MeshNode*>( meshDS->FindNode( nodeID )))
+ n->SetPosition( positions[ nodeID ], n->GetShapeID() );
+
+ // restore icons
+ _gen_i->UpdateIcons( SMESH::SMESH_Mesh_var( _this() ));
+ }
+
+ TPythonDump() << "SHAPERSTUDY.breakLinkForSubElements(salome.ObjectToSObject("
+ << me <<".GetMesh()), " << entry.in() << ")";
+
+ TPythonDump() << me << ".ReplaceShape( " << entry.in() << " )";
+
+}
+
//================================================================================
/*!
* \brief Return new group contents if it has been changed and update group data
*/
//================================================================================
+
enum { ONLY_IF_CHANGED, IS_BREAK_LINK, MAIN_TRANSFORMED };
TopoDS_Shape SMESH_Mesh_i::newGroupShape( TGeomGroupData & groupData, int how )
*/
//=============================================================================
-void SMESH_Mesh_i::CheckGeomModif( bool isBreakLink )
+void SMESH_Mesh_i::CheckGeomModif( bool theIsBreakLink )
{
SMESH::SMESH_Mesh_var me = _this();
GEOM::GEOM_Object_var mainGO = GetShapeToMesh();
// Update after group modification
- if ( mainGO->GetType() == GEOM_GROUP || // is group or not modified
- mainGO->GetTick() == _mainShapeTick )
- {
- int nb = NbNodes() + NbElements();
- CheckGeomGroupModif();
- if ( nb != NbNodes() + NbElements() ) // something removed due to hypotheses change
- _gen_i->UpdateIcons( me );
- return;
- }
+ const bool geomChanged = ( mainGO->GetTick() != _mainShapeTick );
+ if ( !theIsBreakLink )
+ if ( mainGO->GetType() == GEOM_GROUP || !geomChanged ) // is group or not modified
+ {
+ int nb = NbNodes() + NbElements();
+ CheckGeomGroupModif();
+ if ( nb != NbNodes() + NbElements() ) // something removed due to hypotheses change
+ _gen_i->UpdateIcons( me );
+ return;
+ }
- // Update after shape modification
+ // Update after shape modification or breakLink w/o geometry change
GEOM_Client* geomClient = _gen_i->GetShapeReader();
if ( !geomClient ) return;
if ( _preMeshInfo )
_preMeshInfo->ForgetAllData();
- if ( isBreakLink || !isShaper )
+ if ( geomChanged || !isShaper )
_impl->Clear();
if ( newShape.IsNull() )
return;
GEOM::GEOM_Object_var geom;
if ( !gog->_is_nil() )
{
- if ( !isBreakLink )
+ if ( !theIsBreakLink )
geom = gog->GetShape();
- if ( isBreakLink || geom->_is_nil() )
+ if ( theIsBreakLink || geom->_is_nil() )
{
SALOMEDS::SObject_wrap grpSO = _gen_i->ObjectToSObject( gog );
SALOMEDS::SObject_wrap geomRefSO, geomSO;
if ( old2newIDs.count( oldID ))
continue;
- int how = ( isBreakLink || !sameTopology ) ? IS_BREAK_LINK : MAIN_TRANSFORMED;
+ int how = ( theIsBreakLink || !sameTopology ) ? IS_BREAK_LINK : MAIN_TRANSFORMED;
newShape = newGroupShape( *data, how );
if ( !newShape.IsNull() )
_gen_i->UpdateIcons( me );
- if ( !isBreakLink && isShaper )
+ if ( !theIsBreakLink && isShaper )
{
SALOMEDS::SObject_wrap meshSO = _gen_i->ObjectToSObject( me );
if ( !meshSO->_is_nil() )
return aGroup._retn();
}
-//=============================================================================
+//================================================================================
/*!
- *
+ * \brief Create a sub-mesh on a given sub-shape
*/
-//=============================================================================
+//================================================================================
SMESH::SMESH_subMesh_ptr SMESH_Mesh_i::createSubMesh( GEOM::GEOM_Object_ptr theSubShapeObject )
{
return subMesh._retn();
}
-//=======================================================================
-//function : getSubMesh
-//purpose :
-//=======================================================================
+//================================================================================
+/*!
+ * \brief Return an existing sub-mesh based on a sub-shape with the given ID
+ */
+//================================================================================
SMESH::SMESH_subMesh_ptr SMESH_Mesh_i::getSubMesh(int shapeID)
{
return SMESH::SMESH_subMesh::_duplicate( (*it).second );
}
-//=============================================================================
+//================================================================================
/*!
- *
+ * \brief Remove a sub-mesh based on the given sub-shape
*/
-//=============================================================================
+//================================================================================
bool SMESH_Mesh_i::removeSubMesh (SMESH::SMESH_subMesh_ptr theSubMesh,
GEOM::GEOM_Object_ptr theSubShapeObject )
return isHypChanged;
}
-//=============================================================================
+//================================================================================
/*!
- *
+ * \brief Create a group. Group type depends on given arguments
*/
-//=============================================================================
+//================================================================================
SMESH::SMESH_GroupBase_ptr SMESH_Mesh_i::createGroup (SMESH::ElementType theElemType,
const char* theName,
}
}
-//=============================================================================
+//================================================================================
/*!
- *
+ * \brief Return a log that can be used to move another mesh to the same state as this one
*/
-//=============================================================================
+//================================================================================
SMESH::log_array * SMESH_Mesh_i::GetLog(CORBA::Boolean clearAfterGet)
throw(SALOME::SALOME_Exception)
aLog = new SMESH::log_array;
int indexLog = 0;
int lg = logDS.size();
- SCRUTE(lg);
aLog->length(lg);
list < SMESHDS_Command * >::iterator its = logDS.begin();
while(its != logDS.end()){
SMESHDS_Command *com = *its;
int comType = com->GetType();
- //SCRUTE(comType);
int lgcom = com->GetNumber();
- //SCRUTE(lgcom);
const list < int >&intList = com->GetIndexes();
int inum = intList.size();
- //SCRUTE(inum);
list < int >::const_iterator ii = intList.begin();
const list < double >&coordList = com->GetCoords();
int rnum = coordList.size();
- //SCRUTE(rnum);
list < double >::const_iterator ir = coordList.begin();
aLog[indexLog].commandType = comType;
aLog[indexLog].number = lgcom;
aLog[indexLog].indexes.length(inum);
for(int i = 0; i < rnum; i++){
aLog[indexLog].coords[i] = *ir;
- //MESSAGE(" "<<i<<" "<<ir.Value());
ir++;
}
for(int i = 0; i < inum; i++){
aLog[indexLog].indexes[i] = *ii;
- //MESSAGE(" "<<i<<" "<<ii.Value());
ii++;
}
indexLog++;
return aLog._retn();
}
-
-//=============================================================================
+//================================================================================
/*!
- *
+ * \brief Remove the log of commands
*/
-//=============================================================================
+//================================================================================
void SMESH_Mesh_i::ClearLog() throw(SALOME::SALOME_Exception)
{
SMESH_CATCH( SMESH::throwCorbaException );
}
-//=============================================================================
+//================================================================================
/*!
- *
+ * \brief Return a mesh ID
*/
-//=============================================================================
+//================================================================================
CORBA::Long SMESH_Mesh_i::GetId()throw(SALOME::SALOME_Exception)
{
}
}
-//=============================================================================
+//================================================================================
/*!
- *
+ * \brief Set mesh implementation
*/
-//=============================================================================
+//================================================================================
void SMESH_Mesh_i::SetImpl(::SMESH_Mesh * impl)
{
//=============================================================================
/*!
- *
+ * Return a mesh implementation
*/
//=============================================================================
//================================================================================
/*!
- * \brief Returns a random unique color
+ * \brief Return a random unique color
*/
//================================================================================
//=============================================================================
/*!
- * Sets auto-color mode. If it is on, groups get unique random colors
+ * Set auto-color mode. If it is on, groups get unique random colors
*/
//=============================================================================
//=============================================================================
/*!
- * Returns true if auto-color mode is on
+ * Return true if auto-color mode is on
*/
//=============================================================================
//=============================================================================
/*!
- * Checks if there are groups with equal names
+ * Check if there are groups with equal names
*/
//=============================================================================
//================================================================================
/*!
- * \brief Prepares a file for export and pass names of mesh groups from study to mesh DS
+ * \brief Prepare a file for export and pass names of mesh groups from study to mesh DS
* \param file - file name
* \param overwrite - to erase the file or not
* \retval string - mesh name
return 0.;
}
+//================================================================================
+/*!
+ * \brief Return nb of nodes
+ */
+//================================================================================
+
CORBA::Long SMESH_Mesh_i::NbNodes()throw(SALOME::SALOME_Exception)
{
Unexpect aCatch(SALOME_SalomeException);
return _impl->NbNodes();
}
+//================================================================================
+/*!
+ * \brief Return nb of elements
+ */
+//================================================================================
+
CORBA::Long SMESH_Mesh_i::NbElements()throw (SALOME::SALOME_Exception)
{
Unexpect aCatch(SALOME_SalomeException);
return Nb0DElements() + NbEdges() + NbFaces() + NbVolumes() + NbBalls();
}
+//================================================================================
+/*!
+ * \brief Return nb of 0D elements
+ */
+//================================================================================
+
CORBA::Long SMESH_Mesh_i::Nb0DElements()throw (SALOME::SALOME_Exception)
{
Unexpect aCatch(SALOME_SalomeException);
return _impl->Nb0DElements();
}
+//================================================================================
+/*!
+ * \brief Return nb of BALL elements
+ */
+//================================================================================
+
CORBA::Long SMESH_Mesh_i::NbBalls() throw (SALOME::SALOME_Exception)
{
Unexpect aCatch(SALOME_SalomeException);
return _impl->NbBalls();
}
+//================================================================================
+/*!
+ * \brief Return nb of 1D elements
+ */
+//================================================================================
+
CORBA::Long SMESH_Mesh_i::NbEdges()throw(SALOME::SALOME_Exception)
{
Unexpect aCatch(SALOME_SalomeException);
return _impl->NbEdges();
}
+//================================================================================
+/*!
+ * \brief Return nb of edges
+ */
+//================================================================================
+
CORBA::Long SMESH_Mesh_i::NbEdgesOfOrder(SMESH::ElementOrder order)
throw(SALOME::SALOME_Exception)
{
return _impl->NbEdges( (SMDSAbs_ElementOrder) order);
}
-//=============================================================================
+//================================================================================
+/*!
+ * \brief Return nb of faces
+ */
+//================================================================================
CORBA::Long SMESH_Mesh_i::NbFaces()throw(SALOME::SALOME_Exception)
{
return _impl->NbFaces();
}
+//================================================================================
+/*!
+ * \brief Return nb of tringles
+ */
+//================================================================================
+
CORBA::Long SMESH_Mesh_i::NbTriangles()throw(SALOME::SALOME_Exception)
{
Unexpect aCatch(SALOME_SalomeException);
return _impl->NbTriangles();
}
+//================================================================================
+/*!
+ * \brief Return nb of bi-quadratic triangles
+ */
+//================================================================================
+
CORBA::Long SMESH_Mesh_i::NbBiQuadTriangles()throw(SALOME::SALOME_Exception)
{
Unexpect aCatch(SALOME_SalomeException);
//=============================================================================
/*!
- * Returns nb of published sub-meshes
+ * Return nb of published sub-meshes
*/
//=============================================================================
//=============================================================================
/*!
- * Returns ids of all elements
+ * Return ids of all elements
*/
//=============================================================================
//=============================================================================
/*!
- * Returns ids of all elements of given type
+ * Return ids of all elements of given type
*/
//=============================================================================
//=============================================================================
/*!
- * Returns ids of all nodes
+ * Return ids of all nodes
*/
//=============================================================================
//=============================================================================
/*!
- *
+ * Return type of the given element
*/
//=============================================================================
//=============================================================================
/*!
- *
+ * Return geometric type of the given element
*/
//=============================================================================
//=============================================================================
/*!
- *
+ * Return type of the given element
*/
//=============================================================================
//=============================================================================
/*!
- * Returns ID of elements for given submesh
+ * Return ID of elements for given submesh
*/
//=============================================================================
+
SMESH::long_array* SMESH_Mesh_i::GetSubMeshElementsId(const CORBA::Long ShapeID)
throw (SALOME::SALOME_Exception)
{
//=============================================================================
/*!
- * Returns ID of nodes for given submesh
- * If param all==true - returns all nodes, else -
- * returns only nodes on shapes.
+ * Return ID of nodes for given sub-mesh
+ * If param all==true - return all nodes, else -
+ * Return only nodes on shapes.
*/
//=============================================================================
//=============================================================================
/*!
- * Returns type of elements for given submesh
+ * Return type of elements for given sub-mesh
*/
//=============================================================================
//=============================================================================
/*!
- * Returns pointer to _impl as an integer value. Is called from constructor of SMESH_Client
+ * Return pointer to _impl as an integer value. Is called from constructor of SMESH_Client
*/
//=============================================================================
//=============================================================================
/*!
* Get XYZ coordinates of node as list of double
- * If there is not node for given ID - returns empty list
+ * If there is not node for given ID - return empty list
*/
//=============================================================================
//=============================================================================
/*!
- * For given node returns list of IDs of inverse elements
- * If there is not node for given ID - returns empty list
+ * For given node return list of IDs of inverse elements
+ * If there is not node for given ID - return empty list
*/
//=============================================================================
//=============================================================================
/*!
- * If given element is node returns IDs of shape from position
- * If there is not node for given ID - returns -1
+ * If given element is node return IDs of shape from position
+ * If there is not node for given ID - return -1
*/
//=============================================================================
//=============================================================================
/*!
- * For given element returns ID of result shape after
+ * For given element return ID of result shape after
* ::FindShape() from SMESH_MeshEditor
- * If there is not element for given ID - returns -1
+ * If there is not element for given ID - return -1
*/
//=============================================================================
//=============================================================================
/*!
- * Returns number of nodes for given element
- * If there is not element for given ID - returns -1
+ * Return number of nodes for given element
+ * If there is not element for given ID - return -1
*/
//=============================================================================
//=============================================================================
/*!
- * Returns ID of node by given index for given element
- * If there is not element for given ID - returns -1
- * If there is not node for given index - returns -2
+ * Return ID of node by given index for given element
+ * If there is not element for given ID - return -1
+ * If there is not node for given index - return -2
*/
//=============================================================================
//=============================================================================
/*!
- * Returns IDs of nodes of given element
+ * Return IDs of nodes of given element
*/
//=============================================================================
//=============================================================================
/*!
- * Returns true if given node is medium node
+ * Return true if given node is medium node
* in given quadratic element
*/
//=============================================================================
//=============================================================================
/*!
- * Returns true if given node is medium node
+ * Return true if given node is medium node
* in one of quadratic elements
*/
//=============================================================================
//=============================================================================
/*!
- * Returns number of edges for given element
+ * Return number of edges for given element
*/
//=============================================================================
//=============================================================================
/*!
- * Returns number of faces for given element
+ * Return number of faces for given element
*/
//=============================================================================
return elem->NbFaces();
}
-//=======================================================================
-//function : GetElemFaceNodes
-//purpose : Returns nodes of given face (counted from zero) for given element.
-//=======================================================================
+//================================================================================
+/*!
+ * \brief Return nodes of given face (counted from zero) for given element.
+ */
+//================================================================================
SMESH::long_array* SMESH_Mesh_i::GetElemFaceNodes(CORBA::Long elemId,
CORBA::Short faceIndex)
return aResult._retn();
}
-//=======================================================================
-//function : GetFaceNormal
-//purpose : Returns three components of normal of given mesh face.
-//=======================================================================
+//================================================================================
+/*!
+ * \brief Return three components of normal of given mesh face.
+ */
+//================================================================================
SMESH::double_array* SMESH_Mesh_i::GetFaceNormal(CORBA::Long elemId,
CORBA::Boolean normalized)
return aResult._retn();
}
-//=======================================================================
-//function : FindElementByNodes
-//purpose : Returns an element based on all given nodes.
-//=======================================================================
+//================================================================================
+/*!
+ * \brief Return an element based on all given nodes.
+ */
+//================================================================================
CORBA::Long SMESH_Mesh_i::FindElementByNodes(const SMESH::long_array& nodes)
{
//=============================================================================
/*!
- * Returns true if given element is polygon
+ * Return true if given element is polygon
*/
//=============================================================================
//=============================================================================
/*!
- * Returns true if given element is quadratic
+ * Return true if given element is quadratic
*/
//=============================================================================
//=============================================================================
/*!
- * Returns diameter of ball discrete element or zero in case of an invalid \a id
+ * Return diameter of ball discrete element or zero in case of an invalid \a id
*/
//=============================================================================
//=============================================================================
/*!
- * Returns bary center for given element
+ * Return bary center for given element
*/
//=============================================================================
GEOM::GEOM_Object_var shapeVar = _gen_i->ShapeToGeomObject( shape );
_gen_i->PublishGroup( aMesh, groupVar, shapeVar, group->GetName());
}
+
if ( !addedIDs.empty() )
{
// python dump
- set<int>::iterator id = addedIDs.begin();
- for ( ; id != addedIDs.end(); ++id )
+ map<int, SMESH::SMESH_GroupBase_ptr>::iterator i_grp = _mapGroups.begin();
+ for ( int index = 0; i_grp != _mapGroups.end(); ++index, ++i_grp )
{
- map<int, SMESH::SMESH_GroupBase_ptr>::iterator it = _mapGroups.find(*id);
- int i = std::distance( _mapGroups.begin(), it );
- TPythonDump() << it->second << " = " << aMesh << ".GetGroups()[ "<< i << " ]";
+ set<int>::iterator it = addedIDs.find( i_grp->first );
+ if ( it != addedIDs.end() )
+ {
+ TPythonDump() << i_grp->second << " = " << aMesh << ".GetGroups()[ "<< index << " ]";
+ addedIDs.erase( it );
+ if ( addedIDs.empty() )
+ break;
+ }
}
}
}
//=============================================================================
/*!
- * \brief Sets list of notebook variables used for Mesh operations separated by ":" symbol
+ * \brief Set list of notebook variables used for Mesh operations separated by ":" symbol
*/
//=============================================================================
void SMESH_Mesh_i::SetParameters(const char* theParameters)
//=============================================================================
/*!
- * \brief Returns list of notebook variables used for Mesh operations separated by ":" symbol
+ * \brief Return list of notebook variables used for Mesh operations separated by ":" symbol
*/
//=============================================================================
//=============================================================================
/*!
- * \brief Returns list of notebook variables used for last Mesh operation
+ * \brief Return list of notebook variables used for last Mesh operation
*/
//=============================================================================
SMESH::string_array* SMESH_Mesh_i::GetLastParameters()
return aResult._retn();
}
-//=======================================================================
-//function : GetTypes
-//purpose : Returns types of elements it contains
-//=======================================================================
+//================================================================================
+/*!
+ * \brief Return types of elements it contains
+ */
+//================================================================================
SMESH::array_of_ElementType* SMESH_Mesh_i::GetTypes()
{
return types._retn();
}
-//=======================================================================
-//function : GetMesh
-//purpose : Returns self
-//=======================================================================
+//================================================================================
+/*!
+ * \brief Return self
+ */
+//================================================================================
SMESH::SMESH_Mesh_ptr SMESH_Mesh_i::GetMesh()
{
return SMESH::SMESH_Mesh::_duplicate( _this() );
}
-//=======================================================================
-//function : IsMeshInfoCorrect
-//purpose : * Returns false if GetMeshInfo() returns incorrect information that may
-// * happen if mesh data is not yet fully loaded from the file of study.
-//=======================================================================
+//================================================================================
+/*!
+ * \brief Return false if GetMeshInfo() return incorrect information that may
+ * happen if mesh data is not yet fully loaded from the file of study.
+ *
+ *
+ */
+//================================================================================
bool SMESH_Mesh_i::IsMeshInfoCorrect()
{
//=============================================================================
/*!
- * \brief Returns number of mesh elements per each \a EntityType
+ * \brief Return number of mesh elements per each \a EntityType
*/
//=============================================================================
//=============================================================================
/*!
- * \brief Returns number of mesh elements per each \a ElementType
+ * \brief Return number of mesh elements per each \a ElementType
*/
//=============================================================================
}
//=============================================================================
/*
- * Returns mesh unstructed grid information.
+ * Return mesh unstructed grid information.
*/
//=============================================================================
//! fields
int _dim; //!< a dimension the algo can build (concurrent dimension)
int _ownDim; //!< dimension of shape of _subMesh (>=_dim)
- TopTools_MapOfShape _shapeMap;
- SMESH_subMesh* _subMesh;
+ TopTools_MapOfShape _shapeMap; //!< [sub-]shapes of dimension == _dim
+ const SMESH_subMesh* _subMesh;
list<const SMESHDS_Hypothesis*> _hypotheses; //!< algo is first, then its parameters
//-----------------------------------------------------------------------------
const int theDim,
const TopoDS_Shape& theShape)
{
- _subMesh = (SMESH_subMesh*)theSubMesh;
+ _subMesh = theSubMesh;
SetShape( theDim, theShape );
}
bool isSame = checkAlgo( a1, a2 );
if ( !isSame )
{
- if ( !a1 || !a2 )
- return false; // pb?
- return a1->GetDim() == a2->GetDim(); // different algorithms of same dim -> concurrency !
+ return true;
+ // commented off for IPAL54678
+ // if ( !a1 || !a2 )
+ // return false; // pb?
+ // return a1->GetDim() == a2->GetDim(); // different algorithms of same dim -> concurrency !
}
// check hypothesises for concurrence (skip first as algorithm)
const list <const SMESHDS_Hypothesis*>& theHypList,
TDimHypList* theDimHypListArr )
{
+ if ( !theAlgo->NeedDiscreteBoundary() &&
+ theAlgo->NeedLowerHyps( theDim )) // IPAL54678
+ return;
TDimHypList& listOfdimHyp = theDimHypListArr[theDim];
- if ( listOfdimHyp.empty() || listOfdimHyp.back()->_subMesh != theSubMesh ) {
+ if ( listOfdimHyp.empty() || listOfdimHyp.back()->_subMesh != theSubMesh )
+ {
SMESH_DimHyp* dimHyp = new SMESH_DimHyp( theSubMesh, theDim, theShape );
dimHyp->_hypotheses.push_front(theAlgo);
listOfdimHyp.push_back( dimHyp );
const int theIndx )
{
TListOfListOfInt::iterator it = theListOfListOfId.begin();
- for ( int i = 0; it != theListOfListOfId.end(); it++, i++ ) {
+ for ( int i = 0; it != theListOfListOfId.end(); it++, i++ )
+ {
if ( i < theIndx )
continue; //skip already treated lists
// check if other list has any same submesh object
//=============================================================================
/*!
- * \brief Return submesh objects list in meshing order
+ * \brief Return sub-mesh objects list in meshing order
*/
//=============================================================================
{
TListOfListOfInt anOrder;
::SMESH_Mesh& mesh = GetImpl();
- {
- // collect submeshes and detect concurrent algorithms and hypothesises
- TDimHypList dimHypListArr[4]; // dimHyp list for each shape dimension
-
- map<int, ::SMESH_subMesh*>::iterator i_sm = _mapSubMesh.begin();
- for ( ; i_sm != _mapSubMesh.end(); i_sm++ ) {
- ::SMESH_subMesh* sm = (*i_sm).second;
- // shape of submesh
- const TopoDS_Shape& aSubMeshShape = sm->GetSubShape();
-
- // list of assigned hypothesises
- const list <const SMESHDS_Hypothesis*>& hypList = mesh.GetHypothesisList(aSubMeshShape);
- // Find out dimensions where the submesh can be concurrent.
- // We define the dimensions by algo of each of hypotheses in hypList
- list <const SMESHDS_Hypothesis*>::const_iterator hypIt = hypList.begin();
- for( ; hypIt != hypList.end(); hypIt++ ) {
- SMESH_Algo* anAlgo = 0;
- const SMESH_Hypothesis* hyp = dynamic_cast<const SMESH_Hypothesis*>(*hypIt);
- if ( hyp->GetType() != SMESHDS_Hypothesis::PARAM_ALGO )
- // hyp it-self is algo
- anAlgo = (SMESH_Algo*)dynamic_cast<const SMESH_Algo*>(hyp);
- else {
- // try to find algorithm with help of sub-shapes
- TopExp_Explorer anExp( aSubMeshShape, shapeTypeByDim(hyp->GetDim()) );
- for ( ; !anAlgo && anExp.More(); anExp.Next() )
- anAlgo = mesh.GetGen()->GetAlgo( mesh, anExp.Current() );
- }
- if (!anAlgo)
- continue; // no algorithm assigned to a current submesh
- int dim = anAlgo->GetDim(); // top concurrent dimension (see comment to SMESH_DimHyp)
- // the submesh can concurrent at <dim> (or lower dims if !anAlgo->NeedDiscreteBoundary())
+ // collect submeshes and detect concurrent algorithms and hypothesises
+ TDimHypList dimHypListArr[4]; // dimHyp list for each shape dimension
- // create instance of dimension-hypothesis for found concurrent dimension(s) and algorithm
- for ( int j = anAlgo->NeedDiscreteBoundary() ? dim : 1, jn = dim; j <= jn; j++ )
- addDimHypInstance( j, aSubMeshShape, anAlgo, sm, hypList, dimHypListArr );
+ map<int, ::SMESH_subMesh*>::iterator i_sm = _mapSubMesh.begin();
+ for ( ; i_sm != _mapSubMesh.end(); i_sm++ )
+ {
+ ::SMESH_subMesh* sm = (*i_sm).second;
+ // shape of submesh
+ const TopoDS_Shape& aSubMeshShape = sm->GetSubShape();
+
+ // list of assigned hypothesises
+ const list <const SMESHDS_Hypothesis*>& hypList = mesh.GetHypothesisList(aSubMeshShape);
+ // Find out dimensions where the submesh can be concurrent.
+ // We define the dimensions by algo of each of hypotheses in hypList
+ list <const SMESHDS_Hypothesis*>::const_iterator hypIt = hypList.begin();
+ for( ; hypIt != hypList.end(); hypIt++ )
+ {
+ SMESH_Algo* anAlgo = 0;
+ const SMESH_Hypothesis* hyp = dynamic_cast<const SMESH_Hypothesis*>(*hypIt);
+ if ( hyp->GetType() != SMESHDS_Hypothesis::PARAM_ALGO )
+ // hyp it-self is algo
+ anAlgo = (SMESH_Algo*)dynamic_cast<const SMESH_Algo*>(hyp);
+ else {
+ // try to find algorithm with help of sub-shapes
+ TopExp_Explorer anExp( aSubMeshShape, shapeTypeByDim(hyp->GetDim()) );
+ for ( ; !anAlgo && anExp.More(); anExp.Next() )
+ anAlgo = mesh.GetGen()->GetAlgo( mesh, anExp.Current() );
}
- } // end iterations on submesh
+ if (!anAlgo)
+ continue; // no algorithm assigned to a current submesh
+
+ int dim = anAlgo->GetDim(); // top concurrent dimension (see comment to SMESH_DimHyp)
+ // the submesh can concurrent at <dim> (or lower dims if !anAlgo->NeedDiscreteBoundary()
+ // and !anAlgo->NeedLowerHyps( dim ))
+
+ // create instance of dimension-hypothesis for found concurrent dimension(s) and algorithm
+ for ( int j = anAlgo->NeedDiscreteBoundary() ? dim : 1, jn = dim; j <= jn; j++ )
+ addDimHypInstance( j, aSubMeshShape, anAlgo, sm, hypList, dimHypListArr );
+ }
+ } // end iterations on submesh
// iterate on created dimension-hypotheses and check for concurrents
- for ( int i = 0; i < 4; i++ ) {
- const TDimHypList& listOfDimHyp = dimHypListArr[i];
- // check for concurrents in own and other dimensions (step-by-step)
- TDimHypList::const_iterator dhIt = listOfDimHyp.begin();
- for ( ; dhIt != listOfDimHyp.end(); dhIt++ ) {
- const SMESH_DimHyp* dimHyp = *dhIt;
- TDimHypList listOfConcurr;
- set<int> setOfConcurrIds;
- // looking for concurrents and collect into own list
- for ( int j = i; j < 4; j++ )
- findConcurrents( dimHyp, dimHypListArr[j], listOfConcurr, setOfConcurrIds );
- // check if any concurrents found
- if ( listOfConcurr.size() > 0 ) {
- // add own submesh to list of concurrent
- addInOrderOfPriority( dimHyp, listOfConcurr );
- list<int> listOfConcurrIds;
- TDimHypList::iterator hypIt = listOfConcurr.begin();
- for ( ; hypIt != listOfConcurr.end(); ++hypIt )
- listOfConcurrIds.push_back( (*hypIt)->_subMesh->GetId() );
- anOrder.push_back( listOfConcurrIds );
- }
+ for ( int i = 0; i < 4; i++ )
+ {
+ const TDimHypList& listOfDimHyp = dimHypListArr[i];
+ // check for concurrents in own and other dimensions (step-by-step)
+ TDimHypList::const_iterator dhIt = listOfDimHyp.begin();
+ for ( ; dhIt != listOfDimHyp.end(); dhIt++ )
+ {
+ const SMESH_DimHyp* dimHyp = *dhIt;
+ TDimHypList listOfConcurr;
+ set<int> setOfConcurrIds;
+ // looking for concurrents and collect into own list
+ for ( int j = i; j < 4; j++ )
+ findConcurrents( dimHyp, dimHypListArr[j], listOfConcurr, setOfConcurrIds );
+ // check if any concurrents found
+ if ( listOfConcurr.size() > 0 )
+ {
+ // add own submesh to list of concurrent
+ addInOrderOfPriority( dimHyp, listOfConcurr );
+ list<int> listOfConcurrIds;
+ TDimHypList::iterator hypIt = listOfConcurr.begin();
+ for ( ; hypIt != listOfConcurr.end(); ++hypIt )
+ listOfConcurrIds.push_back( (*hypIt)->_subMesh->GetId() );
+ anOrder.push_back( listOfConcurrIds );
}
}
+ }
- removeDimHyps(dimHypListArr);
+ removeDimHyps(dimHypListArr);
- // now, minimize the number of concurrent groups
- // Here we assume that lists of submeshes can have same submesh
- // in case of multi-dimension algorithms, as result
- // list with common submesh has to be united into one list
- int listIndx = 0;
- TListOfListOfInt::iterator listIt = anOrder.begin();
- for(; listIt != anOrder.end(); listIt++, listIndx++ )
- unionLists( *listIt, anOrder, listIndx + 1 );
- }
+ // now, minimize the number of concurrent groups
+ // Here we assume that lists of submeshes can have same submesh
+ // in case of multi-dimension algorithms, as result
+ // list with common submesh has to be united into one list
+ int listIndx = 0;
+ TListOfListOfInt::iterator listIt = anOrder.begin();
+ for(; listIt != anOrder.end(); listIt++, listIndx++ )
+ unionLists( *listIt, anOrder, listIndx + 1 );
return anOrder;
}
theResOrder.length(nbSet);
TListOfListOfInt::const_iterator it = theIdsOrder.begin();
int listIndx = 0;
- for( ; it != theIdsOrder.end(); it++ ) {
+ for( ; it != theIdsOrder.end(); it++ )
+ {
// translate submesh identificators into submesh objects
// takeing into account real number of concurrent lists
const TListOfInt& aSubOrder = (*it);
aResSubSet->length(aSubOrder.size());
TListOfInt::const_iterator subIt = aSubOrder.begin();
int j;
- for( j = 0; subIt != aSubOrder.end(); subIt++ ) {
+ for( j = 0; subIt != aSubOrder.end(); subIt++ )
+ {
if ( _mapSubMeshIor.find(*subIt) == _mapSubMeshIor.end() )
continue;
SMESH::SMESH_subMesh_var subMesh =
