STYLE: use faceUList typedef instead of unallocFaceList

This commit is contained in:
Mark Olesen
2010-12-21 13:06:17 +01:00
parent 399e160efb
commit 29e06d366b
10 changed files with 30 additions and 28 deletions

View File

@ -158,7 +158,7 @@ void Foam::fluentFvMesh::writeFluentMesh() const
// Writing boundary faces // Writing boundary faces
forAll(boundary(), patchI) forAll(boundary(), patchI)
{ {
const unallocFaceList& patchFaces = boundaryMesh()[patchI]; const faceUList& patchFaces = boundaryMesh()[patchI];
const labelList& patchFaceCells = const labelList& patchFaceCells =
boundaryMesh()[patchI].faceCells(); boundaryMesh()[patchI].faceCells();

View File

@ -107,7 +107,7 @@ int main(int argc, char *argv[])
label nVisited = 0; label nVisited = 0;
label nVisitedOld = 0; label nVisitedOld = 0;
const unallocFaceList& faces = mesh.faces(); const faceUList& faces = mesh.faces();
const pointField& points = mesh.points(); const pointField& points = mesh.points();
label nInternalFaces = mesh.nInternalFaces(); label nInternalFaces = mesh.nInternalFaces();

View File

@ -32,7 +32,7 @@ const char* const Foam::cell::typeName = "cell";
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * 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 // 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 Foam::pointField Foam::cell::points
( (
const unallocFaceList& f, const faceUList& f,
const pointField& meshPoints const pointField& meshPoints
) const ) 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 // return the lisf of cell edges
@ -172,7 +172,7 @@ Foam::edgeList Foam::cell::edges(const unallocFaceList& f) const
Foam::point Foam::cell::centre Foam::point Foam::cell::centre
( (
const pointField& p, const pointField& p,
const unallocFaceList& f const faceUList& f
) const ) const
{ {
// When one wants to access the cell centre and magnitude, the // 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 Foam::scalar Foam::cell::mag
( (
const pointField& p, const pointField& p,
const unallocFaceList& f const faceUList& f
) const ) const
{ {
// When one wants to access the cell centre and magnitude, the // When one wants to access the cell centre and magnitude, the

View File

@ -90,26 +90,26 @@ public:
inline label nFaces() const; inline label nFaces() const;
//- Return labels of cell vertices //- Return labels of cell vertices
labelList labels(const unallocFaceList&) const; labelList labels(const faceUList&) const;
//- Return the cell vertices //- Return the cell vertices
pointField points(const unallocFaceList&, const pointField&) const; pointField points(const faceUList&, const pointField&) const;
//- Return cell edges //- Return cell edges
edgeList edges(const unallocFaceList&) const; edgeList edges(const faceUList&) const;
//- Return index of opposite face //- Return index of opposite face
label opposingFaceLabel label opposingFaceLabel
( (
const label masterFaceLabel, const label masterFaceLabel,
const unallocFaceList& meshFaces const faceUList& meshFaces
) const; ) const;
//- Return opposite face oriented the same way as the master face //- Return opposite face oriented the same way as the master face
oppositeFace opposingFace oppositeFace opposingFace
( (
const label masterFaceLabel, const label masterFaceLabel,
const unallocFaceList& meshFaces const faceUList& meshFaces
) const; ) const;
@ -122,10 +122,10 @@ public:
// future. // future.
//- Returns cell centre //- Returns cell centre
point centre(const pointField&, const unallocFaceList&) const; point centre(const pointField&, const faceUList&) const;
//- Returns cell volume //- Returns cell volume
scalar mag(const pointField&, const unallocFaceList&) const; scalar mag(const pointField&, const faceUList&) const;
// Friend Operators // Friend Operators

View File

@ -39,7 +39,7 @@ Description
Foam::label Foam::cell::opposingFaceLabel Foam::label Foam::cell::opposingFaceLabel
( (
const label masterFaceLabel, const label masterFaceLabel,
const unallocFaceList& meshFaces const faceUList& meshFaces
) const ) const
{ {
// Algorithm: // Algorithm:
@ -114,7 +114,7 @@ Foam::label Foam::cell::opposingFaceLabel
Foam::oppositeFace Foam::cell::opposingFace Foam::oppositeFace Foam::cell::opposingFace
( (
const label masterFaceLabel, const label masterFaceLabel,
const unallocFaceList& meshFaces const faceUList& meshFaces
) const ) const
{ {
// Get the label of the opposite face // Get the label of the opposite face

View File

@ -39,10 +39,12 @@ Description
namespace Foam namespace Foam
{ {
class face; class face;
typedef UList<face> unallocFaceList; typedef UList<face> faceUList;
typedef List<face> faceList; typedef List<face> faceList;
typedef SubList<face> faceSubList; typedef SubList<face> faceSubList;
typedef List<faceList> faceListList; typedef List<faceList> faceListList;
// same as faceUList:
typedef UList<face> unallocFaceList;
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

View File

@ -60,7 +60,7 @@ class fvMeshLduAddressing
const labelList& upperAddr_; const labelList& upperAddr_;
//- Patch addressing as a list of sublists //- Patch addressing as a list of sublists
List<const unallocLabelList*> patchAddr_; List<const labelUList*> patchAddr_;
//- Patch field evaluation schedule //- Patch field evaluation schedule
const lduSchedule& patchSchedule_; const lduSchedule& patchSchedule_;

View File

@ -117,7 +117,7 @@ public:
const labelUList& directAddressing() const const labelUList& directAddressing() const
{ {
return unallocLabelList::null(); return labelUList::null();
} }
}; };

View File

@ -114,7 +114,7 @@ public:
const labelUList& directAddressing() const const labelUList& directAddressing() const
{ {
return unallocLabelList::null(); return labelUList::null();
} }
}; };

View File

@ -226,7 +226,7 @@ Foam::tmp<Foam::scalarField> Foam::solidMixtureThermo<MixtureType>::rho
{ {
const scalarField& patchT = T_.boundaryField()[patchI]; const scalarField& patchT = T_.boundaryField()[patchI];
const polyPatch& pp = mesh_.boundaryMesh()[patchI]; const polyPatch& pp = mesh_.boundaryMesh()[patchI];
const unallocLabelList& cells = pp.faceCells(); const labelUList& cells = pp.faceCells();
tmp<scalarField> tRho(new scalarField(patchT.size())); tmp<scalarField> tRho(new scalarField(patchT.size()));
scalarField& Rho = tRho(); scalarField& Rho = tRho();
@ -248,7 +248,7 @@ Foam::tmp<Foam::scalarField> Foam::solidMixtureThermo<MixtureType>::Cp
{ {
const scalarField& patchT = T_.boundaryField()[patchI]; const scalarField& patchT = T_.boundaryField()[patchI];
const polyPatch& pp = mesh_.boundaryMesh()[patchI]; const polyPatch& pp = mesh_.boundaryMesh()[patchI];
const unallocLabelList& cells = pp.faceCells(); const labelUList& cells = pp.faceCells();
tmp<scalarField> tCp(new scalarField(patchT.size())); tmp<scalarField> tCp(new scalarField(patchT.size()));
scalarField& Cp = tCp(); scalarField& Cp = tCp();
@ -270,7 +270,7 @@ Foam::tmp<Foam::scalarField> Foam::solidMixtureThermo<MixtureType>::hs
{ {
const scalarField& patchT = T_.boundaryField()[patchI]; const scalarField& patchT = T_.boundaryField()[patchI];
const polyPatch& pp = mesh_.boundaryMesh()[patchI]; const polyPatch& pp = mesh_.boundaryMesh()[patchI];
const unallocLabelList& cells = pp.faceCells(); const labelUList& cells = pp.faceCells();
tmp<scalarField> ths(new scalarField(patchT.size())); tmp<scalarField> ths(new scalarField(patchT.size()));
scalarField& hs = ths(); scalarField& hs = ths();
@ -292,7 +292,7 @@ Foam::tmp<Foam::scalarField> Foam::solidMixtureThermo<MixtureType>::K
{ {
const scalarField& patchT = T_.boundaryField()[patchI]; const scalarField& patchT = T_.boundaryField()[patchI];
const polyPatch& pp = mesh_.boundaryMesh()[patchI]; const polyPatch& pp = mesh_.boundaryMesh()[patchI];
const unallocLabelList& cells = pp.faceCells(); const labelUList& cells = pp.faceCells();
tmp<scalarField> tK(new scalarField(patchT.size())); tmp<scalarField> tK(new scalarField(patchT.size()));
scalarField& K = tK(); scalarField& K = tK();
@ -314,7 +314,7 @@ Foam::tmp<Foam::scalarField> Foam::solidMixtureThermo<MixtureType>::Hf
{ {
const scalarField& patchT = T_.boundaryField()[patchI]; const scalarField& patchT = T_.boundaryField()[patchI];
const polyPatch& pp = mesh_.boundaryMesh()[patchI]; const polyPatch& pp = mesh_.boundaryMesh()[patchI];
const unallocLabelList& cells = pp.faceCells(); const labelUList& cells = pp.faceCells();
tmp<scalarField> tHf(new scalarField(patchT.size())); tmp<scalarField> tHf(new scalarField(patchT.size()));
scalarField& Hf = tHf(); scalarField& Hf = tHf();
@ -336,7 +336,7 @@ Foam::tmp<Foam::scalarField> Foam::solidMixtureThermo<MixtureType>::sigmaS
{ {
const scalarField& patchT = T_.boundaryField()[patchI]; const scalarField& patchT = T_.boundaryField()[patchI];
const polyPatch& pp = mesh_.boundaryMesh()[patchI]; const polyPatch& pp = mesh_.boundaryMesh()[patchI];
const unallocLabelList& cells = pp.faceCells(); const labelUList& cells = pp.faceCells();
tmp<scalarField> tsigmaS(new scalarField(patchT.size())); tmp<scalarField> tsigmaS(new scalarField(patchT.size()));
scalarField& sigmaS = tsigmaS(); scalarField& sigmaS = tsigmaS();
@ -359,7 +359,7 @@ Foam::tmp<Foam::scalarField> Foam::solidMixtureThermo<MixtureType>::kappa
{ {
const scalarField& patchT = T_.boundaryField()[patchI]; const scalarField& patchT = T_.boundaryField()[patchI];
const polyPatch& pp = mesh_.boundaryMesh()[patchI]; const polyPatch& pp = mesh_.boundaryMesh()[patchI];
const unallocLabelList& cells = pp.faceCells(); const labelUList& cells = pp.faceCells();
tmp<scalarField> tKappa(new scalarField(patchT.size())); tmp<scalarField> tKappa(new scalarField(patchT.size()));
scalarField& kappa = tKappa(); scalarField& kappa = tKappa();
@ -382,7 +382,7 @@ Foam::tmp<Foam::scalarField> Foam::solidMixtureThermo<MixtureType>::emissivity
{ {
const scalarField& patchT = T_.boundaryField()[patchI]; const scalarField& patchT = T_.boundaryField()[patchI];
const polyPatch& pp = mesh_.boundaryMesh()[patchI]; const polyPatch& pp = mesh_.boundaryMesh()[patchI];
const unallocLabelList& cells = pp.faceCells(); const labelUList& cells = pp.faceCells();
tmp<scalarField> te(new scalarField(patchT.size())); tmp<scalarField> te(new scalarField(patchT.size()));
scalarField& e = te(); scalarField& e = te();