exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

List<label> -> labelList and simiar throughout

Browse source
This commit is contained in:
Henrik Rusche 2019-02-01 13:36:12 +01:00
parent c9f9aa069b
commit f000c7f6b8
221 changed files with 616 additions and 606 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H
View file

@ -8,7 +8,7 @@
PtrList<compressible::turbulenceModel> turbulence(fluidRegions.size()); PtrList<compressible::turbulenceModel> turbulence(fluidRegions.size());
PtrList<volScalarField> DpDtFluid(fluidRegions.size()); PtrList<volScalarField> DpDtFluid(fluidRegions.size());
List<scalar> initialMassFluid(fluidRegions.size()); scalarList initialMassFluid(fluidRegions.size());
// Populate fluid field pointer lists // Populate fluid field pointer lists
forAll(fluidRegions, i) forAll(fluidRegions, i)

8
applications/solvers/heatTransfer/chtMultiRegionFoam/regionProperties/regionProperties.H
View file

@ -54,10 +54,10 @@ class regionProperties
// Private data // Private data
//- List of the fluid region names //- List of the fluid region names
List<word> fluidRegionNames_; wordList fluidRegionNames_;
//- List of the solid region names //- List of the solid region names
List<word> solidRegionNames_; wordList solidRegionNames_;
// Private Member Functions // Private Member Functions
@ -87,10 +87,10 @@ public:
// Access // Access
//- Return const reference to the list of fluid region names //- Return const reference to the list of fluid region names
const List<word>& fluidRegionNames() const; const wordList& fluidRegionNames() const;
//- Return const reference to the list of solid region names //- Return const reference to the list of solid region names
const List<word>& solidRegionNames() const; const wordList& solidRegionNames() const;
}; };

6
applications/solvers/heatTransfer/chtMultiRegionSimpleFoam/fluid/createFluidFields.H
View file

@ -8,9 +8,9 @@
PtrList<compressible::turbulenceModel> turbulence(fluidRegions.size()); PtrList<compressible::turbulenceModel> turbulence(fluidRegions.size());
PtrList<volScalarField> DpDtf(fluidRegions.size()); PtrList<volScalarField> DpDtf(fluidRegions.size());
List<scalar> initialMassFluid(fluidRegions.size()); scalarList initialMassFluid(fluidRegions.size());
List<label> pRefCellFluid(fluidRegions.size(),0); labelList pRefCellFluid(fluidRegions.size(),0);
List<scalar> pRefValueFluid(fluidRegions.size(),0.0); scalarList pRefValueFluid(fluidRegions.size(),0.0);
// Populate fluid field pointer lists // Populate fluid field pointer lists

4
applications/solvers/solidMechanics/elasticAcpSolidFoam/updateCrack.H
View file

@ -60,7 +60,7 @@ nCoupledFacesToBreak = 0;
} }
labelList facesToBreak(facesToBreakList); labelList facesToBreak(facesToBreakList);
List<scalar> facesToBreakEffTractionFraction scalarList facesToBreakEffTractionFraction
( (
facesToBreakEffTractionFractionList facesToBreakEffTractionFractionList
); );
@ -192,7 +192,7 @@ nCoupledFacesToBreak = 0;
} }
labelList coupledFacesToBreak(coupledFacesToBreakList); labelList coupledFacesToBreak(coupledFacesToBreakList);
List<scalar> coupledFacesToBreakEffTractionFraction scalarList coupledFacesToBreakEffTractionFraction
( (
coupledFacesToBreakEffTractionFractionList coupledFacesToBreakEffTractionFractionList
); );

4
applications/solvers/solidMechanics/elasticIncrAcpSolidFoam/updateCrack.H
View file

@ -62,7 +62,7 @@ nCoupledFacesToBreak = 0;
} }
labelList facesToBreak(facesToBreakList); labelList facesToBreak(facesToBreakList);
List<scalar> facesToBreakEffTractionFraction scalarList facesToBreakEffTractionFraction
( (
facesToBreakEffTractionFractionList facesToBreakEffTractionFractionList
); );
@ -197,7 +197,7 @@ nCoupledFacesToBreak = 0;
} }
labelList coupledFacesToBreak(coupledFacesToBreakList); labelList coupledFacesToBreak(coupledFacesToBreakList);
List<scalar> coupledFacesToBreakEffTractionFraction scalarList coupledFacesToBreakEffTractionFraction
( (
coupledFacesToBreakEffTractionFractionList coupledFacesToBreakEffTractionFractionList
); );

4
applications/solvers/solidMechanics/elasticOrthoAcpSolidFoam/updateCrack.H
View file

@ -60,7 +60,7 @@ nCoupledFacesToBreak = 0;
} }
labelList facesToBreak(facesToBreakList); labelList facesToBreak(facesToBreakList);
List<scalar> facesToBreakEffTractionFraction scalarList facesToBreakEffTractionFraction
( (
facesToBreakEffTractionFractionList facesToBreakEffTractionFractionList
); );
@ -192,7 +192,7 @@ nCoupledFacesToBreak = 0;
} }
labelList coupledFacesToBreak(coupledFacesToBreakList); labelList coupledFacesToBreak(coupledFacesToBreakList);
List<scalar> coupledFacesToBreakEffTractionFraction scalarList coupledFacesToBreakEffTractionFraction
( (
coupledFacesToBreakEffTractionFractionList coupledFacesToBreakEffTractionFractionList
); );

2
applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
View file

@ -143,7 +143,7 @@ int main(int argc, char *argv[])
// Mark cut edges. // Mark cut edges.
DynamicList<label> allCutEdges(pp.nEdges()); dynamicLabelList allCutEdges(pp.nEdges());
DynamicList<scalar> allCutEdgeWeights(pp.nEdges()); DynamicList<scalar> allCutEdgeWeights(pp.nEdges());

14
applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C
View file

@ -117,14 +117,14 @@ int main(int argc, char *argv[])
SortableList<scalar> sortedVols(vols); SortableList<scalar> sortedVols(vols);
// All cell labels, sorted per bin. // All cell labels, sorted per bin.
DynamicList<DynamicList<label> > bins; DynamicList<dynamicLabelList > bins;
// Lower/upper limits // Lower/upper limits
DynamicList<scalar> lowerLimits; DynamicList<scalar> lowerLimits;
DynamicList<scalar> upperLimits; DynamicList<scalar> upperLimits;
// Create bin0. Have upperlimit as factor times lowerlimit. // Create bin0. Have upperlimit as factor times lowerlimit.
bins.append(DynamicList<label>()); bins.append(dynamicLabelList());
lowerLimits.append(sortedVols[0]); lowerLimits.append(sortedVols[0]);
upperLimits.append(1.1*lowerLimits[lowerLimits.size()-1]); upperLimits.append(1.1*lowerLimits[lowerLimits.size()-1]);
@ -135,7 +135,7 @@ int main(int argc, char *argv[])
// New value outside of current bin // New value outside of current bin
// Shrink old bin. // Shrink old bin.
DynamicList<label>& bin = bins[bins.size()-1]; dynamicLabelList& bin = bins[bins.size()-1];
bin.shrink(); bin.shrink();
@ -144,7 +144,7 @@ int main(int argc, char *argv[])
<< upperLimits[upperLimits.size()-1] << endl; << upperLimits[upperLimits.size()-1] << endl;
// Create new bin. // Create new bin.
bins.append(DynamicList<label>()); bins.append(dynamicLabelList());
lowerLimits.append(sortedVols[i]); lowerLimits.append(sortedVols[i]);
upperLimits.append(1.1*lowerLimits[lowerLimits.size()-1]); upperLimits.append(1.1*lowerLimits[lowerLimits.size()-1]);
@ -154,7 +154,7 @@ int main(int argc, char *argv[])
} }
// Append to current bin. // Append to current bin.
DynamicList<label>& bin = bins[bins.size()-1]; dynamicLabelList& bin = bins[bins.size()-1];
bin.append(sortedVols.indices()[i]); bin.append(sortedVols.indices()[i]);
} }
@ -173,7 +173,7 @@ int main(int argc, char *argv[])
Info<< "Volume bins:" << nl; Info<< "Volume bins:" << nl;
forAll(bins, binI) forAll(bins, binI)
{ {
const DynamicList<label>& bin = bins[binI]; const dynamicLabelList& bin = bins[binI];
cellSet cells(mesh, "vol" + name(binI), bin.size()); cellSet cells(mesh, "vol" + name(binI), bin.size());
@ -280,7 +280,7 @@ int main(int argc, char *argv[])
// Set cell values // Set cell values
forAll(bins, binI) forAll(bins, binI)
{ {
const DynamicList<label>& bin = bins[binI]; const dynamicLabelList& bin = bins[binI];
forAll(bin, i) forAll(bin, i)
{ {

2
applications/utilities/mesh/advanced/selectCells/selectCells.C
View file

@ -256,7 +256,7 @@ label selectOutsideCells
// Outside faces // Outside faces
labelHashSet outsideFacesMap(outsidePts.size() * 6 * 2); labelHashSet outsideFacesMap(outsidePts.size() * 6 * 2);
DynamicList<label> outsideFaces(outsideFacesMap.size()); dynamicLabelList outsideFaces(outsideFacesMap.size());
// CellInfo on outside faces // CellInfo on outside faces
DynamicList<cellInfo> outsideFacesInfo(outsideFacesMap.size()); DynamicList<cellInfo> outsideFacesInfo(outsideFacesMap.size());

8
applications/utilities/mesh/advanced/splitCells/splitCells.C
View file

@ -190,7 +190,7 @@ bool splitHex
const label cellI, const label cellI,
const label edgeI, const label edgeI,
DynamicList<label>& cutCells, dynamicLabelList& cutCells,
DynamicList<labelList>& cellLoops, DynamicList<labelList>& cellLoops,
DynamicList<scalarField>& cellEdgeWeights DynamicList<scalarField>& cellEdgeWeights
) )
@ -306,7 +306,7 @@ bool splitCell
const boolList& edgeIsCut, const boolList& edgeIsCut,
const scalarField& edgeWeight, const scalarField& edgeWeight,
DynamicList<label>& cutCells, dynamicLabelList& cutCells,
DynamicList<labelList>& cellLoops, DynamicList<labelList>& cellLoops,
DynamicList<scalarField>& cellEdgeWeights DynamicList<scalarField>& cellEdgeWeights
) )
@ -369,7 +369,7 @@ void collectCuts
const scalar minSin, const scalar minSin,
const cellSet& cellsToCut, const cellSet& cellsToCut,
DynamicList<label>& cutCells, dynamicLabelList& cutCells,
DynamicList<labelList>& cellLoops, DynamicList<labelList>& cellLoops,
DynamicList<scalarField>& cellEdgeWeights DynamicList<scalarField>& cellEdgeWeights
) )
@ -600,7 +600,7 @@ int main(int argc, char *argv[])
// Cut information per cut cell // Cut information per cut cell
DynamicList<label> cutCells(mesh.nCells()/10 + 10); dynamicLabelList cutCells(mesh.nCells()/10 + 10);
DynamicList<labelList> cellLoops(mesh.nCells()/10 + 10); DynamicList<labelList> cellLoops(mesh.nCells()/10 + 10);
DynamicList<scalarField> cellEdgeWeights(mesh.nCells()/10 + 10); DynamicList<scalarField> cellEdgeWeights(mesh.nCells()/10 + 10);

12
applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C
View file

