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
22361: EDF SMESH: Quadrangle (mapping) algorithm: faces with more than 4 edges
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_CompositeHexa_3D.cxx
diff --git
a/src/StdMeshers/StdMeshers_CompositeHexa_3D.cxx
b/src/StdMeshers/StdMeshers_CompositeHexa_3D.cxx
index 38d36f450c741add879c1489cd2f94461bb9bc9f..30b645a622793de22e636862ba28688f23e51168 100644
(file)
--- a/
src/StdMeshers/StdMeshers_CompositeHexa_3D.cxx
+++ b/
src/StdMeshers/StdMeshers_CompositeHexa_3D.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
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@
-32,6
+32,7
@@
#include "SMESH_Comment.hxx"
#include "SMESH_ComputeError.hxx"
#include "SMESH_Mesh.hxx"
#include "SMESH_Comment.hxx"
#include "SMESH_ComputeError.hxx"
#include "SMESH_Mesh.hxx"
+#include "SMESH_MeshAlgos.hxx"
#include "SMESH_MesherHelper.hxx"
#include "SMESH_subMesh.hxx"
#include "SMESH_MesherHelper.hxx"
#include "SMESH_subMesh.hxx"
@@
-962,10
+963,10
@@
bool _QuadFaceGrid::LoadGrid( SMESH_Mesh& mesh )
//
TIDSortedElemSet emptySet, avoidSet;
avoidSet.insert( firstQuad );
//
TIDSortedElemSet emptySet, avoidSet;
avoidSet.insert( firstQuad );
- firstQuad = SMESH_Mesh
Editor
::FindFaceInSet( n1down, n2down, emptySet, avoidSet);
+ firstQuad = SMESH_Mesh
Algos
::FindFaceInSet( n1down, n2down, emptySet, avoidSet);
while ( firstQuad && !faceSubMesh->Contains( firstQuad )) {
avoidSet.insert( firstQuad );
while ( firstQuad && !faceSubMesh->Contains( firstQuad )) {
avoidSet.insert( firstQuad );
- firstQuad = SMESH_Mesh
Editor
::FindFaceInSet( n1down, n2down, emptySet, avoidSet);
+ firstQuad = SMESH_Mesh
Algos
::FindFaceInSet( n1down, n2down, emptySet, avoidSet);
}
if ( !firstQuad || !faceSubMesh->Contains( firstQuad ))
return error(ERR_LI("Error in _QuadFaceGrid::LoadGrid()"));
}
if ( !firstQuad || !faceSubMesh->Contains( firstQuad ))
return error(ERR_LI("Error in _QuadFaceGrid::LoadGrid()"));
@@
-995,7
+996,7
@@
bool _QuadFaceGrid::LoadGrid( SMESH_Mesh& mesh )
{
// next face
avoidSet.clear(); avoidSet.insert( quad );
{
// next face
avoidSet.clear(); avoidSet.insert( quad );
- quad = SMESH_Mesh
Editor
::FindFaceInSet( n1down, n1up, emptySet, avoidSet );
+ quad = SMESH_Mesh
Algos
::FindFaceInSet( n1down, n1up, emptySet, avoidSet );
if ( !quad || quad->NbNodes() % 4 > 0)
return error(ERR_LI("Error in _QuadFaceGrid::LoadGrid()"));
if ( !quad || quad->NbNodes() % 4 > 0)
return error(ERR_LI("Error in _QuadFaceGrid::LoadGrid()"));