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

PAL13460 (PAL EDF 301 force the mesh to go through a point)

Browse Source 
add generic method
     AddElement(const vector<const SMDS_MeshNode*> & node,
                const SMDSAbs_ElementType            type,
                const bool                           isPoly,
                const int                            ID=0)
This commit is contained in:
eap 2007-02-21 17:19:15 +00:00
parent 8a94b0bd1f
commit 3de06f4736
2 changed files with 177 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

255
src/SMESH/SMESH_MeshEditor.cxx
View File

@ -96,6 +96,137 @@ myMesh( theMesh )
{ {
} }
//=======================================================================
/*!
* \brief Add element
*/
//=======================================================================
SMDS_MeshElement*
SMESH_MeshEditor::AddElement(const vector<const SMDS_MeshNode*> & node,
const SMDSAbs_ElementType type,
const bool isPoly,
const int ID)
{
SMDS_MeshElement* e = 0;
int nbnode = node.size();
SMESHDS_Mesh* mesh = GetMeshDS();
switch ( type ) {
case SMDSAbs_Edge:
if ( nbnode == 2 )
if ( ID ) e = mesh->AddEdgeWithID(node[0], node[1], ID);
else e = mesh->AddEdge (node[0], node[1] );
else if ( nbnode == 3 )
if ( ID ) e = mesh->AddEdgeWithID(node[0], node[1], node[2], ID);
else e = mesh->AddEdge (node[0], node[1], node[2] );
break;
case SMDSAbs_Face:
if ( !isPoly ) {
if (nbnode == 3)
if ( ID ) e = mesh->AddFaceWithID(node[0], node[1], node[2], ID);
else e = mesh->AddFace (node[0], node[1], node[2] );
else if (nbnode == 4)
if ( ID ) e = mesh->AddFaceWithID(node[0], node[1], node[2], node[3], ID);
else e = mesh->AddFace (node[0], node[1], node[2], node[3] );
else if (nbnode == 6)
if ( ID ) e = mesh->AddFaceWithID(node[0], node[1], node[2], node[3],
node[4], node[5], ID);
else e = mesh->AddFace (node[0], node[1], node[2], node[3],
node[4], node[5] );
else if (nbnode == 8)
if ( ID ) e = mesh->AddFaceWithID(node[0], node[1], node[2], node[2],
node[3], node[4], node[5], node[2], ID);
else e = mesh->AddFace (node[0], node[1], node[2], node[2],
node[3], node[4], node[5], node[2] );
} else {
if ( ID ) e = mesh->AddPolygonalFaceWithID(node, ID);
else e = mesh->AddPolygonalFace (node );
}
break;
case SMDSAbs_Volume:
if ( !isPoly ) {
if (nbnode == 4)
if ( ID ) e = mesh->AddVolumeWithID(node[0], node[1], node[2], node[3], ID);
else e = mesh->AddVolume (node[0], node[1], node[2], node[3] );
else if (nbnode == 5)
if ( ID ) e = mesh->AddVolumeWithID(node[0], node[1], node[2], node[3],
node[4], ID);
else e = mesh->AddVolume (node[0], node[1], node[2], node[3],
node[4] );
else if (nbnode == 6)
if ( ID ) e = mesh->AddVolumeWithID(node[0], node[1], node[2], node[3],
node[4], node[5], ID);
else e = mesh->AddVolume (node[0], node[1], node[2], node[3],
node[4], node[5] );
else if (nbnode == 8)
if ( ID ) e = mesh->AddVolumeWithID(node[0], node[1], node[2], node[3],
node[4], node[5], node[6], node[7], ID);
else e = mesh->AddVolume (node[0], node[1], node[2], node[3],
node[4], node[5], node[6], node[7] );
else if (nbnode == 10)
if ( ID ) e = mesh->AddVolumeWithID(node[0], node[1], node[2], node[3],
node[4], node[5], node[6], node[7],
node[8], node[9], ID);
else e = mesh->AddVolume (node[0], node[1], node[2], node[3],
node[4], node[5], node[6], node[7],
node[8], node[9] );
else if (nbnode == 13)
if ( ID ) e = mesh->AddVolumeWithID(node[0], node[1], node[2], node[3],
node[4], node[5], node[6], node[7],
node[8], node[9], node[10],node[11],
node[12],ID);
else e = mesh->AddVolume (node[0], node[1], node[2], node[3],
node[4], node[5], node[6], node[7],
node[8], node[9], node[10],node[11],
node[12] );
else if (nbnode == 15)
if ( ID ) e = mesh->AddVolumeWithID(node[0], node[1], node[2], node[3],
node[4], node[5], node[6], node[7],
node[8], node[9], node[10],node[11],
node[12],node[13],node[14],ID);
else e = mesh->AddVolume (node[0], node[1], node[2], node[3],
node[4], node[5], node[6], node[7],
node[8], node[9], node[10],node[11],
node[12],node[13],node[14] );
else if (nbnode == 20)
if ( ID ) e = mesh->AddVolumeWithID(node[0], node[1], node[2], node[3],
node[4], node[5], node[6], node[7],
node[8], node[9], node[10],node[11],
node[12],node[13],node[14],node[15],
node[16],node[17],node[18],node[19],ID);
else e = mesh->AddVolume (node[0], node[1], node[2], node[3],
node[4], node[5], node[6], node[7],
node[8], node[9], node[10],node[11],
node[12],node[13],node[14],node[15],
node[16],node[17],node[18],node[19] );
}
}
return e;
}
//=======================================================================
/*!
* \brief Add element
*/
//=======================================================================
SMDS_MeshElement* SMESH_MeshEditor::AddElement(const vector<int> & nodeIDs,
const SMDSAbs_ElementType type,
const bool isPoly,
const int ID)
{
vector<const SMDS_MeshNode*> nodes;
nodes.reserve( nodeIDs.size() );
vector<int>::const_iterator id = nodeIDs.begin();
while ( id != nodeIDs.end() ) {
if ( const SMDS_MeshNode* node = GetMeshDS()->FindNode( *id++ ))
nodes.push_back( node );
else
return 0;
}
return AddElement( nodes, type, isPoly, ID );
}
//======================================================================= //=======================================================================
//function : Remove //function : Remove
//purpose : Remove a node or an element. //purpose : Remove a node or an element.
@ -3191,7 +3322,8 @@ void SMESH_MeshEditor::RotationSweep(TIDSortedElemSet & theElems,
const gp_Ax1& theAxis, const gp_Ax1& theAxis,
const double theAngle, const double theAngle,
const int theNbSteps, const int theNbSteps,
const double theTol) const double theTol,
const bool theMakeWalls)
{ {
myLastCreatedElems.Clear(); myLastCreatedElems.Clear();
myLastCreatedNodes.Clear(); myLastCreatedNodes.Clear();
@ -3290,8 +3422,9 @@ void SMESH_MeshEditor::RotationSweep(TIDSortedElemSet & theElems,
sweepElement( aMesh, elem, newNodesItVec, newElemsMap[elem], theNbSteps, myLastCreatedElems ); sweepElement( aMesh, elem, newNodesItVec, newElemsMap[elem], theNbSteps, myLastCreatedElems );
} }
makeWalls( aMesh, mapNewNodes, newElemsMap, mapElemNewNodes, theElems, theNbSteps, myLastCreatedElems ); if ( theMakeWalls )
makeWalls( aMesh, mapNewNodes, newElemsMap, mapElemNewNodes,
theElems, theNbSteps, myLastCreatedElems );
} }
@ -4114,7 +4247,7 @@ void SMESH_MeshEditor::Transform (TIDSortedElemSet & theElems,
} }
// find transformed nodes // find transformed nodes
const SMDS_MeshNode* nodes[8]; vector<const SMDS_MeshNode*> nodes(nbNodes);
int iNode = 0; int iNode = 0;
SMDS_ElemIteratorPtr itN = elem->nodesIterator(); SMDS_ElemIteratorPtr itN = elem->nodesIterator();
while ( itN->more() ) { while ( itN->more() ) {
@ -4129,63 +4262,14 @@ void SMESH_MeshEditor::Transform (TIDSortedElemSet & theElems,
continue; // not all nodes transformed continue; // not all nodes transformed
if ( theCopy ) { if ( theCopy ) {
// add a new element if ( SMDS_MeshElement* elem = AddElement( nodes, elem->GetType(), elem->IsPoly() ))
switch ( elemType ) { myLastCreatedElems.Append( elem );
case SMDSAbs_Edge:
if ( nbNodes == 2 )
myLastCreatedElems.Append(aMesh->AddEdge( nodes[ 0 ], nodes[ 1 ] ));
else
myLastCreatedElems.Append(aMesh->AddEdge( nodes[ 0 ], nodes[ 1 ], nodes[ 2 ] ));
break;
case SMDSAbs_Face:
if ( nbNodes == 3 )
myLastCreatedElems.Append(aMesh->AddFace( nodes[ 0 ], nodes[ 1 ], nodes[ 2 ] ));
else if(nbNodes==4)
myLastCreatedElems.Append(aMesh->AddFace( nodes[ 0 ], nodes[ 1 ], nodes[ 2 ] , nodes[ 3 ]));
else if(nbNodes==6)
myLastCreatedElems.Append(aMesh->AddFace(nodes[0], nodes[1], nodes[2], nodes[3],
nodes[4], nodes[5]));
else // nbNodes==8
myLastCreatedElems.Append(aMesh->AddFace(nodes[0], nodes[1], nodes[2], nodes[3],
nodes[4], nodes[5], nodes[6], nodes[7]));
break;
case SMDSAbs_Volume:
if ( nbNodes == 4 )
myLastCreatedElems.Append(aMesh->AddVolume( nodes[ 0 ], nodes[ 1 ], nodes[ 2 ] , nodes[ 3 ] ));
else if ( nbNodes == 8 )
myLastCreatedElems.Append(aMesh->AddVolume( nodes[ 0 ], nodes[ 1 ], nodes[ 2 ] , nodes[ 3 ],
nodes[ 4 ], nodes[ 5 ], nodes[ 6 ] , nodes[ 7 ]));
else if ( nbNodes == 6 )
myLastCreatedElems.Append(aMesh->AddVolume( nodes[ 0 ], nodes[ 1 ], nodes[ 2 ] , nodes[ 3 ],
nodes[ 4 ], nodes[ 5 ]));
else if ( nbNodes == 5 )
myLastCreatedElems.Append(aMesh->AddVolume( nodes[ 0 ], nodes[ 1 ], nodes[ 2 ] , nodes[ 3 ],
nodes[ 4 ]));
else if(nbNodes==10)
myLastCreatedElems.Append(aMesh->AddVolume(nodes[0], nodes[1], nodes[2], nodes[3], nodes[4],
nodes[5], nodes[6], nodes[7], nodes[8], nodes[9]));
else if(nbNodes==13)
myLastCreatedElems.Append(aMesh->AddVolume(nodes[0], nodes[1], nodes[2], nodes[3], nodes[4],
nodes[5], nodes[6], nodes[7], nodes[8], nodes[9],
nodes[10], nodes[11], nodes[12]));
else if(nbNodes==15)
myLastCreatedElems.Append(aMesh->AddVolume(nodes[0], nodes[1], nodes[2], nodes[3], nodes[4],
nodes[5], nodes[6], nodes[7], nodes[8], nodes[9],
nodes[10], nodes[11], nodes[12], nodes[13], nodes[14]));
else // nbNodes==20
myLastCreatedElems.Append(aMesh->AddVolume(nodes[0], nodes[1], nodes[2], nodes[3], nodes[4],
nodes[5], nodes[6], nodes[7], nodes[8], nodes[9],
nodes[10], nodes[11], nodes[12], nodes[13], nodes[14],
nodes[15], nodes[16], nodes[17], nodes[18], nodes[19]));
break;
default:;
}
} }
else else
{ {
// reverse element as it was reversed by transformation // reverse element as it was reversed by transformation
if ( nbNodes > 2 ) if ( nbNodes > 2 )
aMesh->ChangeElementNodes( elem, nodes, nbNodes ); aMesh->ChangeElementNodes( elem, &nodes[0], nbNodes );
} }
} }
} }
@ -6276,28 +6360,21 @@ void SMESH_MeshEditor::RemoveQuadElem(SMESHDS_SubMesh * theSm,
if( elem && elem->IsQuadratic()) if( elem && elem->IsQuadratic())
{ {
int id = elem->GetID(); int id = elem->GetID();
int nbNodes = elem->NbNodes(), idx = 0; int nbNodes = elem->NbNodes();
vector<const SMDS_MeshNode *> aNds; vector<const SMDS_MeshNode *> aNds, mediumNodes;
aNds.reserve( nbNodes ); aNds.reserve( nbNodes );
mediumNodes.reserve( nbNodes );
for(int i = 0; i < nbNodes; i++) for(int i = 0; i < nbNodes; i++)
{ {
const SMDS_MeshNode* n = elem->GetNode(i); const SMDS_MeshNode* n = elem->GetNode(i);
if( elem->IsMediumNode( n ) ) if( elem->IsMediumNode( n ) )
{ mediumNodes.push_back( n );
if ( n->GetPosition()->GetShapeId() != theShapeID )
meshDS->RemoveFreeNode( n, meshDS->MeshElements
( n->GetPosition()->GetShapeId() ));
else
meshDS->RemoveFreeNode( n, theSm );
}
else else
aNds.push_back( n ); aNds.push_back( n );
} }
if( aNds.empty() ) continue;
idx = aNds.size();
if( !idx ) continue;
SMDSAbs_ElementType aType = elem->GetType(); SMDSAbs_ElementType aType = elem->GetType();
//remove old quadratic elements //remove old quadratic elements
@ -6305,42 +6382,30 @@ void SMESH_MeshEditor::RemoveQuadElem(SMESHDS_SubMesh * theSm,
if ( theSm ) if ( theSm )
theSm->RemoveElement( elem ); theSm->RemoveElement( elem );
SMDS_MeshElement * NewElem = 0; SMDS_MeshElement * NewElem = AddElement( aNds, aType, false, id );
switch(aType)
{
case SMDSAbs_Edge:
NewElem = meshDS->AddEdgeWithID( aNds[0], aNds[1] ,id );
break;
case SMDSAbs_Face:
if( idx==3 ) NewElem = meshDS->AddFaceWithID( aNds[0],
aNds[1], aNds[2], id );
if( idx==4 ) NewElem = meshDS->AddFaceWithID( aNds[0],
aNds[1], aNds[2], aNds[3],id );
break;
case SMDSAbs_Volume:
if( idx==4 ) NewElem = meshDS->AddVolumeWithID( aNds[0],
aNds[1], aNds[2], aNds[3], id );
if( idx==6 ) NewElem = meshDS->AddVolumeWithID( aNds[0],
aNds[1], aNds[2], aNds[3],
aNds[4], aNds[5], id );
if( idx==8 ) NewElem = meshDS->AddVolumeWithID(aNds[0],
aNds[1], aNds[2], aNds[3],
aNds[4], aNds[5], aNds[6],
aNds[7] ,id );
break;
default:
break;
}
if ( NewElem ) if ( NewElem )
AddToSameGroups(NewElem, elem, meshDS); AddToSameGroups(NewElem, elem, meshDS);
if ( NewElem != elem ) if ( NewElem != elem )
RemoveElemFromGroups (elem, meshDS); RemoveElemFromGroups (elem, meshDS);
if( theSm && NewElem ) if( theSm && NewElem )
theSm->AddElement( NewElem ); theSm->AddElement( NewElem );
// remove medium nodes
vector<const SMDS_MeshNode*>::iterator nIt = mediumNodes.begin();
for ( ; nIt != mediumNodes.end(); ++nIt ) {
const SMDS_MeshNode* n = *nIt;
if ( n->NbInverseNodes() == 0 ) {
if ( n->GetPosition()->GetShapeId() != theShapeID )
meshDS->RemoveFreeNode( n, meshDS->MeshElements
( n->GetPosition()->GetShapeId() ));
else
meshDS->RemoveFreeNode( n, theSm );
}
}
} }
} }
} }
//======================================================================= //=======================================================================
//function : ConvertFromQuadratic //function : ConvertFromQuadratic
//purpose : //purpose :

