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

22613: EDF 8419 SMESH: 1d hypothesis is not applied correctly with 3Dextrusion

Browse Source 
Project vertical distribution only if (1) no hyp defined or (2) defined hyp
  provides incorrect nb of segments.
This commit is contained in:
eap 2014-06-30 16:07:18 +04:00
parent b3da9e90b4
commit 6440fc57c2
1 changed files with 59 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
src/StdMeshers/StdMeshers_Prism_3D.cxx
View File

@ -190,7 +190,7 @@ namespace {
( sm->NbElements() > 0 ) && ( sm->NbElements() > 0 ) &&
( !theHelper.IsSameElemGeometry( sm, SMDSGeom_QUADRANGLE ) )) ( !theHelper.IsSameElemGeometry( sm, SMDSGeom_QUADRANGLE ) ))
{ {
faceFound; faceFound = true;
break; break;
} }
if ( !faceFound ) if ( !faceFound )
@ -1263,34 +1263,36 @@ bool StdMeshers_Prism_3D::computeWalls(const Prism_3D::TPrismTopo& thePrism)
TProjction1dAlgo* projector1D = TProjction1dAlgo::instance( this ); TProjction1dAlgo* projector1D = TProjction1dAlgo::instance( this );
StdMeshers_Quadrangle_2D* quadAlgo = TQuadrangleAlgo::instance( this, myHelper ); StdMeshers_Quadrangle_2D* quadAlgo = TQuadrangleAlgo::instance( this, myHelper );
SMESH_HypoFilter hyp1dFilter( SMESH_HypoFilter::IsAlgo(),/*not=*/true); // SMESH_HypoFilter hyp1dFilter( SMESH_HypoFilter::IsAlgo(),/*not=*/true);
hyp1dFilter.And( SMESH_HypoFilter::HasDim( 1 )); // hyp1dFilter.And( SMESH_HypoFilter::HasDim( 1 ));
hyp1dFilter.And( SMESH_HypoFilter::IsMoreLocalThan( thePrism.myShape3D, *mesh )); // hyp1dFilter.And( SMESH_HypoFilter::IsMoreLocalThan( thePrism.myShape3D, *mesh ));
// Discretize equally 'vertical' EDGEs // Discretize equally 'vertical' EDGEs
// ----------------------------------- // -----------------------------------
// find source FACE sides for projection: either already computed ones or // find source FACE sides for projection: either already computed ones or
// the 'most composite' ones // the 'most composite' ones
multimap< int, int > wgt2quad; const size_t nbWalls = thePrism.myWallQuads.size();
for ( size_t iW = 0; iW != thePrism.myWallQuads.size(); ++iW ) vector< int > wgt( nbWalls, 0 ); // "weight" of a wall
for ( size_t iW = 0; iW != nbWalls; ++iW )
{ {
Prism_3D::TQuadList::const_iterator quad = thePrism.myWallQuads[iW].begin(); Prism_3D::TQuadList::const_iterator quad = thePrism.myWallQuads[iW].begin();
int wgt = 0; // "weight"
for ( ; quad != thePrism.myWallQuads[iW].end(); ++quad ) for ( ; quad != thePrism.myWallQuads[iW].end(); ++quad )
{ {
StdMeshers_FaceSidePtr lftSide = (*quad)->side[ QUAD_LEFT_SIDE ]; StdMeshers_FaceSidePtr lftSide = (*quad)->side[ QUAD_LEFT_SIDE ];
for ( int i = 0; i < lftSide->NbEdges(); ++i ) for ( int i = 0; i < lftSide->NbEdges(); ++i )
{ {
++wgt; ++wgt[ iW ];
const TopoDS_Edge& E = lftSide->Edge(i); const TopoDS_Edge& E = lftSide->Edge(i);
if ( mesh->GetSubMesh( E )->IsMeshComputed() ) if ( mesh->GetSubMesh( E )->IsMeshComputed() )
wgt += 10; {
else if ( mesh->GetHypothesis( E, hyp1dFilter, true )) // local hypothesis! wgt[ iW ] += 100;
wgt += 100; wgt[ myHelper->WrapIndex( iW+1, nbWalls)] += 10;
wgt[ myHelper->WrapIndex( iW-1, nbWalls)] += 10;
}
// else if ( mesh->GetHypothesis( E, hyp1dFilter, true )) // local hypothesis!
// wgt += 100;
} }
} }
wgt2quad.insert( make_pair( wgt, iW ));
// in quadratic mesh, pass ignoreMediumNodes to quad sides // in quadratic mesh, pass ignoreMediumNodes to quad sides
if ( myHelper->GetIsQuadratic() ) if ( myHelper->GetIsQuadratic() )
{ {
@ -1300,6 +1302,9 @@ bool StdMeshers_Prism_3D::computeWalls(const Prism_3D::TPrismTopo& thePrism)
(*quad)->side[ i ].grid->SetIgnoreMediumNodes( true ); (*quad)->side[ i ].grid->SetIgnoreMediumNodes( true );
} }
} }
multimap< int, int > wgt2quad;
for ( size_t iW = 0; iW != nbWalls; ++iW )
wgt2quad.insert( make_pair( wgt[ iW ], iW ));
// Project 'vertical' EDGEs, from left to right // Project 'vertical' EDGEs, from left to right
multimap< int, int >::reverse_iterator w2q = wgt2quad.rbegin(); multimap< int, int >::reverse_iterator w2q = wgt2quad.rbegin();
@ -1348,7 +1353,11 @@ bool StdMeshers_Prism_3D::computeWalls(const Prism_3D::TPrismTopo& thePrism)
{ {
const TopoDS_Edge& tgtE = rgtSide->Edge(i); const TopoDS_Edge& tgtE = rgtSide->Edge(i);
SMESH_subMesh* tgtSM = mesh->GetSubMesh( tgtE ); SMESH_subMesh* tgtSM = mesh->GetSubMesh( tgtE );
if (( isTgtEdgeComputed[ i ] = tgtSM->IsMeshComputed() )) { if ( !( isTgtEdgeComputed[ i ] = tgtSM->IsMeshComputed() )) {
tgtSM->ComputeSubMeshStateEngine( SMESH_subMesh::COMPUTE );
tgtSM->ComputeStateEngine ( SMESH_subMesh::COMPUTE );
}
if ( tgtSM->IsMeshComputed() ) {
++nbTgtMeshed; ++nbTgtMeshed;
nbTgtSegments += tgtSM->GetSubMeshDS()->NbElements(); nbTgtSegments += tgtSM->GetSubMeshDS()->NbElements();
} }
@ -1357,16 +1366,33 @@ bool StdMeshers_Prism_3D::computeWalls(const Prism_3D::TPrismTopo& thePrism)
{ {
if ( nbTgtSegments != nbSrcSegments ) if ( nbTgtSegments != nbSrcSegments )
{ {
for ( int i = 0; i < lftSide->NbEdges(); ++i ) bool badMeshRemoved = false;
addBadInputElements( meshDS->MeshElements( lftSide->Edge( i ))); // remove just computed segments
for ( int i = 0; i < rgtSide->NbEdges(); ++i ) for ( int i = 0; i < rgtSide->NbEdges(); ++i )
addBadInputElements( meshDS->MeshElements( rgtSide->Edge( i ))); if ( !isTgtEdgeComputed[ i ])
return toSM( error( TCom("Different nb of segment on logically vertical edges #") {
<< shapeID( lftSide->Edge(0) ) << " and #" const TopoDS_Edge& tgtE = rgtSide->Edge(i);
<< shapeID( rgtSide->Edge(0) ) << ": " SMESH_subMesh* tgtSM = mesh->GetSubMesh( tgtE );
<< nbSrcSegments << " != " << nbTgtSegments )); tgtSM->ComputeStateEngine( SMESH_subMesh::CLEAN );
badMeshRemoved = true;
nbTgtMeshed--;
}
if ( !badMeshRemoved )
{
for ( int i = 0; i < lftSide->NbEdges(); ++i )
addBadInputElements( meshDS->MeshElements( lftSide->Edge( i )));
for ( int i = 0; i < rgtSide->NbEdges(); ++i )
addBadInputElements( meshDS->MeshElements( rgtSide->Edge( i )));
return toSM( error( TCom("Different nb of segment on logically vertical edges #")
<< shapeID( lftSide->Edge(0) ) << " and #"
<< shapeID( rgtSide->Edge(0) ) << ": "
<< nbSrcSegments << " != " << nbTgtSegments ));
}
}
else // if ( nbTgtSegments == nbSrcSegments )
{
continue;
} }
continue;
} }
// Compute 'vertical projection' // Compute 'vertical projection'
if ( nbTgtMeshed == 0 ) if ( nbTgtMeshed == 0 )
@ -1408,13 +1434,22 @@ bool StdMeshers_Prism_3D::computeWalls(const Prism_3D::TPrismTopo& thePrism)
// new nodes are on different EDGEs; put one of them on VERTEX // new nodes are on different EDGEs; put one of them on VERTEX
const int edgeIndex = rgtSide->EdgeIndex( srcNodeStr[ iN-1 ].normParam ); const int edgeIndex = rgtSide->EdgeIndex( srcNodeStr[ iN-1 ].normParam );
const double vertexParam = rgtSide->LastParameter( edgeIndex ); const double vertexParam = rgtSide->LastParameter( edgeIndex );
const gp_Pnt p = BRep_Tool::Pnt( rgtSide->LastVertex( edgeIndex )); TopoDS_Vertex vertex = rgtSide->LastVertex( edgeIndex );
const SMDS_MeshNode* vn = SMESH_Algo::VertexNode( vertex, meshDS );
const gp_Pnt p = BRep_Tool::Pnt( vertex );
const int isPrev = ( Abs( srcNodeStr[ iN-1 ].normParam - vertexParam ) < const int isPrev = ( Abs( srcNodeStr[ iN-1 ].normParam - vertexParam ) <
Abs( srcNodeStr[ iN ].normParam - vertexParam )); Abs( srcNodeStr[ iN ].normParam - vertexParam ));
meshDS->UnSetNodeOnShape( newNodes[ iN-isPrev ] ); meshDS->UnSetNodeOnShape( newNodes[ iN-isPrev ] );
meshDS->SetNodeOnVertex ( newNodes[ iN-isPrev ], rgtSide->LastVertex( edgeIndex )); meshDS->SetNodeOnVertex ( newNodes[ iN-isPrev ], vertex );
meshDS->MoveNode ( newNodes[ iN-isPrev ], p.X(), p.Y(), p.Z() ); meshDS->MoveNode ( newNodes[ iN-isPrev ], p.X(), p.Y(), p.Z() );
id2type.first = newNodes[ iN-(1-isPrev) ]->getshapeId(); id2type.first = newNodes[ iN-(1-isPrev) ]->getshapeId();
if ( vn )
{
SMESH_MeshEditor::TListOfListOfNodes lln( 1, list< const SMDS_MeshNode* >() );
lln.back().push_back ( vn );
lln.back().push_front( newNodes[ iN-isPrev ] ); // to keep
SMESH_MeshEditor( mesh ).MergeNodes( lln );
}
} }
SMDS_MeshElement* newEdge = myHelper->AddEdge( newNodes[ iN-1 ], newNodes[ iN ] ); SMDS_MeshElement* newEdge = myHelper->AddEdge( newNodes[ iN-1 ], newNodes[ iN ] );
meshDS->SetMeshElementOnShape( newEdge, id2type.first ); meshDS->SetMeshElementOnShape( newEdge, id2type.first );