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

Regression SALOME_TESTS/Grids/smesh/bugs_02/C9

Browse Source 
In updateDegenUV() set number of nodes on a degenerated side to be
same as on an opposite side ONLY IF myQuadType == QUAD_STANDARD
This commit is contained in:
eap 2013-12-05 11:26:24 +00:00
parent 3a98cb17c9
commit f24e7f0173
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/StdMeshers/StdMeshers_Quadrangle_2D.cxx
View File

@ -223,6 +223,8 @@ bool StdMeshers_Quadrangle_2D::Compute (SMESH_Mesh& aMesh,
return false; return false;
myQuadStruct = quad; myQuadStruct = quad;
updateDegenUV( quad );
enum { NOT_COMPUTED = -1, COMPUTE_FAILED = 0, COMPUTE_OK = 1 }; enum { NOT_COMPUTED = -1, COMPUTE_FAILED = 0, COMPUTE_OK = 1 };
int res = NOT_COMPUTED; int res = NOT_COMPUTED;
if (myQuadranglePreference) if (myQuadranglePreference)
@ -1231,8 +1233,6 @@ bool StdMeshers_Quadrangle_2D::setNormalizedGrid (SMESH_Mesh & aMesh,
// =down // =down
// //
updateDegenUV( quad );
int nbhoriz = Min(quad->side[0]->NbPoints(), quad->side[2]->NbPoints()); int nbhoriz = Min(quad->side[0]->NbPoints(), quad->side[2]->NbPoints());
int nbvertic = Min(quad->side[1]->NbPoints(), quad->side[3]->NbPoints()); int nbvertic = Min(quad->side[1]->NbPoints(), quad->side[3]->NbPoints());
@ -1418,8 +1418,6 @@ bool StdMeshers_Quadrangle_2D::computeQuadPref (SMESH_Mesh & aMesh,
bool WisF = true; bool WisF = true;
int i,j,geomFaceID = meshDS->ShapeToIndex(aFace); int i,j,geomFaceID = meshDS->ShapeToIndex(aFace);
updateDegenUV( quad );
int nb = quad->side[0]->NbPoints(); int nb = quad->side[0]->NbPoints();
int nr = quad->side[1]->NbPoints(); int nr = quad->side[1]->NbPoints();
int nt = quad->side[2]->NbPoints(); int nt = quad->side[2]->NbPoints();
@ -2402,8 +2400,6 @@ bool StdMeshers_Quadrangle_2D::computeReduced (SMESH_Mesh & aMesh,
if (uv_eb.size() != nb || uv_er.size() != nr || uv_et.size() != nt || uv_el.size() != nl) if (uv_eb.size() != nb || uv_er.size() != nr || uv_et.size() != nt || uv_el.size() != nl)
return error(COMPERR_BAD_INPUT_MESH); return error(COMPERR_BAD_INPUT_MESH);
updateDegenUV( quad );
// arrays for normalized params // arrays for normalized params
TColStd_SequenceOfReal npb, npr, npt, npl; TColStd_SequenceOfReal npb, npr, npt, npl;
for (j = 0; j < nb; j++) { for (j = 0; j < nb; j++) {
@ -3272,7 +3268,7 @@ void StdMeshers_Quadrangle_2D::updateDegenUV(FaceQuadStruct::Ptr quad)
uv1.v = uv2.v = 0.5 * ( uv1.v + uv2.v ); uv1.v = uv2.v = 0.5 * ( uv1.v + uv2.v );
} }
else if ( quad->side.size() == 4 ) else if ( quad->side.size() == 4 && myQuadType == QUAD_STANDARD)
// Set number of nodes on a degenerated side to be same as on an opposite side // Set number of nodes on a degenerated side to be same as on an opposite side
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------