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 #24257 [CEA] Fatal error when creating a submesh if the mesh is on a sub-shape
[modules/smesh.git]
/
src
/
SMESHClient
/
SMESH_Client.cxx
diff --git
a/src/SMESHClient/SMESH_Client.cxx
b/src/SMESHClient/SMESH_Client.cxx
index 66d071a07614ca97a4f69e2d2a655bb1930979ea..f0473ff66ae43334ce18e62f279260f7d87b7766 100644
(file)
--- a/
src/SMESHClient/SMESH_Client.cxx
+++ b/
src/SMESHClient/SMESH_Client.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-202
0
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-202
1
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
@@
-34,6
+34,7
@@
#include "SALOME_LifeCycleCORBA.hxx"
#include <SALOMEconfig.h>
#include "SALOME_LifeCycleCORBA.hxx"
#include <SALOMEconfig.h>
+#include <smIdType.hxx>
#include CORBA_SERVER_HEADER(SALOME_Component)
#include CORBA_SERVER_HEADER(SALOME_Exception)
#include CORBA_SERVER_HEADER(SALOME_Component)
#include CORBA_SERVER_HEADER(SALOME_Exception)
@@
-89,14
+90,14
@@
namespace
//=======================================================================
inline void AddNodesWithID(SMDS_Mesh* theMesh,
SMESH::log_array_var& theSeq,
//=======================================================================
inline void AddNodesWithID(SMDS_Mesh* theMesh,
SMESH::log_array_var& theSeq,
-
CORBA::Long
theId)
+
SMESH::smIdType
theId)
{
const SMESH::double_array& aCoords = theSeq[theId].coords;
const SMESH::long_array& anIndexes = theSeq[theId].indexes;
{
const SMESH::double_array& aCoords = theSeq[theId].coords;
const SMESH::long_array& anIndexes = theSeq[theId].indexes;
-
CORBA::Long
anElemId = 0, aNbElems = theSeq[theId].number;
- if(3*aNbElems != (
CORBA::Long
) aCoords.length())
+
SMESH::smIdType
anElemId = 0, aNbElems = theSeq[theId].number;
+ if(3*aNbElems != (
SMESH::smIdType
) aCoords.length())
EXCEPTION(runtime_error,"AddNodesWithID - 3*aNbElems != aCoords.length()");
EXCEPTION(runtime_error,"AddNodesWithID - 3*aNbElems != aCoords.length()");
- for(
CORBA::Long
aCoordId = 0; anElemId < aNbElems; anElemId++, aCoordId+=3){
+ for(
SMESH::smIdType
aCoordId = 0; anElemId < aNbElems; anElemId++, aCoordId+=3){
SMDS_MeshElement* anElem = theMesh->AddNodeWithID(aCoords[aCoordId],
aCoords[aCoordId+1],
aCoords[aCoordId+2],
SMDS_MeshElement* anElem = theMesh->AddNodeWithID(aCoords[aCoordId],
aCoords[aCoordId+1],
aCoords[aCoordId+2],
@@
-112,13
+113,13
@@
namespace
//=======================================================================
inline void Add0DElementsWithID(SMDS_Mesh* theMesh,
SMESH::log_array_var& theSeq,
//=======================================================================
inline void Add0DElementsWithID(SMDS_Mesh* theMesh,
SMESH::log_array_var& theSeq,
-
CORBA::Long
theId)
+
SMESH::smIdType
theId)
{
const SMESH::long_array& anIndexes = theSeq[theId].indexes;
{
const SMESH::long_array& anIndexes = theSeq[theId].indexes;
-
CORBA::Long
anElemId = 0, aNbElems = theSeq[theId].number;
- if (2*aNbElems != (
CORBA::Long
) anIndexes.length())
+
SMESH::smIdType
anElemId = 0, aNbElems = theSeq[theId].number;
+ if (2*aNbElems != (
SMESH::smIdType
) anIndexes.length())
EXCEPTION(runtime_error,"AddEdgeWithID - 2*aNbElems != aCoords.length()");
EXCEPTION(runtime_error,"AddEdgeWithID - 2*aNbElems != aCoords.length()");
-
CORBA::Long
anIndexId = 0;
+
SMESH::smIdType
anIndexId = 0;
for (; anElemId < aNbElems; anElemId++, anIndexId+=2)
{
SMDS_MeshElement* anElem = theMesh->Add0DElementWithID(anIndexes[anIndexId+1],
for (; anElemId < aNbElems; anElemId++, anIndexId+=2)
{
SMDS_MeshElement* anElem = theMesh->Add0DElementWithID(anIndexes[anIndexId+1],
@@
-134,16
+135,16
@@
namespace
//=======================================================================
inline void AddBallsWithID(SMDS_Mesh* theMesh,
SMESH::log_array_var& theSeq,
//=======================================================================
inline void AddBallsWithID(SMDS_Mesh* theMesh,
SMESH::log_array_var& theSeq,
-
CORBA::Long
theId)
+
SMESH::smIdType
theId)
{
const SMESH::double_array& aDiameter = theSeq[theId].coords;
const SMESH::long_array& anIndexes = theSeq[theId].indexes;
{
const SMESH::double_array& aDiameter = theSeq[theId].coords;
const SMESH::long_array& anIndexes = theSeq[theId].indexes;
-
CORBA::Long
anElemId = 0, aNbElems = theSeq[theId].number;
- if (2*aNbElems != (
CORBA::Long
) anIndexes.length() )
+
SMESH::smIdType
anElemId = 0, aNbElems = theSeq[theId].number;
+ if (2*aNbElems != (
SMESH::smIdType
) anIndexes.length() )
EXCEPTION(runtime_error,"AddEdgeWithID - 2*aNbElems != anIndexes.length()");
EXCEPTION(runtime_error,"AddEdgeWithID - 2*aNbElems != anIndexes.length()");
- if (aNbElems != (
CORBA::Long
) aDiameter.length())
+ if (aNbElems != (
SMESH::smIdType
) aDiameter.length())
EXCEPTION(runtime_error,"AddEdgeWithID - aNbElems != aDiameter.length()");
EXCEPTION(runtime_error,"AddEdgeWithID - aNbElems != aDiameter.length()");
-
CORBA::Long
anIndexId = 0;
+
SMESH::smIdType
anIndexId = 0;
for (; anElemId < aNbElems; anElemId++, anIndexId+=2)
{
SMDS_MeshElement* anElem = theMesh->AddBallWithID(anIndexes[anIndexId+1],
for (; anElemId < aNbElems; anElemId++, anIndexId+=2)
{
SMDS_MeshElement* anElem = theMesh->AddBallWithID(anIndexes[anIndexId+1],
@@
-160,13
+161,13
@@
namespace
//=======================================================================
inline void AddEdgesWithID(SMDS_Mesh* theMesh,
SMESH::log_array_var& theSeq,
//=======================================================================
inline void AddEdgesWithID(SMDS_Mesh* theMesh,
SMESH::log_array_var& theSeq,
-
CORBA::Long
theId)
+
SMESH::smIdType
theId)
{
const SMESH::long_array& anIndexes = theSeq[theId].indexes;
{
const SMESH::long_array& anIndexes = theSeq[theId].indexes;
-
CORBA::Long
anElemId = 0, aNbElems = theSeq[theId].number;
- if(3*aNbElems != (
CORBA::Long
) anIndexes.length())
+
SMESH::smIdType
anElemId = 0, aNbElems = theSeq[theId].number;
+ if(3*aNbElems != (
SMESH::smIdType
) anIndexes.length())
EXCEPTION(runtime_error,"AddEdgeWithID - 3*aNbElems != aCoords.length()");
EXCEPTION(runtime_error,"AddEdgeWithID - 3*aNbElems != aCoords.length()");
- for(
CORBA::Long
anIndexId = 0; anElemId < aNbElems; anElemId++, anIndexId+=3){
+ for(
SMESH::smIdType
anIndexId = 0; anElemId < aNbElems; anElemId++, anIndexId+=3){
SMDS_MeshElement* anElem = theMesh->AddEdgeWithID(anIndexes[anIndexId+1],
anIndexes[anIndexId+2],
anIndexes[anIndexId]);
SMDS_MeshElement* anElem = theMesh->AddEdgeWithID(anIndexes[anIndexId+1],
anIndexes[anIndexId+2],
anIndexes[anIndexId]);
@@
-181,13
+182,13
@@
namespace
//=======================================================================
inline void AddTriasWithID(SMDS_Mesh* theMesh,
SMESH::log_array_var& theSeq,
//=======================================================================
inline void AddTriasWithID(SMDS_Mesh* theMesh,
SMESH::log_array_var& theSeq,
-
CORBA::Long
theId)
+
SMESH::smIdType
theId)
{
const SMESH::long_array& anIndexes = theSeq[theId].indexes;
{
const SMESH::long_array& anIndexes = theSeq[theId].indexes;
-
CORBA::Long
anElemId = 0, aNbElems = theSeq[theId].number;
- if(4*aNbElems != (
CORBA::Long
) anIndexes.length())
+
SMESH::smIdType
anElemId = 0, aNbElems = theSeq[theId].number;
+ if(4*aNbElems != (
SMESH::smIdType
) anIndexes.length())
EXCEPTION(runtime_error,"AddTriasWithID - 4*aNbElems != anIndexes.length()");
EXCEPTION(runtime_error,"AddTriasWithID - 4*aNbElems != anIndexes.length()");
- for(
CORBA::Long
anIndexId = 0; anElemId < aNbElems; anElemId++, anIndexId+=4){
+ for(
SMESH::smIdType
anIndexId = 0; anElemId < aNbElems; anElemId++, anIndexId+=4){
SMDS_MeshElement* anElem = theMesh->AddFaceWithID(anIndexes[anIndexId+1],
anIndexes[anIndexId+2],
anIndexes[anIndexId+3],
SMDS_MeshElement* anElem = theMesh->AddFaceWithID(anIndexes[anIndexId+1],
anIndexes[anIndexId+2],
anIndexes[anIndexId+3],
@@
-203,13
+204,13
@@
namespace
//=======================================================================
inline void AddQuadsWithID(SMDS_Mesh* theMesh,
SMESH::log_array_var theSeq,
//=======================================================================
inline void AddQuadsWithID(SMDS_Mesh* theMesh,
SMESH::log_array_var theSeq,
-
CORBA::Long
theId)
+
SMESH::smIdType
theId)
{
const SMESH::long_array& anIndexes = theSeq[theId].indexes;
{
const SMESH::long_array& anIndexes = theSeq[theId].indexes;
-
CORBA::Long
anElemId = 0, aNbElems = theSeq[theId].number;
- if(5*aNbElems != (
CORBA::Long
) anIndexes.length())
+
SMESH::smIdType
anElemId = 0, aNbElems = theSeq[theId].number;
+ if(5*aNbElems != (
SMESH::smIdType
) anIndexes.length())
EXCEPTION(runtime_error,"AddQuadsWithID - 4*aNbElems != anIndexes.length()");
EXCEPTION(runtime_error,"AddQuadsWithID - 4*aNbElems != anIndexes.length()");
- for(
CORBA::Long
anIndexId = 0; anElemId < aNbElems; anElemId++, anIndexId+=5){
+ for(
SMESH::smIdType
anIndexId = 0; anElemId < aNbElems; anElemId++, anIndexId+=5){
SMDS_MeshElement* anElem = theMesh->AddFaceWithID(anIndexes[anIndexId+1],
anIndexes[anIndexId+2],
anIndexes[anIndexId+3],
SMDS_MeshElement* anElem = theMesh->AddFaceWithID(anIndexes[anIndexId+1],
anIndexes[anIndexId+2],
anIndexes[anIndexId+3],
@@
-226,16
+227,16
@@
namespace
//=======================================================================
inline void AddPolygonsWithID(SMDS_Mesh* theMesh,
SMESH::log_array_var& theSeq,
//=======================================================================
inline void AddPolygonsWithID(SMDS_Mesh* theMesh,
SMESH::log_array_var& theSeq,
-
CORBA::Long
theId)
+
SMESH::smIdType
theId)
{
const SMESH::long_array& anIndexes = theSeq[theId].indexes;
{
const SMESH::long_array& anIndexes = theSeq[theId].indexes;
-
CORBA::Long
anIndexId = 0, aNbElems = theSeq[theId].number;
+
SMESH::smIdType
anIndexId = 0, aNbElems = theSeq[theId].number;
- for (
CORBA::Long
anElemId = 0; anElemId < aNbElems; anElemId++) {
-
int
aFaceId = anIndexes[anIndexId++];
+ for (
SMESH::smIdType
anElemId = 0; anElemId < aNbElems; anElemId++) {
+
smIdType
aFaceId = anIndexes[anIndexId++];
int aNbNodes = anIndexes[anIndexId++];
int aNbNodes = anIndexes[anIndexId++];
- std::vector<
int
> nodes_ids (aNbNodes);
+ std::vector<
smIdType
> nodes_ids (aNbNodes);
for (int i = 0; i < aNbNodes; i++) {
nodes_ids[i] = anIndexes[anIndexId++];
}
for (int i = 0; i < aNbNodes; i++) {
nodes_ids[i] = anIndexes[anIndexId++];
}
@@
-253,16
+254,16
@@
namespace
//=======================================================================
inline void AddQuadPolygonsWithID(SMDS_Mesh* theMesh,
SMESH::log_array_var& theSeq,
//=======================================================================
inline void AddQuadPolygonsWithID(SMDS_Mesh* theMesh,
SMESH::log_array_var& theSeq,
-
CORBA::Long
theId)
+
SMESH::smIdType
theId)
{
const SMESH::long_array& anIndexes = theSeq[theId].indexes;
{
const SMESH::long_array& anIndexes = theSeq[theId].indexes;
-
CORBA::Long
anIndexId = 0, aNbElems = theSeq[theId].number;
+
SMESH::smIdType
anIndexId = 0, aNbElems = theSeq[theId].number;
- for (
CORBA::Long
anElemId = 0; anElemId < aNbElems; anElemId++) {
-
int
aFaceId = anIndexes[anIndexId++];
+ for (
SMESH::smIdType
anElemId = 0; anElemId < aNbElems; anElemId++) {
+
smIdType
aFaceId = anIndexes[anIndexId++];
int aNbNodes = anIndexes[anIndexId++];
int aNbNodes = anIndexes[anIndexId++];
- std::vector<
int
> nodes_ids (aNbNodes);
+ std::vector<
smIdType
> nodes_ids (aNbNodes);
for (int i = 0; i < aNbNodes; i++) {
nodes_ids[i] = anIndexes[anIndexId++];
}
for (int i = 0; i < aNbNodes; i++) {
nodes_ids[i] = anIndexes[anIndexId++];
}
@@
-280,13
+281,13
@@
namespace
//=======================================================================
inline void AddTetrasWithID(SMDS_Mesh* theMesh,
SMESH::log_array_var& theSeq,
//=======================================================================
inline void AddTetrasWithID(SMDS_Mesh* theMesh,
SMESH::log_array_var& theSeq,
-
CORBA::Long
theId)
+
SMESH::smIdType
theId)
{
const SMESH::long_array& anIndexes = theSeq[theId].indexes;
{
const SMESH::long_array& anIndexes = theSeq[theId].indexes;
-
CORBA::Long
anElemId = 0, aNbElems = theSeq[theId].number;
- if(5*aNbElems != (
CORBA::Long
) anIndexes.length())
+
SMESH::smIdType
anElemId = 0, aNbElems = theSeq[theId].number;
+ if(5*aNbElems != (
SMESH::smIdType
) anIndexes.length())
EXCEPTION(runtime_error,"AddTetrasWithID - 5*aNbElems != anIndexes.length()");
EXCEPTION(runtime_error,"AddTetrasWithID - 5*aNbElems != anIndexes.length()");
- for(
CORBA::Long
anIndexId = 0; anElemId < aNbElems; anElemId++, anIndexId+=5){
+ for(
SMESH::smIdType
anIndexId = 0; anElemId < aNbElems; anElemId++, anIndexId+=5){
SMDS_MeshElement* anElem = theMesh->AddVolumeWithID(anIndexes[anIndexId+1],
anIndexes[anIndexId+2],
anIndexes[anIndexId+3],
SMDS_MeshElement* anElem = theMesh->AddVolumeWithID(anIndexes[anIndexId+1],
anIndexes[anIndexId+2],
anIndexes[anIndexId+3],
@@
-303,13
+304,13
@@
namespace
//=======================================================================
inline void AddPiramidsWithID(SMDS_Mesh* theMesh,
SMESH::log_array_var& theSeq,
//=======================================================================
inline void AddPiramidsWithID(SMDS_Mesh* theMesh,
SMESH::log_array_var& theSeq,
-
CORBA::Long
theId)
+
SMESH::smIdType
theId)
{
const SMESH::long_array& anIndexes = theSeq[theId].indexes;
{
const SMESH::long_array& anIndexes = theSeq[theId].indexes;
-
CORBA::Long
anElemId = 0, aNbElems = theSeq[theId].number;
- if(6*aNbElems != (
CORBA::Long
) anIndexes.length())
+
SMESH::smIdType
anElemId = 0, aNbElems = theSeq[theId].number;
+ if(6*aNbElems != (
SMESH::smIdType
) anIndexes.length())
EXCEPTION(runtime_error,"AddPiramidsWithID - 6*aNbElems != anIndexes.length()");
EXCEPTION(runtime_error,"AddPiramidsWithID - 6*aNbElems != anIndexes.length()");
- for(
CORBA::Long
anIndexId = 0; anElemId < aNbElems; anElemId++, anIndexId+=6){
+ for(
SMESH::smIdType
anIndexId = 0; anElemId < aNbElems; anElemId++, anIndexId+=6){
SMDS_MeshElement* anElem = theMesh->AddVolumeWithID(anIndexes[anIndexId+1],
anIndexes[anIndexId+2],
anIndexes[anIndexId+3],
SMDS_MeshElement* anElem = theMesh->AddVolumeWithID(anIndexes[anIndexId+1],
anIndexes[anIndexId+2],
anIndexes[anIndexId+3],
@@
-327,7
+328,7
@@
namespace
//=======================================================================
inline void AddPrismsWithID(SMDS_Mesh* theMesh,
SMESH::log_array_var& theSeq,
//=======================================================================
inline void AddPrismsWithID(SMDS_Mesh* theMesh,
SMESH::log_array_var& theSeq,
-
CORBA::Long
theId)
+
SMESH::smIdType
theId)
{
const SMESH::long_array& anIndexes = theSeq[theId].indexes;
CORBA::Long anElemId = 0, aNbElems = theSeq[theId].number;
{
const SMESH::long_array& anIndexes = theSeq[theId].indexes;
CORBA::Long anElemId = 0, aNbElems = theSeq[theId].number;
@@
-415,10
+416,10
@@
namespace
CORBA::Long anIndexId = 0, aNbElems = theSeq[theId].number;
for (CORBA::Long anElemId = 0; anElemId < aNbElems; anElemId++) {
CORBA::Long anIndexId = 0, aNbElems = theSeq[theId].number;
for (CORBA::Long anElemId = 0; anElemId < aNbElems; anElemId++) {
-
int
aFaceId = anIndexes[anIndexId++];
+
smIdType
aFaceId = anIndexes[anIndexId++];
int aNbNodes = anIndexes[anIndexId++];
int aNbNodes = anIndexes[anIndexId++];
- std::vector<
int
> nodes_ids (aNbNodes);
+ std::vector<
smIdType
> nodes_ids (aNbNodes);
for (int i = 0; i < aNbNodes; i++) {
nodes_ids[i] = anIndexes[anIndexId++];
}
for (int i = 0; i < aNbNodes; i++) {
nodes_ids[i] = anIndexes[anIndexId++];
}