0021988: EDF 2484 SMESH : NETGEN and GDHS3D/BLSURF mixed meshes

In checkMissing(), avoid reporting "global 1D algorithm is missing"
  with a local GHS3D and a global NETGEN 1D-2D.
This commit is contained in:
eap 2012-11-21 11:07:33 +00:00
parent c60dfba99e
commit cc4d17c75b

View File

@ -670,7 +670,7 @@ static bool checkMissing(SMESH_Gen* aGen,
} }
case SMESH_subMesh::MISSING_HYP: { case SMESH_subMesh::MISSING_HYP: {
// notify if an algo missing hyp is attached to aSubMesh // notify if an algo missing hyp is attached to aSubMesh
algo = aGen->GetAlgo( aMesh, aSubMesh->GetSubShape() ); algo = aSubMesh->GetAlgo();
ASSERT( algo ); ASSERT( algo );
bool IsGlobalHypothesis = aGen->IsGlobalHypothesis( algo, aMesh ); bool IsGlobalHypothesis = aGen->IsGlobalHypothesis( algo, aMesh );
if (!IsGlobalHypothesis || !globalChecked[ algo->GetDim() ]) if (!IsGlobalHypothesis || !globalChecked[ algo->GetDim() ])
@ -721,7 +721,7 @@ static bool checkMissing(SMESH_Gen* aGen,
{ {
bool checkNoAlgo2 = ( algo->NeedDiscreteBoundary() ); bool checkNoAlgo2 = ( algo->NeedDiscreteBoundary() );
SMESH_subMeshIteratorPtr itsub = aSubMesh->getDependsOnIterator( /*includeSelf=*/false, SMESH_subMeshIteratorPtr itsub = aSubMesh->getDependsOnIterator( /*includeSelf=*/false,
/*complexShapeFirst=*/false); /*complexShapeFirst=*/true);
while ( itsub->more() ) while ( itsub->more() )
{ {
// sub-meshes should not be checked further more // sub-meshes should not be checked further more