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

PAL15148(0D Algorithm "Segments around vertex" works wrong)

Browse Source 
fix redistributeNearVertices() compensateError()
This commit is contained in:
eap 2007-03-06 14:21:50 +00:00
parent e0af6f94f0
commit 868b7afd2b
1 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/StdMeshers/StdMeshers_Regular_1D.cxx
View File

@ -313,28 +313,24 @@ static void compensateError(double a1, double an,
int i, nPar = theParams.size(); int i, nPar = theParams.size();
if ( a1 + an < length && nPar > 1 ) if ( a1 + an < length && nPar > 1 )
{ {
bool reverse = ( U1 > Un );
GCPnts_AbscissaPoint Discret(C3d, reverse ? an : -an, Un);
if ( !Discret.IsDone() )
return;
double Utgt = Discret.Parameter(); // target value of the last parameter
list<double>::reverse_iterator itU = theParams.rbegin(); list<double>::reverse_iterator itU = theParams.rbegin();
double Ul = *itU++; double Ul = *itU++; // real value of the last parameter
// dist from the last point to the edge end <Un>, it should be equal to <an> double dUn = Utgt - Ul; // parametric error of <an>
double Ln = GCPnts_AbscissaPoint::Length( C3d, Ul, Un ); if ( Abs(dUn) <= Precision::Confusion() )
double dLn = an - Ln; // signed error of <an>
if ( Abs( dLn ) <= Precision::Confusion() )
return; return;
double dU = Abs( Ul - *itU ); // parametric length of the last but one segment double dU = Abs( Ul - *itU ); // parametric length of the last but one segment
double dUn = dLn * Abs( Un - U1 ) / length; // parametric error of <an> if ( adjustNeighbors2an || Abs(dUn) < 0.5 * dU ) { // last segment is a bit shorter than it should
if ( adjustNeighbors2an || dUn < 0.5 * dU ) { // last segment is a bit shorter than it should // move the last parameter to the edge beginning
dUn = -dUn; // move the last parameter to the edge beginning
} }
else { // last segment is much shorter than it should -> remove the last param and else { // last segment is much shorter than it should -> remove the last param and
theParams.pop_back(); nPar--; // move the rest points toward the edge end theParams.pop_back(); nPar--; // move the rest points toward the edge end
Ln = GCPnts_AbscissaPoint::Length( C3d, theParams.back(), Un ); dUn = Utgt - theParams.back();
dUn = ( an - Ln ) * Abs( Un - U1 ) / length;
if ( dUn < 0.5 * dU )
dUn = -dUn;
} }
bool reverse = ( U1 > Un );
if ( reverse )
dUn = -dUn;
double q = dUn / ( nPar - 1 ); double q = dUn / ( nPar - 1 );
if ( !adjustNeighbors2an ) { if ( !adjustNeighbors2an ) {
@ -477,14 +473,31 @@ void StdMeshers_Regular_1D::redistributeNearVertices (SMESH_Mesh & theM
double vertexLength = hyp->GetLength(); double vertexLength = hyp->GetLength();
if ( vertexLength > theLength / 2.0 ) if ( vertexLength > theLength / 2.0 )
continue; continue;
if ( isEnd1 ) { if ( isEnd1 ) { // to have a segment of interest at end of theParameters
theParameters.reverse(); theParameters.reverse();
std::swap( f, l ); std::swap( f, l );
} }
if ( _hypType == NB_SEGMENTS || nPar < 5 ) if ( _hypType == NB_SEGMENTS )
{ {
compensateError(0, vertexLength, f, l, theLength, theC3d, theParameters, true ); compensateError(0, vertexLength, f, l, theLength, theC3d, theParameters, true );
} }
else if ( nPar <= 3 )
{
if ( !isEnd1 )
vertexLength = -vertexLength;
GCPnts_AbscissaPoint Discret(theC3d, vertexLength, l);
if ( Discret.IsDone() ) {
if ( nPar == 0 )
theParameters.push_back( Discret.Parameter());
else {
double L = GCPnts_AbscissaPoint::Length( theC3d, theParameters.back(), l);
if ( vertexLength < L / 2.0 )
theParameters.push_back( Discret.Parameter());
else
compensateError(0, vertexLength, f, l, theLength, theC3d, theParameters, true );
}
}
}
else else
{ {
// recompute params between the last segment and a middle one. // recompute params between the last segment and a middle one.