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 'V9_9_BR'
[modules/smesh.git]
/
src
/
SMESHUtils
/
SMESH_Block.cxx
diff --git
a/src/SMESHUtils/SMESH_Block.cxx
b/src/SMESHUtils/SMESH_Block.cxx
index 90bd9bce65db5a18b5a9f9cc02d526287948bf65..5f3b9e53bd7e0756043c28267df720f0c57bbe01 100644
(file)
--- a/
src/SMESHUtils/SMESH_Block.cxx
+++ b/
src/SMESHUtils/SMESH_Block.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
22
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
@@
-720,7
+720,7
@@
bool SMESH_Block::ComputeParameters(const gp_Pnt& thePoint,
const bool isOnFace = IsFaceID( theShapeID );
double * coef = GetShapeCoef( theShapeID );
const bool isOnFace = IsFaceID( theShapeID );
double * coef = GetShapeCoef( theShapeID );
- // Find the first guess par
e
meters
+ // Find the first guess par
a
meters
gp_XYZ start(0, 0, 0);
gp_XYZ start(0, 0, 0);
@@
-1029,7
+1029,7
@@
bool SMESH_Block::findUVByHalfDivision( const gp_Pnt& thePoint,
dy *= 1.2;
xSol = 0.5 * (xMax + xMin) ;
ySol = 0.5 * (yMax + yMin) ;
dy *= 1.2;
xSol = 0.5 * (xMax + xMin) ;
ySol = 0.5 * (yMax + yMin) ;
- if ( xMin == 0. && yMin == 0. && xMax == 1. && yMax == 1. ) // avoid infinit loop
+ if ( xMin == 0. && yMin == 0. && xMax == 1. && yMax == 1. ) // avoid infinit
e
loop
{
#ifdef _DEBUG_REFINE_
cout << "SMESH_Block::refineParametersOnFace(): tface.IsUVInQuad() fails" << endl;
{
#ifdef _DEBUG_REFINE_
cout << "SMESH_Block::refineParametersOnFace(): tface.IsUVInQuad() fails" << endl;
@@
-1040,7
+1040,7
@@
bool SMESH_Block::findUVByHalfDivision( const gp_Pnt& thePoint,
}
}
}
}
- // refine solution using half-division techni
c
+ // refine solution using half-division techni
que
gp_XYZ sol = theParams;
gp_XYZ sol = theParams;
@@
-1114,7
+1114,7
@@
bool SMESH_Block::findUVByHalfDivision( const gp_Pnt& thePoint,
if ( saveBetterSolution( sol, theParams, thePoint.SquareDistance( tface.Point( sol ))))
{
#ifdef _DEBUG_REFINE_
if ( saveBetterSolution( sol, theParams, thePoint.SquareDistance( tface.Point( sol ))))
{
#ifdef _DEBUG_REFINE_
- cout << "SMESH_Block::refineParametersOnFace(): dividing suceeded" << endl;
+ cout << "SMESH_Block::refineParametersOnFace(): dividing suc
c
eeded" << endl;
cout << " nbGetUV = " << nbGetUV << endl;
#endif
return true;
cout << " nbGetUV = " << nbGetUV << endl;
#endif
return true;
@@
-1130,8
+1130,8
@@
bool SMESH_Block::findUVByHalfDivision( const gp_Pnt& thePoint,
//================================================================================
/*!
//================================================================================
/*!
- * \brief Find
s parameters corresponding to a given UV of a given face by searching
- * around the starting solution
+ * \brief Find
parameters corresponding to a given UV of a given face by searching
+ *
around the starting solution
* \param [in] theUV - the UV to locate
* \param [in] tface - the face
* \param [in,out] theParams - the starting parameters to improve
* \param [in] theUV - the UV to locate
* \param [in] tface - the face
* \param [in,out] theParams - the starting parameters to improve
@@
-1142,7
+1142,7
@@
bool SMESH_Block::findUVByHalfDivision( const gp_Pnt& thePoint,
//================================================================================
bool SMESH_Block::findUVAround( const gp_Pnt& thePoint,
//================================================================================
bool SMESH_Block::findUVAround( const gp_Pnt& thePoint,
- const gp_XY&
theUV
,
+ const gp_XY&
/*theUV*/
,
const SMESH_Block::TFace& tface,
gp_XYZ& theParams,
int nbGetWorstLimit )
const SMESH_Block::TFace& tface,
gp_XYZ& theParams,
int nbGetWorstLimit )
@@
-1585,7
+1585,7
@@
int SMESH_Block::GetOrderedEdges (const TopoDS_Face& theFace,
}
//================================================================================
/*!
}
//================================================================================
/*!
- * \brief Call it after geometry initiali
s
ation
+ * \brief Call it after geometry initiali
z
ation
*/
//================================================================================
*/
//================================================================================
@@
-1608,7
+1608,6
@@
bool SMESH_Block::LoadMeshBlock(const SMDS_MeshVolume* theVolume,
const int theNode001Index,
vector<const SMDS_MeshNode*>& theOrderedNodes)
{
const int theNode001Index,
vector<const SMDS_MeshNode*>& theOrderedNodes)
{
- MESSAGE(" ::LoadMeshBlock()");
init();
SMDS_VolumeTool vTool;
init();
SMDS_VolumeTool vTool;
@@
-1728,7
+1727,7
@@
bool SMESH_Block::LoadMeshBlock(const SMDS_MeshVolume* theVolume,
//function : LoadBlockShapes
//purpose : Initialize block geometry with theShell,
// add sub-shapes of theBlock to theShapeIDMap so that they get
//function : LoadBlockShapes
//purpose : Initialize block geometry with theShell,
// add sub-shapes of theBlock to theShapeIDMap so that they get
-// IDs ac
o
ording to enum TShapeID
+// IDs ac
c
ording to enum TShapeID
//=======================================================================
bool SMESH_Block::LoadBlockShapes(const TopoDS_Shell& theShell,
//=======================================================================
bool SMESH_Block::LoadBlockShapes(const TopoDS_Shell& theShell,
@@
-1736,7
+1735,6
@@
bool SMESH_Block::LoadBlockShapes(const TopoDS_Shell& theShell,
const TopoDS_Vertex& theVertex001,
TopTools_IndexedMapOfOrientedShape& theShapeIDMap )
{
const TopoDS_Vertex& theVertex001,
TopTools_IndexedMapOfOrientedShape& theShapeIDMap )
{
- MESSAGE(" ::LoadBlockShapes()");
return ( FindBlockShapes( theShell, theVertex000, theVertex001, theShapeIDMap ) &&
LoadBlockShapes( theShapeIDMap ));
}
return ( FindBlockShapes( theShell, theVertex000, theVertex001, theShapeIDMap ) &&
LoadBlockShapes( theShapeIDMap ));
}
@@
-1744,7
+1742,7
@@
bool SMESH_Block::LoadBlockShapes(const TopoDS_Shell& theShell,
//=======================================================================
//function : LoadBlockShapes
//purpose : add sub-shapes of theBlock to theShapeIDMap so that they get
//=======================================================================
//function : LoadBlockShapes
//purpose : add sub-shapes of theBlock to theShapeIDMap so that they get
-// IDs ac
o
ording to enum TShapeID
+// IDs ac
c
ording to enum TShapeID
//=======================================================================
bool SMESH_Block::FindBlockShapes(const TopoDS_Shell& theShell,
//=======================================================================
bool SMESH_Block::FindBlockShapes(const TopoDS_Shell& theShell,
@@
-1752,8
+1750,6
@@
bool SMESH_Block::FindBlockShapes(const TopoDS_Shell& theShell,
const TopoDS_Vertex& theVertex001,
TopTools_IndexedMapOfOrientedShape& theShapeIDMap )
{
const TopoDS_Vertex& theVertex001,
TopTools_IndexedMapOfOrientedShape& theShapeIDMap )
{
- MESSAGE(" ::FindBlockShapes()");
-
// 8 vertices
TopoDS_Shape V000, V100, V010, V110, V001, V101, V011, V111;
// 12 edges
// 8 vertices
TopoDS_Shape V000, V100, V010, V110, V001, V101, V011, V111;
// 12 edges