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
[bos #41122][EDF] Quadrangle radial for face which curved edges didn't discretize...
[modules/smesh.git]
/
src
/
SMESH
/
SMESH_MesherHelper.hxx
diff --git
a/src/SMESH/SMESH_MesherHelper.hxx
b/src/SMESH/SMESH_MesherHelper.hxx
index 8c9aea094484e247dbeb362fb91a49e1a74b2cf9..1dc0594f5064b2ed09f14b40c3a799685859d2d1 100644
(file)
--- a/
src/SMESH/SMESH_MesherHelper.hxx
+++ b/
src/SMESH/SMESH_MesherHelper.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16 CEA/DEN, EDF R&D
, OPEN CASCADE
+// Copyright (C) 2007-20
24 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
@@
-100,7
+100,7
@@
class SMESH_EXPORT SMESH_MesherHelper
* \brief Load nodes bound to face into a map of node columns
* \param theParam2ColumnMap - map of node columns to fill
* \param theFace - the face on which nodes are searched for
* \brief Load nodes bound to face into a map of node columns
* \param theParam2ColumnMap - map of node columns to fill
* \param theFace - the face on which nodes are searched for
- * \param theBaseSide - the edges holding nodes on which columns
' bases
+ * \param theBaseSide - the edges holding nodes on which columns
base
* \param theMesh - the mesh containing nodes
* \retval bool - false if something is wrong
*
* \param theMesh - the mesh containing nodes
* \retval bool - false if something is wrong
*
@@
-127,6
+127,13
@@
class SMESH_EXPORT SMESH_MesherHelper
*/
static bool IsStructured( SMESH_subMesh* faceSM );
*/
static bool IsStructured( SMESH_subMesh* faceSM );
+ /*!
+ * \brief Return true if a node is at a corner of a 2D structured mesh of FACE
+ */
+ static bool IsCornerOfStructure( const SMDS_MeshNode* n,
+ const SMESHDS_SubMesh* faceSM,
+ SMESH_MesherHelper& faceAnalyser );
+
/*!
* \brief Return true if 2D mesh on FACE is distored
*/
/*!
* \brief Return true if 2D mesh on FACE is distored
*/
@@
-343,13
+350,13
@@
public:
/*!
* Creates a node (!Note ID before u=0.,v0.)
*/
/*!
* Creates a node (!Note ID before u=0.,v0.)
*/
- SMDS_MeshNode* AddNode(double x, double y, double z,
int
ID = 0, double u=0., double v=0.);
+ SMDS_MeshNode* AddNode(double x, double y, double z,
smIdType
ID = 0, double u=0., double v=0.);
/*!
* Creates quadratic or linear edge
*/
SMDS_MeshEdge* AddEdge(const SMDS_MeshNode* n1,
const SMDS_MeshNode* n2,
/*!
* Creates quadratic or linear edge
*/
SMDS_MeshEdge* AddEdge(const SMDS_MeshNode* n1,
const SMDS_MeshNode* n2,
- const
int
id = 0,
+ const
smIdType
id = 0,
const bool force3d = true);
/*!
* Creates quadratic or linear triangle
const bool force3d = true);
/*!
* Creates quadratic or linear triangle
@@
-357,7
+364,7
@@
public:
SMDS_MeshFace* AddFace(const SMDS_MeshNode* n1,
const SMDS_MeshNode* n2,
const SMDS_MeshNode* n3,
SMDS_MeshFace* AddFace(const SMDS_MeshNode* n1,
const SMDS_MeshNode* n2,
const SMDS_MeshNode* n3,
- const
int
id=0,
+ const
smIdType
id=0,
const bool force3d = false);
/*!
* Creates bi-quadratic, quadratic or linear quadrangle
const bool force3d = false);
/*!
* Creates bi-quadratic, quadratic or linear quadrangle
@@
-366,13
+373,13
@@
public:
const SMDS_MeshNode* n2,
const SMDS_MeshNode* n3,
const SMDS_MeshNode* n4,
const SMDS_MeshNode* n2,
const SMDS_MeshNode* n3,
const SMDS_MeshNode* n4,
- const
int
id = 0,
+ const
smIdType
id = 0,
const bool force3d = false);
/*!
* Creates polygon, with additional nodes in quadratic mesh
*/
SMDS_MeshFace* AddPolygonalFace (const std::vector<const SMDS_MeshNode*>& nodes,
const bool force3d = false);
/*!
* Creates polygon, with additional nodes in quadratic mesh
*/
SMDS_MeshFace* AddPolygonalFace (const std::vector<const SMDS_MeshNode*>& nodes,
- const
int
id = 0,
+ const
smIdType
id = 0,
const bool force3d = false);
/*!
* Creates quadratic or linear tetrahedron
const bool force3d = false);
/*!
* Creates quadratic or linear tetrahedron
@@
-381,7
+388,7
@@
public:
const SMDS_MeshNode* n2,
const SMDS_MeshNode* n3,
const SMDS_MeshNode* n4,
const SMDS_MeshNode* n2,
const SMDS_MeshNode* n3,
const SMDS_MeshNode* n4,
- const
int
id = 0,
+ const
smIdType
id = 0,
const bool force3d = true);
/*!
* Creates quadratic or linear pyramid
const bool force3d = true);
/*!
* Creates quadratic or linear pyramid
@@
-391,7
+398,7
@@
public:
const SMDS_MeshNode* n3,
const SMDS_MeshNode* n4,
const SMDS_MeshNode* n5,
const SMDS_MeshNode* n3,
const SMDS_MeshNode* n4,
const SMDS_MeshNode* n5,
- const
int
id = 0,
+ const
smIdType
id = 0,
const bool force3d = true);
/*!
* Creates quadratic or linear pentahedron
const bool force3d = true);
/*!
* Creates quadratic or linear pentahedron
@@
-402,7
+409,7
@@
public:
const SMDS_MeshNode* n4,
const SMDS_MeshNode* n5,
const SMDS_MeshNode* n6,
const SMDS_MeshNode* n4,
const SMDS_MeshNode* n5,
const SMDS_MeshNode* n6,
- const
int
id = 0,
+ const
smIdType
id = 0,
const bool force3d = true);
/*!
* Creates bi-quadratic, quadratic or linear hexahedron
const bool force3d = true);
/*!
* Creates bi-quadratic, quadratic or linear hexahedron
@@
-415,7
+422,7
@@
public:
const SMDS_MeshNode* n6,
const SMDS_MeshNode* n7,
const SMDS_MeshNode* n8,
const SMDS_MeshNode* n6,
const SMDS_MeshNode* n7,
const SMDS_MeshNode* n8,
- const
int
id = 0,
+ const
smIdType
id = 0,
bool force3d = true);
/*!
bool force3d = true);
/*!
@@
-433,7
+440,7
@@
public:
const SMDS_MeshNode* n10,
const SMDS_MeshNode* n11,
const SMDS_MeshNode* n12,
const SMDS_MeshNode* n10,
const SMDS_MeshNode* n11,
const SMDS_MeshNode* n12,
- const
int
id = 0,
+ const
smIdType
id = 0,
bool force3d = true);
/*!
bool force3d = true);
/*!
@@
-441,7
+448,7
@@
public:
*/
SMDS_MeshVolume* AddPolyhedralVolume (const std::vector<const SMDS_MeshNode*>& nodes,
const std::vector<int>& quantities,
*/
SMDS_MeshVolume* AddPolyhedralVolume (const std::vector<const SMDS_MeshNode*>& nodes,
const std::vector<int>& quantities,
- const
int
ID=0,
+ const
smIdType
ID=0,
const bool force3d = true);
/*!
* \brief Enables fixing node parameters on EDGEs and FACEs by
const bool force3d = true);
/*!
* \brief Enables fixing node parameters on EDGEs and FACEs by
@@
-510,7
+517,7
@@
public:
/*!
* \brief Define a pointer to wrapper over a function of gp_XY class,
* suitable to pass as xyFunPtr to ApplyIn2D().
/*!
* \brief Define a pointer to wrapper over a function of gp_XY class,
* suitable to pass as xyFunPtr to ApplyIn2D().
- * For exaple gp_XY_FunPtr(Added) defines pointer gp_XY_Added to function
+ * For exa
m
ple gp_XY_FunPtr(Added) defines pointer gp_XY_Added to function
* calling gp_XY::Added(gp_XY), which is to be used like following
* ApplyIn2D(surf, uv1, uv2, gp_XY_Added)
*/
* calling gp_XY::Added(gp_XY), which is to be used like following
* ApplyIn2D(surf, uv1, uv2, gp_XY_Added)
*/
@@
-547,11
+554,20
@@
public:
bool GetNodeUVneedInFaceNode(const TopoDS_Face& F = TopoDS_Face()) const;
/*!
bool GetNodeUVneedInFaceNode(const TopoDS_Face& F = TopoDS_Face()) const;
/*!
- * \brief Return projector initialized by given face without location
, which is returned
+ * \brief Return projector initialized by given face without location
*/
GeomAPI_ProjectPointOnSurf& GetProjector(const TopoDS_Face& F,
TopLoc_Location& loc,
*/
GeomAPI_ProjectPointOnSurf& GetProjector(const TopoDS_Face& F,
TopLoc_Location& loc,
- double tol=0 ) const;
+ double tol=0 ) const;
+ /*!
+ * \brief Return projector initialized by given face
+ */
+ GeomAPI_ProjectPointOnSurf& GetProjector(const TopoDS_Face& F,
+ double tol=0 ) const;
+ /*!
+ * \brief Return projector initialized by given EDGE
+ */
+ GeomAPI_ProjectPointOnCurve& GetPCProjector(const TopoDS_Edge& E ) const;
/*!
* \brief Return a cached ShapeAnalysis_Surface of a FACE
*/
/*!
* \brief Return a cached ShapeAnalysis_Surface of a FACE
*/
@@
-635,6
+651,10
@@
public:
* \retval int - 1 for U, 2 for V direction
*/
int GetPeriodicIndex() const { return myParIndex; }
* \retval int - 1 for U, 2 for V direction
*/
int GetPeriodicIndex() const { return myParIndex; }
+ /*!
+ * \brief Return period in given direction [1,2]
+ */
+ double GetPeriod(int perioIndex) const { return myPar2[ perioIndex-1 ] - myPar1[ perioIndex-1 ]; }
/*!
* \brief Return an alternative parameter for a node on seam
*/
/*!
* \brief Return an alternative parameter for a node on seam
*/
@@
-749,7
+769,7
@@
public:
SMESH_MesherHelper (const SMESH_MesherHelper& theOther);
// key of a map of bi-quadratic face to it's central node
SMESH_MesherHelper (const SMESH_MesherHelper& theOther);
// key of a map of bi-quadratic face to it's central node
- struct TBiQuad: public std::pair<
int, std::pair<int, int
> >
+ struct TBiQuad: public std::pair<
smIdType, std::pair<smIdType, smIdType
> >
{
TBiQuad(const SMDS_MeshNode* n1,
const SMDS_MeshNode* n2,
{
TBiQuad(const SMDS_MeshNode* n1,
const SMDS_MeshNode* n2,