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
Merge branch 'master' into gni/evolution
[modules/smesh.git]
/
src
/
SMDS
/
SMDS_MeshVolume.cxx
diff --git
a/src/SMDS/SMDS_MeshVolume.cxx
b/src/SMDS/SMDS_MeshVolume.cxx
index ee9eb939fa0a11fbe1e681b9aff2753162271ad5..e4030afa92c30b0d1e94c6e1b68eb08376ef6a89 100644
(file)
--- a/
src/SMDS/SMDS_MeshVolume.cxx
+++ b/
src/SMDS/SMDS_MeshVolume.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
19
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
21
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
@@
-82,8
+82,9
@@
bool SMDS_MeshVolume::ChangeNodes(const std::vector<const SMDS_MeshNode*>& nodes
return false;
vtkIdType nFaces = 0;
return false;
vtkIdType nFaces = 0;
- vtkIdType* ptIds = 0;
- getGrid()->GetFaceStream( GetVtkID(), nFaces, ptIds );
+ vtkIdType const *tmp(nullptr);
+ getGrid()->GetFaceStream( GetVtkID(), nFaces, tmp );
+ vtkIdType *ptIds = const_cast<vtkIdType*>( tmp );
// stream size and nb faces should not change
// stream size and nb faces should not change
@@
-91,14
+92,14
@@
bool SMDS_MeshVolume::ChangeNodes(const std::vector<const SMDS_MeshNode*>& nodes
{
return false;
}
{
return false;
}
-
in
t id = 0, nbPoints = 0;
+
size_
t id = 0, nbPoints = 0;
for ( int i = 0; i < nFaces; i++ )
{
int nodesInFace = ptIds[id];
nbPoints += nodesInFace;
id += (nodesInFace + 1);
}
for ( int i = 0; i < nFaces; i++ )
{
int nodesInFace = ptIds[id];
nbPoints += nodesInFace;
id += (nodesInFace + 1);
}
- if (
(int)
nodes.size() != nbPoints )
+ if ( nodes.size() != nbPoints )
{
return false;
}
{
return false;
}
@@
-120,7
+121,7
@@
const SMDS_MeshNode* SMDS_MeshVolume::GetNode(const int ind) const
return SMDS_MeshCell::GetNode( ind );
vtkIdType nFaces = 0;
return SMDS_MeshCell::GetNode( ind );
vtkIdType nFaces = 0;
- vtkIdType
* ptIds = 0
;
+ vtkIdType
const *ptIds(nullptr)
;
getGrid()->GetFaceStream( GetVtkID(), nFaces, ptIds );
int id = 0, nbPoints = 0;
for (int i = 0; i < nFaces; i++)
getGrid()->GetFaceStream( GetVtkID(), nFaces, ptIds );
int id = 0, nbPoints = 0;
for (int i = 0; i < nFaces; i++)
@@
-139,7
+140,7
@@
int SMDS_MeshVolume::NbNodes() const
return SMDS_MeshCell::NbNodes();
vtkIdType nFaces = 0;
return SMDS_MeshCell::NbNodes();
vtkIdType nFaces = 0;
- vtkIdType
* ptIds = 0
;
+ vtkIdType
const *ptIds(nullptr)
;
getGrid()->GetFaceStream( GetVtkID(), nFaces, ptIds );
int id = 0, nbPoints = 0;
for (int i = 0; i < nFaces; i++)
getGrid()->GetFaceStream( GetVtkID(), nFaces, ptIds );
int id = 0, nbPoints = 0;
for (int i = 0; i < nFaces; i++)
@@
-157,7
+158,7
@@
int SMDS_MeshVolume::NbFaces() const
return SMDS_MeshCell::NbFaces();
vtkIdType nFaces = 0;
return SMDS_MeshCell::NbFaces();
vtkIdType nFaces = 0;
- vtkIdType
* ptIds = 0
;
+ vtkIdType
const *ptIds(nullptr)
;
getGrid()->GetFaceStream( GetVtkID(), nFaces, ptIds );
return nFaces;
getGrid()->GetFaceStream( GetVtkID(), nFaces, ptIds );
return nFaces;
@@
-168,7
+169,7
@@
int SMDS_MeshVolume::NbEdges() const
return SMDS_MeshCell::NbEdges();
vtkIdType nFaces = 0;
return SMDS_MeshCell::NbEdges();
vtkIdType nFaces = 0;
- vtkIdType
* ptIds = 0
;
+ vtkIdType
const *ptIds(nullptr)
;
getGrid()->GetFaceStream( GetVtkID(), nFaces, ptIds );
int id = 0, nbEdges = 0;
for (int i = 0; i < nFaces; i++)
getGrid()->GetFaceStream( GetVtkID(), nFaces, ptIds );
int id = 0, nbEdges = 0;
for (int i = 0; i < nFaces; i++)
@@
-187,7
+188,7
@@
int SMDS_MeshVolume::GetNodeIndex( const SMDS_MeshNode* node ) const
return SMDS_MeshCell::GetNodeIndex( node );
vtkIdType nFaces = 0;
return SMDS_MeshCell::GetNodeIndex( node );
vtkIdType nFaces = 0;
- vtkIdType
* ptIds = 0
;
+ vtkIdType
const *ptIds(nullptr)
;
getGrid()->GetFaceStream( GetVtkID(), nFaces, ptIds );
int id = 0;
for (int iF = 0; iF < nFaces; iF++)
getGrid()->GetFaceStream( GetVtkID(), nFaces, ptIds );
int id = 0;
for (int iF = 0; iF < nFaces; iF++)
@@
-200,7
+201,7
@@
int SMDS_MeshVolume::GetNodeIndex( const SMDS_MeshNode* node ) const
}
return -1;
}
}
return -1;
}
-bool SMDS_MeshVolume::ChangeNodes(const SMDS_MeshNode*
nodes[], const int nbNodes
)
+bool SMDS_MeshVolume::ChangeNodes(const SMDS_MeshNode*
/*nodes*/[], const int /*nbNodes*/
)
{
return false;
}
{
return false;
}
@@
-227,7
+228,7
@@
int SMDS_MeshVolume::NbFaceNodes (const int face_ind) const
return SMDS_VolumeTool( this ).NbFaceNodes( face_ind-1 );
vtkIdType nFaces = 0;
return SMDS_VolumeTool( this ).NbFaceNodes( face_ind-1 );
vtkIdType nFaces = 0;
- vtkIdType
* ptIds = 0
;
+ vtkIdType
const *ptIds(nullptr)
;
getGrid()->GetFaceStream( GetVtkID(), nFaces, ptIds );
int id = 0, nbNodes = 0;
for (int i = 0; i < nFaces; i++)
getGrid()->GetFaceStream( GetVtkID(), nFaces, ptIds );
int id = 0, nbNodes = 0;
for (int i = 0; i < nFaces; i++)
@@
-249,7
+250,7
@@
const SMDS_MeshNode* SMDS_MeshVolume::GetFaceNode (const int face_ind, const int
return SMDS_VolumeTool( this ).GetFaceNodes( face_ind-1 )[ node_ind - 1 ];
vtkIdType nFaces = 0;
return SMDS_VolumeTool( this ).GetFaceNodes( face_ind-1 )[ node_ind - 1 ];
vtkIdType nFaces = 0;
- vtkIdType
* ptIds = 0
;
+ vtkIdType
const *ptIds(nullptr)
;
getGrid()->GetFaceStream( GetVtkID(), nFaces, ptIds);
int id = 0;
for (int i = 0; i < nFaces; i++)
getGrid()->GetFaceStream( GetVtkID(), nFaces, ptIds);
int id = 0;
for (int i = 0; i < nFaces; i++)
@@
-271,7
+272,7
@@
std::vector<int> SMDS_MeshVolume::GetQuantities() const
if ( IsPoly() )
{
vtkIdType nFaces = 0;
if ( IsPoly() )
{
vtkIdType nFaces = 0;
- vtkIdType
* ptIds = 0
;
+ vtkIdType
const *ptIds(nullptr)
;
getGrid()->GetFaceStream( GetVtkID(), nFaces, ptIds );
int id = 0;
for (int i = 0; i < nFaces; i++)
getGrid()->GetFaceStream( GetVtkID(), nFaces, ptIds );
int id = 0;
for (int i = 0; i < nFaces; i++)