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
[bos #41122][EDF] Quadrangle radial for face which curved edges didn't discretize...
[modules/smesh.git]
/
src
/
SMESH_I
/
SMESH_subMesh_i.cxx
diff --git
a/src/SMESH_I/SMESH_subMesh_i.cxx
b/src/SMESH_I/SMESH_subMesh_i.cxx
index 5982ff089b339981cff994dd71183106d91d0dae..f5a74eb67469dfb4d4c8e890a35e6739e4772069 100644
(file)
--- a/
src/SMESH_I/SMESH_subMesh_i.cxx
+++ b/
src/SMESH_I/SMESH_subMesh_i.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-202
0 CEA/DEN, EDF R&D
, OPEN CASCADE
+// Copyright (C) 2007-202
4 CEA, EDF
, 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
@@
-140,7
+140,7
@@
bool getSubMeshes(::SMESH_subMesh* theSubMesh,
*/
//=============================================================================
*/
//=============================================================================
-
CORBA::Long
SMESH_subMesh_i::GetNumberOfElements()
+
SMESH::smIdType
SMESH_subMesh_i::GetNumberOfElements()
{
Unexpect aCatch(SALOME_SalomeException);
{
Unexpect aCatch(SALOME_SalomeException);
@@
-152,7
+152,7
@@
CORBA::Long SMESH_subMesh_i::GetNumberOfElements()
::SMESH_subMesh* aSubMesh = _mesh_i->_mapSubMesh[_localId];
::SMESH_subMesh* aSubMesh = _mesh_i->_mapSubMesh[_localId];
-
int
nbElems = 0;
+
SMESH::smIdType
nbElems = 0;
TListOfSubMeshes smList;
if ( getSubMeshes( aSubMesh, smList ))
TListOfSubMeshes smList;
if ( getSubMeshes( aSubMesh, smList ))
@@
-170,7
+170,7
@@
CORBA::Long SMESH_subMesh_i::GetNumberOfElements()
*/
//=============================================================================
*/
//=============================================================================
-
CORBA::Long
SMESH_subMesh_i::GetNumberOfNodes(CORBA::Boolean all)
+
SMESH::smIdType
SMESH_subMesh_i::GetNumberOfNodes(CORBA::Boolean all)
{
Unexpect aCatch(SALOME_SalomeException);
{
Unexpect aCatch(SALOME_SalomeException);
@@
-197,7
+197,7
@@
CORBA::Long SMESH_subMesh_i::GetNumberOfNodes(CORBA::Boolean all)
}
if ( all ) // get nodes from aSubMesh and all child sub-meshes
{
}
if ( all ) // get nodes from aSubMesh and all child sub-meshes
{
-
int
nbNodes = 0;
+
SMESH::smIdType
nbNodes = 0;
SMESH_subMeshIteratorPtr smIt = aSubMesh->getDependsOnIterator( /*includeSelf=*/true );
while ( smIt->more() )
{
SMESH_subMeshIteratorPtr smIt = aSubMesh->getDependsOnIterator( /*includeSelf=*/true );
while ( smIt->more() )
{
@@
-217,11
+217,11
@@
CORBA::Long SMESH_subMesh_i::GetNumberOfNodes(CORBA::Boolean all)
*/
//=============================================================================
*/
//=============================================================================
-SMESH::
long
_array* SMESH_subMesh_i::GetElementsId()
+SMESH::
smIdType
_array* SMESH_subMesh_i::GetElementsId()
{
Unexpect aCatch(SALOME_SalomeException);
{
Unexpect aCatch(SALOME_SalomeException);
- SMESH::
long_array_var aResult = new SMESH::long
_array();
+ SMESH::
smIdType_array_var aResult = new SMESH::smIdType
_array();
if ( _mesh_i->_mapSubMesh.find( _localId ) == _mesh_i->_mapSubMesh.end() )
return aResult._retn();
if ( _mesh_i->_mapSubMesh.find( _localId ) == _mesh_i->_mapSubMesh.end() )
return aResult._retn();
@@
-231,7
+231,7
@@
SMESH::long_array* SMESH_subMesh_i::GetElementsId()
::SMESH_subMesh* aSubMesh = _mesh_i->_mapSubMesh[_localId];
::SMESH_subMesh* aSubMesh = _mesh_i->_mapSubMesh[_localId];
-
int
nbElems = 0;
+
SMESH::smIdType
nbElems = 0;
TListOfSubMeshes smList;
if ( getSubMeshes( aSubMesh, smList ))
{
TListOfSubMeshes smList;
if ( getSubMeshes( aSubMesh, smList ))
{
@@
-261,11
+261,11
@@
SMESH::long_array* SMESH_subMesh_i::GetElementsId()
*/
//=============================================================================
*/
//=============================================================================
-SMESH::
long
_array* SMESH_subMesh_i::GetElementsByType( SMESH::ElementType theElemType )
+SMESH::
smIdType
_array* SMESH_subMesh_i::GetElementsByType( SMESH::ElementType theElemType )
{
Unexpect aCatch(SALOME_SalomeException);
{
Unexpect aCatch(SALOME_SalomeException);
- SMESH::
long_array_var aResult = new SMESH::long
_array();
+ SMESH::
smIdType_array_var aResult = new SMESH::smIdType
_array();
if ( _mesh_i->_mapSubMesh.find( _localId ) == _mesh_i->_mapSubMesh.end() )
return aResult._retn();
if ( _mesh_i->_mapSubMesh.find( _localId ) == _mesh_i->_mapSubMesh.end() )
return aResult._retn();
@@
-276,8
+276,8
@@
SMESH::long_array* SMESH_subMesh_i::GetElementsByType( SMESH::ElementType theEle
::SMESH_subMesh* aSubMesh = _mesh_i->_mapSubMesh[_localId];
// PAL5440, return all nodes belonging to elements of the sub-mesh
::SMESH_subMesh* aSubMesh = _mesh_i->_mapSubMesh[_localId];
// PAL5440, return all nodes belonging to elements of the sub-mesh
- set<
int
> nodeIds;
-
int
nbElems = 0;
+ set<
smIdType
> nodeIds;
+
smIdType
nbElems = 0;
// volumes may be bound to shell instead of solid
TListOfSubMeshes smList;
// volumes may be bound to shell instead of solid
TListOfSubMeshes smList;
@@
-317,7
+317,7
@@
SMESH::long_array* SMESH_subMesh_i::GetElementsByType( SMESH::ElementType theEle
int i = 0, n = aResult->length();
if ( theElemType == SMESH::NODE && !nodeIds.empty() ) {
int i = 0, n = aResult->length();
if ( theElemType == SMESH::NODE && !nodeIds.empty() ) {
- set<
int
>::iterator idIt = nodeIds.begin();
+ set<
smIdType
>::iterator idIt = nodeIds.begin();
for ( ; i < n && idIt != nodeIds.end() ; i++, idIt++ )
aResult[i] = *idIt;
}
for ( ; i < n && idIt != nodeIds.end() ; i++, idIt++ )
aResult[i] = *idIt;
}
@@
-346,11
+346,11
@@
SMESH::long_array* SMESH_subMesh_i::GetElementsByType( SMESH::ElementType theEle
*/
//=============================================================================
*/
//=============================================================================
-SMESH::
long
_array* SMESH_subMesh_i::GetNodesId()
+SMESH::
smIdType
_array* SMESH_subMesh_i::GetNodesId()
{
Unexpect aCatch(SALOME_SalomeException);
{
Unexpect aCatch(SALOME_SalomeException);
- SMESH::
long
_array_var aResult = GetElementsByType( SMESH::NODE );
+ SMESH::
smIdType
_array_var aResult = GetElementsByType( SMESH::NODE );
return aResult._retn();
}
return aResult._retn();
}
@@
-358,7
+358,7
@@
SMESH::long_array* SMESH_subMesh_i::GetNodesId()
/*!
*
*/
/*!
*
*/
-//=============================================================================
+//========
error:
=====================================================================
SMESH::SMESH_Mesh_ptr SMESH_subMesh_i::GetFather()
{
SMESH::SMESH_Mesh_ptr SMESH_subMesh_i::GetFather()
{
@@
-410,7
+410,7
@@
GEOM::GEOM_Object_ptr SMESH_subMesh_i::GetSubShape()
*
*/
//=============================================================================
*
*/
//=============================================================================
-SMESH::
long
_array* SMESH_subMesh_i::GetIDs()
+SMESH::
smIdType
_array* SMESH_subMesh_i::GetIDs()
{
return GetElementsId();
}
{
return GetElementsId();
}
@@
-420,7
+420,7
@@
SMESH::long_array* SMESH_subMesh_i::GetIDs()
*
*/
//=============================================================================
*
*/
//=============================================================================
-SMESH::ElementType SMESH_subMesh_i::GetElementType( const
CORBA::Long
id, const bool iselem )
+SMESH::ElementType SMESH_subMesh_i::GetElementType( const
SMESH::smIdType
id, const bool iselem )
{
if ( _preMeshInfo )
_preMeshInfo->FullLoadFromFile();
{
if ( _preMeshInfo )
_preMeshInfo->FullLoadFromFile();
@@
-434,12
+434,12
@@
SMESH::ElementType SMESH_subMesh_i::GetElementType( const CORBA::Long id, const
*/
//=============================================================================
*/
//=============================================================================
-SMESH::
long
_array* SMESH_subMesh_i::GetMeshInfo()
+SMESH::
smIdType
_array* SMESH_subMesh_i::GetMeshInfo()
{
if ( _preMeshInfo )
return _preMeshInfo->GetMeshInfo();
{
if ( _preMeshInfo )
return _preMeshInfo->GetMeshInfo();
- SMESH::
long_array_var aRes = new SMESH::long
_array();
+ SMESH::
smIdType_array_var aRes = new SMESH::smIdType
_array();
aRes->length(SMESH::Entity_Last);
for (int i = SMESH::Entity_Node; i < SMESH::Entity_Last; i++)
aRes[i] = 0;
aRes->length(SMESH::Entity_Last);
for (int i = SMESH::Entity_Node; i < SMESH::Entity_Last; i++)
aRes[i] = 0;
@@
-464,9
+464,9
@@
SMESH::long_array* SMESH_subMesh_i::GetMeshInfo()
*/
//=======================================================================
*/
//=======================================================================
-SMESH::
long
_array* SMESH_subMesh_i::GetNbElementsByType()
+SMESH::
smIdType
_array* SMESH_subMesh_i::GetNbElementsByType()
{
{
- SMESH::
long_array_var aRes = new SMESH::long
_array();
+ SMESH::
smIdType_array_var aRes = new SMESH::smIdType
_array();
aRes->length(SMESH::NB_ELEMENT_TYPES);
for (int i = 0; i < SMESH::NB_ELEMENT_TYPES; i++)
if ( _preMeshInfo )
aRes->length(SMESH::NB_ELEMENT_TYPES);
for (int i = 0; i < SMESH::NB_ELEMENT_TYPES; i++)
if ( _preMeshInfo )