X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESH%2FSMESH_ProxyMesh.cxx;h=4c1a87ea4645c48fbec7e903f627d666d0fc61e3;hp=c8dcec11c7f3cd0bddb77175f8bf3b4fdc6fddd2;hb=refs%2Ftags%2FV9_7_0b1;hpb=2f529dcd2629679dadcca3047583bfcf28ca7b1a diff --git a/src/SMESH/SMESH_ProxyMesh.cxx b/src/SMESH/SMESH_ProxyMesh.cxx index c8dcec11c..4c1a87ea4 100644 --- a/src/SMESH/SMESH_ProxyMesh.cxx +++ b/src/SMESH/SMESH_ProxyMesh.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2021 CEA/DEN, EDF R&D, OPEN CASCADE // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -32,6 +32,9 @@ #include #include +#include +#include + //================================================================================ /*! * \brief Constructor; mesh must be set by a descendant class @@ -169,14 +172,24 @@ SMESH_ProxyMesh::SubMesh* SMESH_ProxyMesh::newSubmesh(int index) const //================================================================================ const SMESHDS_SubMesh* SMESH_ProxyMesh::GetSubMesh(const TopoDS_Shape& shape) const +{ + return GetSubMesh( shapeIndex( shape )); +} + +//================================================================================ +/*! + * \brief Return a sub-mesh by a shape ID; it can be a proxy sub-mesh + */ +//================================================================================ + +const SMESHDS_SubMesh* SMESH_ProxyMesh::GetSubMesh(const int shapeID) const { const SMESHDS_SubMesh* sm = 0; - size_t i = shapeIndex(shape); - if ( i < _subMeshes.size() ) - sm = _subMeshes[i]; + if ( 0 < shapeID && shapeID < (int)_subMeshes.size() ) + sm = _subMeshes[ shapeID ]; if ( !sm ) - sm = GetMeshDS()->MeshElements( i ); + sm = GetMeshDS()->MeshElements( shapeID ); return sm; } @@ -272,6 +285,62 @@ namespace return res; } }; + + //================================================================================ + /*! + * \brief Iterator returning unique elements from a vector and another iterator + */ + //================================================================================ + + class TUniqueIterator : public SMDS_ElemIterator + { + typedef boost::container::flat_set< const SMDS_MeshElement* > TElemSet; + typedef SMDS_SetIterator< const SMDS_MeshElement*, TElemSet::const_iterator > TSetIterator; + + TElemSet _uniqueElems; + TSetIterator* _iterator; + + public: + TUniqueIterator( const std::vector< const SMDS_MeshElement* >& elems, + const SMDS_ElemIteratorPtr& elemIterator ) + : _uniqueElems( elems.begin(), elems.end() ) + { + if ( elemIterator ) + while ( elemIterator->more() ) + _uniqueElems.insert( elemIterator->next() ); + + _iterator = new TSetIterator( _uniqueElems.begin(), _uniqueElems.end() ); + } + ~TUniqueIterator() + { + delete _iterator; + } + virtual bool more() + { + return _iterator->more(); + } + virtual const SMDS_MeshElement* next() + { + return _iterator->next(); + } + }; + + //================================================================================ + /*! + * \brief Return iterator on 2 element iterators + */ + //================================================================================ + + SMDS_ElemIteratorPtr iteratorOn2Iterators( SMDS_ElemIteratorPtr it1, SMDS_ElemIteratorPtr it2 ) + { + std::vector< SMDS_ElemIteratorPtr > iters; iters.reserve(2); + if ( it1 ) iters.push_back( it1 ); + if ( it2 ) iters.push_back( it2 ); + + typedef std::vector< SMDS_ElemIteratorPtr > TElemIterVector; + typedef SMDS_IteratorOnIterators TItersIter; + return SMDS_ElemIteratorPtr( new TItersIter( iters )); + } } //================================================================================ @@ -324,13 +393,7 @@ SMDS_ElemIteratorPtr SMESH_ProxyMesh::GetFaces() const // ... else elements filtered using allowedTypes are additionally returned SMDS_ElemIteratorPtr facesIter = GetMeshDS()->elementsIterator(SMDSAbs_Face); SMDS_ElemIteratorPtr filterIter( new TFilteringIterator( _allowedTypes, facesIter )); - std::vector< SMDS_ElemIteratorPtr > iters(2); - iters[0] = proxyIter; - iters[1] = filterIter; - - typedef std::vector< SMDS_ElemIteratorPtr > TElemIterVector; - typedef SMDS_IteratorOnIterators TItersIter; - return SMDS_ElemIteratorPtr( new TItersIter( iters )); + return iteratorOn2Iterators( proxyIter, filterIter ); } //================================================================================ @@ -339,9 +402,9 @@ SMDS_ElemIteratorPtr SMESH_ProxyMesh::GetFaces() const */ //================================================================================ -int SMESH_ProxyMesh::NbFaces() const +smIdType SMESH_ProxyMesh::NbFaces() const { - int nb = 0; + smIdType nb = 0; if ( _mesh->HasShapeToMesh() ) { TopTools_IndexedMapOfShape FF; @@ -476,8 +539,14 @@ void SMESH_ProxyMesh::removeTmpElement( const SMDS_MeshElement* elem ) std::set< const SMDS_MeshElement* >::iterator i = _elemsInMesh.find( elem ); if ( i != _elemsInMesh.end() ) { + std::vector< const SMDS_MeshNode* > nodes( elem->begin_nodes(), elem->end_nodes() ); + GetMeshDS()->RemoveFreeElement( elem, 0 ); _elemsInMesh.erase( i ); + + for ( size_t i = 0; i < nodes.size(); ++i ) + if ( nodes[i]->GetID() > 0 && nodes[i]->NbInverseElements() == 0 ) + GetMeshDS()->RemoveFreeNode( nodes[i], 0, false ); } } else @@ -524,6 +593,79 @@ bool SMESH_ProxyMesh::IsTemporary(const SMDS_MeshElement* elem ) const return ( elem->GetID() < 1 ) || _elemsInMesh.count( elem ); } +//================================================================================ +/*! + * \brief Return iterator on inverse elements of a node that may be a proxy one + */ +//================================================================================ + +SMDS_ElemIteratorPtr SMESH_ProxyMesh::GetInverseElementIterator(const SMDS_MeshNode* node, + SMDSAbs_ElementType type) const +{ + typedef std::vector< const SMDS_MeshElement* > TElemVec; + TElemVec *elemVecPtr; + + TNodeElemVecMap& inverseElements = const_cast< TNodeElemVecMap& >( _inverseElements ); + if ( inverseElements.IsEmpty() && NbProxySubMeshes() > 0 ) + { + TElemVec elemVec; + for ( size_t i = 0; i < _subMeshes.size(); ++i ) + if ( _subMeshes[i] ) + for ( size_t j = 0; j < _subMeshes[i]->_elements.size(); ++j ) + { + const SMDS_MeshElement* e = _subMeshes[i]->_elements[j]; + for ( SMDS_NodeIteratorPtr nIt = e->nodeIterator(); nIt->more(); ) + { + const SMDS_MeshNode* n = nIt->next(); + elemVecPtr = inverseElements.ChangeSeek( n ); + if ( !elemVecPtr ) + elemVecPtr = inverseElements.Bound( n, elemVec ); + elemVecPtr->push_back( e ); + } + } + } + + SMDS_ElemIteratorPtr iter = node->GetInverseElementIterator( type ); + + if (( elemVecPtr = inverseElements.ChangeSeek( node ))) + { + if ( iter->more() ) + iter = boost::make_shared< TUniqueIterator >( *elemVecPtr, iter ); + else + iter = boost::make_shared< SMDS_ElementVectorIterator> ( elemVecPtr->begin(), + elemVecPtr->end() ); + } + + return iter; +} + +//================================================================================ +/*! + * \brief Check if a FACE has prisms on its both sides + * \param [in] smFace - sub-mesh of the FACE. NOT a proxy sub-mesh! + * \return bool - true if there are prisms on the two sides + */ +//================================================================================ + +bool SMESH_ProxyMesh::HasPrismsOnTwoSides( SMESHDS_SubMesh* smFace ) +{ + if ( !smFace || smFace->NbElements() == 0 ) + return false; + + SMDS_ElemIteratorPtr faces = smFace->GetElements(); + while ( faces->more() ) + { + const SMDS_MeshElement* f = faces->next(); + std::vector fNodes( f->begin_nodes(), f->end_nodes() ); + std::vector vols; + if ( SMDS_Mesh::GetElementsByNodes( fNodes, vols, SMDSAbs_Volume ) < 2 ) + return false; + return ( vols[0]->NbCornerNodes() == 2 * f->NbCornerNodes() && + vols[1]->NbCornerNodes() == 2 * f->NbCornerNodes() ); + } + return false; +} + //================================================================================ /*! * \brief SubMesh Constructor @@ -573,7 +715,7 @@ void SMESH_ProxyMesh::SubMesh::Clear() */ //================================================================================ -int SMESH_ProxyMesh::SubMesh::NbElements() const +smIdType SMESH_ProxyMesh::SubMesh::NbElements() const { return _uvPtStructVec.empty() ? _elements.size() : _uvPtStructVec.size() - 1; } @@ -598,7 +740,7 @@ SMDS_ElemIteratorPtr SMESH_ProxyMesh::SubMesh::GetElements() const */ //================================================================================ -int SMESH_ProxyMesh::SubMesh::NbNodes() const +smIdType SMESH_ProxyMesh::SubMesh::NbNodes() const { return _uvPtStructVec.size(); }