mirror of
https://git.salome-platform.org/gitpub/modules/smesh.git
synced 2025-01-12 01:30:34 +05:00
Regression of test case bugs/D0
call ComputePentahedralMesh() if the mesh of FACE is quadrangular but not structured
This commit is contained in:
parent
ad61c4111d
commit
44bcdd8f8c
@ -388,7 +388,8 @@ bool StdMeshers_Hexa_3D::Compute(SMESH_Mesh & aMesh,
|
|||||||
const TopoDS_Edge& baseE = baseQuadSide->Edge( iE );
|
const TopoDS_Edge& baseE = baseQuadSide->Edge( iE );
|
||||||
eOri[ iE ] = baseE.Orientation();
|
eOri[ iE ] = baseE.Orientation();
|
||||||
|
|
||||||
// assure correctness of node positions on baseE
|
// assure correctness of node positions on baseE:
|
||||||
|
// helper.GetNodeU() will fix positions if they are wrong
|
||||||
if ( SMESHDS_SubMesh* smDS = meshDS->MeshElements( baseE ))
|
if ( SMESHDS_SubMesh* smDS = meshDS->MeshElements( baseE ))
|
||||||
{
|
{
|
||||||
bool ok;
|
bool ok;
|
||||||
@ -422,6 +423,15 @@ bool StdMeshers_Hexa_3D::Compute(SMESH_Mesh & aMesh,
|
|||||||
append( aCubeSide[i]._u2nodesMap, u2nodesMap.rbegin(), u2nodesMap.rend());
|
append( aCubeSide[i]._u2nodesMap, u2nodesMap.rbegin(), u2nodesMap.rend());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// check if the loaded grid corresponds to nb of quadrangles
|
||||||
|
const int nbQuads = meshDS->MeshElements( F )->NbElements();
|
||||||
|
const int nbHor = aCubeSide[i]._u2nodesMap.size() - 1;
|
||||||
|
const int nbVer = aCubeSide[i]._u2nodesMap.begin()->second.size() - 1;
|
||||||
|
if ( nbQuads != nbHor * nbVer )
|
||||||
|
{
|
||||||
|
SMESH_ComputeErrorPtr err = ComputePentahedralMesh(aMesh, aShape, proxymesh.get());
|
||||||
|
return error( err );
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Orient loaded grids of cube sides along axis of the unitary cube coord system
|
// Orient loaded grids of cube sides along axis of the unitary cube coord system
|
||||||
|
Loading…
Reference in New Issue
Block a user