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
Merge from V5_1_main branch 24/11/2010
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_Quadrangle_2D.hxx
diff --git
a/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx
b/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx
index b4257bb406ff2782a17f3805d7c3b5bd028bab6e..56741ec764f008fdaea8731d81e083a5a9035355 100644
(file)
--- a/
src/StdMeshers/StdMeshers_Quadrangle_2D.hxx
+++ b/
src/StdMeshers/StdMeshers_Quadrangle_2D.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
08
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
10
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
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-25,12
+25,14
@@
// Author : Paul RASCLE, EDF
// Module : SMESH
// $Header$
// Author : Paul RASCLE, EDF
// Module : SMESH
// $Header$
-//
+
#ifndef _SMESH_QUADRANGLE_2D_HXX_
#define _SMESH_QUADRANGLE_2D_HXX_
#include "SMESH_StdMeshers.hxx"
#ifndef _SMESH_QUADRANGLE_2D_HXX_
#define _SMESH_QUADRANGLE_2D_HXX_
#include "SMESH_StdMeshers.hxx"
+#include "StdMeshers_QuadrangleParams.hxx"
+
#include "SMESH_2D_Algo.hxx"
#include "Utils_SALOME_Exception.hxx"
#include "SMESH_2D_Algo.hxx"
#include "Utils_SALOME_Exception.hxx"
@@
-119,6
+121,10
@@
protected:
const TopoDS_Face& F, const TopoDS_Edge& E,
double first, double last, int nb_segm);
const TopoDS_Face& F, const TopoDS_Edge& E,
double first, double last, int nb_segm);
+ bool ComputeReduced (SMESH_Mesh& aMesh,
+ const TopoDS_Shape& aShape,
+ FaceQuadStruct* quad);
+
// true if QuadranglePreference hypothesis is assigned that forces
// construction of quadrangles if the number of nodes on opposite edges
// is not the same in the case where the global number of nodes on edges
// true if QuadranglePreference hypothesis is assigned that forces
// construction of quadrangles if the number of nodes on opposite edges
// is not the same in the case where the global number of nodes on edges
@@
-129,6
+135,8
@@
protected:
int myTriaVertexID;
int myTriaVertexID;
+ StdMeshers_QuadType myQuadType;
+
SMESH_MesherHelper* myTool; // tool for working with quadratic elements
};
SMESH_MesherHelper* myTool; // tool for working with quadratic elements
};