mirror of
https://git.salome-platform.org/gitpub/modules/smesh.git
synced 2024-12-29 19:00:35 +05:00
0022005: Error at the end of NETGEN 3D spheres mesh while tetrahedrons have been generated
SMESH_Algo::IsReversedSubMesh() is fixed and moved to SMESH_MesherHelper
This commit is contained in:
parent
0d03554147
commit
98e6b6eb53
@ -252,120 +252,13 @@ bool SMESH_Algo::FaceNormal(const SMDS_MeshElement* F, gp_XYZ& normal, bool norm
|
||||
return ok;
|
||||
}
|
||||
|
||||
//================================================================================
|
||||
/*!
|
||||
* \brief Find out elements orientation on a geometrical face
|
||||
* \param theFace - The face correctly oriented in the shape being meshed
|
||||
* \param theMeshDS - The mesh data structure
|
||||
* \retval bool - true if the face normal and the normal of first element
|
||||
* in the correspoding submesh point in different directions
|
||||
/*
|
||||
* Moved to SMESH_MesherHelper
|
||||
*/
|
||||
//================================================================================
|
||||
|
||||
bool SMESH_Algo::IsReversedSubMesh (const TopoDS_Face& theFace,
|
||||
SMESHDS_Mesh* theMeshDS)
|
||||
{
|
||||
if ( theFace.IsNull() || !theMeshDS )
|
||||
return false;
|
||||
|
||||
// find out orientation of a meshed face
|
||||
int faceID = theMeshDS->ShapeToIndex( theFace );
|
||||
TopoDS_Shape aMeshedFace = theMeshDS->IndexToShape( faceID );
|
||||
bool isReversed = ( theFace.Orientation() != aMeshedFace.Orientation() );
|
||||
|
||||
const SMESHDS_SubMesh * aSubMeshDSFace = theMeshDS->MeshElements( faceID );
|
||||
if ( !aSubMeshDSFace )
|
||||
return isReversed;
|
||||
|
||||
// find element with node located on face and get its normal
|
||||
const SMDS_FacePosition* facePos = 0;
|
||||
int vertexID = 0;
|
||||
gp_Pnt nPnt[3];
|
||||
gp_Vec Ne;
|
||||
bool normalOK = false;
|
||||
SMDS_ElemIteratorPtr iteratorElem = aSubMeshDSFace->GetElements();
|
||||
while ( iteratorElem->more() ) // loop on elements on theFace
|
||||
{
|
||||
const SMDS_MeshElement* elem = iteratorElem->next();
|
||||
if ( elem && elem->NbNodes() > 2 ) {
|
||||
SMDS_ElemIteratorPtr nodesIt = elem->nodesIterator();
|
||||
const SMDS_FacePosition* fPos = 0;
|
||||
int i = 0, vID = 0;
|
||||
while ( nodesIt->more() ) { // loop on nodes
|
||||
const SMDS_MeshNode* node
|
||||
= static_cast<const SMDS_MeshNode *>(nodesIt->next());
|
||||
if ( i == 3 ) i = 2;
|
||||
nPnt[ i++ ].SetCoord( node->X(), node->Y(), node->Z() );
|
||||
// check position
|
||||
const SMDS_PositionPtr& pos = node->GetPosition();
|
||||
if ( !pos ) continue;
|
||||
if ( pos->GetTypeOfPosition() == SMDS_TOP_FACE ) {
|
||||
fPos = dynamic_cast< const SMDS_FacePosition* >( pos );
|
||||
}
|
||||
else if ( pos->GetTypeOfPosition() == SMDS_TOP_VERTEX ) {
|
||||
vID = node->getshapeId();
|
||||
}
|
||||
}
|
||||
if ( fPos || ( !normalOK && vID )) {
|
||||
// compute normal
|
||||
gp_Vec v01( nPnt[0], nPnt[1] ), v02( nPnt[0], nPnt[2] );
|
||||
if ( v01.SquareMagnitude() > RealSmall() &&
|
||||
v02.SquareMagnitude() > RealSmall() )
|
||||
{
|
||||
Ne = v01 ^ v02;
|
||||
normalOK = ( Ne.SquareMagnitude() > RealSmall() );
|
||||
}
|
||||
// we need position on theFace or at least on vertex
|
||||
if ( normalOK ) {
|
||||
vertexID = vID;
|
||||
if ((facePos = fPos))
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if ( !normalOK )
|
||||
return isReversed;
|
||||
|
||||
// node position on face
|
||||
double u,v;
|
||||
if ( facePos ) {
|
||||
u = facePos->GetUParameter();
|
||||
v = facePos->GetVParameter();
|
||||
}
|
||||
else if ( vertexID ) {
|
||||
TopoDS_Shape V = theMeshDS->IndexToShape( vertexID );
|
||||
if ( V.IsNull() || V.ShapeType() != TopAbs_VERTEX )
|
||||
return isReversed;
|
||||
gp_Pnt2d uv = BRep_Tool::Parameters( TopoDS::Vertex( V ), theFace );
|
||||
u = uv.X();
|
||||
v = uv.Y();
|
||||
}
|
||||
else
|
||||
{
|
||||
return isReversed;
|
||||
}
|
||||
|
||||
// face normal at node position
|
||||
TopLoc_Location loc;
|
||||
Handle(Geom_Surface) surf = BRep_Tool::Surface( theFace, loc );
|
||||
// if ( surf.IsNull() || surf->Continuity() < GeomAbs_C1 )
|
||||
// some surfaces not detected as GeomAbs_C1 are nevertheless correct for meshing
|
||||
if ( surf.IsNull() || surf->Continuity() < GeomAbs_C0 )
|
||||
{
|
||||
if (!surf.IsNull())
|
||||
MESSAGE("surf->Continuity() < GeomAbs_C1 " << (surf->Continuity() < GeomAbs_C1));
|
||||
return isReversed;
|
||||
}
|
||||
gp_Vec d1u, d1v;
|
||||
surf->D1( u, v, nPnt[0], d1u, d1v );
|
||||
gp_Vec Nf = (d1u ^ d1v).Transformed( loc );
|
||||
|
||||
if ( theFace.Orientation() == TopAbs_REVERSED )
|
||||
Nf.Reverse();
|
||||
|
||||
return Ne * Nf < 0.;
|
||||
}
|
||||
// bool SMESH_Algo::IsReversedSubMesh (const TopoDS_Face& theFace,
|
||||
// SMESHDS_Mesh* theMeshDS)
|
||||
// {
|
||||
// }
|
||||
|
||||
//================================================================================
|
||||
/*!
|
||||
|
@ -287,14 +287,10 @@ public:
|
||||
const bool ignoreMediumNodes,
|
||||
std::map< double, const SMDS_MeshNode* > & theNodes);
|
||||
/*!
|
||||
* \brief Find out elements orientation on a geometrical face
|
||||
* \param theFace - The face correctly oriented in the shape being meshed
|
||||
* \param theMeshDS - The mesh data structure
|
||||
* \retval bool - true if the face normal and the normal of first element
|
||||
* in the correspoding submesh point in different directions
|
||||
* Moved to SMESH_MesherHelper
|
||||
*/
|
||||
static bool IsReversedSubMesh (const TopoDS_Face& theFace,
|
||||
SMESHDS_Mesh* theMeshDS);
|
||||
// static bool IsReversedSubMesh (const TopoDS_Face& theFace,
|
||||
// SMESHDS_Mesh* theMeshDS);
|
||||
/*!
|
||||
* \brief Compute length of an edge
|
||||
* \param E - the edge
|
||||
|
@ -2002,6 +2002,79 @@ bool SMESH_MesherHelper::IsStructured( SMESH_subMesh* faceSM )
|
||||
return true;
|
||||
}
|
||||
|
||||
//================================================================================
|
||||
/*!
|
||||
* \brief Find out elements orientation on a geometrical face
|
||||
* \param theFace - The face correctly oriented in the shape being meshed
|
||||
* \retval bool - true if the face normal and the normal of first element
|
||||
* in the correspoding submesh point in different directions
|
||||
*/
|
||||
//================================================================================
|
||||
|
||||
bool SMESH_MesherHelper::IsReversedSubMesh (const TopoDS_Face& theFace)
|
||||
{
|
||||
if ( theFace.IsNull() )
|
||||
return false;
|
||||
|
||||
// find out orientation of a meshed face
|
||||
int faceID = GetMeshDS()->ShapeToIndex( theFace );
|
||||
TopoDS_Shape aMeshedFace = GetMeshDS()->IndexToShape( faceID );
|
||||
bool isReversed = ( theFace.Orientation() != aMeshedFace.Orientation() );
|
||||
|
||||
const SMESHDS_SubMesh * aSubMeshDSFace = GetMeshDS()->MeshElements( faceID );
|
||||
if ( !aSubMeshDSFace )
|
||||
return isReversed;
|
||||
|
||||
// find an element with a good normal
|
||||
gp_Vec Ne;
|
||||
bool normalOK = false;
|
||||
gp_XY uv;
|
||||
SMDS_ElemIteratorPtr iteratorElem = aSubMeshDSFace->GetElements();
|
||||
while ( !normalOK && iteratorElem->more() ) // loop on elements on theFace
|
||||
{
|
||||
const SMDS_MeshElement* elem = iteratorElem->next();
|
||||
if ( elem && elem->NbCornerNodes() > 2 )
|
||||
{
|
||||
SMESH_TNodeXYZ nPnt[3];
|
||||
SMDS_ElemIteratorPtr nodesIt = elem->nodesIterator();
|
||||
for ( int iN = 0; nodesIt->more() && iN < 3; ++iN) // loop on nodes
|
||||
nPnt[ iN ] = nodesIt->next();
|
||||
|
||||
// compute normal
|
||||
gp_Vec v01( nPnt[0], nPnt[1] ), v02( nPnt[0], nPnt[2] );
|
||||
if ( v01.SquareMagnitude() > RealSmall() &&
|
||||
v02.SquareMagnitude() > RealSmall() )
|
||||
{
|
||||
Ne = v01 ^ v02;
|
||||
if (( normalOK = ( Ne.SquareMagnitude() > RealSmall() )))
|
||||
uv = GetNodeUV( theFace, nPnt[0]._node, nPnt[2]._node, &normalOK );
|
||||
}
|
||||
}
|
||||
}
|
||||
if ( !normalOK )
|
||||
return isReversed;
|
||||
|
||||
// face normal at node position
|
||||
TopLoc_Location loc;
|
||||
Handle(Geom_Surface) surf = BRep_Tool::Surface( theFace, loc );
|
||||
// if ( surf.IsNull() || surf->Continuity() < GeomAbs_C1 )
|
||||
// some surfaces not detected as GeomAbs_C1 are nevertheless correct for meshing
|
||||
if ( surf.IsNull() || surf->Continuity() < GeomAbs_C0 )
|
||||
{
|
||||
if (!surf.IsNull())
|
||||
MESSAGE("surf->Continuity() < GeomAbs_C1 " << (surf->Continuity() < GeomAbs_C1));
|
||||
return isReversed;
|
||||
}
|
||||
gp_Vec d1u, d1v; gp_Pnt p;
|
||||
surf->D1( uv.X(), uv.Y(), p, d1u, d1v );
|
||||
gp_Vec Nf = (d1u ^ d1v).Transformed( loc );
|
||||
|
||||
if ( theFace.Orientation() == TopAbs_REVERSED )
|
||||
Nf.Reverse();
|
||||
|
||||
return Ne * Nf < 0.;
|
||||
}
|
||||
|
||||
//=======================================================================
|
||||
//function : Count
|
||||
//purpose : Count nb of sub-shapes
|
||||
|
@ -221,6 +221,11 @@ public:
|
||||
*/
|
||||
bool GetIsQuadratic() const { return myCreateQuadratic; }
|
||||
|
||||
/*
|
||||
* \brief Find out elements orientation on a geometrical face
|
||||
*/
|
||||
bool IsReversedSubMesh (const TopoDS_Face& theFace);
|
||||
|
||||
/*!
|
||||
* \brief Move medium nodes of faces and volumes to fix distorted elements
|
||||
* \param error - container of fixed distorted elements
|
||||
@ -373,6 +378,7 @@ public:
|
||||
/*!
|
||||
* \brief Return node UV on face
|
||||
* \param inFaceNode - a node of element being created located inside a face
|
||||
* \param check - if provided, returns result of UV check that it enforces
|
||||
*/
|
||||
gp_XY GetNodeUV(const TopoDS_Face& F,
|
||||
const SMDS_MeshNode* n,
|
||||
|
Loading…
Reference in New Issue
Block a user