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 'V9_9_BR'
[modules/smesh.git]
/
src
/
SMDS
/
SMDS_Downward.cxx
diff --git
a/src/SMDS/SMDS_Downward.cxx
b/src/SMDS/SMDS_Downward.cxx
index c62667a9da06381bec545ab3e1e48ed937fb2872..a1ea1d954ba75fdad6ef2703df107c7a434eafbd 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
2
CEA/DEN, EDF R&D, 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>
@@
-122,7
+123,7
@@
int SMDS_Downward::addCell(int vtkId)
*
* @param cellId
*/
*
* @param cellId
*/
-void SMDS_Downward::initCell(int
cellId
)
+void SMDS_Downward::initCell(int
/*cellId*/
)
{
}
{
}
@@
-131,7
+132,7
@@
void SMDS_Downward::initCell(int cellId)
* @param cellId not used here.
* @return
*/
* @param cellId not used here.
* @return
*/
-int SMDS_Downward::getNumberOfDownCells(int
cellId
)
+int SMDS_Downward::getNumberOfDownCells(int
/*cellId*/
)
{
return _nbDownCells;
}
{
return _nbDownCells;
}
@@
-154,7
+155,7
@@
const int* SMDS_Downward::getDownCells(int cellId)
* @param cellId index of the cell in the downward structure relative to a vtk cell type.
* @return table of downward entities types.
*/
* @param cellId index of the cell in the downward structure relative to a vtk cell type.
* @return table of downward entities types.
*/
-const unsigned char* SMDS_Downward::getDownTypes(int
cellId
)
+const unsigned char* SMDS_Downward::getDownTypes(int
/*cellId*/
)
{
return &_cellTypes[0];
}
{
return &_cellTypes[0];
}
@@
-165,7
+166,7
@@
const unsigned char* SMDS_Downward::getDownTypes(int cellId)
* @param lowCellId index of the children cell to add (dimension n-1)
* @param aType vtk cell type of the cell to add (needed to find the SMDS_Downward structure containing the cell to add).
*/
* @param lowCellId index of the children cell to add (dimension n-1)
* @param aType vtk cell type of the cell to add (needed to find the SMDS_Downward structure containing the cell to add).
*/
-void SMDS_Downward::addDownCell(int
cellId, int lowCellId, unsigned char aType
)
+void SMDS_Downward::addDownCell(int
/*cellId*/, int /*lowCellId*/, unsigned char /*aType*/
)
{
ASSERT(0); // must be re-implemented in derived class
}
{
ASSERT(0); // must be re-implemented in derived class
}
@@
-176,12
+177,12
@@
void SMDS_Downward::addDownCell(int cellId, int lowCellId, unsigned char aType)
* @param upCellId index of the parent cell to add (dimension n+1)
* @param aType vtk cell type of the cell to add (needed to find the SMDS_Downward structure containing the cell to add).
*/
* @param upCellId index of the parent cell to add (dimension n+1)
* @param aType vtk cell type of the cell to add (needed to find the SMDS_Downward structure containing the cell to add).
*/
-void SMDS_Downward::addUpCell(int
cellId, int upCellId, unsigned char aType
)
+void SMDS_Downward::addUpCell(int
/*cellId*/, int /*upCellId*/, unsigned char /*aType*/
)
{
ASSERT(0); // must be re-implemented in derived class
}
{
ASSERT(0); // must be re-implemented in derived class
}
-int SMDS_Downward::getNodeSet(int
cellId, int* nodeSet
)
+int SMDS_Downward::getNodeSet(int
/*cellId*/, int* /*nodeSet*/
)
{
return 0;
}
{
return 0;
}
@@
-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))
{
@@
-777,17
+778,17
@@
void SMDS_Down3D::compactStorage()
// nothing to do, size was known before
}
// nothing to do, size was known before
}
-int SMDS_Down3D::getNumberOfUpCells(int
cellId
)
+int SMDS_Down3D::getNumberOfUpCells(int
/*cellId*/
)
{
return 0;
}
{
return 0;
}
-const int* SMDS_Down3D::getUpCells(int
cellId
)
+const int* SMDS_Down3D::getUpCells(int
/*cellId*/
)
{
return 0;
}
{
return 0;
}
-const unsigned char* SMDS_Down3D::getUpTypes(int
cellId
)
+const unsigned char* SMDS_Down3D::getUpTypes(int
/*cellId*/
)
{
return 0;
}
{
return 0;
}
@@
-904,7
+905,7
@@
void SMDS_DownTriangle::computeEdgesWithNodes(int cellId, ListElemByNodesType& e
edgesWithNodes.elems[2].vtkType = VTK_LINE;
}
edgesWithNodes.elems[2].vtkType = VTK_LINE;
}
-void SMDS_DownTriangle::addDownCell(int cellId, int lowCellId, unsigned char
aType
)
+void SMDS_DownTriangle::addDownCell(int cellId, int lowCellId, unsigned char
/*aType*/
)
{
//ASSERT((cellId >=0)&& (cellId < _maxId));
//ASSERT(aType == VTK_LINE);
{
//ASSERT((cellId >=0)&& (cellId < _maxId));
//ASSERT(aType == VTK_LINE);
@@
-961,7
+962,7
@@
void SMDS_DownQuadTriangle::computeEdgesWithNodes(int cellId, ListElemByNodesTyp
edgesWithNodes.elems[2].vtkType = VTK_QUADRATIC_EDGE;
}
edgesWithNodes.elems[2].vtkType = VTK_QUADRATIC_EDGE;
}
-void SMDS_DownQuadTriangle::addDownCell(int cellId, int lowCellId, unsigned char
aType
)
+void SMDS_DownQuadTriangle::addDownCell(int cellId, int lowCellId, unsigned char
/*aType*/
)
{
//ASSERT((cellId >=0)&& (cellId < _maxId));
//ASSERT(aType == VTK_QUADRATIC_EDGE);
{
//ASSERT((cellId >=0)&& (cellId < _maxId));
//ASSERT(aType == VTK_QUADRATIC_EDGE);
@@
-1021,7
+1022,7
@@
void SMDS_DownQuadrangle::computeEdgesWithNodes(int cellId, ListElemByNodesType&
edgesWithNodes.elems[3].vtkType = VTK_LINE;
}
edgesWithNodes.elems[3].vtkType = VTK_LINE;
}
-void SMDS_DownQuadrangle::addDownCell(int cellId, int lowCellId, unsigned char
aType
)
+void SMDS_DownQuadrangle::addDownCell(int cellId, int lowCellId, unsigned char
/*aType*/
)
{
//ASSERT((cellId >=0)&& (cellId < _maxId));
//ASSERT(aType == VTK_LINE);
{
//ASSERT((cellId >=0)&& (cellId < _maxId));
//ASSERT(aType == VTK_LINE);
@@
-1085,7
+1086,7
@@
void SMDS_DownQuadQuadrangle::computeEdgesWithNodes(int cellId, ListElemByNodesT
edgesWithNodes.elems[3].vtkType = VTK_QUADRATIC_EDGE;
}
edgesWithNodes.elems[3].vtkType = VTK_QUADRATIC_EDGE;
}
-void SMDS_DownQuadQuadrangle::addDownCell(int cellId, int lowCellId, unsigned char
aType
)
+void SMDS_DownQuadQuadrangle::addDownCell(int cellId, int lowCellId, unsigned char
/*aType*/
)
{
//ASSERT((cellId >=0)&& (cellId < _maxId));
//ASSERT(aType == VTK_QUADRATIC_EDGE);
{
//ASSERT((cellId >=0)&& (cellId < _maxId));
//ASSERT(aType == VTK_QUADRATIC_EDGE);
@@
-1150,7
+1151,7
@@
void SMDS_DownTetra::getOrderedNodesOfFace(int cellId, std::vector<vtkIdType>& o
MESSAGE(nodes[0] << " " << nodes[1] << " " << nodes[2] << " " << nodes[3]);
}
MESSAGE(nodes[0] << " " << nodes[1] << " " << nodes[2] << " " << nodes[3]);
}
-void SMDS_DownTetra::addDownCell(int cellId, int lowCellId, unsigned char
aType
)
+void SMDS_DownTetra::addDownCell(int cellId, int lowCellId, unsigned char
/*aType*/
)
{
//ASSERT((cellId >=0)&& (cellId < _maxId));
//ASSERT(aType == VTK_TRIANGLE);
{
//ASSERT((cellId >=0)&& (cellId < _maxId));
//ASSERT(aType == VTK_TRIANGLE);
@@
-1258,7
+1259,7
@@
void SMDS_DownQuadTetra::getOrderedNodesOfFace(int cellId, std::vector<vtkIdType
MESSAGE(nodes[0] << " " << nodes[1] << " " << nodes[2] << " " << nodes[3]);
}
MESSAGE(nodes[0] << " " << nodes[1] << " " << nodes[2] << " " << nodes[3]);
}
-void SMDS_DownQuadTetra::addDownCell(int cellId, int lowCellId, unsigned char
aType
)
+void SMDS_DownQuadTetra::addDownCell(int cellId, int lowCellId, unsigned char
/*aType*/
)
{
//ASSERT((cellId >=0)&& (cellId < _maxId));
//ASSERT(aType == VTK_QUADRATIC_TRIANGLE);
{
//ASSERT((cellId >=0)&& (cellId < _maxId));
//ASSERT(aType == VTK_QUADRATIC_TRIANGLE);
@@
-2006,7
+2007,7
@@
void SMDS_DownHexa::getOrderedNodesOfFace(int cellId, std::vector<vtkIdType>& or
MESSAGE(nodes[4] << " " << nodes[5] << " " << nodes[6] << " " << nodes[7]);
}
MESSAGE(nodes[4] << " " << nodes[5] << " " << nodes[6] << " " << nodes[7]);
}
-void SMDS_DownHexa::addDownCell(int cellId, int lowCellId, unsigned char
aType
)
+void SMDS_DownHexa::addDownCell(int cellId, int lowCellId, unsigned char
/*aType*/
)
{
//ASSERT((cellId >=0)&& (cellId < _maxId));
int *faces = &_cellIds[_nbDownCells * cellId];
{
//ASSERT((cellId >=0)&& (cellId < _maxId));
int *faces = &_cellIds[_nbDownCells * cellId];
@@
-2137,7
+2138,7
@@
void SMDS_DownQuadHexa::getOrderedNodesOfFace(int cellId, std::vector<vtkIdType>
MESSAGE(nodes[0] << " " << nodes[1] << " " << nodes[2] << " " << nodes[3]);
}
MESSAGE(nodes[0] << " " << nodes[1] << " " << nodes[2] << " " << nodes[3]);
}
-void SMDS_DownQuadHexa::addDownCell(int cellId, int lowCellId, unsigned char
aType
)
+void SMDS_DownQuadHexa::addDownCell(int cellId, int lowCellId, unsigned char
/*aType*/
)
{
//ASSERT((cellId >=0)&& (cellId < _maxId));
int *faces = &_cellIds[_nbDownCells * cellId];
{
//ASSERT((cellId >=0)&& (cellId < _maxId));
int *faces = &_cellIds[_nbDownCells * cellId];