18
src/SMESH/SMESH_MeshEditor.hxx
View File

@ -79,6 +79,21 @@ public:
SMESH_MeshEditor( SMESH_Mesh* theMesh ); SMESH_MeshEditor( SMESH_Mesh* theMesh );
/*!
* \brief Add element
*/
SMDS_MeshElement* AddElement(const std::vector<const SMDS_MeshNode*> & nodes,
const SMDSAbs_ElementType type,
const bool isPoly,
const int ID = 0);
/*!
* \brief Add element
*/
SMDS_MeshElement* AddElement(const std::vector<int> & nodeIDs,
const SMDSAbs_ElementType type,
const bool isPoly,
const int ID = 0);
bool Remove (const std::list< int >& theElemIDs, const bool isNodes); bool Remove (const std::list< int >& theElemIDs, const bool isNodes);
// Remove a node or an element. // Remove a node or an element.
// Modify a compute state of sub-meshes which become empty // Modify a compute state of sub-meshes which become empty
@ -167,7 +182,8 @@ public:
const gp_Ax1& theAxis, const gp_Ax1& theAxis,
const double theAngle, const double theAngle,
const int theNbSteps, const int theNbSteps,
const double theToler); const double theToler,
const bool theMakeWalls=true);
// Generate new elements by rotation of theElements around theAxis // Generate new elements by rotation of theElements around theAxis
// by theAngle by theNbSteps // by theAngle by theNbSteps