ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-26 09:20:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

IPAL0054629: Compute sub-mesh fails in TUI but works in GUI

Browse Source
This commit is contained in:
eap 2020-03-31 14:32:27 +03:00
parent cfa95f0477
commit e7ac767896
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/StdMeshers/StdMeshers_ViscousLayers.cxx
View File

@ -917,7 +917,7 @@ namespace VISCOUS_3D
private: private:
bool findSolidsWithLayers(); bool findSolidsWithLayers(const bool checkFaceMesh=true);
bool setBefore( _SolidData& solidBefore, _SolidData& solidAfter ); bool setBefore( _SolidData& solidBefore, _SolidData& solidAfter );
bool findFacesWithLayers(const bool onlyWith=false); bool findFacesWithLayers(const bool onlyWith=false);
void findPeriodicFaces(); void findPeriodicFaces();
@ -2040,7 +2040,7 @@ SMESH_ComputeErrorPtr _ViscousBuilder::CheckHypotheses( SMESH_Mesh& mesh
return SMESH_ComputeErrorPtr(); // everything already computed return SMESH_ComputeErrorPtr(); // everything already computed
findSolidsWithLayers(); findSolidsWithLayers( /*checkFaceMesh=*/false );
bool ok = findFacesWithLayers( true ); bool ok = findFacesWithLayers( true );
// remove _MeshOfSolid's of _SolidData's // remove _MeshOfSolid's of _SolidData's
@ -2059,7 +2059,7 @@ SMESH_ComputeErrorPtr _ViscousBuilder::CheckHypotheses( SMESH_Mesh& mesh
*/ */
//================================================================================ //================================================================================
bool _ViscousBuilder::findSolidsWithLayers() bool _ViscousBuilder::findSolidsWithLayers(const bool checkFaceMesh)
{ {
// get all solids // get all solids
TopTools_IndexedMapOfShape allSolids; TopTools_IndexedMapOfShape allSolids;
@ -2069,13 +2069,28 @@ bool _ViscousBuilder::findSolidsWithLayers()
SMESH_HypoFilter filter; SMESH_HypoFilter filter;
for ( int i = 1; i <= allSolids.Extent(); ++i ) for ( int i = 1; i <= allSolids.Extent(); ++i )
{ {
// find StdMeshers_ViscousLayers hyp assigned to the i-th solid
SMESH_subMesh* sm = _mesh->GetSubMesh( allSolids(i) ); SMESH_subMesh* sm = _mesh->GetSubMesh( allSolids(i) );
if ( sm->GetSubMeshDS() && sm->GetSubMeshDS()->NbElements() > 0 ) if ( sm->GetSubMeshDS() && sm->GetSubMeshDS()->NbElements() > 0 )
continue; // solid is already meshed continue; // solid is already meshed
// TODO: check if algo is hidden
SMESH_Algo* algo = sm->GetAlgo(); SMESH_Algo* algo = sm->GetAlgo();
if ( !algo ) continue; if ( !algo ) continue;
// TODO: check if algo is hidden // check if all FACEs are meshed, which can be false if Compute() a sub-shape
if ( checkFaceMesh )
{
bool facesMeshed = true;
SMESH_subMeshIteratorPtr smIt = sm->getDependsOnIterator(false,true);
while ( smIt->more() && facesMeshed )
{
SMESH_subMesh * faceSM = smIt->next();
if ( faceSM->GetSubShape().ShapeType() != TopAbs_FACE )
break;
facesMeshed = faceSM->IsMeshComputed();
}
if ( !facesMeshed )
continue;
}
// find StdMeshers_ViscousLayers hyp assigned to the i-th solid
const list <const SMESHDS_Hypothesis *> & allHyps = const list <const SMESHDS_Hypothesis *> & allHyps =
algo->GetUsedHypothesis(*_mesh, allSolids(i), /*ignoreAuxiliary=*/false); algo->GetUsedHypothesis(*_mesh, allSolids(i), /*ignoreAuxiliary=*/false);
_SolidData* soData = 0; _SolidData* soData = 0;