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
[EDF25906] : redirect output of the wget into MESSAGE macro
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_PolygonPerFace_2D.cxx
diff --git
a/src/StdMeshers/StdMeshers_PolygonPerFace_2D.cxx
b/src/StdMeshers/StdMeshers_PolygonPerFace_2D.cxx
index 5f3a21e8ad455b3ddf7eb1b6feb2f53a8d98eefe..d09f736dbce16c80b55e6f3dfc438b3fe17fa73d 100644
(file)
--- a/
src/StdMeshers/StdMeshers_PolygonPerFace_2D.cxx
+++ b/
src/StdMeshers/StdMeshers_PolygonPerFace_2D.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
@@
-37,21
+37,20
@@
#include <TopExp_Explorer.hxx>
#include <TopoDS_Face.hxx>
#include <TopExp_Explorer.hxx>
#include <TopoDS_Face.hxx>
+#include <TopoDS.hxx>
#include <vector>
#include <vector>
-#include <TopoDS.hxx>
using namespace std;
//=======================================================================
//function : StdMeshers_PolygonPerFace_2D
using namespace std;
//=======================================================================
//function : StdMeshers_PolygonPerFace_2D
-//purpose :
+//purpose :
//=======================================================================
StdMeshers_PolygonPerFace_2D::StdMeshers_PolygonPerFace_2D(int hypId,
//=======================================================================
StdMeshers_PolygonPerFace_2D::StdMeshers_PolygonPerFace_2D(int hypId,
- int studyId,
SMESH_Gen* gen)
SMESH_Gen* gen)
- :SMESH_2D_Algo(hypId,
studyId,
gen)
+ :SMESH_2D_Algo(hypId, gen)
{
_name = "PolygonPerFace_2D";
}
{
_name = "PolygonPerFace_2D";
}
@@
-61,8
+60,8
@@
StdMeshers_PolygonPerFace_2D::StdMeshers_PolygonPerFace_2D(int hypId,
//purpose :
//=======================================================================
//purpose :
//=======================================================================
-bool StdMeshers_PolygonPerFace_2D::CheckHypothesis(SMESH_Mesh&
theMesh
,
- const TopoDS_Shape&
theShape
,
+bool StdMeshers_PolygonPerFace_2D::CheckHypothesis(SMESH_Mesh&
/*theMesh*/
,
+ const TopoDS_Shape&
/*theShape*/
,
SMESH_Hypothesis::Hypothesis_Status& theStatus)
{
theStatus = HYP_OK;
SMESH_Hypothesis::Hypothesis_Status& theStatus)
{
theStatus = HYP_OK;
@@
-87,10
+86,10
@@
bool StdMeshers_PolygonPerFace_2D::Compute(SMESH_Mesh& theMesh,
if ( !proxyMesh )
return false;
if ( !proxyMesh )
return false;
- TError er
or
r;
+ TError err;
TSideVector wires = StdMeshers_FaceSide::GetFaceWires(face, theMesh,
/*skipMediumNodes=*/_quadraticMesh,
TSideVector wires = StdMeshers_FaceSide::GetFaceWires(face, theMesh,
/*skipMediumNodes=*/_quadraticMesh,
- er
or
r, proxyMesh,
+ er
r, &helpe
r, proxyMesh,
/*checkVertexNodes=*/false);
if ( wires.size() != 1 )
return error( COMPERR_BAD_SHAPE, SMESH_Comment("One wire required, not ") << wires.size() );
/*checkVertexNodes=*/false);
if ( wires.size() != 1 )
return error( COMPERR_BAD_SHAPE, SMESH_Comment("One wire required, not ") << wires.size() );
@@
-137,7
+136,7
@@
bool StdMeshers_PolygonPerFace_2D::Evaluate(SMESH_Mesh& theMesh,
nbQuadSegs += sm2vec->second.at( SMDSEntity_Quad_Edge );
}
nbQuadSegs += sm2vec->second.at( SMDSEntity_Quad_Edge );
}
- std::vector<
int
> aVec( SMDSEntity_Last, 0 );
+ std::vector<
smIdType
> aVec( SMDSEntity_Last, 0 );
switch ( nbLinSegs + nbQuadSegs ) {
case 3:
aVec[ nbQuadSegs ? SMDSEntity_Quad_Triangle : SMDSEntity_Triangle ] = 1;
switch ( nbLinSegs + nbQuadSegs ) {
case 3:
aVec[ nbQuadSegs ? SMDSEntity_Quad_Triangle : SMDSEntity_Triangle ] = 1;