{
if ( _alwaysComputed )
return true;
- // algo may bind a submesh not to _subShape, eg 3D algo
+ // algo may bind a sub-mesh not to _subShape, eg 3D algo
// sets nodes on SHELL while _subShape may be SOLID
SMESHDS_Mesh* meshDS = _father->GetMeshDS();
int dimToCheck = myDim - 1;
bool subMeshesComputed = true;
if ( isFailedToCompute ) *isFailedToCompute = false;
- // check subMeshes with upper dimension => reverse iteration
+ // check sub-meshes with upper dimension => reverse iteration
SMESH_subMeshIteratorPtr smIt = getDependsOnIterator(false,true);
while ( smIt->more() )
{
// MSV 07.04.2006: restrict checking to myDim-1 only. Ex., there is no sense
// in checking of existence of edges if the algo needs only faces. Moreover,
- // degenerated edges may have no submesh, as after computing NETGEN_2D.
+ // degenerated edges may have no sub-mesh, as after computing NETGEN_2D.
if ( !_algo || _algo->NeedDiscreteBoundary() ) {
int dim = SMESH_Gen::GetShapeDim( ss );
if (dim < dimToCheck)
- break; // the rest subMeshes are all of less dimension
+ break; // the rest sub-meshes are all of less dimension
}
SMESHDS_SubMesh * ds = sm->GetSubMeshDS();
- bool computeOk = (sm->GetComputeState() == COMPUTE_OK ||
- (ds && ( dimToCheck ? ds->NbElements() : ds->NbNodes() )));
+ bool computeOk = ((sm->GetComputeState() == COMPUTE_OK ) ||
+ (ds && ( dimToCheck ? ds->NbElements() : ds->NbNodes() )));
if (!computeOk)
{
subMeshesComputed = false;
+
if ( isFailedToCompute && !(*isFailedToCompute) )
*isFailedToCompute = ( sm->GetComputeState() == FAILED_TO_COMPUTE );
- // int type = ss.ShapeType();
-
- // switch (type)
- // {
- // case TopAbs_COMPOUND:
- // {
- // MESSAGE("The not computed sub mesh is a COMPOUND");
- // break;
- // }
- // case TopAbs_COMPSOLID:
- // {
- // MESSAGE("The not computed sub mesh is a COMPSOLID");
- // break;
- // }
- // case TopAbs_SHELL:
- // {
- // MESSAGE("The not computed sub mesh is a SHEL");
- // break;
- // }
- // case TopAbs_WIRE:
- // {
- // MESSAGE("The not computed sub mesh is a WIRE");
- // break;
- // }
- // case TopAbs_SOLID:
- // {
- // MESSAGE("The not computed sub mesh is a SOLID");
- // break;
- // }
- // case TopAbs_FACE:
- // {
- // MESSAGE("The not computed sub mesh is a FACE");
- // break;
- // }
- // case TopAbs_EDGE:
- // {
- // MESSAGE("The not computed sub mesh is a EDGE");
- // break;
- // }
- // default:
- // {
- // MESSAGE("The not computed sub mesh is of unknown type");
- // break;
- // }
- // }
-
if ( !isFailedToCompute )
break;
}
// remember all sub-meshes of sm
if ( keepSubMeshes )
{
- SMESH_subMeshIteratorPtr smIt2 = getDependsOnIterator(false);
+ SMESH_subMeshIteratorPtr smIt2 = sm->getDependsOnIterator(false);
while ( smIt2->more() )
smToKeep.insert( smIt2->next() );
}
_computeError.reset();
}
+ // transform errors into warnings if it is caused by mesh edition (imp 0023068)
+ if (!ret && _father->GetIsModified() )
+ {
+ for (subS.ReInit(); subS.More(); subS.Next())
+ {
+ SMESH_subMesh* sm = _father->GetSubMesh( subS.Current() );
+ if ( !sm->IsMeshComputed() && sm->_computeError )
+ {
+ // check if there is a VERTEX w/o nodes
+ // with READY_TO_COMPUTE state (after MergeNodes())
+ SMESH_subMeshIteratorPtr smIt = sm->getDependsOnIterator(false,false);
+ while ( smIt->more() )
+ {
+ SMESH_subMesh * vertSM = smIt->next();
+ if ( vertSM->_subShape.ShapeType() != TopAbs_VERTEX ) break;
+ if ( vertSM->GetComputeState() == READY_TO_COMPUTE )
+ {
+ SMESHDS_SubMesh * ds = vertSM->GetSubMeshDS();
+ if ( !ds || ds->NbNodes() == 0 )
+ {
+ sm->_computeState = READY_TO_COMPUTE;
+ sm->_computeError->myName = COMPERR_WARNING;
+ break;
+ }
+ }
+ }
+ }
+ }
+ }
+
// send event SUBMESH_COMPUTED
if ( ret ) {
if ( !algo->NeedDiscreteBoundary() )
#include "SMESH_Gen_i.hxx"
#include "SMESH_Mesh_i.hxx"
#include "SMESH_PreMeshInfo.hxx"
+#include "SMESH_MesherHelper.hxx"
#include "Utils_CorbaException.hxx"
#include "utilities.h"
#include "OpUtil.hxx"
#include "Utils_ExceptHandlers.hxx"
-#include <TopExp_Explorer.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
#include <TopoDS_Iterator.hxx>
using namespace std;
{
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() || ( aSubMeshDS && aSubMeshDS->IsComplexSubmesh() )) &&
- ( !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 )
{
- // find max dimension of an assigned algo
- TopAbs_ShapeEnum algoShape = TopAbs_SHAPE;
- const std::list <const SMESHDS_Hypothesis * >& hyps = aMesh->GetHypothesisList( aShape );
- std::list <const SMESHDS_Hypothesis * >::const_iterator hypIt = hyps.begin();
- for ( ; hypIt != hyps.end(); ++hypIt )
- if ( const SMESH_Algo* algo = dynamic_cast< const SMESH_Algo* >( *hypIt ))
- switch ( algo->GetDim() ) {
- case 1: algoShape = TopAbs_EDGE; break;
- case 2: algoShape = TopAbs_FACE; break;
- case 3: algoShape = TopAbs_SOLID; break;
- case 0: algoShape = TopAbs_VERTEX; break;
- }
- if ( algoShape != TopAbs_SHAPE )
- {
- // return all sub-meshes on this dimension
- SMESH_subMeshIteratorPtr smIt = theSubMesh->getDependsOnIterator(/*includeSelf=*/false);
- 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<TopoDS_Shape> shapeList;
- shapeList.push_back( aShape );
- list<TopoDS_Shape>::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<SMESHDS_SubMesh*> 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();
}
return 0;
::SMESH_subMesh* aSubMesh = _mesh_i->_mapSubMesh[_localId];
- SMESHDS_SubMesh* aSubMeshDS = aSubMesh->GetSubMeshDS();
- if ( aSubMeshDS && aSubMeshDS->IsComplexSubmesh() )
- aSubMeshDS = 0;
- 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 )
}
::SMESH_subMesh* aSubMesh = _mesh_i->_mapSubMesh[_localId];
SMESHDS_SubMesh* aSubMeshDS = aSubMesh->GetSubMeshDS();
- if ( aSubMeshDS && aSubMeshDS->IsComplexSubmesh() )
- aSubMeshDS = 0;
if ( aSubMeshDS && aSubMeshDS->IsComplexSubmesh() )
{
_preMeshInfo->FullLoadFromFile();
::SMESH_subMesh* aSubMesh = _mesh_i->_mapSubMesh[_localId];
- SMESHDS_SubMesh* aSubMeshDS = aSubMesh->GetSubMeshDS();
- if ( aSubMeshDS && aSubMeshDS->IsComplexSubmesh() )
- aSubMeshDS = 0;
- 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 )
_preMeshInfo->FullLoadFromFile();
::SMESH_subMesh* aSubMesh = _mesh_i->_mapSubMesh[_localId];
- SMESHDS_SubMesh* aSubMeshDS = aSubMesh->GetSubMeshDS();
- if ( aSubMeshDS && aSubMeshDS->IsComplexSubmesh() )
- aSubMeshDS = 0;
- // PAL5440, return all nodes belonging to elements of submesh
+ // PAL5440, return all nodes belonging to elements of the sub-mesh
set<int> 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 )
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 )
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 )
