IPAL0052448: Too thin viscous layers are constructed

[modules/smesh.git] / src / SMESH / SMESH_MesherHelper.hxx

diff --git a/src/SMESH/SMESH_MesherHelper.hxx b/src/SMESH/SMESH_MesherHelper.hxx
index 3ac5547cb9500b5f145dc92b372a8232fc331912..7c8ddbdcf3ddd7dd4a2137b19f6c43846f75d062 100644 (file)
--- a/src/SMESH/SMESH_MesherHelper.hxx
+++ b/src/SMESH/SMESH_MesherHelper.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014  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
@@ -6,7 +6,7 @@
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -97,7 +97,7 @@ class SMESH_EXPORT SMESH_MesherHelper
    * The key of the map is a normalized parameter of each
    * base node on theBaseSide. Edges in theBaseSide must be sequenced.
    * This method works in supposition that nodes on the face
-   * forms a rectangular grid and elements can be quardrangles or triangles
+   * forms a structured grid and elements can be quardrangles or triangles
    */
   static bool LoadNodeColumns(TParam2ColumnMap &            theParam2ColumnMap,
                               const TopoDS_Face&            theFace,
@@ -140,10 +140,8 @@ class SMESH_EXPORT SMESH_MesherHelper
     * \param nbNodes - total nb of nodes
     * \retval int - valid node index
    */
-  static int WrapIndex(const int ind, const int nbNodes) {
-    if ( ind < 0 ) return nbNodes + ind % nbNodes;
-    if ( ind >= nbNodes ) return ind % nbNodes;
-    return ind;
+  static inline int WrapIndex(int ind, const int nbNodes) {
+    return (( ind %= nbNodes ) < 0 ) ? ind + nbNodes : ind;
   }
 
   /*!
@@ -156,15 +154,16 @@ class SMESH_EXPORT SMESH_MesherHelper
    *  \param p0,p1,p2,p3 - UV of the point projections on EDGEs of the FACE
    *  \return gp_XY - UV of the point on the FACE
    *
-   * Order of those UV in the FACE is as follows.
-   *   a4   p3    a3
+   *  Y ^              Order of those UV in the FACE is as follows.
+   *    |
+   *   a3   p2    a2
    *    o---x-----o
    *    |   :     |
    *    |   :UV   |
-   * p4 x...O.....x p2
+   * p3 x...O.....x p1
    *    |   :     |
-   *    o---x-----o
-   *   a1   p1    a2
+   *    o---x-----o    ----> X
+   *   a0   p0    a1
    */
   inline static gp_XY calcTFI(double x, double y,
                               const gp_XY a0,const gp_XY a1,const gp_XY a2,const gp_XY a3,
@@ -218,6 +217,10 @@ class SMESH_EXPORT SMESH_MesherHelper
 
   static double MaxTolerance( const TopoDS_Shape& shape );
 
+  static double GetAngle( const TopoDS_Edge & E1, const TopoDS_Edge & E2,
+                          const TopoDS_Face & F,  const TopoDS_Vertex & V,
+                          gp_Vec* faceNormal=0);
+
   static bool IsClosedEdge( const TopoDS_Edge& anEdge );
 
   static TopoDS_Vertex IthVertex( const bool is2nd, TopoDS_Edge anEdge, const bool CumOri=true );
@@ -303,7 +306,7 @@ public:
   const TopoDS_Shape& GetSubShape() const  { return myShape; }
 
   /*!
-   * Creates a node
+   * 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.);
   /*!
@@ -419,7 +422,7 @@ public:
   double GetNodeU(const TopoDS_Edge&   theEdge,
                   const SMDS_MeshNode* theNode,
                   const SMDS_MeshNode* inEdgeNode=0,
-                  bool*                check=0);
+                  bool*                check=0) const;
   /*!
    * \brief Return node UV on face
    *  \param inFaceNode - a node of element being created located inside a face
@@ -459,6 +462,16 @@ public:
   static gp_XY GetMiddleUV(const Handle(Geom_Surface)& surface,
                            const gp_XY&                uv1,
                            const gp_XY&                uv2);
+  /*!
+   * \brief Return UV for the central node of a biquadratic triangle
+   */
+  static gp_XY GetCenterUV(const gp_XY& uv1,
+                           const gp_XY& uv2, 
+                           const gp_XY& uv3, 
+                           const gp_XY& uv12,
+                           const gp_XY& uv23,
+                           const gp_XY& uv31,
+                           bool *       isBadTria=0);
   /*!
    * \brief Define a pointer to wrapper over a function of gp_XY class,
    *       suitable to pass as xyFunPtr to applyIn2D().
@@ -547,13 +560,20 @@ public:
   { return IsRealSeam( GetMeshDS()->ShapeToIndex( subShape)); }
   /*!
    * \brief Check if the shape set through IsQuadraticSubMesh() or SetSubShape()
-   *        has a seam edge
-    * \retval bool - true if it has
+   *        has a seam edge, i.e. an edge that has two parametric representations
+   *        on a surface
+   *  \retval bool - true if it has
    */
   bool HasSeam() const { return !mySeamShapeIds.empty(); }
+  /*!
+   * \brief Check if the shape set through IsQuadraticSubMesh() or SetSubShape()
+   *        has a seam edge that encounters twice in a wire
+   *  \retval bool - true if it has
+   */
+  bool HasRealSeam() const { return HasSeam() && ( *mySeamShapeIds.begin() < 0 ); }
   /*!
    * \brief Return index of periodic parametric direction of a closed face
-    * \retval int - 1 for U, 2 for V direction
+   *  \retval int - 1 for U, 2 for V direction
    */
   int GetPeriodicIndex() const { return myParIndex; }
   /*!