ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-30 02:30:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

0021843: [CEA 658] Segmentation fault when using GHS3D on a 2D group

Browse Source 
Avoid "1D global algo is missing" error if it's not really missing
This commit is contained in:
eap 2012-09-07 07:58:38 +00:00
parent ab9945d2b0
commit f8658faa90
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/SMESH/SMESH_Gen.cxx
View File

@ -646,7 +646,8 @@ static bool checkMissing(SMESH_Gen* aGen,
set<SMESH_subMesh*>& aCheckedMap,
list< SMESH_Gen::TAlgoStateError > & theErrors)
{
if ( aSubMesh->GetSubShape().ShapeType() == TopAbs_VERTEX)
if ( aSubMesh->GetSubShape().ShapeType() == TopAbs_VERTEX ||
aCheckedMap.count( aSubMesh ))
return true;
//MESSAGE("=====checkMissing");
@ -702,8 +703,15 @@ static bool checkMissing(SMESH_Gen* aGen,
break;
}
case SMESH_subMesh::HYP_OK:
algo = aGen->GetAlgo( aMesh, aSubMesh->GetSubShape() );
algo = aSubMesh->GetAlgo();
ret = true;
if (!algo->NeedDiscreteBoundary())
{
SMESH_subMeshIteratorPtr itsub = aSubMesh->getDependsOnIterator( /*includeSelf=*/false,
/*complexShapeFirst=*/false);
while ( itsub->more() )
aCheckedMap.insert( itsub->next() );
}
break;
default: ASSERT(0);
}
@ -722,7 +730,6 @@ static bool checkMissing(SMESH_Gen* aGen,
{
// sub-meshes should not be checked further more
SMESH_subMesh* sm = itsub->next();
aCheckedMap.insert( sm );
if (isTopLocalAlgo)
{
@ -736,6 +743,7 @@ static bool checkMissing(SMESH_Gen* aGen,
checkNoAlgo2 = false;
}
}
aCheckedMap.insert( sm );
}
}
return ret;
@ -769,9 +777,9 @@ bool SMESH_Gen::GetAlgoState(SMESH_Mesh& theMesh,
bool ret = true;
bool hasAlgo = false;
SMESH_subMesh* sm = theMesh.GetSubMesh(theShape);
SMESH_subMesh* sm = theMesh.GetSubMesh(theShape);
const SMESHDS_Mesh* meshDS = theMesh.GetMeshDS();
TopoDS_Shape mainShape = meshDS->ShapeToMesh();
TopoDS_Shape mainShape = meshDS->ShapeToMesh();
// -----------------
// get global algos