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
0021543: EDF 1978 SMESH: Viscous layer for 2D meshes
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_QuadToTriaAdaptor.hxx
diff --git
a/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.hxx
b/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.hxx
index 79017c20d2420ae19524c08c52b6cd3592b3b28f..87063ee3f416098685fdbc8d39b81872dc158ed4 100644
(file)
--- a/
src/StdMeshers/StdMeshers_QuadToTriaAdaptor.hxx
+++ b/
src/StdMeshers/StdMeshers_QuadToTriaAdaptor.hxx
@@
-1,23
+1,22
@@
-//
Copyright (C) 2007-2010
CEA/DEN, EDF R&D, OPEN CASCADE
+//
Copyright (C) 2007-2012
CEA/DEN, EDF R&D, OPEN CASCADE
//
//
-//
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 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.
+// 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
+// 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
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
//
-// SMESH SMESH : implementaion of SMESH idl descriptions
// File : StdMeshers_QuadToTriaAdaptor.hxx
// Module : SMESH
//
// File : StdMeshers_QuadToTriaAdaptor.hxx
// Module : SMESH
//
@@
-25,41
+24,49
@@
#define _SMESH_QuadToTriaAdaptor_HXX_
#include "SMESH_StdMeshers.hxx"
#define _SMESH_QuadToTriaAdaptor_HXX_
#include "SMESH_StdMeshers.hxx"
-#include "SMDS_FaceOfNodes.hxx"
+
+#include "SMESH_ProxyMesh.hxx"
class SMESH_Mesh;
class SMESH_Mesh;
+class SMESH_ElementSearcher;
class SMDS_MeshElement;
class SMDS_MeshNode;
class SMDS_MeshElement;
class SMDS_MeshNode;
-class
Handle(TColgp_HArray1OfPnt)
;
-class Handle
(TColgp_HArray1OfVec)
;
-class
TopoDS_Shape
;
+class
SMDS_MeshFace
;
+class Handle
_TColgp_HArray1OfPnt
;
+class
Handle_TColgp_HArray1OfVec
;
class gp_Pnt;
class gp_Vec;
class gp_Pnt;
class gp_Vec;
-#include <
map
>
+#include <
set
>
#include <list>
#include <vector>
#include <list>
#include <vector>
-class STDMESHERS_EXPORT StdMeshers_QuadToTriaAdaptor
+#include <TopoDS_Shape.hxx>
+
+/*!
+ * \brief "Transforms" quadrilateral faces into triangular ones by creation of pyramids
+ */
+class STDMESHERS_EXPORT StdMeshers_QuadToTriaAdaptor : public SMESH_ProxyMesh
{
public:
{
public:
+ StdMeshers_QuadToTriaAdaptor();
~StdMeshers_QuadToTriaAdaptor();
~StdMeshers_QuadToTriaAdaptor();
- bool Compute(SMESH_Mesh& aMesh, const TopoDS_Shape& aShape);
+ bool Compute(SMESH_Mesh& aMesh,
+ const TopoDS_Shape& aShape,
+ SMESH_ProxyMesh* aProxyMesh=0);
bool Compute(SMESH_Mesh& aMesh);
bool Compute(SMESH_Mesh& aMesh);
- const
std::list<const SMDS_FaceOfNodes*>* GetTriangles(const SMDS_MeshElement* aFace);
+ const
TopoDS_Shape& GetShape() const { return myShape; }
protected:
protected:
- //bool CheckDegenerate(const SMDS_MeshElement* aFace);
-
int Preparation(const SMDS_MeshElement* face,
int Preparation(const SMDS_MeshElement* face,
- Handle
(TColgp_HArray1OfPnt)
& PN,
- Handle
(TColgp_HArray1OfVec)
& VN,
+ Handle
_TColgp_HArray1OfPnt
& PN,
+ Handle
_TColgp_HArray1OfVec
& VN,
std::vector<const SMDS_MeshNode*>& FNodes,
gp_Pnt& PC, gp_Vec& VNorm,
const SMDS_MeshElement** volumes=0);
std::vector<const SMDS_MeshNode*>& FNodes,
gp_Pnt& PC, gp_Vec& VNorm,
const SMDS_MeshElement** volumes=0);
@@
-67,19
+74,24
@@
protected:
bool CheckIntersection(const gp_Pnt& P, const gp_Pnt& PC,
gp_Pnt& Pint, SMESH_Mesh& aMesh,
const TopoDS_Shape& aShape,
bool CheckIntersection(const gp_Pnt& P, const gp_Pnt& PC,
gp_Pnt& Pint, SMESH_Mesh& aMesh,
const TopoDS_Shape& aShape,
- const
TopoDS_Shape&
NotCheckedFace);
+ const
SMDS_MeshElement*
NotCheckedFace);
- bool Compute2ndPart(SMESH_Mesh& aMesh);
+ bool Compute2ndPart(SMESH_Mesh& aMesh,
+ const std::vector<const SMDS_MeshElement*>& pyramids);
- typedef std::list<const SMDS_FaceOfNodes* > TTriaList;
- typedef std::multimap<const SMDS_MeshElement*, TTriaList > TQuad2Trias;
- typedef std::map<const SMDS_MeshElement*, TTriaList *, TIDCompare> TPyram2Trias;
- TQuad2Trias myResMap;
- TPyram2Trias myPyram2Trias;
+ void MergePiramids( const SMDS_MeshElement* PrmI,
+ const SMDS_MeshElement* PrmJ,
+ std::set<const SMDS_MeshNode*> & nodesToMove);
+
+ void MergeAdjacent(const SMDS_MeshElement* PrmI,
+ std::set<const SMDS_MeshNode*>& nodesToMove);
- std::list< const SMDS_MeshNode* > myDegNodes;
+ TopoDS_Shape myShape;
+ std::set<const SMDS_MeshElement*> myRemovedTrias;
+ std::list< const SMDS_MeshNode* > myDegNodes;
+ const SMESH_ElementSearcher* myElemSearcher;
};
#endif
};
#endif