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 'hydro/imps_2015' into V7_dev
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_QuadFromMedialAxis_1D2D.cxx
diff --git
a/src/StdMeshers/StdMeshers_QuadFromMedialAxis_1D2D.cxx
b/src/StdMeshers/StdMeshers_QuadFromMedialAxis_1D2D.cxx
index a9b924724f4a96cb424121fd43a45c17b7d0a993..acd20284680a90ed6ab0b414249abb79a788b20c 100644
(file)
--- a/
src/StdMeshers/StdMeshers_QuadFromMedialAxis_1D2D.cxx
+++ b/
src/StdMeshers/StdMeshers_QuadFromMedialAxis_1D2D.cxx
@@
-61,6
+61,8
@@
#include <list>
#include <vector>
#include <list>
#include <vector>
+using namespace std;
+
//================================================================================
/*!
* \brief 1D algo
//================================================================================
/*!
* \brief 1D algo
@@
-551,7
+553,7
@@
namespace
allEdges, theShortEdges[ nbBranchPoints > 0 ] ))
return false;
allEdges, theShortEdges[ nbBranchPoints > 0 ] ))
return false;
- for ( size_t iS = 0; iS < theShortEdges[ nbBranchPoints ].size(); ++iS )
+ for ( size_t iS = 0; iS < theShortEdges[ nbBranchPoints
> 0
].size(); ++iS )
shortMap.Add( theShortEdges[ nbBranchPoints ][ iS ]);
++nbBranchPoints;
shortMap.Add( theShortEdges[ nbBranchPoints ][ iS ]);
++nbBranchPoints;
@@
-949,7
+951,7
@@
namespace
{
const SMDS_MeshNode* _node;
double _u;
{
const SMDS_MeshNode* _node;
double _u;
-
int
_edgeInd; // index in theSinuEdges vector
+
size_t
_edgeInd; // index in theSinuEdges vector
NodePoint(): _node(0), _u(0), _edgeInd(-1) {}
NodePoint(const SMDS_MeshNode* n, double u, size_t iEdge ): _node(n), _u(u), _edgeInd(iEdge) {}
NodePoint(): _node(0), _u(0), _edgeInd(-1) {}
NodePoint(const SMDS_MeshNode* n, double u, size_t iEdge ): _node(n), _u(u), _edgeInd(iEdge) {}
@@
-1251,8
+1253,8
@@
namespace
const vector<TopoDS_Edge>& theSinuEdges = theSinuFace._sinuEdges;
const vector< Handle(Geom_Curve) >& curves = theSinuFace._sinuCurves;
const vector<TopoDS_Edge>& theSinuEdges = theSinuFace._sinuEdges;
const vector< Handle(Geom_Curve) >& curves = theSinuFace._sinuCurves;
- SMESH_MAT2d::BoundaryPoint bp[2];
- const SMESH_MAT2d::Branch& branch = *theMA.getBranch(0);
+
//
SMESH_MAT2d::BoundaryPoint bp[2];
+
//
const SMESH_MAT2d::Branch& branch = *theMA.getBranch(0);
typedef TMAPar2NPoints::iterator TIterator;
typedef TMAPar2NPoints::iterator TIterator;
@@
-1292,7
+1294,7
@@
namespace
{
// find an existing node on VERTEX among sameU2NP and get underlying EDGEs
const SMDS_MeshNode* existingNode = 0;
{
// find an existing node on VERTEX among sameU2NP and get underlying EDGEs
const SMDS_MeshNode* existingNode = 0;
- set<
in
t > edgeInds;
+ set<
size_
t > edgeInds;
NodePoint* np;
for ( size_t i = 0; i < sameU2NP.size(); ++i )
{
NodePoint* np;
for ( size_t i = 0; i < sameU2NP.size(); ++i )
{
@@
-1309,7
+1311,7
@@
namespace
if ( u2NPprev->first < 0. ) ++u2NPprev;
if ( u2NPnext->first > 1. ) --u2NPnext;
if ( u2NPprev->first < 0. ) ++u2NPprev;
if ( u2NPnext->first > 1. ) --u2NPnext;
- set<
in
t >::iterator edgeID = edgeInds.begin();
+ set<
size_
t >::iterator edgeID = edgeInds.begin();
for ( ; edgeID != edgeInds.end(); ++edgeID )
{
// get U range on iEdge within which the equal points will be distributed
for ( ; edgeID != edgeInds.end(); ++edgeID )
{
// get U range on iEdge within which the equal points will be distributed
@@
-1844,12
+1846,12
@@
namespace
const double dksi = 0.5, deta = 0.5;
const double dksi2 = dksi*dksi, deta2 = deta*deta;
double err = 0., g11, g22, g12;
const double dksi = 0.5, deta = 0.5;
const double dksi2 = dksi*dksi, deta2 = deta*deta;
double err = 0., g11, g22, g12;
- int nbErr = 0;
+
//
int nbErr = 0;
FaceQuadStruct& q = *quad;
UVPtStruct pNew;
FaceQuadStruct& q = *quad;
UVPtStruct pNew;
- double refArea = area( q.UVPt(0,0), q.UVPt(1,0), q.UVPt(1,1) );
+
//
double refArea = area( q.UVPt(0,0), q.UVPt(1,0), q.UVPt(1,1) );
for ( int iLoop = 0; iLoop < nbLoops; ++iLoop )
{
for ( int iLoop = 0; iLoop < nbLoops; ++iLoop )
{