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

Merge branch 'master' into gni/adaptation

Browse Source
This commit is contained in:
GERALD NICOLAS 2021-01-15 16:03:31 +01:00
commit 1d3309b296
1 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/StdMeshers/StdMeshers_Quadrangle_2D.cxx
View File

@ -208,8 +208,8 @@ bool StdMeshers_Quadrangle_2D::CheckHypothesis
*/ */
//============================================================================= //=============================================================================
bool StdMeshers_Quadrangle_2D::Compute (SMESH_Mesh& aMesh, bool StdMeshers_Quadrangle_2D::Compute( SMESH_Mesh& aMesh,
const TopoDS_Shape& aShape) const TopoDS_Shape& aShape )
{ {
const TopoDS_Face& F = TopoDS::Face(aShape); const TopoDS_Face& F = TopoDS::Face(aShape);
aMesh.GetSubMesh( F ); aMesh.GetSubMesh( F );
@ -4776,6 +4776,7 @@ bool StdMeshers_Quadrangle_2D::check()
const SMDS_MeshNode* nInFace = 0; const SMDS_MeshNode* nInFace = 0;
if ( myHelper->HasSeam() ) if ( myHelper->HasSeam() )
{
for ( int i = 0; i < nbN && !nInFace; ++i ) for ( int i = 0; i < nbN && !nInFace; ++i )
if ( !myHelper->IsSeamShape( nn[i]->getshapeId() )) if ( !myHelper->IsSeamShape( nn[i]->getshapeId() ))
{ {
@ -4784,6 +4785,33 @@ bool StdMeshers_Quadrangle_2D::check()
if ( myHelper->IsOnSeam( uv )) if ( myHelper->IsOnSeam( uv ))
nInFace = NULL; nInFace = NULL;
} }
}
if ( myHelper->GetPeriodicIndex() && !nInFace )
{
for ( int i = 0; i < nbN && !nInFace; ++i )
if ( fSubMesh->Contains( nn[i] ))
nInFace = nn[i];
if ( !nInFace )
for ( int i = 0; i < nbN && !nInFace; ++i )
{
SMDS_ElemIteratorPtr fIt = nn[i]->GetInverseElementIterator( SMDSAbs_Face );
while ( fIt->more() && !nInFace )
{
const SMDS_MeshElement* face = fIt->next();
if ( !fSubMesh->Contains( face ))
continue;
for ( int iN = 0, nN = face->NbCornerNodes(); iN < nN; ++iN )
{
const SMDS_MeshNode* n = face->GetNode( iN );
if ( fSubMesh->Contains( n ))
{
nInFace = n;
break;
}
}
}
}
}
toCheckUV = true; toCheckUV = true;
for ( int i = 0; i < nbN; ++i ) for ( int i = 0; i < nbN; ++i )