Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Typo-fix by Kunda
[modules/smesh.git]
/
src
/
SMESHUtils
/
SMESH_MeshAlgos.cxx
diff --git
a/src/SMESHUtils/SMESH_MeshAlgos.cxx
b/src/SMESHUtils/SMESH_MeshAlgos.cxx
index 646fb7bffcab3f0c6c2a995a2350e08deff7b4d0..91f6984a343f8054b23bce2d3587a8fdf90d475d 100644
(file)
--- a/
src/SMESHUtils/SMESH_MeshAlgos.cxx
+++ b/
src/SMESHUtils/SMESH_MeshAlgos.cxx
@@
-28,6
+28,7
@@
#include "SMESH_MeshAlgos.hxx"
#include "SMESH_MeshAlgos.hxx"
+#include "ObjectPool.hxx"
#include "SMDS_FaceOfNodes.hxx"
#include "SMDS_LinearEdge.hxx"
#include "SMDS_Mesh.hxx"
#include "SMDS_FaceOfNodes.hxx"
#include "SMDS_LinearEdge.hxx"
#include "SMDS_Mesh.hxx"
@@
-69,7
+70,7
@@
struct SMESH_NodeSearcherImpl: public SMESH_NodeSearcher
TIDSortedNodeSet nodes;
if ( theMesh ) {
TIDSortedNodeSet nodes;
if ( theMesh ) {
- SMDS_NodeIteratorPtr nIt = theMesh->nodesIterator(
/*idInceasingOrder=*/true
);
+ SMDS_NodeIteratorPtr nIt = theMesh->nodesIterator();
while ( nIt->more() )
nodes.insert( nodes.end(), nIt->next() );
}
while ( nIt->more() )
nodes.insert( nodes.end(), nIt->next() );
}
@@
-1292,7
+1293,7
@@
bool SMESH_MeshAlgos::IsOut( const SMDS_MeshElement* element, const gp_Pnt& poin
std::vector< SMESH_TNodeXYZ > xyz; xyz.reserve( element->NbNodes()+1 );
std::vector< SMESH_TNodeXYZ > xyz; xyz.reserve( element->NbNodes()+1 );
- SMDS_
ElemIteratorPtr nodeIt = element->interlacedNodesElem
Iterator();
+ SMDS_
NodeIteratorPtr nodeIt = element->interlacedNodes
Iterator();
for ( int i = 0; nodeIt->more(); ++i )
xyz.push_back( SMESH_TNodeXYZ( nodeIt->next() ));
for ( int i = 0; nodeIt->more(); ++i )
xyz.push_back( SMESH_TNodeXYZ( nodeIt->next() ));
@@
-1528,11
+1529,11
@@
double SMESH_MeshAlgos::GetDistance( const SMDS_MeshElement* elem,
switch ( elem->GetType() )
{
case SMDSAbs_Volume:
switch ( elem->GetType() )
{
case SMDSAbs_Volume:
- return GetDistance(
dynam
ic_cast<const SMDS_MeshVolume*>( elem ), point, closestPnt );
+ return GetDistance(
stat
ic_cast<const SMDS_MeshVolume*>( elem ), point, closestPnt );
case SMDSAbs_Face:
case SMDSAbs_Face:
- return GetDistance(
dynam
ic_cast<const SMDS_MeshFace*>( elem ), point, closestPnt );
+ return GetDistance(
stat
ic_cast<const SMDS_MeshFace*>( elem ), point, closestPnt );
case SMDSAbs_Edge:
case SMDSAbs_Edge:
- return GetDistance(
dynam
ic_cast<const SMDS_MeshEdge*>( elem ), point, closestPnt );
+ return GetDistance(
stat
ic_cast<const SMDS_MeshEdge*>( elem ), point, closestPnt );
case SMDSAbs_Node:
if ( closestPnt ) *closestPnt = SMESH_TNodeXYZ( elem );
return point.Distance( SMESH_TNodeXYZ( elem ));
case SMDSAbs_Node:
if ( closestPnt ) *closestPnt = SMESH_TNodeXYZ( elem );
return point.Distance( SMESH_TNodeXYZ( elem ));
@@
-1664,9
+1665,8
@@
double SMESH_MeshAlgos::GetDistance( const SMDS_MeshEdge* seg,
int i = 0, nbNodes = seg->NbNodes();
std::vector< SMESH_TNodeXYZ > xyz( nbNodes );
int i = 0, nbNodes = seg->NbNodes();
std::vector< SMESH_TNodeXYZ > xyz( nbNodes );
- SMDS_ElemIteratorPtr nodeIt = seg->interlacedNodesElemIterator();
- while ( nodeIt->more() )
- xyz[ i++ ].Set( nodeIt->next() );
+ for ( SMDS_NodeIteratorPtr nodeIt = seg->interlacedNodesIterator(); nodeIt->more(); i++ )
+ xyz[ i ].Set( nodeIt->next() );
for ( i = 1; i < nbNodes; ++i )
{
for ( i = 1; i < nbNodes; ++i )
{
@@
-1790,7
+1790,7
@@
void SMESH_MeshAlgos::GetBarycentricCoords( const gp_XY& p,
const double t11 = T22, t12 = -T12, t21 = -T21, t22 = T11;
// vector
const double r11 = p.X()-t2.X(), r12 = p.Y()-t2.Y();
const double t11 = T22, t12 = -T12, t21 = -T21, t22 = T11;
// vector
const double r11 = p.X()-t2.X(), r12 = p.Y()-t2.Y();
- // barycentric coordinates: mutiply matrix by vector
+ // barycentric coordinates: mu
l
tiply matrix by vector
bc0 = (t11 * r11 + t12 * r12)/Tdet;
bc1 = (t21 * r11 + t22 * r12)/Tdet;
}
bc0 = (t11 * r11 + t12 * r12)/Tdet;
bc1 = (t21 * r11 + t22 * r12)/Tdet;
}
@@
-1836,7
+1836,7
@@
SMESH_MeshAlgos::FindFaceInSet(const SMDS_MeshNode* n1,
if ( !face && elem->IsQuadratic())
{
// analysis for quadratic elements using all nodes
if ( !face && elem->IsQuadratic())
{
// analysis for quadratic elements using all nodes
- SMDS_
ElemIteratorPtr anIter = elem->interlacedNodesElem
Iterator();
+ SMDS_
NodeIteratorPtr anIter = elem->interlacedNodes
Iterator();
const SMDS_MeshNode* prevN = static_cast<const SMDS_MeshNode*>( anIter->next() );
for ( i1 = -1, i2 = 0; anIter->more() && !face; i1++, i2++ )
{
const SMDS_MeshNode* prevN = static_cast<const SMDS_MeshNode*>( anIter->next() );
for ( i1 = -1, i2 = 0; anIter->more() && !face; i1++, i2++ )
{