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
Merge branch 'agy/arch2_ic0'
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_Import_1D2D.cxx
diff --git
a/src/StdMeshers/StdMeshers_Import_1D2D.cxx
b/src/StdMeshers/StdMeshers_Import_1D2D.cxx
index 657ff448a1e021a4f30ae8469c87888730964df6..30f3d163ca3d6453f67e0e9e21dbd720f83b3a9e 100644
(file)
--- a/
src/StdMeshers/StdMeshers_Import_1D2D.cxx
+++ b/
src/StdMeshers/StdMeshers_Import_1D2D.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
19
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
20
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-324,8
+324,7
@@
bool StdMeshers_Import_1D2D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape &
{
const SMDS_MeshElement* face = srcElems->next();
{
const SMDS_MeshElement* face = srcElems->next();
- SMDS_MeshElement::iterator node = face->begin_nodes();
- if ( bndBox3d.IsOut( SMESH_TNodeXYZ( *node )))
+ if ( bndBox3d.IsOut( SMESH_NodeXYZ( face->GetNode(0) )))
continue;
// find or create nodes of a new face
continue;
// find or create nodes of a new face
@@
-334,13
+333,14
@@
bool StdMeshers_Import_1D2D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape &
newNodes.back() = 0;
int nbCreatedNodes = 0;
bool isOut = false, isIn = false; // if at least one node isIn - do not classify other nodes
newNodes.back() = 0;
int nbCreatedNodes = 0;
bool isOut = false, isIn = false; // if at least one node isIn - do not classify other nodes
- for ( size_t i = 0; i < newNodes.size(); ++i
, ++node
)
+ for ( size_t i = 0; i < newNodes.size(); ++i )
{
{
- SMESH_TNodeXYZ nXYZ = *node;
+ const SMDS_MeshNode* node = face->GetNode( i );
+ SMESH_NodeXYZ nXYZ = node;
nodeState[ i ] = TopAbs_UNKNOWN;
newNodes [ i ] = 0;
nodeState[ i ] = TopAbs_UNKNOWN;
newNodes [ i ] = 0;
- it_isnew = n2n->insert( make_pair(
*node, (SMDS_MeshNode*)0
));
+ it_isnew = n2n->insert( make_pair(
node, nullptr
));
n2nIt = it_isnew.first;
const SMDS_MeshNode* & newNode = n2nIt->second;
n2nIt = it_isnew.first;
const SMDS_MeshNode* & newNode = n2nIt->second;
@@
-354,7
+354,7
@@
bool StdMeshers_Import_1D2D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape &
if ( newNode->GetID() < (int) isNodeIn.size() &&
isNodeIn[ newNode->GetID() ])
isIn = true;
if ( newNode->GetID() < (int) isNodeIn.size() &&
isNodeIn[ newNode->GetID() ])
isIn = true;
- if ( !isIn && bndNodes.count(
*
node ))
+ if ( !isIn && bndNodes.count( node ))
nodeState[ i ] = TopAbs_ON;
}
else
nodeState[ i ] = TopAbs_ON;
}
else
@@
-373,7
+373,7
@@
bool StdMeshers_Import_1D2D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape &
{
// find out if node lies on the surface of theShape
gp_XY uv( Precision::Infinite(), 0 );
{
// find out if node lies on the surface of theShape
gp_XY uv( Precision::Infinite(), 0 );
- isOut = ( !helper.CheckNodeUV( geomFace,
*
node, uv, groupTol, /*force=*/true ) ||
+ isOut = ( !helper.CheckNodeUV( geomFace, node, uv, groupTol, /*force=*/true ) ||
bndBox2d.IsOut( uv ));
//int iCoo;
if ( !isOut && !isIn ) // classify
bndBox2d.IsOut( uv ));
//int iCoo;
if ( !isOut && !isIn ) // classify
@@
-381,7
+381,7
@@
bool StdMeshers_Import_1D2D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape &
nodeState[i] = classifier.Perform( uv ); //classifier.Perform( geomFace, uv, clsfTol );
//nodeState[i] = classifier.State();
isOut = ( nodeState[i] == TopAbs_OUT );
nodeState[i] = classifier.Perform( uv ); //classifier.Perform( geomFace, uv, clsfTol );
//nodeState[i] = classifier.State();
isOut = ( nodeState[i] == TopAbs_OUT );
- if ( isOut && helper.IsOnSeam( uv ) && onEdgeClassifier.IsSatisfy(
(*node)
->GetID() ))
+ if ( isOut && helper.IsOnSeam( uv ) && onEdgeClassifier.IsSatisfy(
node
->GetID() ))
{
// uv.SetCoord( iCoo, helper.GetOtherParam( uv.Coord( iCoo )));
// classifier.Perform( geomFace, uv, clsfTol );
{
// uv.SetCoord( iCoo, helper.GetOtherParam( uv.Coord( iCoo )));
// classifier.Perform( geomFace, uv, clsfTol );
@@
-402,7
+402,7
@@
bool StdMeshers_Import_1D2D::Compute(SMESH_Mesh & theMesh, const TopoDS_Shape &
isNodeIn.resize( newNode->GetID() + 1, false );
}
if ( nodeState[i] == TopAbs_ON )
isNodeIn.resize( newNode->GetID() + 1, false );
}
if ( nodeState[i] == TopAbs_ON )
- bndNodes.insert(
*
node );
+ bndNodes.insert( node );
else if ( nodeState[i] != TopAbs_UNKNOWN )
isNodeIn[ newNode->GetID() ] = isIn = true;
}
else if ( nodeState[i] != TopAbs_UNKNOWN )
isNodeIn[ newNode->GetID() ] = isIn = true;
}