diff --git a/applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.C b/applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.C index 32218f79a6..4306612bc5 100644 --- a/applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.C +++ b/applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.C @@ -158,7 +158,7 @@ void Foam::fluentFvMesh::writeFluentMesh() const // Writing boundary faces forAll(boundary(), patchI) { - const unallocFaceList& patchFaces = boundaryMesh()[patchI]; + const faceUList& patchFaces = boundaryMesh()[patchI]; const labelList& patchFaceCells = boundaryMesh()[patchI].faceCells(); diff --git a/applications/utilities/postProcessing/velocityField/streamFunction/streamFunction.C b/applications/utilities/postProcessing/velocityField/streamFunction/streamFunction.C index 6b1d4a52fe..c3c25221f5 100644 --- a/applications/utilities/postProcessing/velocityField/streamFunction/streamFunction.C +++ b/applications/utilities/postProcessing/velocityField/streamFunction/streamFunction.C @@ -107,7 +107,7 @@ int main(int argc, char *argv[]) label nVisited = 0; label nVisitedOld = 0; - const unallocFaceList& faces = mesh.faces(); + const faceUList& faces = mesh.faces(); const pointField& points = mesh.points(); label nInternalFaces = mesh.nInternalFaces(); diff --git a/src/OpenFOAM/meshes/meshShapes/cell/cell.C b/src/OpenFOAM/meshes/meshShapes/cell/cell.C index fbfd7348ad..e633ff73a4 100644 --- a/src/OpenFOAM/meshes/meshShapes/cell/cell.C +++ b/src/OpenFOAM/meshes/meshShapes/cell/cell.C @@ -32,7 +32,7 @@ const char* const Foam::cell::typeName = "cell"; // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::labelList Foam::cell::labels(const unallocFaceList& f) const +Foam::labelList Foam::cell::labels(const faceUList& f) const { // return the unordered list of vertex labels supporting the cell @@ -100,7 +100,7 @@ Foam::labelList Foam::cell::labels(const unallocFaceList& f) const Foam::pointField Foam::cell::points ( - const unallocFaceList& f, + const faceUList& f, const pointField& meshPoints ) const { @@ -117,7 +117,7 @@ Foam::pointField Foam::cell::points } -Foam::edgeList Foam::cell::edges(const unallocFaceList& f) const +Foam::edgeList Foam::cell::edges(const faceUList& f) const { // return the lisf of cell edges @@ -172,7 +172,7 @@ Foam::edgeList Foam::cell::edges(const unallocFaceList& f) const Foam::point Foam::cell::centre ( const pointField& p, - const unallocFaceList& f + const faceUList& f ) const { // When one wants to access the cell centre and magnitude, the @@ -238,7 +238,7 @@ Foam::point Foam::cell::centre Foam::scalar Foam::cell::mag ( const pointField& p, - const unallocFaceList& f + const faceUList& f ) const { // When one wants to access the cell centre and magnitude, the diff --git a/src/OpenFOAM/meshes/meshShapes/cell/cell.H b/src/OpenFOAM/meshes/meshShapes/cell/cell.H index 099456d804..808701bc32 100644 --- a/src/OpenFOAM/meshes/meshShapes/cell/cell.H +++ b/src/OpenFOAM/meshes/meshShapes/cell/cell.H @@ -90,26 +90,26 @@ public: inline label nFaces() const; //- Return labels of cell vertices - labelList labels(const unallocFaceList&) const; + labelList labels(const faceUList&) const; //- Return the cell vertices - pointField points(const unallocFaceList&, const pointField&) const; + pointField points(const faceUList&, const pointField&) const; //- Return cell edges - edgeList edges(const unallocFaceList&) const; + edgeList edges(const faceUList&) const; //- Return index of opposite face label opposingFaceLabel ( const label masterFaceLabel, - const unallocFaceList& meshFaces + const faceUList& meshFaces ) const; //- Return opposite face oriented the same way as the master face oppositeFace opposingFace ( const label masterFaceLabel, - const unallocFaceList& meshFaces + const faceUList& meshFaces ) const; @@ -122,10 +122,10 @@ public: // future. //- Returns cell centre - point centre(const pointField&, const unallocFaceList&) const; + point centre(const pointField&, const faceUList&) const; //- Returns cell volume - scalar mag(const pointField&, const unallocFaceList&) const; + scalar mag(const pointField&, const faceUList&) const; // Friend Operators diff --git a/src/OpenFOAM/meshes/meshShapes/cell/oppositeCellFace.C b/src/OpenFOAM/meshes/meshShapes/cell/oppositeCellFace.C index 3710aba551..118aa621f2 100644 --- a/src/OpenFOAM/meshes/meshShapes/cell/oppositeCellFace.C +++ b/src/OpenFOAM/meshes/meshShapes/cell/oppositeCellFace.C @@ -39,7 +39,7 @@ Description Foam::label Foam::cell::opposingFaceLabel ( const label masterFaceLabel, - const unallocFaceList& meshFaces + const faceUList& meshFaces ) const { // Algorithm: @@ -114,7 +114,7 @@ Foam::label Foam::cell::opposingFaceLabel Foam::oppositeFace Foam::cell::opposingFace ( const label masterFaceLabel, - const unallocFaceList& meshFaces + const faceUList& meshFaces ) const { // Get the label of the opposite face diff --git a/src/OpenFOAM/meshes/meshShapes/face/faceListFwd.H b/src/OpenFOAM/meshes/meshShapes/face/faceListFwd.H index dea9985085..66726744a1 100644 --- a/src/OpenFOAM/meshes/meshShapes/face/faceListFwd.H +++ b/src/OpenFOAM/meshes/meshShapes/face/faceListFwd.H @@ -39,10 +39,12 @@ Description namespace Foam { class face; - typedef UList unallocFaceList; + typedef UList faceUList; typedef List faceList; typedef SubList faceSubList; typedef List faceListList; + // same as faceUList: + typedef UList unallocFaceList; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/finiteVolume/fvMesh/fvMeshLduAddressing.H b/src/finiteVolume/fvMesh/fvMeshLduAddressing.H index 20954aeb36..836672c90b 100644 --- a/src/finiteVolume/fvMesh/fvMeshLduAddressing.H +++ b/src/finiteVolume/fvMesh/fvMeshLduAddressing.H @@ -60,7 +60,7 @@ class fvMeshLduAddressing const labelList& upperAddr_; //- Patch addressing as a list of sublists - List patchAddr_; + List patchAddr_; //- Patch field evaluation schedule const lduSchedule& patchSchedule_; diff --git a/src/parallel/reconstruct/reconstruct/fvFieldReconstructor.H b/src/parallel/reconstruct/reconstruct/fvFieldReconstructor.H index c2df14ba47..3f18a15a22 100644 --- a/src/parallel/reconstruct/reconstruct/fvFieldReconstructor.H +++ b/src/parallel/reconstruct/reconstruct/fvFieldReconstructor.H @@ -117,7 +117,7 @@ public: const labelUList& directAddressing() const { - return unallocLabelList::null(); + return labelUList::null(); } }; diff --git a/src/parallel/reconstruct/reconstruct/pointFieldReconstructor.H b/src/parallel/reconstruct/reconstruct/pointFieldReconstructor.H index dbb6728c9c..6271fc5e40 100644 --- a/src/parallel/reconstruct/reconstruct/pointFieldReconstructor.H +++ b/src/parallel/reconstruct/reconstruct/pointFieldReconstructor.H @@ -114,7 +114,7 @@ public: const labelUList& directAddressing() const { - return unallocLabelList::null(); + return labelUList::null(); } }; diff --git a/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/solidMixtureThermo/solidMixtureThermo.C b/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/solidMixtureThermo/solidMixtureThermo.C index 569525e20d..36f590e838 100644 --- a/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/solidMixtureThermo/solidMixtureThermo.C +++ b/src/thermophysicalModels/basicSolidThermo/solidMixtureThermo/solidMixtureThermo/solidMixtureThermo.C @@ -226,7 +226,7 @@ Foam::tmp Foam::solidMixtureThermo::rho { const scalarField& patchT = T_.boundaryField()[patchI]; const polyPatch& pp = mesh_.boundaryMesh()[patchI]; - const unallocLabelList& cells = pp.faceCells(); + const labelUList& cells = pp.faceCells(); tmp tRho(new scalarField(patchT.size())); scalarField& Rho = tRho(); @@ -248,7 +248,7 @@ Foam::tmp Foam::solidMixtureThermo::Cp { const scalarField& patchT = T_.boundaryField()[patchI]; const polyPatch& pp = mesh_.boundaryMesh()[patchI]; - const unallocLabelList& cells = pp.faceCells(); + const labelUList& cells = pp.faceCells(); tmp tCp(new scalarField(patchT.size())); scalarField& Cp = tCp(); @@ -270,7 +270,7 @@ Foam::tmp Foam::solidMixtureThermo::hs { const scalarField& patchT = T_.boundaryField()[patchI]; const polyPatch& pp = mesh_.boundaryMesh()[patchI]; - const unallocLabelList& cells = pp.faceCells(); + const labelUList& cells = pp.faceCells(); tmp ths(new scalarField(patchT.size())); scalarField& hs = ths(); @@ -292,7 +292,7 @@ Foam::tmp Foam::solidMixtureThermo::K { const scalarField& patchT = T_.boundaryField()[patchI]; const polyPatch& pp = mesh_.boundaryMesh()[patchI]; - const unallocLabelList& cells = pp.faceCells(); + const labelUList& cells = pp.faceCells(); tmp tK(new scalarField(patchT.size())); scalarField& K = tK(); @@ -314,7 +314,7 @@ Foam::tmp Foam::solidMixtureThermo::Hf { const scalarField& patchT = T_.boundaryField()[patchI]; const polyPatch& pp = mesh_.boundaryMesh()[patchI]; - const unallocLabelList& cells = pp.faceCells(); + const labelUList& cells = pp.faceCells(); tmp tHf(new scalarField(patchT.size())); scalarField& Hf = tHf(); @@ -336,7 +336,7 @@ Foam::tmp Foam::solidMixtureThermo::sigmaS { const scalarField& patchT = T_.boundaryField()[patchI]; const polyPatch& pp = mesh_.boundaryMesh()[patchI]; - const unallocLabelList& cells = pp.faceCells(); + const labelUList& cells = pp.faceCells(); tmp tsigmaS(new scalarField(patchT.size())); scalarField& sigmaS = tsigmaS(); @@ -359,7 +359,7 @@ Foam::tmp Foam::solidMixtureThermo::kappa { const scalarField& patchT = T_.boundaryField()[patchI]; const polyPatch& pp = mesh_.boundaryMesh()[patchI]; - const unallocLabelList& cells = pp.faceCells(); + const labelUList& cells = pp.faceCells(); tmp tKappa(new scalarField(patchT.size())); scalarField& kappa = tKappa(); @@ -382,7 +382,7 @@ Foam::tmp Foam::solidMixtureThermo::emissivity { const scalarField& patchT = T_.boundaryField()[patchI]; const polyPatch& pp = mesh_.boundaryMesh()[patchI]; - const unallocLabelList& cells = pp.faceCells(); + const labelUList& cells = pp.faceCells(); tmp te(new scalarField(patchT.size())); scalarField& e = te();