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

0021371: EDF SMESH: The propagation of elements courbure is sometimes wrong in quadratic conversion with nodes on geometry

Browse Source 
In FixQuadraticElements(), enhance detection of straight links
This commit is contained in:
eap 2011-10-06 16:01:08 +00:00
parent 1d668d5560
commit eaff026082
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/SMESH/SMESH_MesherHelper.cxx
View File

@ -2617,7 +2617,7 @@ namespace { // Structures used by FixQuadraticElements()
gp_XYZ mid1 = _qlink->MiddlePnt(); gp_XYZ mid1 = _qlink->MiddlePnt();
gp_XYZ mid2 = _qfaces[0]->_sides[ iOpp ]->MiddlePnt(); gp_XYZ mid2 = _qfaces[0]->_sides[ iOpp ]->MiddlePnt();
double faceSize2 = (mid1-mid2).SquareModulus(); double faceSize2 = (mid1-mid2).SquareModulus();
isStraight = _qlink->_nodeMove.SquareMagnitude() < 1/3./3. * faceSize2; isStraight = _qlink->_nodeMove.SquareMagnitude() < 1/10./10. * faceSize2;
} }
return isStraight; return isStraight;
} }
@ -2990,6 +2990,7 @@ void SMESH_MesherHelper::FixQuadraticElements(bool volumeOnly)
const SMDS_MeshElement* vol = elemIt->next(); const SMDS_MeshElement* vol = elemIt->next();
if ( !vol->IsQuadratic() || !volTool.Set( vol )) if ( !vol->IsQuadratic() || !volTool.Set( vol ))
return; return;
double volMinSize2 = -1.;
for ( int iF = 0; iF < volTool.NbFaces(); ++iF ) // loop on faces of volume for ( int iF = 0; iF < volTool.NbFaces(); ++iF ) // loop on faces of volume
{ {
int nbN = volTool.NbFaceNodes( iF ); int nbN = volTool.NbFaceNodes( iF );
@ -3002,11 +3003,18 @@ void SMESH_MesherHelper::FixQuadraticElements(bool volumeOnly)
QLink link( faceNodes[iN], faceNodes[iN+2], faceNodes[iN+1] ); QLink link( faceNodes[iN], faceNodes[iN+2], faceNodes[iN+1] );
pLink = links.insert( link ).first; pLink = links.insert( link ).first;
faceLinks[ iN/2 ] = & *pLink; faceLinks[ iN/2 ] = & *pLink;
if ( !isCurved )
isCurved = !link.IsStraight(); if ( link.MediumPos() == SMDS_TOP_3DSPACE )
if ( link.MediumPos() == SMDS_TOP_3DSPACE && !link.IsStraight() ) {
if ( !link.IsStraight() )
return; // already fixed return; // already fixed
} }
else if ( !isCurved )
{
if ( volMinSize2 < 0 ) volMinSize2 = volTool.MinLinearSize2();
isCurved = !isStraightLink( volMinSize2, link._nodeMove.SquareMagnitude() );
}
}
// store QFace // store QFace
pFace = faces.insert( QFace( faceLinks )).first; pFace = faces.insert( QFace( faceLinks )).first;
if ( pFace->NbVolumes() == 0 ) if ( pFace->NbVolumes() == 0 )