X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESH%2FSMESH_Mesh.cxx;h=94b1b7a72c22313edf9cb2d51fd369b3afac1de5;hp=bcddd46d52d707b398cf7b48fa5eaee7da38a1de;hb=22463abfc977f33a756ce1d6398c840b7a8e3af2;hpb=c96730d0aaadc8219291390f9d2e6d1604c3ce3a diff --git a/src/SMESH/SMESH_Mesh.cxx b/src/SMESH/SMESH_Mesh.cxx index bcddd46d5..94b1b7a72 100644 --- a/src/SMESH/SMESH_Mesh.cxx +++ b/src/SMESH/SMESH_Mesh.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2015 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 @@ -6,7 +6,7 @@ // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either -// version 2.1 of the License. +// version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -26,17 +26,18 @@ // #include "SMESH_Mesh.hxx" #include "SMESH_MesherHelper.hxx" -#include "SMESH_subMesh.hxx" +#include "SMDS_MeshVolume.hxx" +#include "SMDS_SetIterator.hxx" +#include "SMESHDS_Document.hxx" +#include "SMESHDS_Group.hxx" +#include "SMESHDS_GroupOnGeom.hxx" +#include "SMESHDS_Script.hxx" +#include "SMESHDS_TSubMeshHolder.hxx" #include "SMESH_Gen.hxx" -#include "SMESH_Hypothesis.hxx" #include "SMESH_Group.hxx" #include "SMESH_HypoFilter.hxx" -#include "SMESHDS_Group.hxx" -#include "SMESHDS_Script.hxx" -#include "SMESHDS_GroupOnGeom.hxx" -#include "SMESHDS_Document.hxx" -#include "SMDS_MeshVolume.hxx" -#include "SMDS_SetIterator.hxx" +#include "SMESH_Hypothesis.hxx" +#include "SMESH_subMesh.hxx" #include "utilities.h" @@ -54,6 +55,8 @@ #include "DriverCGNS_Write.hxx" #endif +#include + #undef _Precision_HeaderFile #include #include @@ -66,10 +69,16 @@ #include #include +#include "SMESH_TryCatch.hxx" // include after OCCT headers! + #include "Utils_ExceptHandlers.hxx" +#ifndef WIN32 #include #include +#else +#include +#endif using namespace std; @@ -86,6 +95,10 @@ static int MYDEBUG = 0; typedef SMESH_HypoFilter THypType; +class SMESH_Mesh::SubMeshHolder : public SMESHDS_TSubMeshHolder< SMESH_subMesh > +{ +}; + //============================================================================= /*! * @@ -111,6 +124,7 @@ SMESH_Mesh::SMESH_Mesh(int theLocalId, _shapeDiagonal = 0.0; _callUp = NULL; _myMeshDS->ShapeToMesh( PseudoShape() ); + _subMeshHolder = new SubMeshHolder; } //================================================================================ @@ -133,20 +147,33 @@ SMESH_Mesh::SMESH_Mesh(): _shapeDiagonal( 0.0 ), _callUp( 0 ) { + _subMeshHolder = new SubMeshHolder; } namespace { +#ifndef WIN32 void deleteMeshDS(SMESHDS_Mesh* meshDS) { //cout << "deleteMeshDS( " << meshDS << endl; delete meshDS; } +#else + static void* deleteMeshDS(void* meshDS) + { + //cout << "deleteMeshDS( " << meshDS << endl; + SMESHDS_Mesh* m = (SMESHDS_Mesh*)meshDS; + if(m) { + delete m; + } + return 0; + } +#endif } //============================================================================= /*! - * + * */ //============================================================================= @@ -154,6 +181,11 @@ SMESH_Mesh::~SMESH_Mesh() { MESSAGE("SMESH_Mesh::~SMESH_Mesh"); + // avoid usual removal of elements while processing RemoveHypothesis( algo ) event + SMESHDS_SubMeshIteratorPtr smIt = _myMeshDS->SubMeshes(); + while ( smIt->more() ) + const_cast( smIt->next() )->Clear(); + // issue 0020340: EDF 1022 SMESH : Crash with FindNodeClosestTo in a second new study // Notify event listeners at least that something happens if ( SMESH_subMesh * sm = GetSubMeshContaining(1)) @@ -168,13 +200,7 @@ SMESH_Mesh::~SMESH_Mesh() _mapGroup.clear(); // delete sub-meshes - map ::iterator sm = _mapSubMesh.begin(); - for ( ; sm != _mapSubMesh.end(); ++sm ) - { - delete sm->second; - sm->second = 0; - } - _mapSubMesh.clear(); + delete _subMeshHolder; if ( _callUp) delete _callUp; _callUp = 0; @@ -189,9 +215,15 @@ SMESH_Mesh::~SMESH_Mesh() _myDocument->RemoveMesh( _id ); _myDocument = 0; - if ( _myMeshDS ) + if ( _myMeshDS ) { // delete _myMeshDS, in a thread in order not to block closing a study with large meshes +#ifndef WIN32 boost::thread aThread(boost::bind( & deleteMeshDS, _myMeshDS )); +#else + pthread_t thread; + int result=pthread_create(&thread, NULL, deleteMeshDS, (void*)_myMeshDS); +#endif + } } //================================================================================ @@ -202,7 +234,27 @@ SMESH_Mesh::~SMESH_Mesh() bool SMESH_Mesh::MeshExists( int meshId ) const { - return _myDocument ? _myDocument->GetMesh( meshId ) : false; + return _myDocument ? bool( _myDocument->GetMesh( meshId )) : false; +} + +//================================================================================ +/*! + * \brief Return a mesh by id + */ +//================================================================================ + +SMESH_Mesh* SMESH_Mesh::FindMesh( int meshId ) const +{ + if ( _id == meshId ) + return (SMESH_Mesh*) this; + + if ( StudyContextStruct *aStudyContext = _gen->GetStudyContext( _studyId )) + { + std::map < int, SMESH_Mesh * >::iterator i_m = aStudyContext->mapMesh.find( meshId ); + if ( i_m != aStudyContext->mapMesh.end() ) + return i_m->second; + } + return NULL; } //============================================================================= @@ -225,10 +277,7 @@ void SMESH_Mesh::ShapeToMesh(const TopoDS_Shape & aShape) { // removal of a shape to mesh, delete objects referring to sub-shapes: // - sub-meshes - map ::iterator i_sm = _mapSubMesh.begin(); - for ( ; i_sm != _mapSubMesh.end(); ++i_sm ) - delete i_sm->second; - _mapSubMesh.clear(); + _subMeshHolder->DeleteAll(); // - groups on geometry map ::iterator i_gr = _mapGroup.begin(); while ( i_gr != _mapGroup.end() ) { @@ -306,8 +355,18 @@ double SMESH_Mesh::GetShapeDiagonalSize(const TopoDS_Shape & aShape) { if ( !aShape.IsNull() ) { Bnd_Box Box; - BRepBndLib::Add(aShape, Box); - return sqrt( Box.SquareExtent() ); + // avoid too long waiting on large shapes. PreciseBoundingBox() was added + // to assure same result which else depends on presence of triangulation (IPAL52557). + const int maxNbFaces = 4000; + int nbFaces = 0; + for ( TopExp_Explorer f( aShape, TopAbs_FACE ); f.More() && nbFaces < maxNbFaces; f.Next() ) + ++nbFaces; + if ( nbFaces < maxNbFaces ) + GEOMUtils::PreciseBoundingBox(aShape, Box); + else + BRepBndLib::Add( aShape, Box); + if ( !Box.IsVoid() ) + return sqrt( Box.SquareExtent() ); } return 0; } @@ -364,13 +423,10 @@ void SMESH_Mesh::Clear() { if ( SMESH_subMesh *sm = GetSubMeshContaining( GetShapeToMesh() ) ) { - SMESH_subMeshIteratorPtr smIt = sm->getDependsOnIterator(/*includeSelf=*/true, - /*complexShapeFirst=*/true); - while ( smIt->more() ) - { - sm = smIt->next(); - sm->ComputeStateEngine( SMESH_subMesh::CLEAN ); - } + sm->ComputeStateEngine( SMESH_subMesh::CLEAN ); + sm->ComputeSubMeshStateEngine( SMESH_subMesh::CLEAN ); + sm->ComputeStateEngine( SMESH_subMesh::CHECK_COMPUTE_STATE ); + sm->ComputeSubMeshStateEngine( SMESH_subMesh::CHECK_COMPUTE_STATE ); } } _isModified = false; @@ -583,12 +639,16 @@ SMESH_ComputeErrorPtr SMESH_Mesh::GMFToMesh(const char* theFileName, //============================================================================= SMESH_Hypothesis::Hypothesis_Status - SMESH_Mesh::AddHypothesis(const TopoDS_Shape & aSubShape, - int anHypId ) throw(SALOME_Exception) +SMESH_Mesh::AddHypothesis(const TopoDS_Shape & aSubShape, + int anHypId, + std::string* anError ) throw(SALOME_Exception) { Unexpect aCatch(SalomeException); if(MYDEBUG) MESSAGE("SMESH_Mesh::AddHypothesis"); + if ( anError ) + anError->clear(); + SMESH_subMesh *subMesh = GetSubMesh(aSubShape); if ( !subMesh || !subMesh->GetId()) return SMESH_Hypothesis::HYP_BAD_SUBSHAPE; @@ -613,23 +673,36 @@ SMESH_Hypothesis::Hypothesis_Status } } - // shape + // shape - bool isAlgo = ( !anHyp->GetType() == SMESHDS_Hypothesis::PARAM_ALGO ); - int event = isAlgo ? SMESH_subMesh::ADD_ALGO : SMESH_subMesh::ADD_HYP; + bool isAlgo = ( anHyp->GetType() != SMESHDS_Hypothesis::PARAM_ALGO ); + int event = isAlgo ? SMESH_subMesh::ADD_ALGO : SMESH_subMesh::ADD_HYP; SMESH_Hypothesis::Hypothesis_Status ret = subMesh->AlgoStateEngine(event, anHyp); + if ( anError && SMESH_Hypothesis::IsStatusFatal(ret) && subMesh->GetComputeError() ) + *anError = subMesh->GetComputeError()->myComment; + // sub-shapes - if (!SMESH_Hypothesis::IsStatusFatal(ret) && - anHyp->GetDim() <= SMESH_Gen::GetShapeDim(aSubShape)) // is added on father + if ( !SMESH_Hypothesis::IsStatusFatal(ret) && + anHyp->GetDim() <= SMESH_Gen::GetShapeDim(aSubShape)) // is added on father { event = isAlgo ? SMESH_subMesh::ADD_FATHER_ALGO : SMESH_subMesh::ADD_FATHER_HYP; SMESH_Hypothesis::Hypothesis_Status ret2 = - subMesh->SubMeshesAlgoStateEngine(event, anHyp); + subMesh->SubMeshesAlgoStateEngine(event, anHyp, /*exitOnFatal=*/true); if (ret2 > ret) + { ret = ret2; + if ( SMESH_Hypothesis::IsStatusFatal( ret )) + { + if ( anError && subMesh->GetComputeError() ) + *anError = subMesh->GetComputeError()->myComment; + // remove anHyp + event = isAlgo ? SMESH_subMesh::REMOVE_ALGO : SMESH_subMesh::REMOVE_HYP; + subMesh->AlgoStateEngine(event, anHyp); + } + } // check concurent hypotheses on ancestors if (ret < SMESH_Hypothesis::HYP_CONCURENT && !isGlobalHyp ) @@ -736,7 +809,6 @@ const list& SMESH_Mesh::GetHypothesisList(const TopoDS_Shape & aSubShape) const throw(SALOME_Exception) { - Unexpect aCatch(SalomeException); return _myMeshDS->GetHypothesis(aSubShape); } @@ -756,7 +828,30 @@ const SMESH_Hypothesis * SMESH_Mesh::GetHypothesis(const TopoDS_Shape & aSubS const bool andAncestors, TopoDS_Shape* assignedTo) const { + return GetHypothesis( const_cast< SMESH_Mesh* >(this)->GetSubMesh( aSubShape ), + aFilter, andAncestors, assignedTo ); +} + +//======================================================================= +/*! + * \brief Return the hypothesis assigned to the shape of a sub-mesh + * \param aSubMesh - the sub-mesh to check + * \param aFilter - the hypothesis filter + * \param andAncestors - flag to check hypos assigned to ancestors of the shape + * \param assignedTo - to return the shape the found hypo is assigned to + * \retval SMESH_Hypothesis* - the first hypo passed through aFilter + */ +//======================================================================= + +const SMESH_Hypothesis * SMESH_Mesh::GetHypothesis(const SMESH_subMesh * aSubMesh, + const SMESH_HypoFilter& aFilter, + const bool andAncestors, + TopoDS_Shape* assignedTo) const +{ + if ( !aSubMesh ) return 0; + { + const TopoDS_Shape & aSubShape = aSubMesh->GetSubShape(); const list& hypList = _myMeshDS->GetHypothesis(aSubShape); list::const_iterator hyp = hypList.begin(); for ( ; hyp != hypList.end(); hyp++ ) { @@ -770,9 +865,12 @@ const SMESH_Hypothesis * SMESH_Mesh::GetHypothesis(const TopoDS_Shape & aSubS if ( andAncestors ) { // user sorted submeshes of ancestors, according to stored submesh priority - const list smList = getAncestorsSubMeshes( aSubShape ); - list::const_iterator smIt = smList.begin(); - for ( ; smIt != smList.end(); smIt++ ) + std::vector< SMESH_subMesh * > & ancestors = + const_cast< std::vector< SMESH_subMesh * > & > ( aSubMesh->GetAncestors() ); + SortByMeshOrder( ancestors ); + + vector::const_iterator smIt = ancestors.begin(); + for ( ; smIt != ancestors.end(); smIt++ ) { const TopoDS_Shape& curSh = (*smIt)->GetSubShape(); const list& hypList = _myMeshDS->GetHypothesis(curSh); @@ -791,7 +889,7 @@ const SMESH_Hypothesis * SMESH_Mesh::GetHypothesis(const TopoDS_Shape & aSubS //================================================================================ /*! - * \brief Return hypothesis assigned to the shape + * \brief Return hypotheses assigned to the shape * \param aSubShape - the shape to check * \param aFilter - the hypothesis filter * \param aHypList - the list of the found hypotheses @@ -806,6 +904,29 @@ int SMESH_Mesh::GetHypotheses(const TopoDS_Shape & aSubShape, const bool andAncestors, list< TopoDS_Shape > * assignedTo/*=0*/) const { + return GetHypotheses( const_cast< SMESH_Mesh* >(this)->GetSubMesh( aSubShape ), + aFilter, aHypList, andAncestors, assignedTo ); +} + +//================================================================================ +/*! + * \brief Return hypotheses assigned to the shape of a sub-mesh + * \param aSubShape - the sub-mesh to check + * \param aFilter - the hypothesis filter + * \param aHypList - the list of the found hypotheses + * \param andAncestors - flag to check hypos assigned to ancestors of the shape + * \retval int - number of unique hypos in aHypList + */ +//================================================================================ + +int SMESH_Mesh::GetHypotheses(const SMESH_subMesh * aSubMesh, + const SMESH_HypoFilter& aFilter, + list & aHypList, + const bool andAncestors, + list< TopoDS_Shape > * assignedTo/*=0*/) const +{ + if ( !aSubMesh ) return 0; + set hypTypes; // to exclude same type hypos from the result list int nbHyps = 0; @@ -823,45 +944,51 @@ int SMESH_Mesh::GetHypotheses(const TopoDS_Shape & aSubShape, // get hypos from aSubShape { + const TopoDS_Shape & aSubShape = aSubMesh->GetSubShape(); const list& hypList = _myMeshDS->GetHypothesis(aSubShape); for ( hyp = hypList.begin(); hyp != hypList.end(); hyp++ ) - if ( aFilter.IsOk (cSMESH_Hyp( *hyp ), aSubShape) && - ( cSMESH_Hyp(*hyp)->IsAuxiliary() || !mainHypFound ) && - hypTypes.insert( (*hyp)->GetName() ).second ) + { + const SMESH_Hypothesis* h = cSMESH_Hyp( *hyp ); + if (( aFilter.IsOk( h, aSubShape )) && + ( h->IsAuxiliary() || !mainHypFound ) && + ( h->IsAuxiliary() || hypTypes.insert( h->GetName() ).second )) { aHypList.push_back( *hyp ); nbHyps++; - if ( !cSMESH_Hyp(*hyp)->IsAuxiliary() ) + if ( !h->IsAuxiliary() ) mainHypFound = true; if ( assignedTo ) assignedTo->push_back( aSubShape ); } + } } // get hypos from ancestors of aSubShape if ( andAncestors ) { - TopTools_MapOfShape map; - // user sorted submeshes of ancestors, according to stored submesh priority - const list smList = getAncestorsSubMeshes( aSubShape ); - list::const_iterator smIt = smList.begin(); - for ( ; smIt != smList.end(); smIt++ ) + std::vector< SMESH_subMesh * > & ancestors = + const_cast< std::vector< SMESH_subMesh * > & > ( aSubMesh->GetAncestors() ); + SortByMeshOrder( ancestors ); + + vector::const_iterator smIt = ancestors.begin(); + for ( ; smIt != ancestors.end(); smIt++ ) { const TopoDS_Shape& curSh = (*smIt)->GetSubShape(); - if ( !map.Add( curSh )) - continue; const list& hypList = _myMeshDS->GetHypothesis(curSh); for ( hyp = hypList.begin(); hyp != hypList.end(); hyp++ ) - if (aFilter.IsOk( cSMESH_Hyp( *hyp ), curSh ) && - ( cSMESH_Hyp(*hyp)->IsAuxiliary() || !mainHypFound ) && - hypTypes.insert( (*hyp)->GetName() ).second ) + { + const SMESH_Hypothesis* h = cSMESH_Hyp( *hyp ); + if (( aFilter.IsOk( h, curSh )) && + ( h->IsAuxiliary() || !mainHypFound ) && + ( h->IsAuxiliary() || hypTypes.insert( h->GetName() ).second )) { aHypList.push_back( *hyp ); nbHyps++; - if ( !cSMESH_Hyp(*hyp)->IsAuxiliary() ) + if ( !h->IsAuxiliary() ) mainHypFound = true; if ( assignedTo ) assignedTo->push_back( curSh ); } + } } } return nbHyps; @@ -877,7 +1004,7 @@ SMESH_Hypothesis * SMESH_Mesh::GetHypothesis(const int anHypId) const { StudyContextStruct *sc = _gen->GetStudyContext(_studyId); if (sc->mapHypothesis.find(anHypId) == sc->mapHypothesis.end()) - return false; + return NULL; SMESH_Hypothesis *anHyp = sc->mapHypothesis[anHypId]; return anHyp; @@ -917,9 +1044,9 @@ void SMESH_Mesh::ClearLog() throw(SALOME_Exception) SMESH_subMesh *SMESH_Mesh::GetSubMesh(const TopoDS_Shape & aSubShape) throw(SALOME_Exception) { - Unexpect aCatch(SalomeException); - SMESH_subMesh *aSubMesh; int index = _myMeshDS->ShapeToIndex(aSubShape); + if ( !index && aSubShape.IsNull() ) + return 0; // for submeshes on GEOM Group if (( !index || index > _nbSubShapes ) && aSubShape.ShapeType() == TopAbs_COMPOUND ) { @@ -932,18 +1059,29 @@ SMESH_subMesh *SMESH_Mesh::GetSubMesh(const TopoDS_Shape & aSubShape) fillAncestorsMap( _myMeshDS->IndexToShape( ++_nbSubShapes )); } } -// if ( !index ) -// return NULL; // neither sub-shape nor a group + // if ( !index ) + // return NULL; // neither sub-shape nor a group - map ::iterator i_sm = _mapSubMesh.find(index); - if ( i_sm != _mapSubMesh.end()) - { - aSubMesh = i_sm->second; - } - else + SMESH_subMesh* aSubMesh = _subMeshHolder->Get( index ); + if ( !aSubMesh ) { aSubMesh = new SMESH_subMesh(index, this, _myMeshDS, aSubShape); - _mapSubMesh[index] = aSubMesh; + _subMeshHolder->Add( index, aSubMesh ); + + // include non-computable sub-meshes in SMESH_subMesh::_ancestors of sub-submeshes + switch ( aSubShape.ShapeType() ) { + case TopAbs_COMPOUND: + case TopAbs_WIRE: + case TopAbs_SHELL: + for ( TopoDS_Iterator subIt( aSubShape ); subIt.More(); subIt.Next() ) + { + SMESH_subMesh* sm = GetSubMesh( subIt.Value() ); + SMESH_subMeshIteratorPtr smIt = sm->getDependsOnIterator(/*inclideSelf=*/true); + while ( smIt->more() ) + smIt->next()->ClearAncestors(); + } + default:; + } } return aSubMesh; } @@ -958,17 +1096,10 @@ SMESH_subMesh *SMESH_Mesh::GetSubMesh(const TopoDS_Shape & aSubShape) SMESH_subMesh *SMESH_Mesh::GetSubMeshContaining(const TopoDS_Shape & aSubShape) const throw(SALOME_Exception) { - Unexpect aCatch(SalomeException); - SMESH_subMesh *aSubMesh = NULL; - int index = _myMeshDS->ShapeToIndex(aSubShape); - - map ::const_iterator i_sm = _mapSubMesh.find(index); - if ( i_sm != _mapSubMesh.end()) - aSubMesh = i_sm->second; - - return aSubMesh; + return GetSubMeshContaining( index ); } + //============================================================================= /*! * Get the SMESH_subMesh object implementation. Dont create it, return null @@ -979,13 +1110,11 @@ SMESH_subMesh *SMESH_Mesh::GetSubMeshContaining(const TopoDS_Shape & aSubShape) SMESH_subMesh *SMESH_Mesh::GetSubMeshContaining(const int aShapeID) const throw(SALOME_Exception) { - Unexpect aCatch(SalomeException); - - map ::const_iterator i_sm = _mapSubMesh.find(aShapeID); - if (i_sm == _mapSubMesh.end()) - return NULL; - return i_sm->second; + SMESH_subMesh *aSubMesh = _subMeshHolder->Get( aShapeID ); + + return aSubMesh; } + //================================================================================ /*! * \brief Return submeshes of groups containing the given sub-shape @@ -996,7 +1125,6 @@ list SMESH_Mesh::GetGroupSubMeshesContaining(const TopoDS_Shape & aSubShape) const throw(SALOME_Exception) { - Unexpect aCatch(SalomeException); list found; SMESH_subMesh * subMesh = GetSubMeshContaining(aSubShape); @@ -1004,13 +1132,14 @@ SMESH_Mesh::GetGroupSubMeshesContaining(const TopoDS_Shape & aSubShape) const return found; // submeshes of groups have max IDs, so search from the map end - map::const_reverse_iterator i_sm; - for ( i_sm = _mapSubMesh.rbegin(); i_sm != _mapSubMesh.rend(); ++i_sm) { - SMESHDS_SubMesh * ds = i_sm->second->GetSubMeshDS(); +SMESH_subMeshIteratorPtr smIt( _subMeshHolder->GetIterator( /*reverse=*/true ) ); + while ( smIt->more() ) { + SMESH_subMesh* sm = smIt->next(); + SMESHDS_SubMesh * ds = sm->GetSubMeshDS(); if ( ds && ds->IsComplexSubmesh() ) { - if ( SMESH_MesherHelper::IsSubShape( aSubShape, i_sm->second->GetSubShape() )) + if ( SMESH_MesherHelper::IsSubShape( aSubShape, sm->GetSubShape() )) { - found.push_back( i_sm->second ); + found.push_back( sm ); //break; } } else { @@ -1020,7 +1149,7 @@ SMESH_Mesh::GetGroupSubMeshesContaining(const TopoDS_Shape & aSubShape) const if ( found.empty() ) // maybe the main shape is a COMPOUND (issue 0021530) { - if ( SMESH_subMesh * mainSM = GetSubMeshContaining(1)) + if ( SMESH_subMesh * mainSM = GetSubMeshContaining(1) ) if ( mainSM->GetSubShape().ShapeType() == TopAbs_COMPOUND ) { TopoDS_Iterator it( mainSM->GetSubShape() ); @@ -1045,9 +1174,7 @@ bool SMESH_Mesh::IsUsedHypothesis(SMESHDS_Hypothesis * anHyp, if ( !aSubMesh || !aSubMesh->IsApplicableHypotesis( hyp )) return false; - const TopoDS_Shape & aSubShape = const_cast( aSubMesh )->GetSubShape(); - - SMESH_Algo *algo = _gen->GetAlgo(*this, aSubShape ); + SMESH_Algo *algo = aSubMesh->GetAlgo(); // algorithm if (anHyp->GetType() > SMESHDS_Hypothesis::PARAM_ALGO) @@ -1057,17 +1184,15 @@ bool SMESH_Mesh::IsUsedHypothesis(SMESHDS_Hypothesis * anHyp, if (algo) { // look trough hypotheses used by algo - SMESH_HypoFilter hypoKind; - if ( algo->InitCompatibleHypoFilter( hypoKind, !hyp->IsAuxiliary() )) { + const SMESH_HypoFilter* hypoKind; + if (( hypoKind = algo->GetCompatibleHypoFilter( !hyp->IsAuxiliary() ))) { list usedHyps; - if ( GetHypotheses( aSubShape, hypoKind, usedHyps, true )) + if ( GetHypotheses( aSubMesh, *hypoKind, usedHyps, true )) return ( find( usedHyps.begin(), usedHyps.end(), anHyp ) != usedHyps.end() ); } } - // look through all assigned hypotheses - //SMESH_HypoFilter filter( SMESH_HypoFilter::Is( hyp )); - return false; //GetHypothesis( aSubShape, filter, true ); + return false; } //============================================================================= @@ -1076,22 +1201,20 @@ bool SMESH_Mesh::IsUsedHypothesis(SMESHDS_Hypothesis * anHyp, */ //============================================================================= -const list < SMESH_subMesh * >& -SMESH_Mesh::GetSubMeshUsingHypothesis(SMESHDS_Hypothesis * anHyp) - throw(SALOME_Exception) -{ - Unexpect aCatch(SalomeException); - if(MYDEBUG) MESSAGE("SMESH_Mesh::GetSubMeshUsingHypothesis"); - map < int, SMESH_subMesh * >::iterator itsm; - _subMeshesUsingHypothesisList.clear(); - for (itsm = _mapSubMesh.begin(); itsm != _mapSubMesh.end(); itsm++) - { - SMESH_subMesh *aSubMesh = (*itsm).second; - if ( IsUsedHypothesis ( anHyp, aSubMesh )) - _subMeshesUsingHypothesisList.push_back(aSubMesh); - } - return _subMeshesUsingHypothesisList; -} +// const list < SMESH_subMesh * >& +// SMESH_Mesh::GetSubMeshUsingHypothesis(SMESHDS_Hypothesis * anHyp) +// throw(SALOME_Exception) +// { +// _subMeshesUsingHypothesisList.clear(); +// SMESH_subMeshIteratorPtr smIt( _subMeshHolder->GetIterator() ); +// while ( smIt->more() ) +// { +// SMESH_subMesh* aSubMesh = smIt->next(); +// if ( IsUsedHypothesis ( anHyp, aSubMesh )) +// _subMeshesUsingHypothesisList.push_back( aSubMesh ); +// } +// return _subMeshesUsingHypothesisList; +// } //======================================================================= //function : NotifySubMeshesHypothesisModification @@ -1108,48 +1231,52 @@ void SMESH_Mesh::NotifySubMeshesHypothesisModification(const SMESH_Hypothesis* h if (_callUp) _callUp->HypothesisModified(); - const SMESH_Algo *foundAlgo = 0; - SMESH_HypoFilter algoKind, compatibleHypoKind; + SMESH_Algo *algo; + const SMESH_HypoFilter* compatibleHypoKind; list usedHyps; + // keep sub-meshes not to miss ones whose state can change due to notifying others + vector< SMESH_subMesh* > smToNotify; - map < int, SMESH_subMesh * >::iterator itsm; - for (itsm = _mapSubMesh.begin(); itsm != _mapSubMesh.end(); itsm++) + SMESH_subMeshIteratorPtr smIt( _subMeshHolder->GetIterator() ); + while ( smIt->more() ) { - SMESH_subMesh *aSubMesh = (*itsm).second; - if ( aSubMesh->IsApplicableHypotesis( hyp )) + SMESH_subMesh* aSubMesh = smIt->next(); + + // if aSubMesh meshing depends on hyp, + // we call aSubMesh->AlgoStateEngine( MODIF_HYP, hyp ) that causes either + // 1) clearing of already computed aSubMesh or + // 2) changing algo_state from MISSING_HYP to HYP_OK when parameters of hyp becomes valid, + // other possible changes are not interesting. (IPAL0052457 - assigning hyp performance pb) + if ( aSubMesh->GetComputeState() != SMESH_subMesh::COMPUTE_OK && + aSubMesh->GetComputeState() != SMESH_subMesh::FAILED_TO_COMPUTE && + aSubMesh->GetAlgoState() != SMESH_subMesh::MISSING_HYP && + !hyp->DataDependOnParams() ) + continue; + + const TopoDS_Shape & aSubShape = aSubMesh->GetSubShape(); + + if (( aSubMesh->IsApplicableHypotesis( hyp )) && + ( algo = aSubMesh->GetAlgo() ) && + ( compatibleHypoKind = algo->GetCompatibleHypoFilter( !hyp->IsAuxiliary() )) && + ( compatibleHypoKind->IsOk( hyp, aSubShape ))) { - const TopoDS_Shape & aSubShape = aSubMesh->GetSubShape(); - - if ( !foundAlgo ) // init filter for algo search - algoKind.Init( THypType::IsAlgo() ).And( THypType::IsApplicableTo( aSubShape )); - - const SMESH_Algo *algo = static_cast - ( GetHypothesis( aSubShape, algoKind, true )); - - if ( algo ) + // check if hyp is used by algo + usedHyps.clear(); + if ( GetHypotheses( aSubMesh, *compatibleHypoKind, usedHyps, true ) && + find( usedHyps.begin(), usedHyps.end(), hyp ) != usedHyps.end() ) { - bool sameAlgo = ( algo == foundAlgo ); - if ( !sameAlgo && foundAlgo ) - sameAlgo = ( strcmp( algo->GetName(), foundAlgo->GetName() ) == 0); - - if ( !sameAlgo ) { // init filter for used hypos search - if ( !algo->InitCompatibleHypoFilter( compatibleHypoKind, !hyp->IsAuxiliary() )) - continue; // algo does not use any hypothesis - foundAlgo = algo; - } - - // check if hyp is used by algo - usedHyps.clear(); - if ( GetHypotheses( aSubShape, compatibleHypoKind, usedHyps, true ) && - find( usedHyps.begin(), usedHyps.end(), hyp ) != usedHyps.end() ) - { - aSubMesh->AlgoStateEngine(SMESH_subMesh::MODIF_HYP, - const_cast< SMESH_Hypothesis*>( hyp )); - } + smToNotify.push_back( aSubMesh ); } } } + + for ( size_t i = 0; i < smToNotify.size(); ++i ) + { + smToNotify[i]->AlgoStateEngine(SMESH_subMesh::MODIF_HYP, + const_cast< SMESH_Hypothesis*>( hyp )); + } + HasModificationsToDiscard(); // to reset _isModified flag if mesh becomes empty GetMeshDS()->Modified(); } @@ -1201,21 +1328,23 @@ bool SMESH_Mesh::HasModificationsToDiscard() const // return true if the next Compute() will be partial and // existing but changed elements may prevent successful re-compute bool hasComputed = false, hasNotComputed = false; - map ::const_iterator i_sm = _mapSubMesh.begin(); - for ( ; i_sm != _mapSubMesh.end() ; ++i_sm ) - switch ( i_sm->second->GetSubShape().ShapeType() ) +SMESH_subMeshIteratorPtr smIt( _subMeshHolder->GetIterator() ); + while ( smIt->more() ) + { + const SMESH_subMesh* aSubMesh = smIt->next(); + switch ( aSubMesh->GetSubShape().ShapeType() ) { case TopAbs_EDGE: case TopAbs_FACE: case TopAbs_SOLID: - if ( i_sm->second->IsMeshComputed() ) + if ( aSubMesh->IsMeshComputed() ) hasComputed = true; else hasNotComputed = true; if ( hasComputed && hasNotComputed) return true; } - + } if ( NbNodes() < 1 ) const_cast(this)->_isModified = false; @@ -1248,6 +1377,19 @@ bool SMESH_Mesh::HasDuplicatedGroupNamesMED() //================================================================================ /*! * \brief Export the mesh to a med file + * \param [in] file - name of the MED file + * \param [in] theMeshName - name of this mesh + * \param [in] theAutoGroups - boolean parameter for creating/not creating + * the groups Group_On_All_Nodes, Group_On_All_Faces, ... ; + * the typical use is auto_groups=false. + * \param [in] theVersion - defines the version of format of MED file, that will be created + * \param [in] meshPart - mesh data to export + * \param [in] theAutoDimension - if \c true, a space dimension of a MED mesh can be either + * - 1D if all mesh nodes lie on OX coordinate axis, or + * - 2D if all mesh nodes lie on XOY coordinate plane, or + * - 3D in the rest cases. + * If \a theAutoDimension is \c false, the space dimension is always 3. + * \return int - mesh index in the file */ //================================================================================ @@ -1256,15 +1398,17 @@ void SMESH_Mesh::ExportMED(const char * file, bool theAutoGroups, int theVersion, const SMESHDS_Mesh* meshPart, - bool theAutoDimension) + bool theAutoDimension, + bool theAddODOnVertices) throw(SALOME_Exception) { - Unexpect aCatch(SalomeException); + SMESH_TRY; DriverMED_W_SMESHDS_Mesh myWriter; myWriter.SetFile ( file, MED::EVersion(theVersion) ); myWriter.SetMesh ( meshPart ? (SMESHDS_Mesh*) meshPart : _myMeshDS ); myWriter.SetAutoDimension( theAutoDimension ); + myWriter.AddODOnVertices ( theAddODOnVertices ); if ( !theMeshName ) myWriter.SetMeshId ( _id ); else { @@ -1306,6 +1450,8 @@ void SMESH_Mesh::ExportMED(const char * file, } // Perform export myWriter.Perform(); + + SMESH_CATCH( SMESH::throwSalomeEx ); } //================================================================================ @@ -1322,7 +1468,7 @@ void SMESH_Mesh::ExportSAUV(const char *file, std::string medfilename(file); medfilename += ".med"; std::string cmd; -#ifdef WNT +#ifdef WIN32 cmd = "%PYTHONBIN% "; #else cmd = "python "; @@ -1332,7 +1478,7 @@ void SMESH_Mesh::ExportSAUV(const char *file, cmd += "\""; system(cmd.c_str()); ExportMED(medfilename.c_str(), theMeshName, theAutoGroups, 1); -#ifdef WNT +#ifdef WIN32 cmd = "%PYTHONBIN% "; #else cmd = "python "; @@ -1341,7 +1487,7 @@ void SMESH_Mesh::ExportSAUV(const char *file, cmd += "from medutilities import convert ; convert(r'" + medfilename + "', 'MED', 'GIBI', 1, r'" + file + "')"; cmd += "\""; system(cmd.c_str()); -#ifdef WNT +#ifdef WIN32 cmd = "%PYTHONBIN% "; #else cmd = "python "; @@ -1426,7 +1572,8 @@ void SMESH_Mesh::ExportSTL(const char * file, //================================================================================ void SMESH_Mesh::ExportCGNS(const char * file, - const SMESHDS_Mesh* meshDS) + const SMESHDS_Mesh* meshDS, + const char * meshName) { int res = Driver_Mesh::DRS_FAIL; #ifdef WITH_CGNS @@ -1434,6 +1581,8 @@ void SMESH_Mesh::ExportCGNS(const char * file, myWriter.SetFile( file ); myWriter.SetMesh( const_cast( meshDS )); myWriter.SetMeshName( SMESH_Comment("Mesh_") << meshDS->GetPersistentId()); + if ( meshName && meshName[0] ) + myWriter.SetMeshName( meshName ); res = myWriter.Perform(); #endif if ( res != Driver_Mesh::DRS_OK ) @@ -1485,13 +1634,27 @@ double SMESH_Mesh::GetComputeProgress() const algoDoneCost += smToCompute[i]->GetComputeCost(); currentSubIds.Add( smToCompute[i]->GetId() ); } - double rate = algo->GetProgress(); - if ( !( 0. < rate && rate < 1.001 )) + double rate = 0; + try + { + OCC_CATCH_SIGNALS; + rate = algo->GetProgress(); + } + catch (...) { +#ifdef _DEBUG_ + cerr << "Exception in " << algo->GetName() << "::GetProgress()" << endl; +#endif + } + if ( 0. < rate && rate < 1.001 ) + { + computedCost += rate * ( algoDoneCost + algoNotDoneCost ); + } + else { rate = algo->GetProgressByTic(); + computedCost += algoDoneCost + rate * algoNotDoneCost; } // cout << "rate: "<NbSubMesh(); } +//================================================================================ +/*! + * \brief Returns number of meshes in the Study, that is supposed to be + * equal to SMESHDS_Document::NbMeshes() + */ +//================================================================================ + +int SMESH_Mesh::NbMeshes() const // nb meshes in the Study +{ + return _myDocument->NbMeshes(); +} + //======================================================================= //function : IsNotConformAllowed //purpose : check if a hypothesis alowing notconform mesh is present @@ -2029,9 +2204,9 @@ SMESH_Group* SMESH_Mesh::ConvertToStandalone ( int theGroupID ) return aGroup; SMESH_Group* anOldGrp = (*itg).second; - SMESHDS_GroupBase* anOldGrpDS = anOldGrp->GetGroupDS(); - if ( !anOldGrp || !anOldGrpDS ) + if ( !anOldGrp || !anOldGrp->GetGroupDS() ) return aGroup; + SMESHDS_GroupBase* anOldGrpDS = anOldGrp->GetGroupDS(); // create new standalone group aGroup = new SMESH_Group (theGroupID, this, anOldGrpDS->GetType(), anOldGrp->GetName() ); @@ -2096,7 +2271,6 @@ const TListOfListOfInt& SMESH_Mesh::GetMeshOrder() const void SMESH_Mesh::fillAncestorsMap(const TopoDS_Shape& theShape) { - int desType, ancType; if ( !theShape.IsSame( GetShapeToMesh()) && theShape.ShapeType() == TopAbs_COMPOUND ) { @@ -2113,10 +2287,11 @@ void SMESH_Mesh::fillAncestorsMap(const TopoDS_Shape& theShape) TopTools_ListIteratorOfListOfShape ancIt (ancList); while ( ancIt.More() && ancIt.Value().ShapeType() >= memberType ) ancIt.Next(); - if ( ancIt.More() ) - ancList.InsertBefore( theShape, ancIt ); + if ( ancIt.More() ) ancList.InsertBefore( theShape, ancIt ); + else ancList.Append( theShape ); } } + else // else added for 52457: Addition of hypotheses is 8 time longer than meshing { for ( desType = TopAbs_VERTEX; desType > TopAbs_COMPOUND; desType-- ) for ( ancType = desType - 1; ancType >= TopAbs_COMPOUND; ancType-- ) @@ -2128,9 +2303,11 @@ void SMESH_Mesh::fillAncestorsMap(const TopoDS_Shape& theShape) // visit COMPOUNDs inside a COMPOUND that are not reachable by TopExp_Explorer if ( theShape.ShapeType() == TopAbs_COMPOUND ) { - for ( TopoDS_Iterator sIt(theShape); sIt.More(); sIt.Next() ) - if ( sIt.Value().ShapeType() == TopAbs_COMPOUND ) - fillAncestorsMap( sIt.Value() ); + TopoDS_Iterator sIt(theShape); + if ( sIt.More() && sIt.Value().ShapeType() == TopAbs_COMPOUND ) + for ( ; sIt.More(); sIt.Next() ) + if ( sIt.Value().ShapeType() == TopAbs_COMPOUND ) + fillAncestorsMap( sIt.Value() ); } } @@ -2142,38 +2319,59 @@ void SMESH_Mesh::fillAncestorsMap(const TopoDS_Shape& theShape) */ //============================================================================= -bool SMESH_Mesh::SortByMeshOrder(list& theListToSort) const + bool SMESH_Mesh::SortByMeshOrder(std::vector& theListToSort) const { if ( !_mySubMeshOrder.size() || theListToSort.size() < 2) return true; bool res = false; - list onlyOrderedList; + vector onlyOrderedList; // collect all ordered submeshes in one list as pointers // and get their positions within theListToSort - typedef list::iterator TPosInList; + typedef vector::iterator TPosInList; map< int, TPosInList > sortedPos; TPosInList smBeg = theListToSort.begin(), smEnd = theListToSort.end(); TListOfListOfInt::const_iterator listIdsIt = _mySubMeshOrder.begin(); - for( ; listIdsIt != _mySubMeshOrder.end(); listIdsIt++) { + for( ; listIdsIt != _mySubMeshOrder.end(); listIdsIt++) + { const TListOfInt& listOfId = *listIdsIt; + // convert sm ids to sm's + vector smVec; TListOfInt::const_iterator idIt = listOfId.begin(); for ( ; idIt != listOfId.end(); idIt++ ) { if ( SMESH_subMesh * sm = GetSubMeshContaining( *idIt )) { - TPosInList smPos = find( smBeg, smEnd, sm ); - if ( smPos != smEnd ) { - onlyOrderedList.push_back( sm ); - sortedPos[ distance( smBeg, smPos )] = smPos; + if ( sm->GetSubMeshDS() && sm->GetSubMeshDS()->IsComplexSubmesh() ) + { + SMESHDS_SubMeshIteratorPtr smdsIt = sm->GetSubMeshDS()->GetSubMeshIterator(); + while ( smdsIt->more() ) + { + const SMESHDS_SubMesh* smDS = smdsIt->next(); + if (( sm = GetSubMeshContaining( smDS->GetID() ))) + smVec.push_back( sm ); + } + } + else + { + smVec.push_back( sm ); } } } + // find smVec items in theListToSort + for ( size_t i = 0; i < smVec.size(); ++i ) + { + TPosInList smPos = find( smBeg, smEnd, smVec[i] ); + if ( smPos != smEnd ) { + onlyOrderedList.push_back( smVec[i] ); + sortedPos[ distance( smBeg, smPos )] = smPos; + } + } } if (onlyOrderedList.size() < 2) return res; res = true; - list::iterator onlyBIt = onlyOrderedList.begin(); - list::iterator onlyEIt = onlyOrderedList.end(); + vector::iterator onlyBIt = onlyOrderedList.begin(); + vector::iterator onlyEIt = onlyOrderedList.end(); // iterate on ordered submeshes and insert them in detected positions map< int, TPosInList >::iterator i_pos = sortedPos.begin(); @@ -2215,17 +2413,15 @@ bool SMESH_Mesh::IsOrderOK( const SMESH_subMesh* smBefore, */ //============================================================================= -list -SMESH_Mesh::getAncestorsSubMeshes (const TopoDS_Shape& theSubShape) const +void SMESH_Mesh::getAncestorsSubMeshes (const TopoDS_Shape& theSubShape, + std::vector< SMESH_subMesh* >& theSubMeshes) const { - list listOfSubMesh; + theSubMeshes.clear(); TopTools_ListIteratorOfListOfShape it( GetAncestors( theSubShape )); for (; it.More(); it.Next() ) if ( SMESH_subMesh* sm = GetSubMeshContaining( it.Value() )) - listOfSubMesh.push_back(sm); + theSubMeshes.push_back(sm); // sort submeshes according to stored mesh order - SortByMeshOrder( listOfSubMesh ); - - return listOfSubMesh; + SortByMeshOrder( theSubMeshes ); }