X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESH_I%2FSMESH_subMesh_i.cxx;h=9328f4b77d1fe503782d040bc484df7a2247bfc1;hp=ee9117e2cae0528bd925a1dbe019ea5f7e8151b5;hb=5504d02a2237b17b8459bcd3b1fb2a89468598cd;hpb=5482b99d07dd144fd5be299e722f39a81de3b5be diff --git a/src/SMESH_I/SMESH_subMesh_i.cxx b/src/SMESH_I/SMESH_subMesh_i.cxx index ee9117e2c..9328f4b77 100644 --- a/src/SMESH_I/SMESH_subMesh_i.cxx +++ b/src/SMESH_I/SMESH_subMesh_i.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2016 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 @@ -26,8 +26,11 @@ // Module : SMESH // #include "SMESH_subMesh_i.hxx" + +#include "SMESHDS_SubMesh.hxx" #include "SMESH_Gen_i.hxx" #include "SMESH_Mesh_i.hxx" +#include "SMESH_MesherHelper.hxx" #include "SMESH_PreMeshInfo.hxx" #include "Utils_CorbaException.hxx" @@ -35,8 +38,6 @@ #include "OpUtil.hxx" #include "Utils_ExceptHandlers.hxx" -#include -#include #include using namespace std; @@ -97,96 +98,37 @@ bool getSubMeshes(::SMESH_subMesh* theSubMesh, { size_t size = theSubMeshList.size(); - SMESH_Mesh* aMesh = theSubMesh->GetFather(); - SMESHDS_Mesh* aMeshDS = aMesh->GetMeshDS(); - SMESHDS_SubMesh* aSubMeshDS = theSubMesh->GetSubMeshDS(); - ::SMESH_subMesh* sm; - - // nodes can be bound to either vertex, edge, face or solid_or_shell - TopoDS_Shape aShape = theSubMesh->GetSubShape(); - TopAbs_ShapeEnum aShapeType = aShape.ShapeType(); - - // IPAL18558: Wrong information of the created sub-mesh is shown. (Sub-mesh on a FACE - // with only 1D algo assigned - // Find dimension of sub-meshes to return as highest dimension of the assigned algorithm - if ( theSubMesh->IsEmpty() && !theSubMesh->GetAlgo() ) + // check all child sub-meshes of one complexity, + // if no elements found and no algo assigned, go to children of lower complexity + + TopoDS_Shape shape = theSubMesh->GetSubShape(); + TopAbs_ShapeEnum mainType = SMESH_MesherHelper::GetGroupType( shape, /*noCompound=*/true ); + TopAbs_ShapeEnum shapeType = shape.ShapeType(); + bool elementsFound = false; + bool algoFound = false; + SMESH_subMeshIteratorPtr smIt = theSubMesh->getDependsOnIterator(/*includeSelf=*/true, + /*complexFirst=*/true); + while ( smIt->more() ) { - // on father sub-meshes, check presence of an algo which will mesh this sub-mesh - // even if no algo is assigned to this sub-mesh - bool topAlgoPresent = false; - TopTools_ListIteratorOfListOfShape ancestors( aMesh->GetAncestors( aShape )); - for ( ; ancestors.More() && !topAlgoPresent; ancestors.Next() ) - if (( sm = aMesh->GetSubMeshContaining( ancestors.Value() ))) - topAlgoPresent = ( sm->GetAlgo() && !sm->GetAlgo()->NeedDiscreteBoundary() ); - - if ( !topAlgoPresent ) + ::SMESH_subMesh* sm = smIt->next(); + if ( sm->GetSubShape().ShapeType() != shapeType ) { - // look for a sub-mesh with an algo - SMESH_subMeshIteratorPtr smIt = - theSubMesh->getDependsOnIterator(/*includeSelf=*/false, /*complexShapeFirst=*/true); - TopAbs_ShapeEnum algoShape = TopAbs_SHAPE; - while ( smIt->more() && algoShape == TopAbs_SHAPE ) - { - sm = smIt->next(); - if ( sm->GetAlgo() ) - algoShape = sm->GetSubShape().ShapeType(); - } - if ( algoShape != TopAbs_SHAPE ) - { - // return all sub-meshes on this shape type - smIt = theSubMesh->getDependsOnIterator(/*includeSelf=*/false, /*complexShapeFirst=*/true); - while ( smIt->more() ) - { - sm = smIt->next(); - if ( sm->GetSubShape().ShapeType() == algoShape && sm->GetSubMeshDS() ) - theSubMeshList.push_back( sm->GetSubMeshDS() ); - } - return size < theSubMeshList.size(); - } + if ( elementsFound || algoFound ) + break; + if ( sm->GetSubShape().ShapeType() == TopAbs_VERTEX && + mainType != TopAbs_VERTEX ) + break; } - } - - switch ( aShapeType ) - { - case TopAbs_SOLID: - { - // add sub-mesh of solid itself - if (( aSubMeshDS = aMeshDS->MeshElements( aShape ))) - theSubMeshList.push_back( aSubMeshDS ); - - // and of the first shell - TopExp_Explorer exp( aShape, TopAbs_SHELL ); - if ( exp.More() ) - if (( aSubMeshDS = aMeshDS->MeshElements( exp.Current() ))) - theSubMeshList.push_back( aSubMeshDS ); - break; - } - case TopAbs_WIRE: - case TopAbs_COMPOUND: - case TopAbs_COMPSOLID: - { - // call getSubMeshes() for sub-shapes - list shapeList; - shapeList.push_back( aShape ); - list::iterator sh = shapeList.begin(); - for ( ; sh != shapeList.end(); ++sh ) { - for ( TopoDS_Iterator it( *sh ); it.More(); it.Next() ) { - if (( sm = aMesh->GetSubMeshContaining( it.Value() ))) - getSubMeshes( sm, theSubMeshList ); // add found sub-mesh or explore deeper - else - // no submesh for a compound inside compound - shapeList.push_back( it.Value() ); - } + shapeType = sm->GetSubShape().ShapeType(); + if ( !sm->IsEmpty() ) + { + elementsFound = true; + theSubMeshList.push_back( sm->GetSubMeshDS() ); } - // return only unique sub-meshes - set smSet( theSubMeshList.begin(), theSubMeshList.end() ); - theSubMeshList.assign( smSet.begin(), smSet.end() ); - break; - } - default: - if ( aSubMeshDS ) - theSubMeshList.push_back( aSubMeshDS ); + if ( sm->GetAlgo() ) + algoFound = true; } + return size < theSubMeshList.size(); } @@ -208,13 +150,11 @@ CORBA::Long SMESH_subMesh_i::GetNumberOfElements() return 0; ::SMESH_subMesh* aSubMesh = _mesh_i->_mapSubMesh[_localId]; - SMESHDS_SubMesh* aSubMeshDS = aSubMesh->GetSubMeshDS(); - int nbElems = aSubMeshDS ? aSubMeshDS->NbElements() : 0; + int nbElems = 0; - // volumes are bound to shell TListOfSubMeshes smList; - if ( nbElems == 0 && getSubMeshes( aSubMesh, smList )) + if ( getSubMeshes( aSubMesh, smList )) { TListOfSubMeshes::iterator sm = smList.begin(); for ( ; sm != smList.end(); ++sm ) @@ -291,15 +231,10 @@ SMESH::long_array* SMESH_subMesh_i::GetElementsId() _preMeshInfo->FullLoadFromFile(); ::SMESH_subMesh* aSubMesh = _mesh_i->_mapSubMesh[_localId]; - SMESHDS_SubMesh* aSubMeshDS = aSubMesh->GetSubMeshDS(); - int nbElems = aSubMeshDS ? aSubMeshDS->NbElements() : 0; + int nbElems = 0; TListOfSubMeshes smList; - if ( nbElems ) - smList.push_back( aSubMeshDS ); - - // volumes are bound to shell - if ( nbElems == 0 && getSubMeshes( aSubMesh, smList )) + if ( getSubMeshes( aSubMesh, smList )) { TListOfSubMeshes::iterator sm = smList.begin(); for ( ; sm != smList.end(); ++sm ) @@ -341,15 +276,14 @@ SMESH::long_array* SMESH_subMesh_i::GetElementsByType( SMESH::ElementType theEle _preMeshInfo->FullLoadFromFile(); ::SMESH_subMesh* aSubMesh = _mesh_i->_mapSubMesh[_localId]; - SMESHDS_SubMesh* aSubMeshDS = aSubMesh->GetSubMeshDS(); - // PAL5440, return all nodes belonging to elements of submesh + // PAL5440, return all nodes belonging to elements of the sub-mesh set nodeIds; - int nbElems = aSubMeshDS ? aSubMeshDS->NbElements() : 0; + int nbElems = 0; // volumes may be bound to shell instead of solid TListOfSubMeshes smList; - if ( nbElems == 0 && getSubMeshes( aSubMesh, smList )) + if ( getSubMeshes( aSubMesh, smList )) { TListOfSubMeshes::iterator sm = smList.begin(); for ( ; sm != smList.end(); ++sm ) @@ -375,29 +309,6 @@ SMESH::long_array* SMESH_subMesh_i::GetElementsByType( SMESH::ElementType theEle nbElems += (*sm)->NbElements(); } } - aSubMeshDS = 0; - } - else - { - if ( nbElems ) - smList.push_back( aSubMeshDS ); - } - - if ( theElemType == SMESH::NODE && aSubMeshDS ) - { - SMDS_ElemIteratorPtr eIt = aSubMeshDS->GetElements(); - if ( eIt->more() ) { - while ( eIt->more() ) { - const SMDS_MeshElement* anElem = eIt->next(); - SMDS_ElemIteratorPtr nIt = anElem->nodesIterator(); - while ( nIt->more() ) - nodeIds.insert( nIt->next()->GetID() ); - } - } else { - SMDS_NodeIteratorPtr nIt = aSubMeshDS->GetNodes(); - while ( nIt->more() ) - nodeIds.insert( nIt->next()->GetID() ); - } } if ( theElemType == SMESH::NODE ) @@ -417,8 +328,7 @@ SMESH::long_array* SMESH_subMesh_i::GetElementsByType( SMESH::ElementType theEle TListOfSubMeshes::iterator sm = smList.begin(); for ( i = 0; sm != smList.end(); sm++ ) { - aSubMeshDS = *sm; - SMDS_ElemIteratorPtr anIt = aSubMeshDS->GetElements(); + SMDS_ElemIteratorPtr anIt = (*sm)->GetElements(); while ( i < n && anIt->more() ) { const SMDS_MeshElement* anElem = anIt->next(); if ( theElemType == SMESH::ALL || anElem->GetType() == (SMDSAbs_ElementType)theElemType )