X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_Prism_3D.hxx;h=0a24284016a0edcaacbe61ab6ff731be9cbb679e;hp=f4e49ce63190253cd9ec38a4abb5defb46ae257d;hb=85b03c36436cae5428fcf5a971eac4bccb127675;hpb=b1f58b701eb4ec6fb4a14b070041f2c89e44723c

diff --git a/src/StdMeshers/StdMeshers_Prism_3D.hxx b/src/StdMeshers/StdMeshers_Prism_3D.hxx
index f4e49ce63..0a2428401 100644
--- a/src/StdMeshers/StdMeshers_Prism_3D.hxx
+++ b/src/StdMeshers/StdMeshers_Prism_3D.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2015  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
@@ -56,6 +56,10 @@ namespace Prism_3D
   struct TNode;
   struct TPrismTopo;
 }
+namespace StdMeshers_ProjectionUtils
+{
+  class TrsfFinder3D;
+}
 class SMESHDS_SubMesh;
 class TopoDS_Edge;
 
@@ -109,6 +113,7 @@ namespace Prism_3D
     bool                     myNotQuadOnTop;
 
     void Clear();
+    void SetUpsideDown();
   };
 }
 
@@ -397,7 +402,43 @@ private:
 
 }; // class StdMeshers_PrismAsBlock
 
-// =============================================
+// ===============================================
+/*!
+ * \brief Tool building internal nodes in a prism
+ */
+struct StdMeshers_Sweeper
+{
+  std::vector< TNodeColumn* > myBndColumns; // boundary nodes
+  std::vector< TNodeColumn* > myIntColumns; // internal nodes
+
+  bool ComputeNodes( SMESH_MesherHelper& helper,
+                     const double        tol,
+                     const bool          allowHighBndError );
+
+private:
+
+  gp_XYZ bndPoint( int iP, int z ) const
+  { return SMESH_TNodeXYZ( (*myBndColumns[ iP ])[ z ]); }
+
+  gp_XYZ intPoint( int iP, int z ) const
+  { return SMESH_TNodeXYZ( (*myIntColumns[ iP ])[ z ]); }
+
+  static bool projectIntPoints(const std::vector< gp_XYZ >& fromBndPoints,
+                               const std::vector< gp_XYZ >& toBndPoints,
+                               const std::vector< gp_XYZ >& fromIntPoints,
+                               std::vector< gp_XYZ >&       toIntPoints,
+                               StdMeshers_ProjectionUtils::TrsfFinder3D& trsf,
+                               std::vector< gp_XYZ > *      bndError);
+
+  static void applyBoundaryError(const std::vector< gp_XYZ >& bndPoints,
+                                 const std::vector< gp_XYZ >& bndError1,
+                                 const std::vector< gp_XYZ >& bndError2,
+                                 const double                 r,
+                                 std::vector< gp_XYZ >&       toIntPoints,
+                                 std::vector< double >&       int2BndDist);
+};
+
+// ===============================================
 /*!
  * \brief Algo building prisms on a prism shape
  */
@@ -431,7 +472,7 @@ public:
     * \param nodeColumns - columns of nodes generated from nodes of a mesh face
     * \param helper - helper initialized by mesh and shape to add prisms to
    */
-  static void AddPrisms( std::vector<const TNodeColumn*> & nodeColumns,
+  static bool AddPrisms( std::vector<const TNodeColumn*> & nodeColumns,
                          SMESH_MesherHelper*               helper);
 
   static bool IsApplicable(const TopoDS_Shape & aShape, bool toCheckAll);
@@ -442,7 +483,9 @@ public:
    * \brief Analyse shape geometry and mesh.
     * If there are triangles on one of faces, it becomes 'bottom'
    */
-  bool initPrism(Prism_3D::TPrismTopo& thePrism, const TopoDS_Shape& theSolid);
+  bool initPrism(Prism_3D::TPrismTopo& thePrism,
+                 const TopoDS_Shape&   theSolid,
+                 const bool            selectBottom = true);
 
   /*!
    * \brief Fill thePrism.myWallQuads and thePrism.myTopEdges
@@ -471,14 +514,26 @@ public:
    *  and projection is possible and allowed, perform the projection
     * \retval bool - is a success or not
    */
-  bool assocOrProjBottom2Top( const gp_Trsf & bottomToTopTrsf );
+  bool assocOrProjBottom2Top( const gp_Trsf & bottomToTopTrsf,
+                              const Prism_3D::TPrismTopo& thePrism);
 
   /*!
    * \brief Remove quadrangles from the top face and
    *        create triangles there by projection from the bottom
     * \retval bool - a success or not
    */
-  bool projectBottomToTop( const gp_Trsf & bottomToTopTrsf );
+  bool projectBottomToTop( const gp_Trsf & bottomToTopTrsf,
+                           const Prism_3D::TPrismTopo& thePrism );
+
+  /*!
+   * \brief Compute tolerance to pass to StdMeshers_Sweeper
+   */
+  double getSweepTolerance( const Prism_3D::TPrismTopo& thePrism );
+
+  /*!
+   * \brief Defines if it's safe to use the block approach
+   */
+  bool isSimpleBottom( const Prism_3D::TPrismTopo& thePrism );
 
   /*!
    * \brief Project mesh faces from a source FACE of one prism to
@@ -509,6 +564,7 @@ private:
 
   bool myProjectTriangles;
   bool mySetErrorToSM;
+  bool myUseBlock;
 
   StdMeshers_PrismAsBlock myBlock;
   SMESH_MesherHelper*     myHelper;