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
/
StdMeshers
/
StdMeshers_Projection_2D.cxx
diff --git
a/src/StdMeshers/StdMeshers_Projection_2D.cxx
b/src/StdMeshers/StdMeshers_Projection_2D.cxx
index cbf06a4f27c249fac258f31536435cc7e29f7326..bbc874cf9da73bf50d8dbb7a52403027ba958744 100644
(file)
--- a/
src/StdMeshers/StdMeshers_Projection_2D.cxx
+++ b/
src/StdMeshers/StdMeshers_Projection_2D.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
@@
-1216,7
+1216,7
@@
namespace {
tgtNbEW.front() != 4 || srcNbEW.front() != 4 )
return; // not quads
tgtNbEW.front() != 4 || srcNbEW.front() != 4 )
return; // not quads
-
int
srcNbSeg[4];
+
smIdType
srcNbSeg[4];
list< TopoDS_Edge >::iterator edgeS = srcEdges.begin(), edgeT = tgtEdges.begin();
for ( int i = 0; edgeS != srcEdges.end(); ++i, ++edgeS )
if ( SMESHDS_SubMesh* sm = srcMesh->GetMeshDS()->MeshElements( *edgeS ))
list< TopoDS_Edge >::iterator edgeS = srcEdges.begin(), edgeT = tgtEdges.begin();
for ( int i = 0; edgeS != srcEdges.end(); ++i, ++edgeS )
if ( SMESHDS_SubMesh* sm = srcMesh->GetMeshDS()->MeshElements( *edgeS ))
@@
-1891,7
+1891,7
@@
bool StdMeshers_Projection_2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape&
// compare nb nodes on srcEdge1 and srcEdge2
if ( srcEdge2 != srcEdges.end() )
{
// compare nb nodes on srcEdge1 and srcEdge2
if ( srcEdge2 != srcEdges.end() )
{
-
int
nbN1 = 0, nbN2 = 0;
+
smIdType
nbN1 = 0, nbN2 = 0;
if ( SMESHDS_SubMesh* sm = srcMesh->GetMeshDS()->MeshElements( srcEdge1 ))
nbN1 = sm->NbNodes();
if ( SMESHDS_SubMesh* sm = srcMesh->GetMeshDS()->MeshElements( *srcEdge2 ))
if ( SMESHDS_SubMesh* sm = srcMesh->GetMeshDS()->MeshElements( srcEdge1 ))
nbN1 = sm->NbNodes();
if ( SMESHDS_SubMesh* sm = srcMesh->GetMeshDS()->MeshElements( *srcEdge2 ))
@@
-2113,9
+2113,9
@@
bool StdMeshers_Projection_2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape&
// Merge
SMESH_MeshEditor editor( tgtMesh );
// Merge
SMESH_MeshEditor editor( tgtMesh );
-
int
nbFaceBeforeMerge = tgtSubMesh->GetSubMeshDS()->NbElements();
+
smIdType
nbFaceBeforeMerge = tgtSubMesh->GetSubMeshDS()->NbElements();
editor.MergeNodes( groupsOfNodes );
editor.MergeNodes( groupsOfNodes );
-
int
nbFaceAtferMerge = tgtSubMesh->GetSubMeshDS()->NbElements();
+
smIdType
nbFaceAtferMerge = tgtSubMesh->GetSubMeshDS()->NbElements();
if ( nbFaceBeforeMerge != nbFaceAtferMerge && !helper.HasDegeneratedEdges() )
return error(COMPERR_BAD_INPUT_MESH, "Probably invalid node parameters on geom faces");
if ( nbFaceBeforeMerge != nbFaceAtferMerge && !helper.HasDegeneratedEdges() )
return error(COMPERR_BAD_INPUT_MESH, "Probably invalid node parameters on geom faces");
@@
-2243,7
+2243,7
@@
bool StdMeshers_Projection_2D::Evaluate(SMESH_Mesh& theMesh,
// Assure that mesh on a source Face is computed/evaluated
// -------------------------------------------------------
// Assure that mesh on a source Face is computed/evaluated
// -------------------------------------------------------
- std::vector<
int
> aVec;
+ std::vector<
smIdType
> aVec;
SMESH_subMesh* srcSubMesh = srcMesh->GetSubMesh( srcFace );
if ( srcSubMesh->IsMeshComputed() )
SMESH_subMesh* srcSubMesh = srcMesh->GetSubMesh( srcFace );
if ( srcSubMesh->IsMeshComputed() )