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
0022100: EDF 2413 SMESH: Take into account TRIA7
[modules/smesh.git]
/
src
/
SMESH
/
SMESH_Mesh.hxx
diff --git
a/src/SMESH/SMESH_Mesh.hxx
b/src/SMESH/SMESH_Mesh.hxx
index 5bd9b9c14476db90d122ac265088b584205e1460..06c4e78023904dd298c3acce8aa478ea35e38d3e 100644
(file)
--- a/
src/SMESH/SMESH_Mesh.hxx
+++ b/
src/SMESH/SMESH_Mesh.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
3
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
@@
-122,7
+122,8
@@
public:
int CGNSToMesh(const char* theFileName, const int theMeshIndex, std::string& theMeshName);
int CGNSToMesh(const char* theFileName, const int theMeshIndex, std::string& theMeshName);
- SMESH_ComputeErrorPtr GMFToMesh(const char* theFileName);
+ SMESH_ComputeErrorPtr GMFToMesh(const char* theFileName,
+ bool theMakeRequiredGroups = true );
SMESH_Hypothesis::Hypothesis_Status
AddHypothesis(const TopoDS_Shape & aSubShape, int anHypId)
SMESH_Hypothesis::Hypothesis_Status
AddHypothesis(const TopoDS_Shape & aSubShape, int anHypId)
@@
-244,45
+245,34
@@
public:
void ExportCGNS(const char * file,
const SMESHDS_Mesh* mesh);
void ExportGMF(const char * file,
void ExportCGNS(const char * file,
const SMESHDS_Mesh* mesh);
void ExportGMF(const char * file,
- const SMESHDS_Mesh* mesh);
+ const SMESHDS_Mesh* mesh,
+ bool withRequiredGroups = true );
void ExportSAUV(const char *file,
const char* theMeshName = NULL,
bool theAutoGroups = true) throw(SALOME_Exception);
int NbNodes() const throw(SALOME_Exception);
void ExportSAUV(const char *file,
const char* theMeshName = NULL,
bool theAutoGroups = true) throw(SALOME_Exception);
int NbNodes() const throw(SALOME_Exception);
-
int Nb0DElements() const throw(SALOME_Exception);
int Nb0DElements() const throw(SALOME_Exception);
+ int NbBalls() const throw(SALOME_Exception);
int NbEdges(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception);
int NbFaces(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception);
int NbEdges(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception);
int NbFaces(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception);
-
int NbTriangles(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception);
int NbTriangles(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception);
-
int NbQuadrangles(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception);
int NbQuadrangles(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception);
-
int NbBiQuadQuadrangles() const throw(SALOME_Exception);
int NbBiQuadQuadrangles() const throw(SALOME_Exception);
-
+ int NbBiQuadTriangles() const throw(SALOME_Exception);
int NbPolygons() const throw(SALOME_Exception);
int NbVolumes(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception);
int NbPolygons() const throw(SALOME_Exception);
int NbVolumes(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception);
-
int NbTetras(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception);
int NbTetras(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception);
-
int NbHexas(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception);
int NbHexas(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception);
-
int NbTriQuadraticHexas() const throw(SALOME_Exception);
int NbTriQuadraticHexas() const throw(SALOME_Exception);
-
int NbPyramids(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception);
int NbPyramids(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception);
-
int NbPrisms(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception);
int NbPrisms(SMDSAbs_ElementOrder order = ORDER_ANY) const throw(SALOME_Exception);
-
int NbHexagonalPrisms() const throw(SALOME_Exception);
int NbHexagonalPrisms() const throw(SALOME_Exception);
-
int NbPolyhedrons() const throw(SALOME_Exception);
int NbPolyhedrons() const throw(SALOME_Exception);
- int NbBalls() const throw(SALOME_Exception);
-
int NbSubMesh() const throw(SALOME_Exception);
int NbGroup() const { return _mapGroup.size(); }
int NbSubMesh() const throw(SALOME_Exception);
int NbGroup() const { return _mapGroup.size(); }
@@
-342,7
+332,6
@@
private:
protected:
int _id; // id given by creator (unique within the creator instance)
int _studyId;
protected:
int _id; // id given by creator (unique within the creator instance)
int _studyId;
- int _idDoc; // id given by SMESHDS_Document
int _groupId; // id generator for group objects
int _nbSubShapes; // initial nb of subshapes in the shape to mesh
bool _isShapeToMesh;// set to true when a shape is given (only once)
int _groupId; // id generator for group objects
int _nbSubShapes; // initial nb of subshapes in the shape to mesh
bool _isShapeToMesh;// set to true when a shape is given (only once)