X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_Hexa_3D.hxx;h=8b50468b7c37625f48e238987b1709f2de9bc491;hp=809f95ee7473aa11640169d2798c70f4f3082765;hb=ccb5e3c25bf204e839c0094f50f543eacedba5e6;hpb=4ff5bd61540272713e48de1eee75625028c32155

diff --git a/src/StdMeshers/StdMeshers_Hexa_3D.hxx b/src/StdMeshers/StdMeshers_Hexa_3D.hxx
index 809f95ee7..8b50468b7 100644
--- a/src/StdMeshers/StdMeshers_Hexa_3D.hxx
+++ b/src/StdMeshers/StdMeshers_Hexa_3D.hxx
@@ -1,66 +1,43 @@
-//  SMESH SMESH : implementaion of SMESH idl descriptions
+// Copyright (C) 2007-2016  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
+//
+// 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, or (at your option) any later version.
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-// 
-//  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. 
-// 
-//  This library is distributed in the hope that it will be useful, 
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-//  Lesser General Public License for more details. 
-// 
-//  You should have received a copy of the GNU Lesser General Public 
-//  License along with this library; if not, write to the Free Software 
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-// 
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
 //
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
+//  SMESH SMESH : implementaion of SMESH idl descriptions
 //  File   : StdMeshers_Hexa_3D.hxx
 //           Moved here from SMESH_Hexa_3D.hxx
 //  Author : Paul RASCLE, EDF
 //  Module : SMESH
-
+//
 #ifndef _SMESH_HEXA_3D_HXX_
 #define _SMESH_HEXA_3D_HXX_
 
-#include "SMESH_3D_Algo.hxx"
-#include "SMESH_Mesh.hxx"
-#include "StdMeshers_Quadrangle_2D.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include "SMESH_StdMeshers.hxx"
 
-#include "StdMeshers_Helper.hxx"
+#include "SMESH_Algo.hxx"
 
-typedef struct point3Dstruct
-{
-  const SMDS_MeshNode * node;
-} Point3DStruct;
 
-typedef double Pt3[3];
+class StdMeshers_ViscousLayers;
+class SMESH_MesherHelper;
 
-typedef struct conv2dstruct
-{
-  double a1; // X = a1*x + b1*y + c1 
-  double b1; // Y = a2*x + b2*y + c2
-  double c1; // a1, b1 a2, b2 in {-1,0,1}
-  double a2; // c1, c2 in {0,1}
-  double b2;
-  double c2;
-  int ia;    // I = ia*i + ib*j + ic
-  int ib;
-  int ic;
-  int ja;    // J = ja*i + jb*j + jc
-  int jb;
-  int jc;
-} Conv2DStruct;
-
-class StdMeshers_Hexa_3D:
-  public SMESH_3D_Algo
+class STDMESHERS_EXPORT StdMeshers_Hexa_3D : public SMESH_3D_Algo
 {
 public:
   StdMeshers_Hexa_3D(int hypId, int studyId, SMESH_Gen* gen);
@@ -70,46 +47,22 @@ public:
                                const TopoDS_Shape& aShape,
                                SMESH_Hypothesis::Hypothesis_Status& aStatus);
 
-  virtual bool Compute(SMESH_Mesh& aMesh,
-		       const TopoDS_Shape& aShape)
-    throw (SALOME_Exception);
-
-  ostream & SaveTo(ostream & save);
-  istream & LoadFrom(istream & load);
-  friend ostream & operator << (ostream & save, StdMeshers_Hexa_3D & hyp);
-  friend istream & operator >> (istream & load, StdMeshers_Hexa_3D & hyp);
+  virtual bool Compute(SMESH_Mesh& aMesh,  const TopoDS_Shape& aShape);
 
-protected:
-  TopoDS_Edge
-  EdgeNotInFace(SMESH_Mesh& aMesh,
-		const TopoDS_Shape& aShape,
-		const TopoDS_Face& aFace,
-		const TopoDS_Vertex& aVertex,
-		const TopTools_IndexedDataMapOfShapeListOfShape& MS);
+  virtual bool Compute(SMESH_Mesh & aMesh, SMESH_MesherHelper* aHelper);
 
-  int GetFaceIndex(SMESH_Mesh& aMesh,
-		   const TopoDS_Shape& aShape,
-		   const vector<SMESH_subMesh*>& meshFaces,
-		   const TopoDS_Vertex& V0,
-		   const TopoDS_Vertex& V1,
-		   const TopoDS_Vertex& V2,
-		   const TopoDS_Vertex& V3);
+  virtual bool Evaluate(SMESH_Mesh & aMesh, const TopoDS_Shape & aShape,
+                        MapShapeNbElems& aResMap);
 
-  void GetConv2DCoefs(const faceQuadStruct& quad,
-		      const TopoDS_Shape& aShape,
-		      const TopoDS_Vertex& V0,
-		      const TopoDS_Vertex& V1,
-		      const TopoDS_Vertex& V2,
-		      const TopoDS_Vertex& V3,
-		      Conv2DStruct& conv);
+  virtual bool IsApplicableToShape(const TopoDS_Shape & shape, bool toCheckAll) const
+  {
+    return IsApplicable( shape, toCheckAll );
+  }
+  static bool IsApplicable(const TopoDS_Shape & aShape, bool toCheckAll);
 
-  void GetPoint(Pt3 p,
-		int i, int j, int k,
-		int nbx, int nby, int nbz,
-		Point3DStruct *np,
-		const SMESHDS_Mesh* meshDS);
+ protected:
 
-  bool ClearAndReturn(FaceQuadStruct* theQuads[6], const bool res);
+  const StdMeshers_ViscousLayers* _viscousLayersHyp;
 };
 
 #endif