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 branch 'master' into V9_dev
[modules/smesh.git]
/
src
/
SMESH_I
/
SMESH_Mesh_i.hxx
diff --git
a/src/SMESH_I/SMESH_Mesh_i.hxx
b/src/SMESH_I/SMESH_Mesh_i.hxx
index e4c1b634a93defe52ba8eaf37db6d731178ff546..f4c2cf71bd39102befbf3a2443efac78d45f64ea 100644
(file)
--- a/
src/SMESH_I/SMESH_Mesh_i.hxx
+++ b/
src/SMESH_I/SMESH_Mesh_i.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
4
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
@@
-31,6
+31,7
@@
#include "SMESH_Hypothesis.hxx"
#include "SMESH_Mesh.hxx"
#include "SMESH_subMesh.hxx"
#include "SMESH_Hypothesis.hxx"
#include "SMESH_Mesh.hxx"
#include "SMESH_subMesh.hxx"
+#include "SMDS_ElemIterator.hxx"
#include <SALOME_GenericObj_i.hh>
#include <SALOMEconfig.h>
#include <SALOME_GenericObj_i.hh>
#include <SALOMEconfig.h>
@@
-58,8
+59,7
@@
class SMESH_I_EXPORT SMESH_Mesh_i:
SMESH_Mesh_i(const SMESH_Mesh_i&);
public:
SMESH_Mesh_i( PortableServer::POA_ptr thePOA,
SMESH_Mesh_i(const SMESH_Mesh_i&);
public:
SMESH_Mesh_i( PortableServer::POA_ptr thePOA,
- SMESH_Gen_i* myGen_i,
- CORBA::Long studyId );
+ SMESH_Gen_i* myGen_i );
virtual ~SMESH_Mesh_i();
virtual ~SMESH_Mesh_i();
@@
-160,9
+160,11
@@
public:
const char* theName )
throw (SALOME::SALOME_Exception);
const char* theName )
throw (SALOME::SALOME_Exception);
- SMESH::SMESH_Group_ptr CreateDimGroup( const SMESH::ListOfGroups& theGroups,
- SMESH::ElementType theElemType,
- const char* theName )
+ SMESH::SMESH_Group_ptr CreateDimGroup( const SMESH::ListOfIDSources& theGroups,
+ SMESH::ElementType theElemType,
+ const char* theName,
+ SMESH::NB_COMMON_NODES_ENUM theNbCommonNodes,
+ CORBA::Boolean theUnderlyingOnly )
throw (SALOME::SALOME_Exception);
throw (SALOME::SALOME_Exception);
@@
-182,8
+184,6
@@
public:
CORBA::Long GetId() throw (SALOME::SALOME_Exception);
CORBA::Long GetId() throw (SALOME::SALOME_Exception);
- CORBA::Long GetStudyId() throw (SALOME::SALOME_Exception);
-
// --- C++ interface
void SetImpl(::SMESH_Mesh* impl);
// --- C++ interface
void SetImpl(::SMESH_Mesh* impl);
@@
-316,6
+316,9
@@
public:
CORBA::Long NbPolygons()
throw (SALOME::SALOME_Exception);
CORBA::Long NbPolygons()
throw (SALOME::SALOME_Exception);
+ CORBA::Long NbPolygonsOfOrder(SMESH::ElementOrder order=SMESH::ORDER_ANY)
+ throw (SALOME::SALOME_Exception);
+
CORBA::Long NbVolumes()
throw (SALOME::SALOME_Exception);
CORBA::Long NbVolumes()
throw (SALOME::SALOME_Exception);
@@
-530,8
+533,8
@@
public:
* Returns true if given node is medium node
* in one of quadratic elements
*/
* Returns true if given node is medium node
* in one of quadratic elements
*/
- CORBA::Boolean IsMediumNodeOfAnyElem(CORBA::Long idn,
- SMESH::ElementType
theE
lemType);
+ CORBA::Boolean IsMediumNodeOfAnyElem(CORBA::Long
idn,
+ SMESH::ElementType
e
lemType);
/*!
* Returns number of edges for given element
/*!
* Returns number of edges for given element
@@
-557,6
+560,12
@@
public:
*/
CORBA::Long FindElementByNodes(const SMESH::long_array& nodes);
*/
CORBA::Long FindElementByNodes(const SMESH::long_array& nodes);
+ /*!
+ * Return elements including all given nodes.
+ */
+ SMESH::long_array* GetElementsByNodes(const SMESH::long_array& nodes,
+ SMESH::ElementType elemType);
+
/*!
* Returns true if given element is polygon
*/
/*!
* Returns true if given element is polygon
*/
@@
-650,6
+659,10
@@
public:
* happen if mesh data is not yet fully loaded from the file of study.
*/
bool IsMeshInfoCorrect();
* happen if mesh data is not yet fully loaded from the file of study.
*/
bool IsMeshInfoCorrect();
+ /*!
+ * Returns mesh unstructed grid information.
+ */
+ virtual SALOMEDS::TMPFile* GetVtkUgStream();
std::map<int, SMESH_subMesh_i*> _mapSubMesh_i; //NRI
std::map<int, ::SMESH_subMesh*> _mapSubMesh; //NRI
std::map<int, SMESH_subMesh_i*> _mapSubMesh_i; //NRI
std::map<int, ::SMESH_subMesh*> _mapSubMesh; //NRI
@@
-687,7
+700,6
@@
private:
::SMESH_Mesh* _impl; // :: force no namespace here
SMESH_Gen_i* _gen_i;
int _id; // id given by creator (unique within the creator instance)
::SMESH_Mesh* _impl; // :: force no namespace here
SMESH_Gen_i* _gen_i;
int _id; // id given by creator (unique within the creator instance)
- int _studyId;
std::map<int, SMESH::SMESH_subMesh_ptr> _mapSubMeshIor;
std::map<int, SMESH::SMESH_GroupBase_ptr> _mapGroups;
std::map<int, SMESH::SMESH_Hypothesis_ptr> _mapHypo;
std::map<int, SMESH::SMESH_subMesh_ptr> _mapSubMeshIor;
std::map<int, SMESH::SMESH_GroupBase_ptr> _mapGroups;
std::map<int, SMESH::SMESH_Hypothesis_ptr> _mapHypo;