ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-11-15 10:08:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Use TXyzIterator in Preparation()

Browse Source
This commit is contained in:
eap 2010-03-30 12:29:24 +00:00
parent 8abf245a59
commit 1d2d0b2f0a
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cxx
View File

@ -40,10 +40,15 @@
#include <gp_Lin.hxx> #include <gp_Lin.hxx>
#include <gp_Pln.hxx> #include <gp_Pln.hxx>
#include <numeric>
using namespace std; using namespace std;
enum EQuadNature { NOT_QUAD, QUAD, DEGEN_QUAD }; enum EQuadNature { NOT_QUAD, QUAD, DEGEN_QUAD };
// sdt-like iterator used to get coordinates of nodes of mesh element
typedef SMDS_StdIterator< SMESH_MeshEditor::TNodeXYZ, SMDS_ElemIteratorPtr > TXyzIterator;
//================================================================================ //================================================================================
/*! /*!
* \brief Destructor * \brief Destructor
@ -378,11 +383,9 @@ int StdMeshers_QuadToTriaAdaptor::Preparation(const SMDS_MeshElement* face
if ( volumes[0] ) if ( volumes[0] )
{ {
// get volume gc // get volume gc
gp_XYZ volGC(0,0,0);
SMDS_ElemIteratorPtr nodeIt = volumes[0]->nodesIterator(); SMDS_ElemIteratorPtr nodeIt = volumes[0]->nodesIterator();
while ( nodeIt->more() ) gp_XYZ volGC(0,0,0);
volGC += SMESH_MeshEditor::TNodeXYZ( nodeIt->next() ); volGC = accumulate( TXyzIterator(nodeIt), TXyzIterator(), volGC ) / volumes[0]->NbNodes();
volGC /= volumes[0]->NbNodes();
if ( VNorm * gp_Vec( PC, volGC ) < 0 ) if ( VNorm * gp_Vec( PC, volGC ) < 0 )
swap( volumes[0], volumes[1] ); swap( volumes[0], volumes[1] );
@ -496,6 +499,7 @@ bool StdMeshers_QuadToTriaAdaptor::Compute(SMESH_Mesh& aMesh, const TopoDS_Shape
triaList.push_back( new SMDS_FaceOfNodes( NewNode, FNodes[i], FNodes[i+1] )); triaList.push_back( new SMDS_FaceOfNodes( NewNode, FNodes[i], FNodes[i+1] ));
// create pyramid // create pyramid
if ( isRev ) swap( FNodes[1], FNodes[3]);
SMDS_MeshVolume* aPyram = SMDS_MeshVolume* aPyram =
helper.AddVolume( FNodes[0], FNodes[1], FNodes[2], FNodes[3], NewNode ); helper.AddVolume( FNodes[0], FNodes[1], FNodes[2], FNodes[3], NewNode );
myPyram2Trias.insert(make_pair(aPyram, & triaList)); myPyram2Trias.insert(make_pair(aPyram, & triaList));
@ -715,10 +719,6 @@ bool StdMeshers_QuadToTriaAdaptor::Compute2ndPart(SMESH_Mesh& aMesh)
if(myPyram2Trias.empty()) if(myPyram2Trias.empty())
return true; return true;
// sdt-like iterator used to get coordinates of nodes of mesh element
typedef SMDS_StdIterator< SMESH_MeshEditor::TNodeXYZ, SMDS_ElemIteratorPtr > TXyzIterator;
TXyzIterator xyzEnd;
int k = 0; int k = 0;
// for each pyramid store list of merged pyramids with their faces // for each pyramid store list of merged pyramids with their faces
@ -733,7 +733,7 @@ bool StdMeshers_QuadToTriaAdaptor::Compute2ndPart(SMESH_Mesh& aMesh)
TPyram2Merged::iterator pMergesI = MergesInfo.find( PrmI ); TPyram2Merged::iterator pMergesI = MergesInfo.find( PrmI );
TXyzIterator xyzIt( PrmI->nodesIterator() ); TXyzIterator xyzIt( PrmI->nodesIterator() );
vector<gp_Pnt> PsI( xyzIt, xyzEnd ); vector<gp_Pnt> PsI( xyzIt, TXyzIterator() );
// compare PrmI with all the rest pyramids // compare PrmI with all the rest pyramids
bool NeedMove = false; bool NeedMove = false;
@ -749,7 +749,7 @@ bool StdMeshers_QuadToTriaAdaptor::Compute2ndPart(SMESH_Mesh& aMesh)
continue; // already merged continue; // already merged
xyzIt = TXyzIterator( PrmJ->nodesIterator() ); xyzIt = TXyzIterator( PrmJ->nodesIterator() );
vector<gp_Pnt> PsJ( xyzIt, xyzEnd ); vector<gp_Pnt> PsJ( xyzIt, TXyzIterator() );
bool hasInt = false; bool hasInt = false;
gp_Pnt Pint; gp_Pnt Pint;