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 #40650][CEA 33012] Beta Law distribution: added a new type of distribution for...
[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 c40722a4c42c03abf337cf341d5cbbddb14fa9ba..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-20
19 CEA/DEN, EDF R&D
, OPEN CASCADE
+// Copyright (C) 2007-20
24 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,8
+140,7
@@
bool getSubMeshes(::SMESH_subMesh* theSubMesh,
*/
//=============================================================================
*/
//=============================================================================
-CORBA::Long SMESH_subMesh_i::GetNumberOfElements()
- throw (SALOME::SALOME_Exception)
+SMESH::smIdType SMESH_subMesh_i::GetNumberOfElements()
{
Unexpect aCatch(SALOME_SalomeException);
{
Unexpect aCatch(SALOME_SalomeException);
@@
-153,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 ))
@@
-171,8
+170,7
@@
CORBA::Long SMESH_subMesh_i::GetNumberOfElements()
*/
//=============================================================================
*/
//=============================================================================
-CORBA::Long SMESH_subMesh_i::GetNumberOfNodes(CORBA::Boolean all)
- throw (SALOME::SALOME_Exception)
+SMESH::smIdType SMESH_subMesh_i::GetNumberOfNodes(CORBA::Boolean all)
{
Unexpect aCatch(SALOME_SalomeException);
{
Unexpect aCatch(SALOME_SalomeException);
@@
-199,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() )
{
@@
-219,12
+217,11
@@
CORBA::Long SMESH_subMesh_i::GetNumberOfNodes(CORBA::Boolean all)
*/
//=============================================================================
*/
//=============================================================================
-SMESH::long_array* SMESH_subMesh_i::GetElementsId()
- throw (SALOME::SALOME_Exception)
+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();
@@
-234,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 ))
{
@@
-264,12
+261,11
@@
SMESH::long_array* SMESH_subMesh_i::GetElementsId()
*/
//=============================================================================
*/
//=============================================================================
-SMESH::long_array* SMESH_subMesh_i::GetElementsByType( SMESH::ElementType theElemType )
- throw (SALOME::SALOME_Exception)
+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();
@@
-280,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;
@@
-321,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;
}
@@
-350,12
+346,11
@@
SMESH::long_array* SMESH_subMesh_i::GetElementsByType( SMESH::ElementType theEle
*/
//=============================================================================
*/
//=============================================================================
-SMESH::long_array* SMESH_subMesh_i::GetNodesId()
- throw (SALOME::SALOME_Exception)
+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();
}
@@
-363,10
+358,9
@@
SMESH::long_array* SMESH_subMesh_i::GetNodesId()
/*!
*
*/
/*!
*
*/
-//=============================================================================
+//========
error:
=====================================================================
SMESH::SMESH_Mesh_ptr SMESH_subMesh_i::GetFather()
SMESH::SMESH_Mesh_ptr SMESH_subMesh_i::GetFather()
- throw (SALOME::SALOME_Exception)
{
Unexpect aCatch(SALOME_SalomeException);
return _mesh_i->_this();
{
Unexpect aCatch(SALOME_SalomeException);
return _mesh_i->_this();
@@
-389,7
+383,6
@@
CORBA::Long SMESH_subMesh_i::GetId()
//=======================================================================
GEOM::GEOM_Object_ptr SMESH_subMesh_i::GetSubShape()
//=======================================================================
GEOM::GEOM_Object_ptr SMESH_subMesh_i::GetSubShape()
- throw (SALOME::SALOME_Exception)
{
Unexpect aCatch(SALOME_SalomeException);
GEOM::GEOM_Object_var aShapeObj;
{
Unexpect aCatch(SALOME_SalomeException);
GEOM::GEOM_Object_var aShapeObj;
@@
-417,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();
}
@@
-427,8
+420,7
@@
SMESH::long_array* SMESH_subMesh_i::GetIDs()
*
*/
//=============================================================================
*
*/
//=============================================================================
-SMESH::ElementType SMESH_subMesh_i::GetElementType( const CORBA::Long id, const bool iselem )
- throw (SALOME::SALOME_Exception)
+SMESH::ElementType SMESH_subMesh_i::GetElementType( const SMESH::smIdType id, const bool iselem )
{
if ( _preMeshInfo )
_preMeshInfo->FullLoadFromFile();
{
if ( _preMeshInfo )
_preMeshInfo->FullLoadFromFile();
@@
-442,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;
@@
-472,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 )
@@
-603,11
+595,10
@@
SMESH_Invalid_subMesh_i::SMESH_Invalid_subMesh_i( PortableServer::POA_ptr thePOA
//=======================================================================
//function : GetSubShape
//=======================================================================
//function : GetSubShape
-//purpose : return geomtry which is not a sub-shape of the main shape
+//purpose : return geom
e
try which is not a sub-shape of the main shape
//=======================================================================
GEOM::GEOM_Object_ptr SMESH_Invalid_subMesh_i::GetSubShape()
//=======================================================================
GEOM::GEOM_Object_ptr SMESH_Invalid_subMesh_i::GetSubShape()
- throw (SALOME::SALOME_Exception)
{
return GEOM::GEOM_Object::_duplicate( _geom );
}
{
return GEOM::GEOM_Object::_duplicate( _geom );
}