zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

COMP: 64bit label changes

Browse Source
This commit is contained in:
mattijs
2011-11-28 12:56:34 +00:00
parent 5eb11ed3c2
commit 51b6dcd4a3
7 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/solvers/combustion/chemFoam/createSingleCellMesh.H
View File

@ -1,6 +1,6 @@
Info<< "Constructing single cell mesh" << nl << endl; Info<< "Constructing single cell mesh" << nl << endl;
labelList owner(6, 0); labelList owner(6, label(0));
labelList neighbour(0); labelList neighbour(0);
pointField points(8); pointField points(8);

2
applications/utilities/mesh/conversion/sammToFoam/readBoundary.C
View File

@ -47,7 +47,7 @@ void sammMesh::readBoundary()
labelList pointLabels(4); labelList pointLabels(4);
labelList pointLabelsTri(3); labelList pointLabelsTri(3);
labelList patchLabels(1000, -1); labelList patchLabels(1000, label(-1));
word patchType; word patchType;
patchTypes_.setSize(1000); patchTypes_.setSize(1000);

2
applications/utilities/mesh/conversion/star3ToFoam/readCells.C
View File

@ -275,7 +275,7 @@ void starMesh::readCells()
{ {
IFstream cellsFile(cellsFileName); IFstream cellsFile(cellsFileName);
labelList labels(24, -1); labelList labels(24, label(-1));
label lineLabel, starLabel, regionLabel, typeFlag; label lineLabel, starLabel, regionLabel, typeFlag;
for (label cellI = 0; cellI < nCells; cellI++) for (label cellI = 0; cellI < nCells; cellI++)

2
applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
View File

@ -1456,7 +1456,7 @@ void setCouplingInfo
{ {
const polyBoundaryMesh& patches = mesh.boundaryMesh(); const polyBoundaryMesh& patches = mesh.boundaryMesh();
List<polyPatch*> newPatches(patches.size(), NULL); List<polyPatch*> newPatches(patches.size(), static_cast<polyPatch*>(NULL));
forAll(zoneToPatch, zoneI) forAll(zoneToPatch, zoneI)
{ {

14
applications/utilities/postProcessing/dataConversion/foamToFieldview9/fieldviewTopology.C
View File

@ -114,7 +114,7 @@ Foam::fieldviewTopology::fieldviewTopology
// Mark all faces that are to be seen as wall for particle // Mark all faces that are to be seen as wall for particle
// tracking and all cells that use one or more of these walls // tracking and all cells that use one or more of these walls
labelList wallFace(mesh.nFaces(), NOT_A_WALL); List<int> wallFace(mesh.nFaces(), NOT_A_WALL);
boolList wallCell(mesh.nCells(), false); boolList wallCell(mesh.nCells(), false);
if (setWallInfo) if (setWallInfo)
@ -149,20 +149,20 @@ Foam::fieldviewTopology::fieldviewTopology
const cellModel& hex = *(cellModeller::lookup("hex")); const cellModel& hex = *(cellModeller::lookup("hex"));
// Pre calculate headers for cells not on walls // Pre calculate headers for cells not on walls
labelList notWallFlags(6, NOT_A_WALL); List<int> notWallFlags(6, NOT_A_WALL);
label tetNotWall = fv_encode_elem_header unsigned int tetNotWall = fv_encode_elem_header
( (
FV_TET_ELEM_ID, notWallFlags.begin() FV_TET_ELEM_ID, notWallFlags.begin()
); );
label pyrNotWall = fv_encode_elem_header unsigned int pyrNotWall = fv_encode_elem_header
( (
FV_PYRA_ELEM_ID, notWallFlags.begin() FV_PYRA_ELEM_ID, notWallFlags.begin()
); );
label prismNotWall = fv_encode_elem_header unsigned int prismNotWall = fv_encode_elem_header
( (
FV_PRISM_ELEM_ID, notWallFlags.begin() FV_PRISM_ELEM_ID, notWallFlags.begin()
); );
label hexNotWall = fv_encode_elem_header unsigned int hexNotWall = fv_encode_elem_header
( (
FV_HEX_ELEM_ID, notWallFlags.begin() FV_HEX_ELEM_ID, notWallFlags.begin()
); );
@ -179,7 +179,7 @@ Foam::fieldviewTopology::fieldviewTopology
const faceList& allFaces = mesh.faces(); const faceList& allFaces = mesh.faces();
labelList wallFlags(6); List<int> wallFlags(6);
forAll(cellShapes, celli) forAll(cellShapes, celli)
{ {
const cellShape& cellShape = cellShapes[celli]; const cellShape& cellShape = cellShapes[celli];

16
applications/utilities/postProcessing/dataConversion/foamToFieldview9/fieldviewTopology.H
View File

@ -55,13 +55,13 @@ class fieldviewTopology
// Private data // Private data
//- Hexes in fieldview format //- Hexes in fieldview format
labelList hexLabels_; List<int> hexLabels_;
labelList prismLabels_; List<int> prismLabels_;
labelList pyrLabels_; List<int> pyrLabels_;
labelList tetLabels_; List<int> tetLabels_;
//- Number of non-hex/prism/pyr/tet labels //- Number of non-hex/prism/pyr/tet labels
label nPoly_; label nPoly_;
@ -108,22 +108,22 @@ public:
// Access // Access
const labelList& hexLabels() const const List<int>& hexLabels() const
{ {
return hexLabels_; return hexLabels_;
} }
const labelList& prismLabels() const const List<int>& prismLabels() const
{ {
return prismLabels_; return prismLabels_;
} }
const labelList& pyrLabels() const const List<int>& pyrLabels() const
{ {
return pyrLabels_; return pyrLabels_;
} }
const labelList& tetLabels() const const List<int>& tetLabels() const
{ {
return tetLabels_; return tetLabels_;
} }

2
applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
View File

@ -332,7 +332,7 @@ int main(int argc, char *argv[])
vectorField normals(2*nFeatEds, vector::zero); vectorField normals(2*nFeatEds, vector::zero);
vectorField edgeDirections(nFeatEds, vector::zero); vectorField edgeDirections(nFeatEds, vector::zero);
labelListList edgeNormals(nFeatEds, labelList(2, -1)); labelListList edgeNormals(nFeatEds, labelList(2, label(-1)));
triSurfaceSearch querySurf1(surf1); triSurfaceSearch querySurf1(surf1);
triSurfaceSearch querySurf2(surf2); triSurfaceSearch querySurf2(surf2);