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 from V6_main 01/04/2013
[modules/smesh.git]
/
src
/
SMESH
/
SMESH_MesherHelper.cxx
diff --git
a/src/SMESH/SMESH_MesherHelper.cxx
b/src/SMESH/SMESH_MesherHelper.cxx
index 258c8ff8a00189fafc2cc38b01dc9659849fc630..47feba98bff396c1969b9910eec00f2772cda5d5 100644
(file)
--- a/
src/SMESH/SMESH_MesherHelper.cxx
+++ b/
src/SMESH/SMESH_MesherHelper.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
3
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
@@
-1378,8
+1378,12
@@
const SMDS_MeshNode* SMESH_MesherHelper::getMediumNodeOnComposedWire(const SMDS_
}
//if ( mySetElemOnShape ) node is not elem!
}
//if ( mySetElemOnShape ) node is not elem!
- GetMeshDS()->SetNodeOnEdge(n12, edges[iOkEdge], u);
-
+ {
+ int edgeID = GetMeshDS()->ShapeToIndex( edges[iOkEdge] );
+ if ( edgeID != n12->getshapeId() )
+ GetMeshDS()->UnSetNodeOnShape( n12 );
+ GetMeshDS()->SetNodeOnEdge(n12, edgeID, u);
+ }
myTLinkNodeMap.insert( make_pair( SMESH_TLink(n1,n2), n12 ));
return n12;
myTLinkNodeMap.insert( make_pair( SMESH_TLink(n1,n2), n12 ));
return n12;
@@
-2170,7
+2174,7
@@
bool SMESH_MesherHelper::IsStructured( SMESH_subMesh* faceSM )
list< int > nbEdgesInWires;
int nbWires = SMESH_Block::GetOrderedEdges( TopoDS::Face( faceSM->GetSubShape() ),
edges, nbEdgesInWires );
list< int > nbEdgesInWires;
int nbWires = SMESH_Block::GetOrderedEdges( TopoDS::Face( faceSM->GetSubShape() ),
edges, nbEdgesInWires );
- if ( nbWires != 1
|| nbEdgesInWires.front() != 4 )
+ if ( nbWires != 1
/*|| nbEdgesInWires.front() != 4*/ ) // allow composite sides
return false;
// algo: find corners of a structure and then analyze nb of faces and
return false;
// algo: find corners of a structure and then analyze nb of faces and