#ifndef StdMeshers_Array2OfNode_HeaderFile
#define StdMeshers_Array2OfNode_HeaderFile
typedef const SMDS_MeshNode* SMDS_MeshNodePtr;
-DEFINE_BASECOLLECTION (StdMeshers_BaseCollectionNodePtr, SMDS_MeshNodePtr)
-DEFINE_ARRAY2(StdMeshers_Array2OfNode,
- StdMeshers_BaseCollectionNodePtr, SMDS_MeshNodePtr)
+typedef NCollection_Array2<SMDS_MeshNodePtr> StdMeshers_Array2OfNode;
#endif
using namespace std;
}
}
- return isOk;
+ error( StdMeshers_ViscousLayers2D::CheckHypothesis( aMesh, aShape, aStatus ));
+
+ return aStatus == HYP_OK;
}
//=============================================================================
"two opposite sides should have same number of segments, "
"but actual number of segments is different on all sides. "
"'Standard' transion has been used.");
- else
+ else if ( ! ( n1 == n3 && n2 == n4 ))
error( COMPERR_WARNING,
"To use 'Reduced' transition, "
"two opposite sides should have an even difference in number of segments. "
{
list< TopoDS_Edge > sideEdges;
TopoDS_Vertex nextSideV = corners[( iSide + 1 - nbUsedDegen ) % corners.size() ];
- while ( edgeIt != edges.end() &&
- !nextSideV.IsSame( myHelper->IthVertex( 0, *edgeIt )))
+ bool nextSideVReached = false;
+ do
{
- if ( SMESH_Algo::isDegenerated( *edgeIt ) )
+ const TopoDS_Edge& edge = *edgeIt;
+ nextSideVReached = nextSideV.IsSame( myHelper->IthVertex( 1, edge ));
+ if ( SMESH_Algo::isDegenerated( edge ))
{
- if ( myNeedSmooth )
- {
- ++edgeIt; // no side on the degenerated EDGE
- }
- else
+ if ( !myNeedSmooth ) // need to make a side on a degen edge
{
if ( sideEdges.empty() )
{
+ sideEdges.push_back( edge );
++nbUsedDegen;
- sideEdges.push_back( *edgeIt++ ); // a degenerated side
- break;
+ nextSideVReached = true;
}
else
{
- break; // do not append a degenerated EDGE to a regular side
+ break;
}
}
}
else
{
- sideEdges.push_back( *edgeIt++ );
+ sideEdges.push_back( edge );
}
+ ++edgeIt;
}
+ while ( edgeIt != edges.end() && !nextSideVReached );
+
if ( !sideEdges.empty() )
{
- quad->side.push_back( StdMeshers_FaceSide::New( F, sideEdges, &aMesh, iSide < QUAD_TOP_SIDE,
- ignoreMediumNodes, myProxyMesh ));
- ++iSide;
- }
- else if ( !SMESH_Algo::isDegenerated( *edgeIt ) && // closed EDGE
- myHelper->IthVertex( 0, *edgeIt ).IsSame( myHelper->IthVertex( 1, *edgeIt )))
- {
- quad->side.push_back( StdMeshers_FaceSide::New( F, *edgeIt++, &aMesh, iSide < QUAD_TOP_SIDE,
- ignoreMediumNodes, myProxyMesh));
+ quad->side.push_back
+ ( StdMeshers_FaceSide::New( F, sideEdges, &aMesh, iSide < QUAD_TOP_SIDE,
+ ignoreMediumNodes, myProxyMesh ));
++iSide;
}
if ( quad->side.size() == 4 )
int iPrev = myHelper->WrapIndex( i-1, wire->NbEdges() );
const TopoDS_Edge& e1 = wire->Edge( iPrev );
const TopoDS_Edge& e2 = wire->Edge( i );
- double angle = myHelper->GetAngle( e1, e2, geomFace );
- if ( maxAngle < angle && angle < 0.9 * M_PI )
+ double angle = myHelper->GetAngle( e1, e2, geomFace, wire->FirstVertex( i ));
+ if (( maxAngle < angle ) &&
+ ( 5.* M_PI/180 < angle && angle < 175.* M_PI/180 ))
{
maxAngle = angle;
iVertex = i;
TopoDS_Vertex v = helper.IthVertex( 0, *edge );
if ( !theConsiderMesh || SMESH_Algo::VertexNode( v, helper.GetMeshDS() ))
{
- double angle = SMESH_MesherHelper::GetAngle( prevE, *edge, theFace );
+ double angle = SMESH_MesherHelper::GetAngle( prevE, *edge, theFace, v );
vertexByAngle.insert( make_pair( angle, v ));
angleByVertex.Bind( v, angle );
}
if ( nbCorners == 3 )
vMap.Add( triaVertex );
multimap<double, TopoDS_Vertex>::reverse_iterator a2v = vertexByAngle.rbegin();
- for ( ; a2v != vertexByAngle.rend() && vMap.Extent() < nbCorners; ++a2v )
+ for ( int iC = 0; a2v != vertexByAngle.rend() && iC < nbCorners; ++a2v, ++iC )
vMap.Add( (*a2v).second );
// check if there are possible variations in choosing corners