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

fix PAL15141 (Hypothesis "Composite side discretization" does not work)

Browse Source 
search also backward from the first edge in a wire
This commit is contained in:
eap 2007-03-05 16:15:11 +00:00
parent a8ab9d5bcc
commit 7e6987663f
2 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/StdMeshers/StdMeshers_Quadrangle_2D.cxx
View File

@ -137,8 +137,8 @@ bool StdMeshers_Quadrangle_2D::Compute (SMESH_Mesh& aMesh,
SMESHDS_Mesh * meshDS = aMesh.GetMeshDS(); SMESHDS_Mesh * meshDS = aMesh.GetMeshDS();
aMesh.GetSubMesh(aShape); aMesh.GetSubMesh(aShape);
myTool = new SMESH_MesherHelper(aMesh); SMESH_MesherHelper helper(aMesh);
std::auto_ptr<SMESH_MesherHelper> helperDeleter( myTool );// to delete helper at exit from Compute() myTool = &helper;
_quadraticMesh = myTool->IsQuadraticSubMesh(aShape); _quadraticMesh = myTool->IsQuadraticSubMesh(aShape);
@ -578,35 +578,54 @@ FaceQuadStruct* StdMeshers_Quadrangle_2D::CheckNbEdges(SMESH_Mesh & aMes
} }
FaceQuadStruct* quad = new FaceQuadStruct; FaceQuadStruct* quad = new FaceQuadStruct;
quad->uv_grid = 0; quad->uv_grid = 0;
for ( int i = 0; i < NB_SIDES; ++i ) quad->side.reserve(nbEdgesInWire.front());
quad->side[i] = 0;
int nbSides = 0; int nbSides = 0;
list< TopoDS_Edge >::iterator edgeIt = edges.begin(); list< TopoDS_Edge >::iterator edgeIt = edges.begin();
if ( nbEdgesInWire.front() == 4 ) { // exactly 4 edges if ( nbEdgesInWire.front() == 4 ) { // exactly 4 edges
for ( ; edgeIt != edges.end(); ++edgeIt, nbSides++ ) for ( ; edgeIt != edges.end(); ++edgeIt, nbSides++ )
quad->side[nbSides] = new StdMeshers_FaceSide(F, *edgeIt, &aMesh, quad->side.push_back( new StdMeshers_FaceSide(F, *edgeIt, &aMesh,
nbSides<TOP_SIDE, ignoreMediumNodes); nbSides<TOP_SIDE, ignoreMediumNodes));
} }
else if ( nbEdgesInWire.front() > 4 ) { // more than 4 edges - try to unite some else if ( nbEdgesInWire.front() > 4 ) { // more than 4 edges - try to unite some
list< TopoDS_Edge > sideEdges; list< TopoDS_Edge > sideEdges;
while ( edgeIt != edges.end()) { while ( !edges.empty()) {
sideEdges.clear(); sideEdges.clear();
sideEdges.push_back( *edgeIt++ ); sideEdges.splice( sideEdges.end(), edges, edges.begin()); // edges.front() -> sideEdges.end()
bool sameSide = true; bool sameSide = true;
while ( edgeIt != edges.end() && sameSide ) { while ( !edges.empty() && sameSide ) {
GeomAbs_Shape cont = SMESH_Algo::Continuity( sideEdges.back(), *edgeIt ); GeomAbs_Shape cont = SMESH_Algo::Continuity( sideEdges.back(), edges.front() );
sameSide = ( cont >= GeomAbs_C1 ); sameSide = ( cont >= GeomAbs_C1 );
if ( sameSide ) if ( sameSide )
sideEdges.push_back( *edgeIt++ ); sideEdges.splice( sideEdges.end(), edges, edges.begin());
} }
quad->side[nbSides] = new StdMeshers_FaceSide(F, sideEdges, &aMesh, if ( nbSides == 0 ) { // go backward from the first edge
nbSides<TOP_SIDE, ignoreMediumNodes); sameSide = true;
while ( !edges.empty() && sameSide ) {
GeomAbs_Shape cont = SMESH_Algo::Continuity( sideEdges.front(), edges.back() );
sameSide = ( cont >= GeomAbs_C1 );
if ( sameSide )
sideEdges.splice( sideEdges.begin(), edges, --edges.end());
}
}
quad->side.push_back( new StdMeshers_FaceSide(F, sideEdges, &aMesh,
nbSides<TOP_SIDE, ignoreMediumNodes));
++nbSides; ++nbSides;
} }
} }
if (nbSides != 4) { if (nbSides != 4) {
#ifdef _DEBUG_
cout << endl << "StdMeshers_Quadrangle_2D. Edge IDs of " << nbSides << " sides:";
for ( int i = 0; i < nbSides; ++i ) {
cout << " ( ";
for ( int e = 0; e < quad->side[i]->NbEdges(); ++e )
cout << myTool->GetMeshDS()->ShapeToIndex( quad->side[i]->Edge( e )) << " ";
cout << ")";
}
cout << endl;
#else
INFOS("face must have 4 edges / quadrangle"); INFOS("face must have 4 edges / quadrangle");
#endif
delete quad; delete quad;
quad = 0; quad = 0;
} }
@ -647,7 +666,7 @@ FaceQuadStruct *StdMeshers_Quadrangle_2D::CheckAnd2Dcompute
faceQuadStruct::~faceQuadStruct() faceQuadStruct::~faceQuadStruct()
{ {
for (int i = 0; i < 4; i++) { for (int i = 0; i < side.size(); i++) {
if (side[i]) delete side[i]; if (side[i]) delete side[i];
//if (uv_edges[i]) delete [] uv_edges[i]; //if (uv_edges[i]) delete [] uv_edges[i];
} }

2
src/StdMeshers/StdMeshers_Quadrangle_2D.hxx
View File

@ -47,7 +47,7 @@ typedef struct faceQuadStruct
{ {
//int nbPts[4]; //int nbPts[4];
//TopoDS_Edge edge[4]; //TopoDS_Edge edge[4];
StdMeshers_FaceSide* side[4]; vector< StdMeshers_FaceSide*> side;
//double first[4]; //double first[4];
//double last[4]; //double last[4];
//bool isEdgeForward[4]; //bool isEdgeForward[4];