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 'OCCT780'
[modules/smesh.git]
/
src
/
SMDS
/
SMDS_Downward.cxx
diff --git
a/src/SMDS/SMDS_Downward.cxx
b/src/SMDS/SMDS_Downward.cxx
index a788a9e5174f995a97fc3756cafbcfcd0bc7bfcd..90140d091fdc4961a84e351f9b867a3066feb84e 100644
(file)
--- a/
src/SMDS/SMDS_Downward.cxx
+++ b/
src/SMDS/SMDS_Downward.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2010-202
0 CEA/DEN, EDF R&D
, OPEN CASCADE
+// Copyright (C) 2010-202
4 CEA, EDF
, OPEN CASCADE
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@
-27,6
+27,7
@@
#include <vtkCellType.h>
#include <vtkCellLinks.h>
#include <vtkCellType.h>
#include <vtkCellLinks.h>
+#include <smIdType.hxx>
#include <map>
#include <map>
@@
-232,7
+233,7
@@
void SMDS_Down1D::compactStorage()
_cellIds.resize(_nbDownCells * _maxId);
_vtkCellIds.resize(_maxId);
_cellIds.resize(_nbDownCells * _maxId);
_vtkCellIds.resize(_maxId);
-
int
sizeUpCells = 0;
+
smIdType
sizeUpCells = 0;
for (int i = 0; i < _maxId; i++)
sizeUpCells += _upCellIdsVector[i].size();
_upCellIds.resize(sizeUpCells, -1);
for (int i = 0; i < _maxId; i++)
sizeUpCells += _upCellIdsVector[i].size();
_upCellIds.resize(sizeUpCells, -1);
@@
-258,8
+259,8
@@
void SMDS_Down1D::compactStorage()
void SMDS_Down1D::addUpCell(int cellId, int upCellId, unsigned char aType)
{
//ASSERT((cellId >=0) && (cellId < _maxId));
void SMDS_Down1D::addUpCell(int cellId, int upCellId, unsigned char aType)
{
//ASSERT((cellId >=0) && (cellId < _maxId));
-
int
nbFaces = _upCellIdsVector[cellId].size();
- for (
int
i = 0; i < nbFaces; i++)
+
smIdType
nbFaces = _upCellIdsVector[cellId].size();
+ for (
smIdType
i = 0; i < nbFaces; i++)
{
if ((_upCellIdsVector[cellId][i] == upCellId) && (_upCellTypesVector[cellId][i] == aType))
{
{
if ((_upCellIdsVector[cellId][i] == upCellId) && (_upCellTypesVector[cellId][i] == aType))
{