ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-14 02:30:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug 10020. Now NumberOfSegments hypothesis allow scale distribution with scale factor = 1.

Browse Source
This commit is contained in:
jfa 2006-03-06 13:18:20 +00:00
parent 1817b67921
commit 269e202f6b
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/StdMeshers/StdMeshers_NumberOfSegments.cxx
View File

@ -170,8 +170,8 @@ void StdMeshers_NumberOfSegments::SetScaleFactor(double scaleFactor)
throw SALOME_Exception(LOCALIZED("not a scale distribution"));
if (scaleFactor < PRECISION)
throw SALOME_Exception(LOCALIZED("scale factor must be positive"));
if (fabs(scaleFactor - 1.0) < PRECISION)
throw SALOME_Exception(LOCALIZED("scale factor must not be equal to 1"));
//if (fabs(scaleFactor - 1.0) < PRECISION)
// throw SALOME_Exception(LOCALIZED("scale factor must not be equal to 1"));
if (fabs(_scaleFactor - scaleFactor) > PRECISION)
{

28
src/StdMeshers/StdMeshers_Regular_1D.cxx
View File

@ -354,17 +354,27 @@ bool StdMeshers_Regular_1D::computeInternalParameters(const TopoDS_Edge& theEdge
{
case StdMeshers_NumberOfSegments::DT_Scale:
{
int NbSegm = _ivalue[ NB_SEGMENTS_IND ];
double scale = _value[ SCALE_FACTOR_IND ];
if ( theReverse )
scale = 1. / scale;
double alpha = pow( scale , 1.0 / (_ivalue[ NB_SEGMENTS_IND ] - 1));
double factor = (l - f) / (1 - pow( alpha,_ivalue[ NB_SEGMENTS_IND ]));
int i, NbPoints = 1 + _ivalue[ NB_SEGMENTS_IND ];
for ( i = 2; i < NbPoints; i++ )
{
double param = f + factor * (1 - pow(alpha, i - 1));
theParams.push_back( param );
if (fabs(scale - 1.0) < Precision::Confusion()) {
// special case to avoid division on zero
for (int i = 1; i < NbSegm; i++) {
double param = f + (l - f) * i / NbSegm;
theParams.push_back( param );
}
} else {
// general case of scale distribution
if ( theReverse )
scale = 1.0 / scale;
double alpha = pow(scale, 1.0 / (NbSegm - 1));
double factor = (l - f) / (1.0 - pow(alpha, NbSegm));
for (int i = 1; i < NbSegm; i++) {
double param = f + factor * (1.0 - pow(alpha, i));
theParams.push_back( param );
}
}
return true;
}