ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-16 03:50:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

021860: EDF 2196 SMESH : Create all the groups in an extrusion operation

Browse Source
This commit is contained in:
eap 2013-01-11 12:00:35 +00:00
parent ea7f54796a
commit 8d0826c197
1 changed files with 77 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
src/SMESH/SMESH_MeshEditor.cxx
View File

@ -97,6 +97,8 @@
#include <algorithm> #include <algorithm>
#include <sstream> #include <sstream>
#include <boost/tuple/tuple.hpp>
#include <Standard_Failure.hxx> #include <Standard_Failure.hxx>
#include <Standard_ErrorHandler.hxx> #include <Standard_ErrorHandler.hxx>
@ -4169,7 +4171,7 @@ void SMESH_MeshEditor::makeWalls (TNodeOfNodeListMap & mapNewNodes,
vecNewNodes[ 1 ]->second.back())) { vecNewNodes[ 1 ]->second.back())) {
myLastCreatedElems.Append(aMesh->AddEdge(vecNewNodes[ 0 ]->second.back(), myLastCreatedElems.Append(aMesh->AddEdge(vecNewNodes[ 0 ]->second.back(),
vecNewNodes[ 1 ]->second.back())); vecNewNodes[ 1 ]->second.back()));
srcElements.Append( myLastCreatedElems.Last() ); srcElements.Append( elem );
} }
} }
else { else {
@ -4179,7 +4181,7 @@ void SMESH_MeshEditor::makeWalls (TNodeOfNodeListMap & mapNewNodes,
myLastCreatedElems.Append(aMesh->AddEdge(vecNewNodes[ 0 ]->second.back(), myLastCreatedElems.Append(aMesh->AddEdge(vecNewNodes[ 0 ]->second.back(),
vecNewNodes[ 1 ]->second.back(), vecNewNodes[ 1 ]->second.back(),
vecNewNodes[ 2 ]->second.back())); vecNewNodes[ 2 ]->second.back()));
srcElements.Append( myLastCreatedElems.Last() ); srcElements.Append( elem );
} }
} }
} }
@ -4201,19 +4203,20 @@ void SMESH_MeshEditor::makeWalls (TNodeOfNodeListMap & mapNewNodes,
int iNext = ( iNode + 1 == nbNodes ) ? 0 : iNode + 1; int iNext = ( iNode + 1 == nbNodes ) ? 0 : iNode + 1;
const SMDS_MeshNode* n1 = vecNewNodes[ iNode ]->first; const SMDS_MeshNode* n1 = vecNewNodes[ iNode ]->first;
const SMDS_MeshNode* n2 = vecNewNodes[ iNext ]->first; const SMDS_MeshNode* n2 = vecNewNodes[ iNext ]->first;
// check if a link is free // check if a link n1-n2 is free
if ( ! SMESH_MeshEditor::FindFaceInSet ( n1, n2, elemSet, avoidSet )) { if ( ! SMESH_MeshEditor::FindFaceInSet ( n1, n2, elemSet, avoidSet )) {
hasFreeLinks = true; hasFreeLinks = true;
// make an edge and a ceiling for a new edge // make a new edge and a ceiling for a new edge
if ( !aMesh->FindEdge( n1, n2 )) { const SMDS_MeshElement* edge;
myLastCreatedElems.Append(aMesh->AddEdge( n1, n2 )); // free link edge if ( ! ( edge = aMesh->FindEdge( n1, n2 ))) {
myLastCreatedElems.Append( edge = aMesh->AddEdge( n1, n2 )); // free link edge
srcElements.Append( myLastCreatedElems.Last() ); srcElements.Append( myLastCreatedElems.Last() );
} }
n1 = vecNewNodes[ iNode ]->second.back(); n1 = vecNewNodes[ iNode ]->second.back();
n2 = vecNewNodes[ iNext ]->second.back(); n2 = vecNewNodes[ iNext ]->second.back();
if ( !aMesh->FindEdge( n1, n2 )) { if ( !aMesh->FindEdge( n1, n2 )) {
myLastCreatedElems.Append(aMesh->AddEdge( n1, n2 )); // ceiling edge myLastCreatedElems.Append(aMesh->AddEdge( n1, n2 )); // new edge ceiling
srcElements.Append( myLastCreatedElems.Last() ); srcElements.Append( edge );
} }
} }
} }
@ -4235,14 +4238,14 @@ void SMESH_MeshEditor::makeWalls (TNodeOfNodeListMap & mapNewNodes,
// find medium node // find medium node
if ( !aMesh->FindEdge( n1, n2, n3 )) { if ( !aMesh->FindEdge( n1, n2, n3 )) {
myLastCreatedElems.Append(aMesh->AddEdge( n1, n2, n3 )); // free link edge myLastCreatedElems.Append(aMesh->AddEdge( n1, n2, n3 )); // free link edge
srcElements.Append( myLastCreatedElems.Last() ); srcElements.Append( elem );
} }
n1 = vecNewNodes[ iNode ]->second.back(); n1 = vecNewNodes[ iNode ]->second.back();
n2 = vecNewNodes[ iNext ]->second.back(); n2 = vecNewNodes[ iNext ]->second.back();
n3 = vecNewNodes[ iNode+nbn ]->second.back(); n3 = vecNewNodes[ iNode+nbn ]->second.back();
if ( !aMesh->FindEdge( n1, n2, n3 )) { if ( !aMesh->FindEdge( n1, n2, n3 )) {
myLastCreatedElems.Append(aMesh->AddEdge( n1, n2, n3 )); // ceiling edge myLastCreatedElems.Append(aMesh->AddEdge( n1, n2, n3 )); // ceiling edge
srcElements.Append( myLastCreatedElems.Last() ); srcElements.Append( elem );
} }
} }
} }
@ -4498,7 +4501,7 @@ void SMESH_MeshEditor::makeWalls (TNodeOfNodeListMap & mapNewNodes,
} }
while ( srcElements.Length() < myLastCreatedElems.Length() ) while ( srcElements.Length() < myLastCreatedElems.Length() )
srcElements.Append( myLastCreatedElems.Last() ); srcElements.Append( elem );
} }
} // loop on swept elements } // loop on swept elements
} }
@ -6001,8 +6004,10 @@ SMESH_MeshEditor::generateGroups(const SMESH_SequenceOfElemPtr& nodeGens,
// Sort existing groups by types and collect their names // Sort existing groups by types and collect their names
// to store an old group and a generated new one // to store an old group and a generated new ones
typedef pair< SMESHDS_GroupBase*, SMESHDS_Group* > TOldNewGroup; using boost::tuple;
using boost::make_tuple;
typedef tuple< SMESHDS_GroupBase*, SMESHDS_Group*, SMESHDS_Group* > TOldNewGroup;
vector< list< TOldNewGroup > > groupsByType( SMDSAbs_NbElementTypes ); vector< list< TOldNewGroup > > groupsByType( SMDSAbs_NbElementTypes );
vector< TOldNewGroup* > orderedOldNewGroups; // in order of old groups vector< TOldNewGroup* > orderedOldNewGroups; // in order of old groups
// group names // group names
@ -6018,11 +6023,12 @@ SMESH_MeshEditor::generateGroups(const SMESH_SequenceOfElemPtr& nodeGens,
if ( !group ) continue; if ( !group ) continue;
SMESHDS_GroupBase* groupDS = group->GetGroupDS(); SMESHDS_GroupBase* groupDS = group->GetGroupDS();
if ( !groupDS || groupDS->IsEmpty() ) continue; if ( !groupDS || groupDS->IsEmpty() ) continue;
groupNames.insert( group->GetName() ); groupNames.insert ( group->GetName() );
groupDS->SetStoreName( group->GetName() ); groupDS->SetStoreName( group->GetName() );
SMESHDS_Group* newGroup = new SMESHDS_Group( newGroupID++, mesh->GetMeshDS(), const SMDSAbs_ElementType type = groupDS->GetType();
groupDS->GetType() ); SMESHDS_Group* newGroup = new SMESHDS_Group( newGroupID++, mesh->GetMeshDS(), type );
groupsByType[ groupDS->GetType() ].push_back( make_pair( groupDS, newGroup )); SMESHDS_Group* newTopGroup = new SMESHDS_Group( newGroupID++, mesh->GetMeshDS(), type );
groupsByType[ groupDS->GetType() ].push_back( make_tuple( groupDS, newGroup, newTopGroup ));
orderedOldNewGroups.push_back( & groupsByType[ groupDS->GetType() ].back() ); orderedOldNewGroups.push_back( & groupsByType[ groupDS->GetType() ].back() );
} }
@ -6033,7 +6039,7 @@ SMESH_MeshEditor::generateGroups(const SMESH_SequenceOfElemPtr& nodeGens,
const SMESH_SequenceOfElemPtr& gens = isNodes ? nodeGens : elemGens; const SMESH_SequenceOfElemPtr& gens = isNodes ? nodeGens : elemGens;
const SMESH_SequenceOfElemPtr& elems = isNodes ? myLastCreatedNodes : myLastCreatedElems; const SMESH_SequenceOfElemPtr& elems = isNodes ? myLastCreatedNodes : myLastCreatedElems;
if ( gens.Length() != elems.Length() ) if ( gens.Length() != elems.Length() )
throw SALOME_Exception(LOCALIZED("invalid args")); throw SALOME_Exception("SMESH_MeshEditor::generateGroups(): invalid args");
// loop on created elements // loop on created elements
for (int iElem = 1; iElem <= elems.Length(); ++iElem ) for (int iElem = 1; iElem <= elems.Length(); ++iElem )
@ -6049,7 +6055,7 @@ SMESH_MeshEditor::generateGroups(const SMESH_SequenceOfElemPtr& nodeGens,
++iElem; // skip all elements made by sourceElem ++iElem; // skip all elements made by sourceElem
continue; continue;
} }
// collect all elements made by sourceElem // collect all elements made by the iElem-th sourceElem
list< const SMDS_MeshElement* > resultElems; list< const SMDS_MeshElement* > resultElems;
if ( const SMDS_MeshElement* resElem = elems( iElem )) if ( const SMDS_MeshElement* resElem = elems( iElem ))
if ( resElem != sourceElem ) if ( resElem != sourceElem )
@ -6063,14 +6069,25 @@ SMESH_MeshEditor::generateGroups(const SMESH_SequenceOfElemPtr& nodeGens,
list< TOldNewGroup >::iterator gOldNew, gLast = groupsOldNew.end(); list< TOldNewGroup >::iterator gOldNew, gLast = groupsOldNew.end();
for ( gOldNew = groupsOldNew.begin(); gOldNew != gLast; ++gOldNew ) for ( gOldNew = groupsOldNew.begin(); gOldNew != gLast; ++gOldNew )
{ {
SMESHDS_GroupBase* oldGroup = gOldNew->first; SMESHDS_GroupBase* oldGroup = gOldNew->get<0>();
if ( oldGroup->Contains( sourceElem )) // sourceElem is in oldGroup if ( oldGroup->Contains( sourceElem )) // sourceElem is in oldGroup
{ {
// fill in a new group // fill in a new group
SMDS_MeshGroup & newGroup = gOldNew->second->SMDSGroup(); SMDS_MeshGroup & newGroup = gOldNew->get<1>()->SMDSGroup();
list< const SMDS_MeshElement* > rejectedElems; // elements of other type
list< const SMDS_MeshElement* >::iterator resLast = resultElems.end(), resElemIt; list< const SMDS_MeshElement* >::iterator resLast = resultElems.end(), resElemIt;
for ( resElemIt = resultElems.begin(); resElemIt != resLast; ++resElemIt ) for ( resElemIt = resultElems.begin(); resElemIt != resLast; ++resElemIt )
newGroup.Add( *resElemIt ); if ( !newGroup.Add( *resElemIt ))
rejectedElems.push_back( *resElemIt );
// fill "top" group
if ( !rejectedElems.empty() )
{
SMDS_MeshGroup & newTopGroup = gOldNew->get<2>()->SMDSGroup();
resLast = rejectedElems.end();
for ( resElemIt = rejectedElems.begin(); resElemIt != resLast; ++resElemIt )
!newTopGroup.Add( *resElemIt );
}
} }
} }
} // loop on created elements } // loop on created elements
@ -6078,35 +6095,52 @@ SMESH_MeshEditor::generateGroups(const SMESH_SequenceOfElemPtr& nodeGens,
// Create new SMESH_Groups from SMESHDS_Groups and remove empty SMESHDS_Groups // Create new SMESH_Groups from SMESHDS_Groups and remove empty SMESHDS_Groups
list<int> topGrouIds;
for ( size_t i = 0; i < orderedOldNewGroups.size(); ++i ) for ( size_t i = 0; i < orderedOldNewGroups.size(); ++i )
{ {
SMESHDS_GroupBase* oldGroupDS = orderedOldNewGroups[i]->first; SMESHDS_GroupBase* oldGroupDS = orderedOldNewGroups[i]->get<0>();
SMESHDS_Group* newGroupDS = orderedOldNewGroups[i]->second; SMESHDS_Group* newGroups[2] = { orderedOldNewGroups[i]->get<1>(),
if ( newGroupDS->IsEmpty() ) orderedOldNewGroups[i]->get<2>() };
const int nbNewGroups = !newGroups[0]->IsEmpty() + !newGroups[1]->IsEmpty();
for ( int is2nd = 0; is2nd < 2; ++is2nd )
{ {
mesh->GetMeshDS()->RemoveGroup( newGroupDS ); SMESHDS_Group* newGroupDS = newGroups[ is2nd ];
} if ( newGroupDS->IsEmpty() )
else {
{ mesh->GetMeshDS()->RemoveGroup( newGroupDS );
// make a name
string name = oldGroupDS->GetStoreName();
if ( !targetMesh ) {
name += "_";
name += postfix;
int nb = 1;
while ( !groupNames.insert( name ).second ) // name exists
name = SMESH_Comment( oldGroupDS->GetStoreName() ) << "_" << postfix << "_" << nb++;
} }
newGroupDS->SetStoreName( name.c_str() ); else
{
// set group type
newGroupDS->SetType( newGroupDS->GetElements()->next()->GetType() );
// make a SMESH_Groups // make a name
mesh->AddGroup( newGroupDS ); const bool isTop = ( nbNewGroups == 2 &&
newGroupIDs->push_back( newGroupDS->GetID() ); newGroupDS->GetType() == oldGroupDS->GetType() );
string name = oldGroupDS->GetStoreName();
if ( !targetMesh ) {
string suffix = ( isTop ? "top": postfix.c_str() );
name += "_";
name += suffix;
int nb = 1;
while ( !groupNames.insert( name ).second ) // name exists
name = SMESH_Comment( oldGroupDS->GetStoreName() ) << "_" << suffix << "_" << nb++;
}
else if ( isTop ) {
name += "_top";
}
newGroupDS->SetStoreName( name.c_str() );
// set group type // make a SMESH_Groups
newGroupDS->SetType( newGroupDS->GetElements()->next()->GetType() ); mesh->AddGroup( newGroupDS );
if ( isTop )
topGrouIds.push_back( newGroupDS->GetID() );
else
newGroupIDs->push_back( newGroupDS->GetID() );
}
} }
} }
newGroupIDs->splice( newGroupIDs->end(), topGrouIds );
return newGroupIDs; return newGroupIDs;
} }