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 from V5_1_4_BR 07/05/2010
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_Penta_3D.hxx
diff --git
a/src/StdMeshers/StdMeshers_Penta_3D.hxx
b/src/StdMeshers/StdMeshers_Penta_3D.hxx
index f061f81443a5f2e8b21c9e1ba93d3c0e000bbaba..0ef1037bffb90a8c50a14005bc1045f27ae15dd7 100644
(file)
--- a/
src/StdMeshers/StdMeshers_Penta_3D.hxx
+++ b/
src/StdMeshers/StdMeshers_Penta_3D.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
08
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
10
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
@@
-19,6
+19,7
@@
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+
// SMESH StdMeshers : implementaion of SMESH idl descriptions
// File : StdMeshers_Penta_3D.hxx
// Module : SMESH
// SMESH StdMeshers : implementaion of SMESH idl descriptions
// File : StdMeshers_Penta_3D.hxx
// Module : SMESH
@@
-45,6
+46,7
@@
#include "SMESH_Block.hxx"
#include "SMESH_ComputeError.hxx"
#include "SMESH_MesherHelper.hxx"
#include "SMESH_Block.hxx"
#include "SMESH_ComputeError.hxx"
#include "SMESH_MesherHelper.hxx"
+#include "SMESH_3D_Algo.hxx"
typedef std::map< double, std::vector<const SMDS_MeshNode*> > StdMeshers_IJNodeMap;
typedef std::map< double, std::vector<const SMDS_MeshNode*> > StdMeshers_IJNodeMap;
@@
-57,26
+59,26
@@
public:
void Load (const TopoDS_Shell& theShell);
void Load (const TopoDS_Shell& theShell,
void Load (const TopoDS_Shell& theShell);
void Load (const TopoDS_Shell& theShell,
- const TopoDS_Vertex& theV000,
- const TopoDS_Vertex& theV001);
+
const TopoDS_Vertex& theV000,
+
const TopoDS_Vertex& theV001);
void ComputeParameters(const gp_Pnt& thePnt,
void ComputeParameters(const gp_Pnt& thePnt,
- gp_XYZ& theXYZ);
+
gp_XYZ& theXYZ);
void ComputeParameters(const gp_Pnt& thePnt,
void ComputeParameters(const gp_Pnt& thePnt,
- const TopoDS_Shape& theShape,
- gp_XYZ& theXYZ);
+
const TopoDS_Shape& theShape,
+
gp_XYZ& theXYZ);
void ComputeParameters(const double& theU,
void ComputeParameters(const double& theU,
- const TopoDS_Shape& theShape,
- gp_XYZ& theXYZ);
+
const TopoDS_Shape& theShape,
+
gp_XYZ& theXYZ);
void Point(const gp_XYZ& theParams,
void Point(const gp_XYZ& theParams,
- gp_Pnt& thePnt);
+
gp_Pnt& thePnt);
void Point(const gp_XYZ& theParams,
void Point(const gp_XYZ& theParams,
- const TopoDS_Shape& theShape,
- gp_Pnt& thePnt);
+
const TopoDS_Shape& theShape,
+
gp_Pnt& thePnt);
int ShapeID(const TopoDS_Shape& theShape);
int ShapeID(const TopoDS_Shape& theShape);
@@
-204,6
+206,9
@@
class STDMESHERS_EXPORT StdMeshers_Penta_3D {
// The key of theIJNodes map is a normalized parameter of each
// 0-the node on theBaseEdge.
// The key of theIJNodes map is a normalized parameter of each
// 0-the node on theBaseEdge.
+ bool Evaluate(SMESH_Mesh & aMesh, const TopoDS_Shape & aShape,
+ MapShapeNbElems& aResMap);
+
protected: // methods
protected: // methods
@@
-219,17
+224,17
@@
class STDMESHERS_EXPORT StdMeshers_Penta_3D {
std::vector<const SMDS_MeshNode*>*& aCol2);
void ShapeSupportID(const bool theIsUpperLayer,
std::vector<const SMDS_MeshNode*>*& aCol2);
void ShapeSupportID(const bool theIsUpperLayer,
- const SMESH_Block::TShapeID theBNSSID,
- SMESH_Block::TShapeID& theSSID);
+
const SMESH_Block::TShapeID theBNSSID,
+
SMESH_Block::TShapeID& theSSID);
void FindNodeOnShape(const TopoDS_Shape& aS,
void FindNodeOnShape(const TopoDS_Shape& aS,
- const gp_XYZ& aParams,
+
const gp_XYZ& aParams,
const int z,
const int z,
- StdMeshers_TNode& aTN);
+
StdMeshers_TNode& aTN);
void CreateNode(const bool theIsUpperLayer,
void CreateNode(const bool theIsUpperLayer,
- const gp_XYZ& aParams,
- StdMeshers_TNode& aTN);
+
const gp_XYZ& aParams,
+
StdMeshers_TNode& aTN);
void ClearMeshOnFxy1();
void ClearMeshOnFxy1();