X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_Penta_3D.hxx;h=1ea79ed87d8e65f4ec131a299d7ca0bbc6a8f080;hp=aac472ec0594b7ad0d128e96382b460bfb3fef27;hb=0fc0831670e27a5611b941c52dc152fd63964515;hpb=ed456586bfb1411c5bff73b221658766689a6253 diff --git a/src/StdMeshers/StdMeshers_Penta_3D.hxx b/src/StdMeshers/StdMeshers_Penta_3D.hxx index aac472ec0..1ea79ed87 100644 --- a/src/StdMeshers/StdMeshers_Penta_3D.hxx +++ b/src/StdMeshers/StdMeshers_Penta_3D.hxx @@ -1,49 +1,56 @@ -// SMESH StdMeshers : implementaion of SMESH idl descriptions +// Copyright (C) 2007-2020 CEA/DEN, EDF R&D, OPEN CASCADE // -// 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 +// 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. // +// 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 StdMeshers : implementation of SMESH idl descriptions // File : StdMeshers_Penta_3D.hxx // Module : SMESH - +// #ifndef StdMeshers_Penta_3D_HeaderFile #define StdMeshers_Penta_3D_HeaderFile -#include +#include "SMESH_StdMeshers.hxx" -typedef std::map < int, int > StdMeshers_DataMapOfIntegerInteger; +#include //////////////////////////////////////////////////////////////////////// // // class StdMeshers_SMESHBlock // +//////////////////////////////////////////////////////////////////////// +#include +#include +#include +#include #include #include -#include -#include -#include +#include "SMESH_Algo.hxx" #include "SMESH_Block.hxx" +#include "SMESH_ComputeError.hxx" +#include "SMESH_MesherHelper.hxx" + +typedef std::map< double, std::vector > StdMeshers_IJNodeMap; -class StdMeshers_SMESHBlock { +class STDMESHERS_EXPORT StdMeshers_SMESHBlock { public: // @@ -52,46 +59,58 @@ public: 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, - gp_XYZ& theXYZ); + gp_XYZ& theXYZ); 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, + const TopoDS_Shape& theShape, + gp_XYZ& theXYZ); void Point(const gp_XYZ& theParams, - gp_Pnt& thePnt); + gp_Pnt& thePnt); 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); const TopoDS_Shape& Shape(const int theID); - - + + SMESH_Block & Block() { return myTBlock; } + + bool IsForwardEdge(const int theEdgeID); + int ErrorStatus() const; + SMESH_ComputeErrorPtr GetError() const; + protected: TopoDS_Shell myShell; TopTools_IndexedMapOfOrientedShape myShapeIDMap; SMESH_Block myTBlock; TopoDS_Shape myEmptyShape; + std::vector myIsEdgeForward; // int myErrorStatus; }; + //////////////////////////////////////////////////////////////////////// // // class StdMeshers_TNode // +//////////////////////////////////////////////////////////////////////// #include "SMDS_MeshNode.hxx" -class StdMeshers_TNode { +class STDMESHERS_EXPORT StdMeshers_TNode { public: @@ -145,19 +164,26 @@ private: // // class StdMeshers_Penta_3D // +//////////////////////////////////////////////////////////////////////// #include "SMESH_Mesh.hxx" #include // -class StdMeshers_Penta_3D { +class STDMESHERS_EXPORT StdMeshers_Penta_3D { // public: // methods StdMeshers_Penta_3D(); - //~StdMeshers_Penta_3D(); + ~StdMeshers_Penta_3D(); bool Compute(SMESH_Mesh& , const TopoDS_Shape& ); int ErrorStatus() const { + if (myErrorStatus->IsOK()) + return 0; + return myErrorStatus->myName; + } + + SMESH_ComputeErrorPtr GetComputeError() const { return myErrorStatus; } @@ -168,7 +194,21 @@ class StdMeshers_Penta_3D { double Tolerance() const { return myTol3D; } - + + bool LoadIJNodes(StdMeshers_IJNodeMap & theIJNodes, + const TopoDS_Face& theFace, + const TopoDS_Edge& theBaseEdge, + SMESHDS_Mesh* theMesh); + // Load nodes bound to theFace into column (vectors) and rows + // of theIJNodes. + // The value of theIJNodes map is a vector of ordered nodes so + // that the 0-the one lies 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 @@ -178,17 +218,23 @@ class StdMeshers_Penta_3D { void MakeNodes(); + double SetHorizEdgeXYZ(const gp_XYZ& aBNXYZ, + const int aFaceID, + std::vector*& aCol1, + std::vector*& 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, - const gp_XYZ& aParams, - StdMeshers_TNode& aTN); + const gp_XYZ& aParams, + const int z, + StdMeshers_TNode& aTN); void CreateNode(const bool theIsUpperLayer, - const gp_XYZ& aParams, - StdMeshers_TNode& aTN); + const gp_XYZ& aParams, + StdMeshers_TNode& aTN); void ClearMeshOnFxy1(); @@ -209,17 +255,22 @@ class StdMeshers_Penta_3D { } protected: // fields - TopoDS_Shape myShape; - StdMeshers_SMESHBlock myBlock; - void * myMesh; - int myErrorStatus; + TopoDS_Shape myShape; + StdMeshers_SMESHBlock myBlock; + void * myMesh; + SMESH_ComputeErrorPtr myErrorStatus; + // + std::vector myTNodes; + int myISize; + int myJSize; + double myTol3D; // Tolerance value + std::map < int, int > myConnectingMap; // - vector myTNodes; - int myISize; - int myJSize; - double myTol3D; // Tolerance value - StdMeshers_DataMapOfIntegerInteger myConnectingMap; + std::vector myWallNodesMaps; // nodes on a face + std::vector myShapeXYZ; // point on each sub-shape + bool myCreateQuadratic; + SMESH_MesherHelper* myTool; // tool building quadratic elements }; #endif