A patch by Paul RASCLE for ASTER cluster (64 bits).

This commit is contained in:
jfa 2007-03-15 06:55:40 +00:00
parent 20061d9dd9
commit 9b12ac2221
5 changed files with 16 additions and 6 deletions

View File

@ -503,7 +503,7 @@ module SMESH
/*!
* Get mesh pointer
*/
long GetMeshPtr();
long long GetMeshPtr();
/*!
* Get XYZ coordinates of node as list of double

View File

@ -2745,7 +2745,11 @@ static void sweepElement(SMESHDS_Mesh* aMesh,
// Loop on elem nodes:
// find new nodes and detect same nodes indices
int nbNodes = elem->NbNodes();
list<const SMDS_MeshNode*>::const_iterator itNN[ nbNodes ];
//---PR
//list<const SMDS_MeshNode*>::const_iterator itNN[ nbNodes ];
vector < list< const SMDS_MeshNode* >::const_iterator > itNN;
itNN.reserve(nbNodes);
//---PR
const SMDS_MeshNode* prevNod[ nbNodes ], *nextNod[ nbNodes ], *midlNod[ nbNodes ];
int iNode, nbSame = 0, iNotSameNode = 0, iSameNode = 0;
vector<int> sames(nbNodes);

View File

@ -621,7 +621,11 @@ SMESH_Client::SMESH_Client(CORBA::ORB_ptr theORB,
if ( MYDEBUG )
MESSAGE("Info: The same process, update mesh by pointer ");
// just set client mesh pointer to server mesh pointer
SMESH_Mesh* aMesh = reinterpret_cast<SMESH_Mesh*>(theMesh->GetMeshPtr());
//SMESH_Mesh* aMesh = reinterpret_cast<SMESH_Mesh*>(theMesh->GetMeshPtr());
CORBA::LongLong pointeur = theMesh->GetMeshPtr();
cerr <<"SMESH_Client::SMESH_Client pointeur " << pointeur << endl;
SMESH_Mesh* aMesh = reinterpret_cast<SMESH_Mesh*> (pointeur);
cerr <<"SMESH_Client::SMESH_Client aMesh " << aMesh << endl;
if(aMesh->GetMeshDS()->IsEmbeddedMode()){
mySMESHDSMesh = aMesh->GetMeshDS();
mySMDSMesh = mySMESHDSMesh;

View File

@ -1813,9 +1813,11 @@ SMESH::ElementType SMESH_Mesh_i::GetSubMeshElementType(const CORBA::Long ShapeID
*/
//=============================================================================
CORBA::Long SMESH_Mesh_i::GetMeshPtr()
CORBA::LongLong SMESH_Mesh_i::GetMeshPtr()
{
return CORBA::Long(size_t(_impl));
CORBA::LongLong pointeur = CORBA::LongLong(_impl);
cerr << "CORBA::LongLong SMESH_Mesh_i::GetMeshPtr() " << pointeur << endl;
return pointeur;
}

View File

@ -309,7 +309,7 @@ public:
virtual SMESH::long_array* GetIDs();
CORBA::Long GetMeshPtr();
CORBA::LongLong GetMeshPtr();
/*!