@ -131,7 +131,7 @@ void storeCellInZone
const label cellI, const label cellI,
const label cellType, const label cellType,
Map<label>& typeToZone, Map<label>& typeToZone,
List<DynamicList<label> >& zoneCells List<dynamicLabelList >& zoneCells
) )
{ {
if (cellType >= 0) if (cellType >= 0)
@ -389,8 +389,8 @@ void ReadCells
labelList& foamCellMap, labelList& foamCellMap,
labelList& foamCellType, labelList& foamCellType,
Map<label>& prostarToFoamPatch, Map<label>& prostarToFoamPatch,
DynamicList<label>& foamPatchSizes, dynamicLabelList& foamPatchSizes,
DynamicList<label>& foamPatchStarts, dynamicLabelList& foamPatchStarts,
labelList& foamFaceMap, labelList& foamFaceMap,
labelList& foamOwner, labelList& foamOwner,
labelList& foamNeighbour, labelList& foamNeighbour,
@ -599,8 +599,8 @@ int main(int argc, char *argv[])
// Patching info // Patching info
Map<label> prostarToFoamPatch; Map<label> prostarToFoamPatch;
DynamicList<label> foamPatchSizes; dynamicLabelList foamPatchSizes;
DynamicList<label> foamPatchStarts; dynamicLabelList foamPatchStarts;
// Face connectivity // Face connectivity
labelList foamFaceMap; labelList foamFaceMap;
labelList foamOwner; labelList foamOwner;
@ -1008,7 +1008,7 @@ int main(int argc, char *argv[])
// From foamCellType physical region to Foam cellZone // From foamCellType physical region to Foam cellZone
Map<label> typeToZone; Map<label> typeToZone;
// Storage for cell zones. // Storage for cell zones.
List<DynamicList<label> > zoneCells(0); List<dynamicLabelList > zoneCells(0);
forAll(foamCellType, cellI) forAll(foamCellType, cellI)
{ {

3
applications/utilities/mesh/conversion/fluentMeshToFoam/create3DCellShape.C
View file

@ -28,6 +28,7 @@ Description
#include "cellShapeRecognition.H" #include "cellShapeRecognition.H"
#include "labelList.H" #include "labelList.H"
#include "boolList.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -143,7 +144,7 @@ cellShape create3DCellShape
labelList pointLabels(curModel.nPoints(), -1); labelList pointLabels(curModel.nPoints(), -1);
// Follow the used mesh faces // Follow the used mesh faces
List<bool> meshFaceUsed(localFaces.size(), false); boolList meshFaceUsed(localFaces.size(), false);
// Get the raw model faces // Get the raw model faces
const faceList& modelFaces = curModel.modelFaces(); const faceList& modelFaces = curModel.modelFaces();

8
applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
View file

@ -206,7 +206,7 @@ void storeCellInZone
Map<label>& physToZone, Map<label>& physToZone,
labelList& zoneToPhys, labelList& zoneToPhys,
List<DynamicList<label> >& zoneCells List<dynamicLabelList >& zoneCells
) )
{ {
Map<label>::const_iterator zoneFnd = physToZone.find(regPhys); Map<label>::const_iterator zoneFnd = physToZone.find(regPhys);
@ -373,7 +373,7 @@ void readCells
List<DynamicList<face> >& patchFaces, List<DynamicList<face> >& patchFaces,
labelList& zoneToPhys, labelList& zoneToPhys,
List<DynamicList<label> >& zoneCells List<dynamicLabelList >& zoneCells
) )
{ {
Info<< "Starting to read cells at line " << inFile.lineNumber() << endl; Info<< "Starting to read cells at line " << inFile.lineNumber() << endl;
@ -786,7 +786,7 @@ int main(int argc, char *argv[])
// Map from cellZone to gmsh physical region // Map from cellZone to gmsh physical region
labelList zoneToPhys; labelList zoneToPhys;
// Storage for cell zones. // Storage for cell zones.
List<DynamicList<label> > zoneCells(0); List<dynamicLabelList > zoneCells(0);
// Name per physical region // Name per physical region
Map<word> physicalNames; Map<word> physicalNames;
@ -933,7 +933,7 @@ int main(int argc, char *argv[])
const polyPatch& pp = mesh.boundaryMesh()[mesh.boundaryMesh().size()-1]; const polyPatch& pp = mesh.boundaryMesh()[mesh.boundaryMesh().size()-1];
// Storage for faceZones. // Storage for faceZones.
List<DynamicList<label> > zoneFaces(patchFaces.size()); List<dynamicLabelList > zoneFaces(patchFaces.size());
// Go through all the patchFaces and find corresponding face in pp. // Go through all the patchFaces and find corresponding face in pp.

16
applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
View file

@ -185,7 +185,7 @@ void readPoints
( (
IFstream& is, IFstream& is,
DynamicList<point>& points, // coordinates DynamicList<point>& points, // coordinates
DynamicList<label>& unvPointID // unv index dynamicLabelList& unvPointID // unv index
) )
{ {
Sout<< "Starting reading points at line " << is.lineNumber() << '.' << endl; Sout<< "Starting reading points at line " << is.lineNumber() << '.' << endl;
@ -210,7 +210,7 @@ void readPoints
IOWarningIn IOWarningIn
( (
"readPoints(IFstream&, label&, DynamicList<point>" "readPoints(IFstream&, label&, DynamicList<point>"
", DynamicList<label>&)", ", dynamicLabelList&)",
is is
) << "Points not in order starting at point " << pointI ) << "Points not in order starting at point " << pointI
//<< " at line " << is.lineNumber() //<< " at line " << is.lineNumber()
@ -242,8 +242,8 @@ void readCells
( (
IFstream& is, IFstream& is,
DynamicList<cellShape>& cellVerts, DynamicList<cellShape>& cellVerts,
DynamicList<label>& cellMaterial, dynamicLabelList& cellMaterial,
DynamicList<label>& boundaryFaceIndices, dynamicLabelList& boundaryFaceIndices,
DynamicList<face>& boundaryFaces DynamicList<face>& boundaryFaces
) )
{ {
@ -514,7 +514,7 @@ void readDOFS
<< " trying to read vertex indices." << " trying to read vertex indices."
<< endl; << endl;
DynamicList<label> vertices; dynamicLabelList vertices;
while (true) while (true)
{ {
string line; string line;
@ -604,14 +604,14 @@ int main(int argc, char *argv[])
// Points // Points
DynamicList<point> points; DynamicList<point> points;
// Original unv point label // Original unv point label
DynamicList<label> unvPointID; dynamicLabelList unvPointID;
// Cells // Cells
DynamicList<cellShape> cellVerts; DynamicList<cellShape> cellVerts;
DynamicList<label> cellMat; dynamicLabelList cellMat;
// Boundary faces // Boundary faces
DynamicList<label> boundaryFaceIndices; dynamicLabelList boundaryFaceIndices;
DynamicList<face> boundaryFaces; DynamicList<face> boundaryFaces;
// Patch names and patchFace indices. // Patch names and patchFace indices.

12
applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.C
View file

@ -212,7 +212,7 @@ Foam::label Foam::meshDualiser::addInternalFace
const bool edgeOrder, const bool edgeOrder,
const label dualCell0, const label dualCell0,
const label dualCell1, const label dualCell1,
const DynamicList<label>& verts, const dynamicLabelList& verts,
directTopoChange& meshMod directTopoChange& meshMod
) const ) const
{ {
@ -330,7 +330,7 @@ Foam::label Foam::meshDualiser::addBoundaryFace
const label dualCellI, const label dualCellI,
const label patchI, const label patchI,
const DynamicList<label>& verts, const dynamicLabelList& verts,
directTopoChange& meshMod directTopoChange& meshMod
) const ) const
{ {
@ -423,7 +423,7 @@ void Foam::meshDualiser::createFacesAroundEdge
// << endl; // << endl;
// Walk and collect face. // Walk and collect face.
DynamicList<label> verts(100); dynamicLabelList verts(100);
if (edgeToDualPoint_[edgeI] != -1) if (edgeToDualPoint_[edgeI] != -1)
{ {
@ -571,7 +571,7 @@ void Foam::meshDualiser::createFaceFromInternalFace
// Walk and collect face. // Walk and collect face.
DynamicList<label> verts(100); dynamicLabelList verts(100);
verts.append(faceToDualPoint_[faceI]); verts.append(faceToDualPoint_[faceI]);
verts.append(edgeToDualPoint_[fEdges[fp]]); verts.append(edgeToDualPoint_[fEdges[fp]]);
@ -672,7 +672,7 @@ void Foam::meshDualiser::createFacesAroundBoundaryPoint
// Starting face // Starting face
label faceI = startFaceI; label faceI = startFaceI;
DynamicList<label> verts(4); dynamicLabelList verts(4);
while (true) while (true)
{ {
@ -770,7 +770,7 @@ void Foam::meshDualiser::createFacesAroundBoundaryPoint
label faceI = startFaceI; label faceI = startFaceI;
// Storage for face // Storage for face
DynamicList<label> verts(mesh_.faces()[faceI].size()); dynamicLabelList verts(mesh_.faces()[faceI].size());
// Starting point. // Starting point.
verts.append(pointToDualPoint_[pointI]); verts.append(pointToDualPoint_[pointI]);

6
applications/utilities/mesh/conversion/polyDualMesh/meshDualiser.H
View file

@ -47,7 +47,7 @@ SourceFiles
#ifndef meshDualiser_H #ifndef meshDualiser_H
#define meshDualiser_H #define meshDualiser_H
#include "DynamicList.H" #include "dynamicLabelList.H"
#include "PackedBoolList.H" #include "PackedBoolList.H"
#include "boolList.H" #include "boolList.H"
#include "typeInfo.H" #include "typeInfo.H"
@ -122,7 +122,7 @@ class meshDualiser
const bool edgeOrder, const bool edgeOrder,
const label dualCell0, const label dualCell0,
const label dualCell1, const label dualCell1,
const DynamicList<label>& verts, const dynamicLabelList& verts,
directTopoChange& meshMod directTopoChange& meshMod
) const; ) const;
@ -135,7 +135,7 @@ class meshDualiser
const label dualCellI, const label dualCellI,
const label patchI, const label patchI,
const DynamicList<label>& verts, const dynamicLabelList& verts,
directTopoChange& meshMod directTopoChange& meshMod
) const; ) const;

2
applications/utilities/mesh/conversion/star4ToFoam/foamMeshToStar/foamMeshToStar.C
View file

@ -290,7 +290,7 @@ void writeCells(const polyMesh& mesh, const fileName& timeName)
const labelList & cFaces = cells[cellId]; const labelList & cFaces = cells[cellId];
// create (beg,end) indices // create (beg,end) indices
List<label> indices(cFaces.size() + 1); labelList indices(cFaces.size() + 1);
indices[0] = indices.size(); indices[0] = indices.size();
label count = indices.size(); label count = indices.size();

2
applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
View file

@ -249,7 +249,7 @@ int main(int argc, char *argv[])
HashTable<label> zoneMap(nZones); HashTable<label> zoneMap(nZones);
// Cells per zone. // Cells per zone.
List<DynamicList<label> > zoneCells(nZones); List<dynamicLabelList > zoneCells(nZones);
// Running cell counter // Running cell counter
label cellI = 0; label cellI = 0;

2
applications/utilities/mesh/generation/blockMesh/mergePatchPairsOld.H
View file

@ -173,7 +173,7 @@
HashTable<label> zoneMap(nZones); HashTable<label> zoneMap(nZones);
// Cells per zone. // Cells per zone.
List<DynamicList<label> > zoneCells(nZones); List<dynamicLabelList > zoneCells(nZones);
// Running cell counter // Running cell counter
label cellI = 0; label cellI = 0;

2
applications/utilities/mesh/generation/cfMesh/FMSToVTK/FMSToVTK.C
View file

@ -397,7 +397,7 @@ int main(int argc, char *argv[])
// Write patches // Write patches
// Create patch addressing // Create patch addressing
List<DynamicList<label> > patchAddr(patches.size()); List<dynamicLabelList > patchAddr(patches.size());
forAll(facets, faceI) forAll(facets, faceI)
{ {

6
applications/utilities/mesh/generation/cfMesh/mergeSurfacePatches/mergeSurfacePatches.C
View file

@ -48,7 +48,7 @@ void getPatchIds
( (
const triSurf& origSurf, const triSurf& origSurf,
const wordList& patchNames, const wordList& patchNames,
DynamicList<label>& patchIds dynamicLabelList& patchIds
) )
{ {
const geometricSurfacePatchList& origPatches = origSurf.patches(); const geometricSurfacePatchList& origPatches = origSurf.patches();
@ -189,7 +189,7 @@ autoPtr<triSurf> mergeSurfacePatches
word newPatchType = origPatches[patchIds[0]].geometricType(); word newPatchType = origPatches[patchIds[0]].geometricType();
// Create patch addressing // Create patch addressing
List<DynamicList<label> > patchAddr(origPatches.size()+1); List<dynamicLabelList > patchAddr(origPatches.size()+1);
forAll(origFacets, faceI) forAll(origFacets, faceI)
{ {
@ -331,7 +331,7 @@ int main(int argc, char *argv[])
triSurf origSurf(inFileName); triSurf origSurf(inFileName);
// Get patch ids // Get patch ids
DynamicList<label> patchIds; dynamicLabelList patchIds;
if (args.options().found("patchNames")) if (args.options().found("patchNames"))
{ {

2
applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
View file

@ -163,7 +163,7 @@ int main(int argc, char *argv[])
fZone.checkParallelSync(true); fZone.checkParallelSync(true);
// Patches to put baffles into // Patches to put baffles into
DynamicList<label> newPatches(1); dynamicLabelList newPatches(1);
word patchName(args.additionalArgs()[1]); word patchName(args.additionalArgs()[1]);
newPatches.append(findPatchID(mesh, patchName)); newPatches.append(findPatchID(mesh, patchName));

6
applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C
View file

@ -481,7 +481,7 @@ void Foam::mergePolyMesh::merge()
{ {
Info << "Updating point zones" << endl; Info << "Updating point zones" << endl;
List<DynamicList<label> > pzPoints(pointZoneNames_.size()); List<dynamicLabelList > pzPoints(pointZoneNames_.size());
forAll(pointZones_, pointI) forAll(pointZones_, pointI)
{ {
label zoneID = pointZones_[pointI]; label zoneID = pointZones_[pointI];
@ -506,7 +506,7 @@ void Foam::mergePolyMesh::merge()
{ {
Info << "Updating face zones" << endl; Info << "Updating face zones" << endl;
List<DynamicList<label> > fzFaces(faceZoneNames_.size()); List<dynamicLabelList > fzFaces(faceZoneNames_.size());
List<DynamicList<bool> > fzFlips(faceZoneNames_.size()); List<DynamicList<bool> > fzFlips(faceZoneNames_.size());
forAll(faceZones_, faceI) forAll(faceZones_, faceI)
@ -540,7 +540,7 @@ void Foam::mergePolyMesh::merge()
{ {
Info << "Updating cell zones" << endl; Info << "Updating cell zones" << endl;
List<DynamicList<label> > czCells(cellZoneNames_.size()); List<dynamicLabelList > czCells(cellZoneNames_.size());
forAll(cellZones_, cellI) forAll(cellZones_, cellI)
{ {
label zoneID = cellZones_[cellI]; label zoneID = cellZones_[cellI];

6
applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.H
View file

@ -74,16 +74,16 @@ class mergePolyMesh
DynamicList<word> cellZoneNames_; DynamicList<word> cellZoneNames_;
//- Point zones //- Point zones
DynamicList<label> pointZones_; dynamicLabelList pointZones_;
//- Face zones //- Face zones
DynamicList<label> faceZones_; dynamicLabelList faceZones_;
//- Face zone Flips //- Face zone Flips
DynamicList<bool> faceZoneFlips_; DynamicList<bool> faceZoneFlips_;
//- Cell zones //- Cell zones
DynamicList<label> cellZones_; dynamicLabelList cellZones_;
// Private Member Functions // Private Member Functions

2
applications/utilities/mesh/manipulation/objToVTK/objToVTK.C
View file

@ -56,7 +56,7 @@ string getLine(std::ifstream& is)
// Read space-separated vertices (with optional '/' arguments) // Read space-separated vertices (with optional '/' arguments)
labelList parseVertices(const string& line) labelList parseVertices(const string& line)
{ {
DynamicList<label> verts; dynamicLabelList verts;
// Assume 'l' is followed by space. // Assume 'l' is followed by space.
string::size_type endNum = 1; string::size_type endNum = 1;

8
applications/utilities/mesh/manipulation/setSet/writeFuns.C
View file

@ -169,7 +169,7 @@ void Foam::writeFuns::write
( (
std::ostream& os, std::ostream& os,
const bool binary, const bool binary,
DynamicList<label>& elems dynamicLabelList& elems
) )
{ {
labelList& fld = elems.shrink(); labelList& fld = elems.shrink();
@ -188,7 +188,7 @@ void Foam::writeFuns::insert(const point& pt, DynamicList<floatScalar>& dest)
// Store labelList in dest. // Store labelList in dest.
void Foam::writeFuns::insert(const labelList& source, DynamicList<label>& dest) void Foam::writeFuns::insert(const labelList& source, dynamicLabelList& dest)
{ {
forAll(source, i) forAll(source, i)
{ {
@ -200,7 +200,7 @@ void Foam::writeFuns::insert(const labelList& source, DynamicList<label>& dest)
// Store scalarField in dest // Store scalarField in dest
void Foam::writeFuns::insert void Foam::writeFuns::insert
( (
const List<scalar>& source, const scalarList& source,
DynamicList<floatScalar>& dest DynamicList<floatScalar>& dest
) )
{ {
@ -215,7 +215,7 @@ void Foam::writeFuns::insert
void Foam::writeFuns::insert void Foam::writeFuns::insert
( (
const labelList& map, const labelList& map,
const List<scalar>& source, const scalarList& source,
DynamicList<floatScalar>& dest DynamicList<floatScalar>& dest
) )
{ {

11
applications/utilities/mesh/manipulation/setSet/writeFuns.H
View file

@ -36,9 +36,10 @@ SourceFiles
#define writeFunctions_H #define writeFunctions_H
#include "labelList.H" #include "labelList.H"
#include "scalarList.H"
#include "floatScalar.H" #include "floatScalar.H"
#include "OFstream.H" #include "OFstream.H"
#include "DynamicList.H" #include "dynamicLabelList.H"
#include "point.H" #include "point.H"
using namespace Foam; using namespace Foam;
@ -68,7 +69,7 @@ public:
//- Write ascii or binary. If binary optionally in-place swaps argument //- Write ascii or binary. If binary optionally in-place swaps argument
static void write(std::ostream&, const bool, DynamicList<floatScalar>&); static void write(std::ostream&, const bool, DynamicList<floatScalar>&);
static void write(std::ostream&, const bool, DynamicList<label>&); static void write(std::ostream&, const bool, dynamicLabelList&);
//- Write ascii or binary. If binary optionally in-place swaps argument //- Write ascii or binary. If binary optionally in-place swaps argument
static void write(std::ostream&, const bool, List<floatScalar>&); static void write(std::ostream&, const bool, List<floatScalar>&);
@ -78,15 +79,15 @@ public:
static void insert(const point&, DynamicList<floatScalar>& dest); static void insert(const point&, DynamicList<floatScalar>& dest);
//- Append elements of labelList to DynamicList //- Append elements of labelList to DynamicList
static void insert(const labelList&, DynamicList<label>&); static void insert(const labelList&, dynamicLabelList&);
//- Append elements of scalarList to DynamicList //- Append elements of scalarList to DynamicList
static void insert(const List<scalar>&, DynamicList<floatScalar>&); static void insert(const scalarList&, DynamicList<floatScalar>&);
//- Append elements of scalarList to DynamicList using map //- Append elements of scalarList to DynamicList using map
static void insert static void insert
( (
const labelList& map, const labelList& map,
const List<scalar>& source, const scalarList& source,
DynamicList<floatScalar>& DynamicList<floatScalar>&
); );

2
applications/utilities/mesh/manipulation/setSet/writePatch.C
View file

@ -89,7 +89,7 @@ void writePatch
<< std::endl; << std::endl;
DynamicList<label> vertLabels(nFaceVerts); dynamicLabelList vertLabels(nFaceVerts);
forAll(fp.localFaces(), faceI) forAll(fp.localFaces(), faceI)
{ {

2
applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
View file

@ -155,7 +155,7 @@ int main(int argc, char *argv[])
faceSet set(*iter()); faceSet set(*iter());
SortableList<label> faceLabels(set.toc()); SortableList<label> faceLabels(set.toc());
DynamicList<label> addressing(set.size()); dynamicLabelList addressing(set.size());
DynamicList<bool> flipMap(set.size()); DynamicList<bool> flipMap(set.size());
if (!noFlipMap) if (!noFlipMap)

2
applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
View file

@ -486,7 +486,7 @@ void subsetSurfaceFields
// Select all cells not in the region // Select all cells not in the region
labelList getNonRegionCells(const labelList& cellRegion, const label regionI) labelList getNonRegionCells(const labelList& cellRegion, const label regionI)
{ {
DynamicList<label> nonRegionCells(cellRegion.size()); dynamicLabelList nonRegionCells(cellRegion.size());
forAll (cellRegion, cellI) forAll (cellRegion, cellI)
{ {
if (cellRegion[cellI] != regionI) if (cellRegion[cellI] != regionI)

4
applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputCase.H
View file

@ -180,10 +180,10 @@ if (fieldTimesUsed.size())
// TODO: allow similar/different time-steps for each cloud // TODO: allow similar/different time-steps for each cloud
cloudNo = 0; cloudNo = 0;
forAllConstIter(HashTable<DynamicList<label> >, cloudTimesUsed, cloudIter) forAllConstIter(HashTable<dynamicLabelList >, cloudTimesUsed, cloudIter)
{ {
// const word& cloudName = cloudIter.key(); // const word& cloudName = cloudIter.key();
const DynamicList<label>& timesUsed = cloudIter(); const dynamicLabelList& timesUsed = cloudIter();
if (timesUsed.size() && cloudNo == 0) if (timesUsed.size() && cloudNo == 0)
{ {

6
applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C
View file

@ -175,15 +175,15 @@ int main(int argc, char *argv[])
Map<scalar> timeIndices; Map<scalar> timeIndices;
// Track the time indices used by the volume fields // Track the time indices used by the volume fields
DynamicList<label> fieldTimesUsed; dynamicLabelList fieldTimesUsed;
// Track the time indices used by each cloud // Track the time indices used by each cloud
HashTable<DynamicList<label> > cloudTimesUsed; HashTable<dynamicLabelList > cloudTimesUsed;
// Create a new DynamicList for each cloud // Create a new DynamicList for each cloud
forAllConstIter(HashTable<HashTable<word> >, cloudFields, cloudIter) forAllConstIter(HashTable<HashTable<word> >, cloudFields, cloudIter)
{ {
cloudTimesUsed.insert(cloudIter.key(), DynamicList<label>()); cloudTimesUsed.insert(cloudIter.key(), dynamicLabelList());
} }

2
applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C
View file

@ -125,7 +125,7 @@ labelList getSelectedPatches
const List<wordRe>& excludePatches //HashSet<word>& excludePatches const List<wordRe>& excludePatches //HashSet<word>& excludePatches
) )
{ {
DynamicList<label> patchIDs(patches.size()); dynamicLabelList patchIDs(patches.size());
Info<< "Combining patches:" << endl; Info<< "Combining patches:" << endl;

4
applications/utilities/postProcessing/dataConversion/foamToVTK/faMeshWriter.C
View file

@ -64,8 +64,8 @@ Foam::faMeshWriter::faMeshWriter
os_ << "CELLS " << aMesh.nFaces() << ' ' << nFaceVerts os_ << "CELLS " << aMesh.nFaces() << ' ' << nFaceVerts
<< std::endl; << std::endl;
DynamicList<label> vertLabels(nFaceVerts); dynamicLabelList vertLabels(nFaceVerts);
DynamicList<label> faceTypes(nFaceVerts); dynamicLabelList faceTypes(nFaceVerts);
forAll(pp, faceI) forAll(pp, faceI)
{ {

2
applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
View file

@ -176,7 +176,7 @@ labelList getSelectedPatches
const HashSet<word>& excludePatches const HashSet<word>& excludePatches
) )
{ {
DynamicList<label> patchIDs(patches.size()); dynamicLabelList patchIDs(patches.size());
Info<< "Combining patches:" << endl; Info<< "Combining patches:" << endl;

4
applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriter.C
View file

@ -91,7 +91,7 @@ Foam::internalWriter::internalWriter
<< std::endl; << std::endl;
DynamicList<label> vertLabels(nFaceVerts); dynamicLabelList vertLabels(nFaceVerts);
forAll(vtkVertLabels, cellI) forAll(vtkVertLabels, cellI)
{ {
@ -110,7 +110,7 @@ Foam::internalWriter::internalWriter
os_ << "CELL_TYPES " << vtkCellTypes.size() << std::endl; os_ << "CELL_TYPES " << vtkCellTypes.size() << std::endl;
// Make copy since writing might swap stuff. // Make copy since writing might swap stuff.
DynamicList<label> cellTypes(vtkCellTypes.size()); dynamicLabelList cellTypes(vtkCellTypes.size());
writeFuns::insert(vtkCellTypes, cellTypes); writeFuns::insert(vtkCellTypes, cellTypes);

4
applications/utilities/postProcessing/dataConversion/foamToVTK/patchWriter.C
View file

@ -94,8 +94,8 @@ Foam::patchWriter::patchWriter
os_ << "CELLS " << nFaces_ << ' ' << nFaceVerts os_ << "CELLS " << nFaces_ << ' ' << nFaceVerts
<< std::endl; << std::endl;
DynamicList<label> vertLabels(nFaceVerts); dynamicLabelList vertLabels(nFaceVerts);
DynamicList<label> faceTypes(nFaceVerts); dynamicLabelList faceTypes(nFaceVerts);
label offset = 0; label offset = 0;

2
applications/utilities/postProcessing/dataConversion/foamToVTK/writeFaceSet.C
View file

@ -110,7 +110,7 @@ void writeFaceSet
pStream << "POLYGONS " << fp.size() << ' ' << nFaceVerts pStream << "POLYGONS " << fp.size() << ' ' << nFaceVerts
<< std::endl; << std::endl;
DynamicList<label> vertLabels(nFaceVerts); dynamicLabelList vertLabels(nFaceVerts);
forAll(lf, faceI) forAll(lf, faceI)
{ {

4
applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.C
View file

@ -170,7 +170,7 @@ void Foam::writeFuns::write
( (
std::ostream& os, std::ostream& os,
const bool binary, const bool binary,
DynamicList<label>& elems dynamicLabelList& elems
) )
{ {
labelList& fld = elems.shrink(); labelList& fld = elems.shrink();
@ -274,7 +274,7 @@ void Foam::writeFuns::insert(const tensor& pt, DynamicList<floatScalar>& dest)
} }
void Foam::writeFuns::insert(const labelList& source, DynamicList<label>& dest) void Foam::writeFuns::insert(const labelList& source, dynamicLabelList& dest)
{ {
forAll(source, i) forAll(source, i)
{ {

4
applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.H
View file

@ -69,7 +69,7 @@ public:
static void write(std::ostream&, const bool, List<floatScalar>&); static void write(std::ostream&, const bool, List<floatScalar>&);
static void write(std::ostream&, const bool, DynamicList<floatScalar>&); static void write(std::ostream&, const bool, DynamicList<floatScalar>&);
static void write(std::ostream&, const bool, labelList&); static void write(std::ostream&, const bool, labelList&);
static void write(std::ostream&, const bool, DynamicList<label>&); static void write(std::ostream&, const bool, dynamicLabelList&);
// Write header // Write header
@ -106,7 +106,7 @@ public:
//- Append elements to DynamicList //- Append elements to DynamicList
static void insert(const labelList&, DynamicList<label>&); static void insert(const labelList&, dynamicLabelList&);
template<class Type> template<class Type>
static void insert(const List<Type>&, DynamicList<floatScalar>&); static void insert(const List<Type>&, DynamicList<floatScalar>&);

2
applications/utilities/postProcessing/dataConversion/foamToVTK/writePatchGeom.C
View file

@ -64,7 +64,7 @@ void writePatchGeom
<< std::endl; << std::endl;
DynamicList<label> vertLabels(nFaceVerts); dynamicLabelList vertLabels(nFaceVerts);
forAll(faces, faceI) forAll(faces, faceI)
{ {

6
applications/utilities/postProcessing/graphics/ensightFoamReader/globalFoam.H
View file

@ -43,9 +43,9 @@ static fileName caseDir;
static instantList timeDirs; static instantList timeDirs;
static List<word> fieldNames; static wordList fieldNames;
static List<word> lagrangianScalarNames; static wordList lagrangianScalarNames;
static List<word> lagrangianVectorNames; static wordList lagrangianVectorNames;
static label var2field[maxNames]; static label var2field[maxNames];
static Time *runTimePtr = 0; static Time *runTimePtr = 0;

2
applications/utilities/postProcessing/graphics/fieldview9Reader/readerDatabase.C
View file

@ -50,7 +50,7 @@ void Foam::readerDatabase::getPolyHedra()
const cellModel& tetWedge = *(cellModeller::lookup("tetWedge")); const cellModel& tetWedge = *(cellModeller::lookup("tetWedge"));
const cellModel& hex = *(cellModeller::lookup("hex")); const cellModel& hex = *(cellModeller::lookup("hex"));
DynamicList<label> polys(mesh().nCells()/100 + 1); dynamicLabelList polys(mesh().nCells()/100 + 1);
const cellShapeList& cellShapes = mesh().cellShapes(); const cellShapeList& cellShapes = mesh().cellShapes();

10
applications/utilities/postProcessing/graphics/newEnsightFoamReader/globalFoam.H
View file

@ -44,9 +44,9 @@ static fileName caseDir;
static instantList TimeList; static instantList TimeList;
static List<word> fieldNames; static wordList fieldNames;
static List<word> lagrangianScalarNames; static wordList lagrangianScalarNames;
static List<word> lagrangianVectorNames; static wordList lagrangianVectorNames;
static label var2field[maxNames]; static label var2field[maxNames];
static Time *runTimePtr = 0; static Time *runTimePtr = 0;
@ -57,7 +57,7 @@ static Cloud<passiveParticle> *sprayPtr = 0;
static fvMesh* secondMeshPtr = 0; static fvMesh* secondMeshPtr = 0;
static int nSecondMeshPatches = 0; static int nSecondMeshPatches = 0;
static char secondMeshName[] = "cells_2"; static char secondMeshName[] = "cells_2";
static List<word> secondMeshFieldNames; static wordList secondMeshFieldNames;
static label secondMeshVar2field[maxNames]; static label secondMeshVar2field[maxNames];
static bool secondMeshIsScalar[maxNames]; static bool secondMeshIsScalar[maxNames];
static bool secondMeshIsVector[maxNames]; static bool secondMeshIsVector[maxNames];
@ -71,7 +71,7 @@ static word faScalarName = "areaScalarField";
static word faVectorName = "areaVectorField"; static word faVectorName = "areaVectorField";
static word faTensorName = "areaTensorField"; static word faTensorName = "areaTensorField";
static char faMeshName[] = "faCells"; static char faMeshName[] = "faCells";
static List<word> faMeshFieldNames; static wordList faMeshFieldNames;
static label faMeshVar2field[maxNames]; static label faMeshVar2field[maxNames];
static bool faMeshIsScalar[maxNames]; static bool faMeshIsScalar[maxNames];
static bool faMeshIsVector[maxNames]; static bool faMeshIsVector[maxNames];

2
applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C
View file

@ -111,7 +111,7 @@ int main(int argc, char *argv[])
// calc starting ids for particles on each processor // calc starting ids for particles on each processor
List<label> startIds(numIds.size(), 0); labelList startIds(numIds.size(), 0);
for (label i = 0; i < numIds.size()-1; i++) for (label i = 0; i < numIds.size()-1; i++)
{ {
startIds[i+1] += startIds[i] + numIds[i]; startIds[i+1] += startIds[i] + numIds[i];

4
applications/utilities/postProcessing/miscellaneous/postChannel/channelIndex.C
View file

@ -59,7 +59,7 @@ void Foam::channelIndex::walkOppositeFaces
const faceList& faces = mesh.faces(); const faceList& faces = mesh.faces();
label nBnd = mesh.nFaces() - mesh.nInternalFaces(); label nBnd = mesh.nFaces() - mesh.nInternalFaces();
DynamicList<label> frontFaces(startFaces); dynamicLabelList frontFaces(startFaces);
forAll(frontFaces, i) forAll(frontFaces, i)
{ {
label faceI = frontFaces[i]; label faceI = frontFaces[i];
@ -93,7 +93,7 @@ void Foam::channelIndex::walkOppositeFaces
} }
// Transfer across cells // Transfer across cells
DynamicList<label> newFrontFaces(frontFaces.size()); dynamicLabelList newFrontFaces(frontFaces.size());
forAll(frontFaces, i) forAll(frontFaces, i)
{ {

2
applications/utilities/preProcessing/mapFields/mapFields.C
View file

@ -427,7 +427,7 @@ int main(int argc, char *argv[])
); );
List<boundBox> bbsTarget(nProcsTarget); List<boundBox> bbsTarget(nProcsTarget);
List<bool> bbsTargetSet(nProcsTarget, false); boolList bbsTargetSet(nProcsTarget, false);
for (int procISource=0; procISource<nProcsSource; procISource++) for (int procISource=0; procISource<nProcsSource; procISource++)
{ {

2
applications/utilities/preProcessing/mapFields/mapLagrangian.C
View file

@ -135,7 +135,7 @@ void mapLagrangian(const meshToMesh& meshToMeshInterp)
label sourceParticleI = 0; label sourceParticleI = 0;
// Indices of source particles that get added to targetParcels // Indices of source particles that get added to targetParcels
DynamicList<label> addParticles(sourceParcels.size()); dynamicLabelList addParticles(sourceParcels.size());
// Unmapped particles // Unmapped particles
labelHashSet unmappedSource(sourceParcels.size()); labelHashSet unmappedSource(sourceParcels.size());

4
applications/utilities/preProcessing/viewFactorsGen/shootRays.H
View file

@ -11,8 +11,8 @@ for (label procI = 0; procI < Pstream::nProcs(); procI++)
DynamicField<point> start(coarseMesh.nFaces()); DynamicField<point> start(coarseMesh.nFaces());
DynamicField<point> end(start.size()); DynamicField<point> end(start.size());
DynamicList<label> startIndex(start.size()); dynamicLabelList startIndex(start.size());
DynamicList<label> endIndex(start.size()); dynamicLabelList endIndex(start.size());
const pointField& myFc = remoteCoarseCf[Pstream::myProcNo()]; const pointField& myFc = remoteCoarseCf[Pstream::myProcNo()];
const vectorField& myArea = remoteCoarseSf[Pstream::myProcNo()]; const vectorField& myArea = remoteCoarseSf[Pstream::myProcNo()];

8
applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
View file

@ -400,9 +400,9 @@ int main(int argc, char *argv[])
// Determine rays between coarse face centres // Determine rays between coarse face centres
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
DynamicList<label> rayStartFace(nCoarseFaces + 0.01*nCoarseFaces); dynamicLabelList rayStartFace(nCoarseFaces + 0.01*nCoarseFaces);
DynamicList<label> rayEndFace(rayStartFace.size()); dynamicLabelList rayEndFace(rayStartFace.size());
globalIndex globalNumbering(nCoarseFaces); globalIndex globalNumbering(nCoarseFaces);
@ -483,7 +483,7 @@ int main(int argc, char *argv[])
IOobject::NO_WRITE, IOobject::NO_WRITE,
false false
), ),
List<label>(1, map.constructSize()) labelList(1, map.constructSize())
); );
consMapDim.write(); consMapDim.write();
@ -510,7 +510,7 @@ int main(int argc, char *argv[])
List<List<point> > compactFineSf(map.constructSize()); List<List<point> > compactFineSf(map.constructSize());
List<List<point> > compactFineCf(map.constructSize()); List<List<point> > compactFineCf(map.constructSize());
DynamicList<label> compactPatchId(map.constructSize()); dynamicLabelList compactPatchId(map.constructSize());
// Insert my coarse local values // Insert my coarse local values
SubList<point>(compactCoarseSf, nCoarseFaces).assign(localCoarseSf); SubList<point>(compactCoarseSf, nCoarseFaces).assign(localCoarseSf);

6
applications/utilities/surface/surfaceCheck/surfaceCheck.C
View file

@ -236,7 +236,7 @@ int main(int argc, char *argv[])
// ~~~~~~~~~~~~~~~ // ~~~~~~~~~~~~~~~
{ {
DynamicList<label> illegalFaces(surf.size()/100 + 1); dynamicLabelList illegalFaces(surf.size()/100 + 1);
forAll(surf, faceI) forAll(surf, faceI)
{ {
@ -350,7 +350,7 @@ int main(int argc, char *argv[])
// Dump for subsetting // Dump for subsetting
{ {
DynamicList<label> problemFaces(surf.size()/100+1); dynamicLabelList problemFaces(surf.size()/100+1);
forAll(triQ, faceI) forAll(triQ, faceI)
{ {
@ -481,7 +481,7 @@ int main(int argc, char *argv[])
// Check manifold // Check manifold
// ~~~~~~~~~~~~~~ // ~~~~~~~~~~~~~~
DynamicList<label> problemFaces(surf.size()/100 + 1); dynamicLabelList problemFaces(surf.size()/100 + 1);
const labelListList& eFaces = surf.edgeFaces(); const labelListList& eFaces = surf.edgeFaces();

4
applications/utilities/surface/surfaceFeatureConvert/surfaceFeatureConvert.C
View file

@ -61,11 +61,11 @@ void readNASEdges
// coordinates of point // coordinates of point
DynamicList<point> points; DynamicList<point> points;
// Nastran index of point // Nastran index of point
DynamicList<label> pointIndices; dynamicLabelList pointIndices;
// beams // beams
DynamicList<edge> edges; DynamicList<edge> edges;
DynamicList<label> edgeIndices; dynamicLabelList edgeIndices;
while (is.good()) while (is.good())

10
applications/utilities/surface/surfaceToPatch/boundaryMesh.C
View file

@ -193,7 +193,7 @@ void Foam::boundaryMesh::markEdges
const label edgeI, const label edgeI,
const label distance, const label distance,
labelList& minDistance, labelList& minDistance,
DynamicList<label>& visited dynamicLabelList& visited
) const ) const
{ {
if (distance < maxDistance) if (distance < maxDistance)
@ -865,8 +865,8 @@ Foam::labelList Foam::boundaryMesh::getNearest
// Divide faces into two bins acc. to normal // Divide faces into two bins acc. to normal
// - left of splitNormal // - left of splitNormal
// - right ,, // - right ,,
DynamicList<label> leftFaces(mesh().size()/2); dynamicLabelList leftFaces(mesh().size()/2);
DynamicList<label> rightFaces(mesh().size()/2); dynamicLabelList rightFaces(mesh().size()/2);
forAll(mesh(), bFaceI) forAll(mesh(), bFaceI)
{ {
@ -1253,7 +1253,7 @@ void Foam::boundaryMesh::patchify
if (newPatchPtrList.size()) if (newPatchPtrList.size())
{ {
List<DynamicList<label> > patchFaces(nNewPatches); List<dynamicLabelList > patchFaces(nNewPatches);
// Give reasonable estimate for size of patches // Give reasonable estimate for size of patches
label nAvgFaces = label nAvgFaces =
@ -1516,7 +1516,7 @@ void Foam::boundaryMesh::setExtraEdges(const label edgeI)
labelList minDistance(mesh().nEdges(), -1); labelList minDistance(mesh().nEdges(), -1);
// All edge labels encountered // All edge labels encountered
DynamicList<label> visitedEdges; dynamicLabelList visitedEdges;
// Floodfill from edgeI starting from distance 0. Stop at distance. // Floodfill from edgeI starting from distance 0. Stop at distance.
markEdges(8, edgeI, 0, minDistance, visitedEdges); markEdges(8, edgeI, 0, minDistance, visitedEdges);

2
applications/utilities/surface/surfaceToPatch/boundaryMesh.H
View file

@ -132,7 +132,7 @@ class boundaryMesh
const label edgeI, const label edgeI,
const label distance, const label distance,
labelList& minDistance, labelList& minDistance,
DynamicList<label>& visited dynamicLabelList& visited
) const; ) const;
//- Get index of polypatch by name //- Get index of polypatch by name

6
applications/utilities/thermophysical/IFCLookUpTableGen/IFCLookUpTableGen.C
View file

@ -173,11 +173,11 @@ int main(int argc, char *argv[])
// Create Look Up Table // Create Look Up Table
interpolationLookUpTable<scalar> LookUpTable(control); interpolationLookUpTable<scalar> LookUpTable(control);
const List<label>& dim = LookUpTable.dim(); const labelList& dim = LookUpTable.dim();
const List<scalar>& min = LookUpTable.min(); const scalarList& min = LookUpTable.min();
const List<scalar>& delta = LookUpTable.delta(); const scalarList& delta = LookUpTable.delta();
label count = 0; label count = 0;

2
src/conversion/ensight/part/ensightPart.C
View file

@ -40,7 +40,7 @@ Foam::List<Foam::word> Foam::ensightPart::elemTypes_(0);
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
bool Foam::ensightPart::isFieldDefined(const List<scalar>& field) const bool Foam::ensightPart::isFieldDefined(const scalarList& field) const
{ {
forAll(elemLists_, elemI) forAll(elemLists_, elemI)
{ {

16
src/conversion/ensight/part/ensightPart.H
View file

@ -60,7 +60,7 @@ class ensightPart
// Private data // Private data
// Static data members // Static data members
static List<word> elemTypes_; static wordList elemTypes_;
protected: protected:
@ -126,7 +126,7 @@ protected:
void reconstruct(Istream&); void reconstruct(Istream&);
//- check for fully defined fields //- check for fully defined fields
bool isFieldDefined(const List<scalar>&) const; bool isFieldDefined(const scalarList&) const;
//- write the part header //- write the part header
void writeHeader(ensightFile&, bool withDescription=false) const; void writeHeader(ensightFile&, bool withDescription=false) const;
@ -135,7 +135,7 @@ protected:
void writeFieldList void writeFieldList
( (
ensightFile& os, ensightFile& os,
const List<scalar>& field, const scalarList& field,
const labelList& idList const labelList& idList
) const; ) const;
@ -212,7 +212,7 @@ public:
// Static members // Static members
virtual List<word> const& elementTypes() const virtual wordList const& elementTypes() const
{ {
return elemTypes_; return elemTypes_;
} }
@ -292,16 +292,16 @@ public:
void writeScalarField void writeScalarField
( (
ensightFile&, ensightFile&,
const List<scalar>& field const scalarList& field
) const; ) const;
//- write vector field components //- write vector field components
void writeVectorField void writeVectorField
( (
ensightFile&, ensightFile&,
const List<scalar>& field0, const scalarList& field0,
const List<scalar>& field1, const scalarList& field1,
const List<scalar>& field2 const scalarList& field2
) const; ) const;

4
src/conversion/ensight/part/ensightPartCells.H
View file

@ -88,7 +88,7 @@ protected:
}; };
// Static data members // Static data members
static List<word> elemTypes_; static wordList elemTypes_;
public: public:
@ -140,7 +140,7 @@ public:
// Member Functions // Member Functions
//- static listing of the element types //- static listing of the element types
virtual List<word> const& elementTypes() const virtual wordList const& elementTypes() const
{ {
return elemTypes_; return elemTypes_;
} }

4
src/conversion/ensight/part/ensightPartFaces.H
View file

@ -79,7 +79,7 @@ protected:
}; };
// Static data members // Static data members
static List<word> elemTypes_; static wordList elemTypes_;
public: public:
@ -120,7 +120,7 @@ public:
// Member Functions // Member Functions
//- static listing of the element types //- static listing of the element types
virtual List<word> const& elementTypes() const virtual wordList const& elementTypes() const
{ {
return elemTypes_; return elemTypes_;
} }

12
src/conversion/ensight/part/ensightPartIO.C
View file

@ -55,8 +55,8 @@ void Foam::ensightPart::writeHeader
void Foam::ensightPart::writeFieldList void Foam::ensightPart::writeFieldList
( (
ensightFile& os, ensightFile& os,
const List<scalar>& field, const scalarList& field,
const List<label>& idList const labelList& idList
) const ) const
{ {
forAll(idList, i) forAll(idList, i)
@ -172,7 +172,7 @@ void Foam::ensightPart::writeGeometry(ensightGeoFile& os) const
void Foam::ensightPart::writeScalarField void Foam::ensightPart::writeScalarField
( (
ensightFile& os, ensightFile& os,
const List<scalar>& field const scalarList& field
) const ) const
{ {
if (size() && field.size() && (os.allowUndef() || isFieldDefined(field))) if (size() && field.size() && (os.allowUndef() || isFieldDefined(field)))
@ -196,9 +196,9 @@ void Foam::ensightPart::writeScalarField
void Foam::ensightPart::writeVectorField void Foam::ensightPart::writeVectorField
( (
ensightFile& os, ensightFile& os,
const List<scalar>& field0, const scalarList& field0,
const List<scalar>& field1, const scalarList& field1,
const List<scalar>& field2 const scalarList& field2
) const ) const
{ {
if (size() && field0.size() && (os.allowUndef() || isFieldDefined(field0))) if (size() && field0.size() && (os.allowUndef() || isFieldDefined(field0)))

8
src/conversion/ensight/part/ensightParts.C
View file

@ -248,7 +248,7 @@ void Foam::ensightParts::writeData(Ostream& os) const
void Foam::ensightParts::writeScalarField void Foam::ensightParts::writeScalarField
( (
ensightFile& os, ensightFile& os,
const List<scalar>& field, const scalarList& field,
bool useFaceData bool useFaceData
) const ) const
{ {
@ -270,9 +270,9 @@ void Foam::ensightParts::writeScalarField
void Foam::ensightParts::writeVectorField void Foam::ensightParts::writeVectorField
( (
ensightFile& os, ensightFile& os,
const List<scalar>& field0, const scalarList& field0,
const List<scalar>& field1, const scalarList& field1,
const List<scalar>& field2, const scalarList& field2,
bool useFaceData bool useFaceData
) const ) const
{ {

8
src/conversion/ensight/part/ensightParts.H
View file

@ -112,7 +112,7 @@ public:
void writeScalarField void writeScalarField
( (
ensightFile&, ensightFile&,
const List<scalar>& field, const scalarList& field,
bool useFaceData = false bool useFaceData = false
) const; ) const;
@ -120,9 +120,9 @@ public:
void writeVectorField void writeVectorField
( (
ensightFile&, ensightFile&,
const List<scalar>& field0, const scalarList& field0,
const List<scalar>& field1, const scalarList& field1,
const List<scalar>& field2, const scalarList& field2,
bool useFaceData = false bool useFaceData = false
) const; ) const;

2
src/conversion/meshReader/createPolyBoundary.C
View file

@ -189,7 +189,7 @@ void Foam::meshReader::createPolyBoundary()
else if (patchPhysicalTypes_[patchI] == "monitoring") else if (patchPhysicalTypes_[patchI] == "monitoring")
{ {
// translate the "monitoring" pseudo-boundaries to face sets // translate the "monitoring" pseudo-boundaries to face sets
List<label> monitoring(idList.size()); labelList monitoring(idList.size());
label monitorI = 0; label monitorI = 0;
forAll(idList, bndI) forAll(idList, bndI)

2
src/conversion/meshReader/meshReader.C
View file

@ -103,7 +103,7 @@ void Foam::meshReader::addFaceZones(polyMesh& mesh) const
( (
iter.key(), iter.key(),
iter(), iter(),
List<bool>(iter().size(), false), boolList(iter().size(), false),
nZone, nZone,
mesh.faceZones() mesh.faceZones()
) )

2
src/conversion/meshReader/meshReader.H
View file

@ -220,7 +220,7 @@ private:
void writeInterfaces(const objectRegistry&) const; void writeInterfaces(const objectRegistry&) const;
//- Write List<label> in constant/polyMesh //- Write labelList in constant/polyMesh
void writeMeshLabelList void writeMeshLabelList
( (
const objectRegistry& registry, const objectRegistry& registry,

4
src/conversion/meshReader/meshReaderAux.C
View file

@ -149,7 +149,7 @@ void Foam::meshReader::writeAux(const objectRegistry& registry) const
cellTable_.writeDict(registry); cellTable_.writeDict(registry);
writeInterfaces(registry); writeInterfaces(registry);
// write origCellId as List<label> // write origCellId as labelList
writeMeshLabelList writeMeshLabelList
( (
registry, registry,
@ -158,7 +158,7 @@ void Foam::meshReader::writeAux(const objectRegistry& registry) const
IOstream::BINARY IOstream::BINARY
); );
// write cellTableId as List<label> // write cellTableId as labelList
// this is crucial for later conversion back to ccm/starcd // this is crucial for later conversion back to ccm/starcd
writeMeshLabelList writeMeshLabelList
( (

2
src/conversion/meshTables/cellTable.H
View file

@ -90,7 +90,7 @@ class cellTable
Map<label> zoneMap() const; Map<label> zoneMap() const;
//- A contiguous list of cellTable names //- A contiguous list of cellTable names
List<word> namesList() const; wordList namesList() const;
//- Add required entries - MaterialType //- Add required entries - MaterialType
void addDefaults(); void addDefaults();

2
src/conversion/meshWriter/starcd/STARCDMeshWriter.C
View file

@ -293,7 +293,7 @@ void Foam::meshWriters::STARCD::writeCells(const fileName& prefix) const
const labelList& cFaces = cells[cellId]; const labelList& cFaces = cells[cellId];
// create (beg,end) indices // create (beg,end) indices
List<label> indices(cFaces.size() + 1); labelList indices(cFaces.size() + 1);
indices[0] = indices.size(); indices[0] = indices.size();
label count = indices.size(); label count = indices.size();

14
src/decompositionMethods/decompositionMethods/decompositionMethod/decompositionMethod.C
View file

@ -46,8 +46,8 @@ namespace Foam
void Foam::decompositionMethod::calcCSR void Foam::decompositionMethod::calcCSR
( (
const labelListList& cellCells, const labelListList& cellCells,
List<label>& adjncy, labelList& adjncy,
List<label>& xadj labelList& xadj
) )
{ {
// Count number of internal faces // Count number of internal faces
@ -88,8 +88,8 @@ void Foam::decompositionMethod::calcCSR
void Foam::decompositionMethod::calcCSR void Foam::decompositionMethod::calcCSR
( (
const polyMesh& mesh, const polyMesh& mesh,
List<label>& adjncy, labelList& adjncy,
List<label>& xadj labelList& xadj
) )
{ {
// Make Metis CSR (Compressed Storage Format) storage // Make Metis CSR (Compressed Storage Format) storage
@ -185,8 +185,8 @@ void Foam::decompositionMethod::calcCSR
void Foam::decompositionMethod::calcDistributedCSR void Foam::decompositionMethod::calcDistributedCSR
( (
const polyMesh& mesh, const polyMesh& mesh,
List<label>& adjncy, labelList& adjncy,
List<label>& xadj labelList& xadj
) )
{ {
// Create global cell numbers // Create global cell numbers
@ -239,7 +239,7 @@ void Foam::decompositionMethod::calcDistributedCSR
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// Number of faces per cell // Number of faces per cell
List<label> nFacesPerCell(mesh.nCells(), 0); labelList nFacesPerCell(mesh.nCells(), 0);
// Number of coupled faces // Number of coupled faces
label nCoupledFaces = 0; label nCoupledFaces = 0;

12
src/decompositionMethods/decompositionMethods/decompositionMethod/decompositionMethod.H
View file

@ -63,8 +63,8 @@ protected:
static void calcCSR static void calcCSR
( (
const labelListList& globalCellCells, const labelListList& globalCellCells,
List<label>& adjncy, labelList& adjncy,
List<label>& xadj labelList& xadj
); );
//- Helper: convert local connectivity from the mesh //- Helper: convert local connectivity from the mesh
@ -73,8 +73,8 @@ protected:
static void calcCSR static void calcCSR
( (
const polyMesh& mesh, const polyMesh& mesh,
List<label>& adjncy, labelList& adjncy,
List<label>& xadj labelList& xadj
); );
//- Helper: convert mesh connectivity into distributed CSR //- Helper: convert mesh connectivity into distributed CSR
@ -82,8 +82,8 @@ protected:
static void calcDistributedCSR static void calcDistributedCSR
( (
const polyMesh&, const polyMesh&,
List<label>& adjncy, labelList& adjncy,
List<label>& xadj labelList& xadj
); );
//- Helper: determine (non-parallel) cellCells from mesh //- Helper: determine (non-parallel) cellCells from mesh

8
src/decompositionMethods/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.C
View file

@ -97,7 +97,7 @@ void Foam::hierarchGeomDecomp::setDecompOrder()
Foam::label Foam::hierarchGeomDecomp::findLower Foam::label Foam::hierarchGeomDecomp::findLower
( (
const List<scalar>& l, const scalarList& l,
const scalar t, const scalar t,
const label initLow, const label initLow,
const label initHigh const label initHigh
@ -179,7 +179,7 @@ void Foam::hierarchGeomDecomp::calculateSortedWeightedSizes
void Foam::hierarchGeomDecomp::findBinary void Foam::hierarchGeomDecomp::findBinary
( (
const label sizeTol, const label sizeTol,
const List<scalar>& values, const scalarList& values,
const label minIndex, // index of previous value const label minIndex, // index of previous value
const scalar minValue, // value at minIndex const scalar minValue, // value at minIndex
const scalar maxValue, // global max of values const scalar maxValue, // global max of values
@ -253,8 +253,8 @@ void Foam::hierarchGeomDecomp::findBinary
void Foam::hierarchGeomDecomp::findBinary void Foam::hierarchGeomDecomp::findBinary
( (
const label sizeTol, const label sizeTol,
const List<scalar>& sortedWeightedSizes, const scalarList& sortedWeightedSizes,
const List<scalar>& values, const scalarList& values,
const label minIndex, // index of previous value const label minIndex, // index of previous value
const scalar minValue, // value at minIndex const scalar minValue, // value at minIndex
const scalar maxValue, // global max of values const scalar maxValue, // global max of values

8
src/decompositionMethods/decompositionMethods/hierarchGeomDecomp/hierarchGeomDecomp.H
View file

@ -100,7 +100,7 @@ class hierarchGeomDecomp
//- Find index of t in list inbetween indices left and right //- Find index of t in list inbetween indices left and right
static label findLower static label findLower
( (
const List<scalar>&, const scalarList&,
const scalar t, const scalar t,
const label left, const label left,
const label right const label right
@ -112,7 +112,7 @@ class hierarchGeomDecomp
static void findBinary static void findBinary
( (
const label sizeTol, // Acceptable size difference const label sizeTol, // Acceptable size difference
const List<scalar>&, const scalarList&,
const label leftIndex, // index of previous value const label leftIndex, // index of previous value
const scalar leftValue, // value at leftIndex const scalar leftValue, // value at leftIndex
const scalar maxValue, // global max of values const scalar maxValue, // global max of values
@ -127,8 +127,8 @@ class hierarchGeomDecomp
static void findBinary static void findBinary
( (
const label sizeTol, // Acceptable size difference const label sizeTol, // Acceptable size difference
const List<scalar>& sortedWeightedSizes, const scalarList& sortedWeightedSizes,
const List<scalar>&, const scalarList&,
const label leftIndex, // index of previous value const label leftIndex, // index of previous value
const scalar leftValue, // value at leftIndex const scalar leftValue, // value at leftIndex
const scalar maxValue, // global max of values const scalar maxValue, // global max of values

28
src/decompositionMethods/metisDecomp/metisDecomp.C
View file

@ -54,10 +54,10 @@ namespace Foam
Foam::label Foam::metisDecomp::decompose Foam::label Foam::metisDecomp::decompose
( (
const List<label>& adjncy, const labelList& adjncy,
const List<label>& xadj, const labelList& xadj,
const scalarField& cWeights, const scalarField& cWeights,
List<label>& finalDecomp labelList& finalDecomp
) )
{ {
// Method of decomposition // Method of decomposition
@ -76,10 +76,10 @@ Foam::label Foam::metisDecomp::decompose
Field<real_t> processorWeights; Field<real_t> processorWeights;
// cell weights (so on the vertices of the dual) // cell weights (so on the vertices of the dual)
List<label> cellWeights; labelList cellWeights;
// face weights (so on the edges of the dual) // face weights (so on the edges of the dual)
List<label> faceWeights; labelList faceWeights;
// Check for externally provided cellweights and if so initialise weights // Check for externally provided cellweights and if so initialise weights
@ -300,8 +300,8 @@ Foam::labelList Foam::metisDecomp::decompose
<< exit(FatalError); << exit(FatalError);
} }
List<label> adjncy; labelList adjncy;
List<label> xadj; labelList xadj;
calcCSR calcCSR
( (
mesh_, mesh_,
@ -310,7 +310,7 @@ Foam::labelList Foam::metisDecomp::decompose
); );
// Decompose using default weights // Decompose using default weights
List<label> finalDecomp; labelList finalDecomp;
decompose(adjncy, xadj, pointWeights, finalDecomp); decompose(adjncy, xadj, pointWeights, finalDecomp);
// Copy back to labelList // Copy back to labelList
@ -348,8 +348,8 @@ Foam::labelList Foam::metisDecomp::decompose
// Make Metis CSR (Compressed Storage Format) storage // Make Metis CSR (Compressed Storage Format) storage
// adjncy : contains neighbours (= edges in graph) // adjncy : contains neighbours (= edges in graph)
// xadj(celli) : start of information in adjncy for celli // xadj(celli) : start of information in adjncy for celli
List<label> adjncy; labelList adjncy;
List<label> xadj; labelList xadj;
{ {
// Get cellCells on coarse mesh. // Get cellCells on coarse mesh.
labelListList cellCells; labelListList cellCells;
@ -365,7 +365,7 @@ Foam::labelList Foam::metisDecomp::decompose
} }
// Decompose using default weights // Decompose using default weights
List<label> finalDecomp; labelList finalDecomp;
decompose(adjncy, xadj, coarseWeights, finalDecomp); decompose(adjncy, xadj, coarseWeights, finalDecomp);
@ -406,12 +406,12 @@ Foam::labelList Foam::metisDecomp::decompose
// adjncy : contains neighbours (= edges in graph) // adjncy : contains neighbours (= edges in graph)
// xadj(celli) : start of information in adjncy for celli // xadj(celli) : start of information in adjncy for celli
List<label> adjncy; labelList adjncy;
List<label> xadj; labelList xadj;
calcCSR(globalCellCells, adjncy, xadj); calcCSR(globalCellCells, adjncy, xadj);
// Decompose using default weights // Decompose using default weights
List<label> finalDecomp; labelList finalDecomp;
decompose(adjncy, xadj, cWeights, finalDecomp); decompose(adjncy, xadj, cWeights, finalDecomp);
// Copy back to labelList // Copy back to labelList

6
src/decompositionMethods/metisDecomp/metisDecomp.H
View file

@ -63,10 +63,10 @@ class metisDecomp
label decompose label decompose
( (
const List<label>& adjncy, const labelList& adjncy,
const List<label>& xadj, const labelList& xadj,
const scalarField& cellWeights, const scalarField& cellWeights,
List<label>& finalDecomp labelList& finalDecomp
); );

24
src/decompositionMethods/parMetisDecomp/parMetisDecomp.C
View file

@ -64,8 +64,8 @@ Foam::label Foam::parMetisDecomp::decompose
const pointField& cellCentres, const pointField& cellCentres,
Field<label>& cellWeights, Field<label>& cellWeights,
Field<label>& faceWeights, Field<label>& faceWeights,
const List<label>& options, const labelList& options,
List<label>& finalDecomp labelList& finalDecomp
) )
{ {
// C style numbering // C style numbering
@ -85,13 +85,13 @@ Foam::label Foam::parMetisDecomp::decompose
// Get number of cells on all processors // Get number of cells on all processors
List<label> nLocalCells(Pstream::nProcs()); labelList nLocalCells(Pstream::nProcs());
nLocalCells[Pstream::myProcNo()] = xadj.size()-1; nLocalCells[Pstream::myProcNo()] = xadj.size()-1;
Pstream::gatherList(nLocalCells); Pstream::gatherList(nLocalCells);
Pstream::scatterList(nLocalCells); Pstream::scatterList(nLocalCells);
// Get cell offsets. // Get cell offsets.
List<label> cellOffsets(Pstream::nProcs()+1); labelList cellOffsets(Pstream::nProcs()+1);
label nGlobalCells = 0; label nGlobalCells = 0;
forAll(nLocalCells, procI) forAll(nLocalCells, procI)
{ {
@ -120,7 +120,7 @@ Foam::label Foam::parMetisDecomp::decompose
// Number of cells to send to the next processor // Number of cells to send to the next processor
// (is same as number of cells next processor has to receive) // (is same as number of cells next processor has to receive)
List<label> nSendCells(Pstream::nProcs(), 0); labelList nSendCells(Pstream::nProcs(), 0);
for (label procI = nLocalCells.size()-1; procI >=1; procI--) for (label procI = nLocalCells.size()-1; procI >=1; procI--)
{ {
@ -317,7 +317,7 @@ Foam::label Foam::parMetisDecomp::decompose
{ {
IPstream fromNextProc(Pstream::blocking, Pstream::myProcNo()+1); IPstream fromNextProc(Pstream::blocking, Pstream::myProcNo()+1);
List<label> nextFinalDecomp(fromNextProc); labelList nextFinalDecomp(fromNextProc);
if (nextFinalDecomp.size() != nSendCells[Pstream::myProcNo()]) if (nextFinalDecomp.size() != nSendCells[Pstream::myProcNo()])
{ {
@ -413,7 +413,7 @@ Foam::labelList Foam::parMetisDecomp::decompose
// decomposition options. 0 = use defaults // decomposition options. 0 = use defaults
List<label> options(3, label(0)); labelList options(3, label(0));
//options[0] = 1; // don't use defaults but use values below //options[0] = 1; // don't use defaults but use values below
//options[1] = -1; // full debug info //options[1] = -1; // full debug info
//options[2] = 15; // random number seed //options[2] = 15; // random number seed
@ -529,7 +529,7 @@ Foam::labelList Foam::parMetisDecomp::decompose
faceWeights.setSize(adjncy.size()); faceWeights.setSize(adjncy.size());
// Assume symmetric weights. Keep same ordering as adjncy. // Assume symmetric weights. Keep same ordering as adjncy.
List<label> nFacesPerCell(mesh_.nCells(), 0); labelList nFacesPerCell(mesh_.nCells(), 0);
// Handle internal faces // Handle internal faces
for (label faceI = 0; faceI < mesh_.nInternalFaces(); faceI++) for (label faceI = 0; faceI < mesh_.nInternalFaces(); faceI++)
@ -583,7 +583,7 @@ Foam::labelList Foam::parMetisDecomp::decompose
// Do actual decomposition // Do actual decomposition
List<label> finalDecomp; labelList finalDecomp;
decompose decompose
( (
xadj, xadj,
@ -638,7 +638,7 @@ Foam::labelList Foam::parMetisDecomp::decompose
// Get renumbered owner region on other side of coupled faces // Get renumbered owner region on other side of coupled faces
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
List<label> globalNeighbour(mesh_.nFaces()-mesh_.nInternalFaces()); labelList globalNeighbour(mesh_.nFaces()-mesh_.nInternalFaces());
forAll(patches, patchI) forAll(patches, patchI)
{ {
@ -791,7 +791,7 @@ Foam::labelList Foam::parMetisDecomp::decompose
calcCSR(globalCellCells, adjncy, xadj); calcCSR(globalCellCells, adjncy, xadj);
// decomposition options. 0 = use defaults // decomposition options. 0 = use defaults
List<label> options(3, label(0)); labelList options(3, label(0));
//options[0] = 1; // don't use defaults but use values below //options[0] = 1; // don't use defaults but use values below
//options[1] = -1; // full debug info //options[1] = -1; // full debug info
//options[2] = 15; // random number seed //options[2] = 15; // random number seed
@ -862,7 +862,7 @@ Foam::labelList Foam::parMetisDecomp::decompose
// Do actual decomposition // Do actual decomposition
List<label> finalDecomp; labelList finalDecomp;
decompose decompose
( (
xadj, xadj,

4
src/decompositionMethods/parMetisDecomp/parMetisDecomp.H
View file

@ -77,9 +77,9 @@ class parMetisDecomp
const pointField& cellCentres, const pointField& cellCentres,
Field<label>& cellWeights, Field<label>& cellWeights,
Field<label>& faceWeights, Field<label>& faceWeights,
const List<label>& options, const labelList& options,
List<label>& finalDecomp labelList& finalDecomp
); );

28
src/decompositionMethods/scotchDecomp/scotchDecomp/scotchDecomp.C
View file

@ -164,11 +164,11 @@ void Foam::scotchDecomp::check(const int retVal, const char* str)
// Call scotch with options from dictionary. // Call scotch with options from dictionary.
Foam::label Foam::scotchDecomp::decompose Foam::label Foam::scotchDecomp::decompose
( (
const List<label>& adjncy, const labelList& adjncy,
const List<label>& xadj, const labelList& xadj,
const scalarField& cWeights, const scalarField& cWeights,
List<label>& finalDecomp labelList& finalDecomp
) )
{ {
// Dump graph // Dump graph
@ -247,7 +247,7 @@ Foam::label Foam::scotchDecomp::decompose
// Graph // Graph
// ~~~~~ // ~~~~~
List<label> velotab; labelList velotab;
// Check for externally provided cellweights and if so initialise weights // Check for externally provided cellweights and if so initialise weights
@ -314,7 +314,7 @@ Foam::label Foam::scotchDecomp::decompose
SCOTCH_Arch archdat; SCOTCH_Arch archdat;
check(SCOTCH_archInit(&archdat), "SCOTCH_archInit"); check(SCOTCH_archInit(&archdat), "SCOTCH_archInit");
List<label> processorWeights; labelList processorWeights;
if (decompositionDict_.found("scotchCoeffs")) if (decompositionDict_.found("scotchCoeffs"))
{ {
const dictionary& scotchCoeffs = const dictionary& scotchCoeffs =
@ -443,12 +443,12 @@ Foam::labelList Foam::scotchDecomp::decompose
// Make Metis CSR (Compressed Storage Format) storage // Make Metis CSR (Compressed Storage Format) storage
// adjncy : contains neighbours (= edges in graph) // adjncy : contains neighbours (= edges in graph)
// xadj(celli) : start of information in adjncy for celli // xadj(celli) : start of information in adjncy for celli
List<label> adjncy; labelList adjncy;
List<label> xadj; labelList xadj;
calcCSR(mesh_, adjncy, xadj); calcCSR(mesh_, adjncy, xadj);
// Decompose using default weights // Decompose using default weights
List<label> finalDecomp; labelList finalDecomp;
decompose(adjncy, xadj, pointWeights, finalDecomp); decompose(adjncy, xadj, pointWeights, finalDecomp);
// Copy back to labelList // Copy back to labelList
@ -485,8 +485,8 @@ Foam::labelList Foam::scotchDecomp::decompose
// Make Metis CSR (Compressed Storage Format) storage // Make Metis CSR (Compressed Storage Format) storage
// adjncy : contains neighbours (= edges in graph) // adjncy : contains neighbours (= edges in graph)
// xadj(celli) : start of information in adjncy for celli // xadj(celli) : start of information in adjncy for celli
List<label> adjncy; labelList adjncy;
List<label> xadj; labelList xadj;
{ {
// Get cellCells on coarse mesh. // Get cellCells on coarse mesh.
labelListList cellCells; labelListList cellCells;
@ -503,7 +503,7 @@ Foam::labelList Foam::scotchDecomp::decompose
} }
// Decompose using weights // Decompose using weights
List<label> finalDecomp; labelList finalDecomp;
decompose(adjncy, xadj, coarseWeights, finalDecomp); decompose(adjncy, xadj, coarseWeights, finalDecomp);
// Rework back into decomposition for original mesh_ // Rework back into decomposition for original mesh_
@ -543,12 +543,12 @@ Foam::labelList Foam::scotchDecomp::decompose
// adjncy : contains neighbours (= edges in graph) // adjncy : contains neighbours (= edges in graph)
// xadj(celli) : start of information in adjncy for celli // xadj(celli) : start of information in adjncy for celli
List<label> adjncy; labelList adjncy;
List<label> xadj; labelList xadj;
calcCSR(globalCellCells, adjncy, xadj); calcCSR(globalCellCells, adjncy, xadj);
// Decompose using weights // Decompose using weights
List<label> finalDecomp; labelList finalDecomp;
decompose(adjncy, xadj, cWeights, finalDecomp); decompose(adjncy, xadj, cWeights, finalDecomp);
// Copy back to labelList // Copy back to labelList

6
src/decompositionMethods/scotchDecomp/scotchDecomp/scotchDecomp.H
View file

@ -68,10 +68,10 @@ class scotchDecomp
label decompose label decompose
( (
const List<label>& adjncy, const labelList& adjncy,
const List<label>& xadj, const labelList& xadj,
const scalarField& cWeights, const scalarField& cWeights,
List<label>& finalDecomp labelList& finalDecomp
); );

6
src/dynamicMesh/dynamicFvMesh/fvMeshDistribute/CompactListList_dev.H
View file

@ -84,7 +84,7 @@ class CompactListList_dev
label size_; label size_;
//- Offset table //- Offset table
List<label> offsets_; labelList offsets_;
//- Packed matrix of data //- Packed matrix of data
List<T> m_; List<T> m_;
@ -143,10 +143,10 @@ public:
inline bool empty() const; inline bool empty() const;
//- Return the offset table (= size()+1) //- Return the offset table (= size()+1)
inline const List<label>& offsets() const; inline const labelList& offsets() const;
//- Return non-const access to the offset table //- Return non-const access to the offset table
inline List<label>& offsets(); inline labelList& offsets();
//- Return the packed matrix of data //- Return the packed matrix of data
inline const List<T>& m() const; inline const List<T>& m() const;

2
src/dynamicMesh/dynamicMesh/directTopoChange/meshCut/wallLayerCells/wallLayerCells.C
View file

@ -68,7 +68,7 @@ bool Foam::wallLayerCells::usesCoupledPatch(const label cellI) const
Foam::wallLayerCells::wallLayerCells Foam::wallLayerCells::wallLayerCells
( (
const polyMesh& mesh, const polyMesh& mesh,
const List<word>& patchNames, const wordList& patchNames,
const label nLayers const label nLayers
) )
: :

2
src/dynamicMesh/dynamicMesh/directTopoChange/meshCut/wallLayerCells/wallLayerCells.H
View file

@ -72,7 +72,7 @@ public:
wallLayerCells wallLayerCells
( (
const polyMesh& mesh, const polyMesh& mesh,
const List<word>& patchNames, const wordList& patchNames,
const label nLayers const label nLayers
); );
}; };

4
src/dynamicMesh/dynamicMesh/polyMeshModifiers/refinement/prismatic2DRefinement/prismatic2DRefinement.C
View file

@ -124,7 +124,7 @@ void Foam::prismatic2DRefinement::appendFaceSplitInfo
const label& faceI, const label& faceI,
const boolList& edgeOnPatchToCut, const boolList& edgeOnPatchToCut,
const labelList& edgeMidPoint, const labelList& edgeMidPoint,
DynamicList<label>& splitFacesIntoTwo, dynamicLabelList& splitFacesIntoTwo,
DynamicList<Pair<label> >& splitFacesEmptyEdges DynamicList<Pair<label> >& splitFacesEmptyEdges
) const ) const
{ {
@ -889,7 +889,7 @@ void Foam::prismatic2DRefinement::setRefinementInstruction
// Allocate enough storage to prevent excessive resizing // Allocate enough storage to prevent excessive resizing
const label nSplitFacesIntoTwo = 3*cellsToRefine_.size(); const label nSplitFacesIntoTwo = 3*cellsToRefine_.size();
DynamicList<label> splitFacesIntoTwo(nSplitFacesIntoTwo); dynamicLabelList splitFacesIntoTwo(nSplitFacesIntoTwo);
DynamicList<Pair<label> > splitFacesEmptyEdges(nSplitFacesIntoTwo); DynamicList<Pair<label> > splitFacesEmptyEdges(nSplitFacesIntoTwo);
// Get necessary mesh data // Get necessary mesh data

2
src/dynamicMesh/dynamicMesh/polyMeshModifiers/refinement/prismatic2DRefinement/prismatic2DRefinement.H
View file

@ -99,7 +99,7 @@ private:
const label& faceI, const label& faceI,
const boolList& edgeOnEmptyPatch, const boolList& edgeOnEmptyPatch,
const labelList& edgeMidPoint, const labelList& edgeMidPoint,
DynamicList<label>& splitFacesIntoTwo, dynamicLabelList& splitFacesIntoTwo,
DynamicList<Pair<label> >& splitFacesEmptyEdges DynamicList<Pair<label> >& splitFacesEmptyEdges
) const; ) const;

2
src/dynamicMesh/dynamicTopoFvMesh/convexSetAlgorithm/cellSetAlgorithm.C
View file

@ -459,7 +459,7 @@ void cellSetAlgorithm::writeVTK
List<edge>(0), List<edge>(0),
List<face>(0), List<face>(0),
allTets, allTets,
List<label>(0) labelList(0)
); );
} }

2
src/dynamicMesh/dynamicTopoFvMesh/convexSetAlgorithm/faceSetAlgorithm.C
View file

@ -403,7 +403,7 @@ void faceSetAlgorithm::writeVTK
List<edge>(0), List<edge>(0),
allTris, allTris,
List<cell>(0), List<cell>(0),
List<label>(0) labelList(0)
); );
} }

2
src/dynamicMesh/dynamicTopoFvMesh/meshOps.H
View file

@ -294,7 +294,7 @@ namespace meshOps
const UList<edge>& edges = List<edge>(0), const UList<edge>& edges = List<edge>(0),
const UList<face>& faces = List<face>(0), const UList<face>& faces = List<face>(0),
const UList<cell>& cells = List<cell>(0), const UList<cell>& cells = List<cell>(0),
const UList<label>& owner = List<label>(0), const UList<label>& owner = labelList(0),
const UList<scalar>& scalField = UList<scalar>(), const UList<scalar>& scalField = UList<scalar>(),
const UList<label>& lablField = UList<label>(), const UList<label>& lablField = UList<label>(),
const UList<vector>& vectField = UList<vector>() const UList<vector>& vectField = UList<vector>()

2
src/dynamicMesh/meshMotion/mesquiteMotionSolver/mesquiteMotionSolver.C
View file

@ -2245,7 +2245,7 @@ void mesquiteMotionSolver::initParallelSurfaceSmoothing()
( (
bufPoints, bufPoints,
recvField, recvField,
List<scalar>(bufPoints.size(), tol), scalarList(bufPoints.size(), tol),
false, false,
pointMap pointMap
); );

4
src/engine/engineTopoChangerMesh/accordionEngineMesh/movePistonPointsAccordionEngineMesh.H
View file

@ -15,8 +15,8 @@
// Whether point displacement is by scaling // Whether point displacement is by scaling
boolList scaleDisp(nPoints(), true); boolList scaleDisp(nPoints(), true);
label nScaled = nPoints(); label nScaled = nPoints();
List<bool> pistonPoint(newPoints.size(), false); boolList pistonPoint(newPoints.size(), false);
List<bool> headPoint(newPoints.size(), false); boolList headPoint(newPoints.size(), false);
forAll(pistonPoints, i) forAll(pistonPoints, i)
{ {

4
src/engine/engineTopoChangerMesh/deformingEngineMesh/movePistonPointsDeformingEngineMesh.H
View file

@ -14,8 +14,8 @@
// Whether point displacement is by scaling // Whether point displacement is by scaling
boolList scaleDisp(nPoints(), true); boolList scaleDisp(nPoints(), true);
label nScaled = nPoints(); label nScaled = nPoints();
List<bool> pistonPoint(newPoints.size(), false); boolList pistonPoint(newPoints.size(), false);
List<bool> headPoint(newPoints.size(), false); boolList headPoint(newPoints.size(), false);
forAll(pistonPoints, i) forAll(pistonPoints, i)
{ {

2
src/engine/engineTopoChangerMesh/engineValveSliding/moveValvePointsEngineValveSliding.H
View file

@ -29,7 +29,7 @@
&& valves_[valveI].isOpen() && valves_[valveI].isOpen()
) )
{ {
List<bool> valveTopPoint(newPoints.size(), false); boolList valveTopPoint(newPoints.size(), false);
/* /*
label layeringVPtsIndex = label layeringVPtsIndex =

4
src/engine/engineTopoChangerMesh/layerAR/layerAR.C
View file

@ -296,8 +296,8 @@ bool Foam::layerAR::update()
// Whether point displacement is by scaling // Whether point displacement is by scaling
boolList scaleDisp(nPoints(), true); boolList scaleDisp(nPoints(), true);
label nScaled = nPoints(); label nScaled = nPoints();
List<bool> pistonPoint(newPoints.size(), false); boolList pistonPoint(newPoints.size(), false);
List<bool> headPoint(newPoints.size(), false); boolList headPoint(newPoints.size(), false);
forAll(pistonPoints, i) forAll(pistonPoints, i)
{ {

4
src/engine/engineTopoChangerMesh/layerARGambit/layerARGambit.C
View file

@ -290,8 +290,8 @@ bool Foam::layerARGambit::update()
// Whether point displacement is by scaling // Whether point displacement is by scaling
boolList scaleDisp(nPoints(), true); boolList scaleDisp(nPoints(), true);
label nScaled = nPoints(); label nScaled = nPoints();
List<bool> pistonPoint(newPoints.size(), false); boolList pistonPoint(newPoints.size(), false);
List<bool> headPoint(newPoints.size(), false); boolList headPoint(newPoints.size(), false);
forAll(pistonPoints, i) forAll(pistonPoints, i)
{ {

4
src/engine/engineTopoChangerMesh/layerSmooth/movePistonPointsLayerSmooth.H
View file

@ -15,8 +15,8 @@
// Whether point displacement is by scaling // Whether point displacement is by scaling
boolList scaleDisp(nPoints(), true); boolList scaleDisp(nPoints(), true);
label nScaled = nPoints(); label nScaled = nPoints();
List<bool> pistonPoint(newPoints.size(), false); boolList pistonPoint(newPoints.size(), false);
List<bool> headPoint(newPoints.size(), false); boolList headPoint(newPoints.size(), false);
forAll(pistonPoints, i) forAll(pistonPoints, i)
{ {

4
src/engine/engineTopoChangerMesh/layerSmooth/movePistonPointsLayeringLayerSmooth.H
View file

@ -15,8 +15,8 @@
// Whether point displacement is by scaling // Whether point displacement is by scaling
boolList scaleDisp(nPoints(), true); boolList scaleDisp(nPoints(), true);
label nScaled = nPoints(); label nScaled = nPoints();
List<bool> pistonPoint(newPoints.size(), false); boolList pistonPoint(newPoints.size(), false);
List<bool> headPoint(newPoints.size(), false); boolList headPoint(newPoints.size(), false);
forAll(pistonPoints, i) forAll(pistonPoints, i)
{ {

6
src/engine/engineTopoChangerMesh/pistonLayer/pistonLayer.C
View file

@ -294,9 +294,9 @@ bool Foam::pistonLayer::update()
// Whether point displacement is by scaling // Whether point displacement is by scaling
boolList scaleDisp(nPoints(), true); boolList scaleDisp(nPoints(), true);
label nScaled = nPoints(); label nScaled = nPoints();
List<bool> pistonPoint(newPoints.size(), false); boolList pistonPoint(newPoints.size(), false);
List<bool> headPoint(newPoints.size(), false); boolList headPoint(newPoints.size(), false);
List<bool> pistonBelowPoint(newPoints.size(), false); boolList pistonBelowPoint(newPoints.size(), false);
forAll(pistonPoints, i) forAll(pistonPoints, i)
{ {

4
src/engine/engineTopoChangerMesh/pistonSliding/addPistonFacesPointZonesPistonSliding.H
View file

@ -297,7 +297,7 @@
// valve top points (move all with valve displacement) // valve top points (move all with valve displacement)
dynamicLabelList valvePistonPoints(nPoints() / 10); dynamicLabelList valvePistonPoints(nPoints() / 10);
List<bool> valvePistonPoint(nPoints(), false); boolList valvePistonPoint(nPoints(), false);
bool foundOne = false; bool foundOne = false;
const cellList& c = cells(); const cellList& c = cells();
@ -397,7 +397,7 @@
// valve top points (move all with valve displacement) // valve top points (move all with valve displacement)
dynamicLabelList pistonPoints(nPoints() / 10); dynamicLabelList pistonPoints(nPoints() / 10);
List<bool> pistonPoint(nPoints(), false); boolList pistonPoint(nPoints(), false);
bool foundOne = false; bool foundOne = false;
const cellList& c = cells(); const cellList& c = cells();

4
src/engine/engineTopoChangerMesh/pistonSliding/addValvePistonCellZonesPistonSliding.H
View file

@ -52,7 +52,7 @@
// valve top points (move all with valve displacement) // valve top points (move all with valve displacement)
dynamicLabelList valveTopPoints(nPoints() / 10); dynamicLabelList valveTopPoints(nPoints() / 10);
List<bool> valveTopPoint(nPoints(), false); boolList valveTopPoint(nPoints(), false);
bool foundOne = false; bool foundOne = false;
const cellList& c = cells(); const cellList& c = cells();
@ -170,7 +170,7 @@
// valve bottom points (move all with valve displacement) // valve bottom points (move all with valve displacement)
dynamicLabelList valveBottomPoints(nPoints() / 10); dynamicLabelList valveBottomPoints(nPoints() / 10);
List<bool> valveBottomPoint(nPoints(), false); boolList valveBottomPoint(nPoints(), false);
bool foundOne = false; bool foundOne = false;

2
src/engine/engineTopoChangerMesh/pistonSliding/movePistonPointsPistonSliding.H
View file

@ -4,7 +4,7 @@
boolList scaleDisp(nPoints(), true); boolList scaleDisp(nPoints(), true);
label nScaled = nPoints(); label nScaled = nPoints();
List<bool> pistonPoint(newPoints.size(), false); boolList pistonPoint(newPoints.size(), false);
label pistonPtsIndex = pointZones().findZoneID("pistonPoints"); label pistonPtsIndex = pointZones().findZoneID("pistonPoints");
const labelList& pistonPoints = pointZones()[pistonPtsIndex]; const labelList& pistonPoints = pointZones()[pistonPtsIndex];

2
src/engine/engineTopoChangerMesh/pistonSliding/moveTopOfTheValvesPistonSliding.H
View file

@ -24,7 +24,7 @@
movingPointsMaskTop(valveI); movingPointsMaskTop(valveI);
{ {
List<bool> valveTopPoint(newPoints.size(), false); boolList valveTopPoint(newPoints.size(), false);
label valveTopPtsIndex = label valveTopPtsIndex =
pointZones().findZoneID("movingPointsTopZoneV" pointZones().findZoneID("movingPointsTopZoneV"

4
src/engine/engineTopoChangerMesh/pistonSliding/moveValvePointsPistonSliding.H
View file

@ -28,7 +28,7 @@
&& valves_[valveI].isOpen() && valves_[valveI].isOpen()
) )
{ {
List<bool> valveTopPoint(newPoints.size(), false); boolList valveTopPoint(newPoints.size(), false);
// const scalarField& movingPointsTop = // const scalarField& movingPointsTop =
// movingPointsMaskTop(valveI); // movingPointsMaskTop(valveI);
@ -107,7 +107,7 @@
if (valves_[valveI].bottomPatchID().active()) if (valves_[valveI].bottomPatchID().active())
{ {
{ {
List<bool> valveBottomPoint(newPoints.size(), false); boolList valveBottomPoint(newPoints.size(), false);
label valveBottomPtsIndex = label valveBottomPtsIndex =
pointZones().findZoneID pointZones().findZoneID

Some files were not shown because too many files have changed in this diff Show more