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
Porting to OCCT 7.8.0
[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 7efd9af5f0e6d125090d7ef70e2f92c8342f6abc..88f79d159bac305c7872ba678f7b5f6a4d3e547c 100644
(file)
--- a/
src/StdMeshers/StdMeshers_QuadFromMedialAxis_1D2D.cxx
+++ b/
src/StdMeshers/StdMeshers_QuadFromMedialAxis_1D2D.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-202
1 CEA/DEN, EDF R&D
, OPEN CASCADE
+// Copyright (C) 2007-202
4 CEA, EDF
, 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
@@
-30,6
+30,7
@@
#include "SMESH_Gen.hxx"
#include "SMESH_MAT2d.hxx"
#include "SMESH_Mesh.hxx"
#include "SMESH_Gen.hxx"
#include "SMESH_MAT2d.hxx"
#include "SMESH_Mesh.hxx"
+#include "SMESH_SequentialMesh.hxx"
#include "SMESH_MeshEditor.hxx"
#include "SMESH_MesherHelper.hxx"
#include "SMESH_ProxyMesh.hxx"
#include "SMESH_MeshEditor.hxx"
#include "SMESH_MesherHelper.hxx"
#include "SMESH_ProxyMesh.hxx"
@@
-144,7
+145,7
@@
public:
return true;
}
};
return true;
}
};
-
+
//================================================================================
/*!
* \brief Constructor sets algo features
//================================================================================
/*!
* \brief Constructor sets algo features
@@
-203,7
+204,7
@@
bool StdMeshers_QuadFromMedialAxis_1D2D::CheckHypothesis(SMESH_Mesh& aMe
namespace
{
typedef map< const SMDS_MeshNode*, list< const SMDS_MeshNode* > > TMergeMap;
namespace
{
typedef map< const SMDS_MeshNode*, list< const SMDS_MeshNode* > > TMergeMap;
-
+
//================================================================================
/*!
* \brief Sinuous face
//================================================================================
/*!
* \brief Sinuous face
@@
-236,11
+237,11
@@
namespace
/*!
* \brief Temporary mesh
*/
/*!
* \brief Temporary mesh
*/
- struct TmpMesh : public SMESH_Mesh
+ struct TmpMesh : public SMESH_
Sequential
Mesh
{
TmpMesh()
{
{
TmpMesh()
{
- _m
yM
eshDS = new SMESHDS_Mesh(/*id=*/0, /*isEmbeddedMode=*/true);
+ _meshDS = new SMESHDS_Mesh(/*id=*/0, /*isEmbeddedMode=*/true);
}
};
}
};
@@
-506,7
+507,7
@@
namespace
theSinuEdges[1].clear();
theShortEdges[0].clear();
theShortEdges[1].clear();
theSinuEdges[1].clear();
theShortEdges[0].clear();
theShortEdges[1].clear();
-
+
vector<TopoDS_Edge> & allEdges = theSinuFace._edges;
const size_t nbEdges = allEdges.size();
if ( nbEdges < 4 && theSinuFace._nbWires == 1 )
vector<TopoDS_Edge> & allEdges = theSinuFace._edges;
const size_t nbEdges = allEdges.size();
if ( nbEdges < 4 && theSinuFace._nbWires == 1 )
@@
-841,7
+842,7
@@
namespace
// Find 1D algo to mesh branchEdge
// Find 1D algo to mesh branchEdge
-
+
// look for a most local 1D hyp assigned to the FACE
int mostSimpleShape = -1, maxShape = TopAbs_EDGE;
TopoDS_Edge edge;
// look for a most local 1D hyp assigned to the FACE
int mostSimpleShape = -1, maxShape = TopAbs_EDGE;
TopoDS_Edge edge;
@@
-1185,6
+1186,8
@@
namespace
if ( !npCloseV._node || npCloseV._node == npVert._node )
{
npProj = npCloseN;
if ( !npCloseV._node || npCloseV._node == npVert._node )
{
npProj = npCloseN;
+ if ( i+1 < projToMerge.size() && u2NPClose == projToMerge[ i+1 ])
+ ++i;
thePointsOnE.erase( u2NPClose );
continue;
}
thePointsOnE.erase( u2NPClose );
continue;
}
@@
-1448,7
+1451,7
@@
namespace
nIn = nodeParams.rbegin()->second;
else
nIn = u2n->second;
nIn = nodeParams.rbegin()->second;
else
nIn = u2n->second;
-
+
// find position of distant nodes in uvsOut and uvsIn
size_t iDistOut, iDistIn;
for ( iDistOut = 0; iDistOut < uvsOut.size(); ++iDistOut )
// find position of distant nodes in uvsOut and uvsIn
size_t iDistOut, iDistIn;
for ( iDistOut = 0; iDistOut < uvsOut.size(); ++iDistOut )
@@
-2149,6
+2152,7
@@
bool StdMeshers_QuadFromMedialAxis_1D2D::computeQuads( SMESH_MesherHelper& theHe
bool StdMeshers_QuadFromMedialAxis_1D2D::Compute(SMESH_Mesh& theMesh,
const TopoDS_Shape& theShape)
{
bool StdMeshers_QuadFromMedialAxis_1D2D::Compute(SMESH_Mesh& theMesh,
const TopoDS_Shape& theShape)
{
+ std::cout << "helper_quad " << theMesh.IsParallel() << std::endl;
SMESH_MesherHelper helper( theMesh );
helper.SetSubShape( theShape );
SMESH_MesherHelper helper( theMesh );
helper.SetSubShape( theShape );