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 #20256: [CEA 18523] Porting SMESH to int 64 bits
[modules/smesh.git]
/
src
/
SMESH
/
SMESH_Pattern.cxx
diff --git
a/src/SMESH/SMESH_Pattern.cxx
b/src/SMESH/SMESH_Pattern.cxx
index a6e36e0d7e1ea22ec9526ffd046bc1ce759f0aa3..f605a90e65d4b405d09b1ea143b1c8fe7cb8593c 100644
(file)
--- a/
src/SMESH/SMESH_Pattern.cxx
+++ b/
src/SMESH/SMESH_Pattern.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
@@
-574,8
+574,8
@@
bool SMESH_Pattern::Load (SMESH_Mesh* theMesh,
SMESH_MesherHelper helper( *theMesh );
helper.SetSubShape( theFace );
SMESH_MesherHelper helper( *theMesh );
helper.SetSubShape( theFace );
-
int
nbNodes = ( !fSubMesh ? 0 : fSubMesh->NbNodes() );
-
int
nbElems = ( !fSubMesh ? 0 : fSubMesh->NbElements() );
+
smIdType
nbNodes = ( !fSubMesh ? 0 : fSubMesh->NbNodes() );
+
smIdType
nbElems = ( !fSubMesh ? 0 : fSubMesh->NbElements() );
if ( nbElems == 0 && aMeshDS->NbFaces() == 0 )
{
MESSAGE( "No elements bound to the face");
if ( nbElems == 0 && aMeshDS->NbFaces() == 0 )
{
MESSAGE( "No elements bound to the face");
@@
-3231,7
+3231,7
@@
bool SMESH_Pattern::Load (SMESH_Mesh* theMesh,
return setErrorCode( ERR_LOADV_BAD_SHAPE );
// count nodes
return setErrorCode( ERR_LOADV_BAD_SHAPE );
// count nodes
-
int nbNodes = 0,
shapeID;
+
smIdType nbNodes = 0; int
shapeID;
for ( shapeID = 1; shapeID <= myShapeIDMap.Extent(); shapeID++ )
{
const TopoDS_Shape& S = myShapeIDMap( shapeID );
for ( shapeID = 1; shapeID <= myShapeIDMap.Extent(); shapeID++ )
{
const TopoDS_Shape& S = myShapeIDMap( shapeID );
@@
-4366,7
+4366,7
@@
void SMESH_Pattern::createElements(SMESH_Mesh* theMes
subMesh->ComputeStateEngine( SMESH_subMesh::CHECK_COMPUTE_STATE );
}
if ( onMeshElements ) {
subMesh->ComputeStateEngine( SMESH_subMesh::CHECK_COMPUTE_STATE );
}
if ( onMeshElements ) {
- list<
int
> elemIDs;
+ list<
smIdType
> elemIDs;
for ( size_t i = 0; i < theElements.size(); i++ )
{
subMesh = theMesh->GetSubMeshContaining( shapeIDs[ i ] );
for ( size_t i = 0; i < theElements.size(); i++ )
{
subMesh = theMesh->GetSubMeshContaining( shapeIDs[ i ] );