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

STYLE: use labelUList typedef instead of UList<label> or unallocLabelList

Browse Source
This commit is contained in:
Mark Olesen
2010-11-02 09:32:32 +01:00
parent 0b6b6ce184
commit d5acd22a63
214 changed files with 536 additions and 536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
applications/solvers/multiphase/interFoam/LTSInterFoam/MULESTemplates.C
View File

@ -325,8 +325,8 @@ void Foam::MULES::limiter
const fvMesh& mesh = psi.mesh();
const unallocLabelList& owner = mesh.owner();
const unallocLabelList& neighb = mesh.neighbour();
const labelUList& owner = mesh.owner();
const labelUList& neighb = mesh.neighbour();
tmp<volScalarField::DimensionedInternalField> tVsc = mesh.Vsc();
const scalarField& V = tVsc();

6
applications/test/PackedList4/PackedListTest4.C
View File

@ -96,7 +96,7 @@ int main(int argc, char *argv[])
(list3 |= list2).printBits(Info);
}
Info<< "\noperator|= with UList<label>\n";
Info<< "\noperator|= with labelUList\n";
{
PackedBoolList list3 = list1;
(list3 |= list2Labels).printBits(Info);
@ -114,7 +114,7 @@ int main(int argc, char *argv[])
(list3 += list2).printBits(Info);
}
Info<< "\noperator+= with UList<label>\n";
Info<< "\noperator+= with labelUList\n";
{
PackedBoolList list3 = list1;
(list3 += list2Labels).printBits(Info);
@ -126,7 +126,7 @@ int main(int argc, char *argv[])
(list3 -= list2).printBits(Info);
}
Info<< "\noperator-= with UList<label>\n";
Info<< "\noperator-= with labelUList\n";
{
PackedBoolList list3 = list1;
(list3 -= list2Labels).printBits(Info);

4
applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.C
View File

@ -124,8 +124,8 @@ void Foam::fluentFvMesh::writeFluentMesh() const
fluentMeshFile
<< "))" << std::endl << std::endl;
const unallocLabelList& own = owner();
const unallocLabelList& nei = neighbour();
const labelUList& own = owner();
const labelUList& nei = neighbour();
const faceList& fcs = faces();

2
applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
View File

@ -138,7 +138,7 @@ Foam::label Foam::checkTopology
{
if (patches[patchI].coupled())
{
const unallocLabelList& owners = patches[patchI].faceCells();
const labelUList& owners = patches[patchI].faceCells();
forAll(owners, i)
{

4
applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.C
View File

@ -128,7 +128,7 @@ Foam::mirrorFvMesh::mirrorFvMesh(const IOobject& io)
// Distribute internal faces
labelListList newCellFaces(oldCells.size());
const unallocLabelList& oldOwnerStart = lduAddr().ownerStartAddr();
const labelUList& oldOwnerStart = lduAddr().ownerStartAddr();
forAll(newCellFaces, cellI)
{
@ -168,7 +168,7 @@ Foam::mirrorFvMesh::mirrorFvMesh(const IOobject& io)
curInsBouFace = false;
// Get faceCells for face insertion
const unallocLabelList& curFaceCells = curPatch.faceCells();
const labelUList& curFaceCells = curPatch.faceCells();
const label curStart = curPatch.start();
forAll(curPatch, faceI)

10
applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
View File

@ -164,7 +164,7 @@ void Foam::domainDecomposition::decomposeMesh()
// Normal patch. Add faces to processor where the cell
// next to the face lives
const unallocLabelList& patchFaceCells =
const labelUList& patchFaceCells =
patches[patchi].faceCells();
forAll(patchFaceCells, facei)
@ -185,9 +185,9 @@ void Foam::domainDecomposition::decomposeMesh()
patches[patchi]
);
// cyclic: check opposite side on this processor
const unallocLabelList& patchFaceCells = pp.faceCells();
const labelUList& patchFaceCells = pp.faceCells();
const unallocLabelList& nbrPatchFaceCells =
const labelUList& nbrPatchFaceCells =
pp.neighbPatch().faceCells();
forAll(patchFaceCells, facei)
@ -259,8 +259,8 @@ void Foam::domainDecomposition::decomposeMesh()
);
// cyclic: check opposite side on this processor
const unallocLabelList& patchFaceCells = pp.faceCells();
const unallocLabelList& nbrPatchFaceCells =
const labelUList& patchFaceCells = pp.faceCells();
const labelUList& nbrPatchFaceCells =
pp.neighbPatch().faceCells();
// Store old sizes. Used to detect which inter-proc patches

8
applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.C
View File

@ -30,7 +30,7 @@ License
Foam::fvFieldDecomposer::patchFieldDecomposer::patchFieldDecomposer
(
const unallocLabelList& addressingSlice,
const labelUList& addressingSlice,
const label addressingOffset
)
:
@ -48,7 +48,7 @@ Foam::fvFieldDecomposer::processorVolPatchFieldDecomposer::
processorVolPatchFieldDecomposer
(
const fvMesh& mesh,
const unallocLabelList& addressingSlice
const labelUList& addressingSlice
)
:
directAddressing_(addressingSlice.size())
@ -95,7 +95,7 @@ processorVolPatchFieldDecomposer
Foam::fvFieldDecomposer::processorSurfacePatchFieldDecomposer::
processorSurfacePatchFieldDecomposer
(
const unallocLabelList& addressingSlice
const labelUList& addressingSlice
)
:
addressing_(addressingSlice.size()),
@ -171,7 +171,7 @@ Foam::fvFieldDecomposer::fvFieldDecomposer
processorSurfacePatchFieldDecomposerPtrs_[patchi] =
new processorSurfacePatchFieldDecomposer
(
static_cast<const unallocLabelList&>
static_cast<const labelUList&>
(
procMesh_.boundary()[patchi].patchSlice
(

10
applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.H
View File

@ -71,7 +71,7 @@ public:
//- Construct given addressing
patchFieldDecomposer
(
const unallocLabelList& addressingSlice,
const labelUList& addressingSlice,
const label addressingOffset
);
@ -88,7 +88,7 @@ public:
return true;
}
const unallocLabelList& directAddressing() const
const labelUList& directAddressing() const
{
return directAddressing_;
}
@ -112,7 +112,7 @@ public:
processorVolPatchFieldDecomposer
(
const fvMesh& mesh,
const unallocLabelList& addressingSlice
const labelUList& addressingSlice
);
@ -128,7 +128,7 @@ public:
return true;
}
const unallocLabelList& directAddressing() const
const labelUList& directAddressing() const
{
return directAddressing_;
}
@ -149,7 +149,7 @@ public:
//- Construct given addressing
processorSurfacePatchFieldDecomposer
(
const unallocLabelList& addressingSlice
const labelUList& addressingSlice
);

2
applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.H
View File

@ -88,7 +88,7 @@ public:
return true;
}
const unallocLabelList& directAddressing() const
const labelUList& directAddressing() const
{
return directAddressing_;
}

2
src/OpenFOAM/containers/Identifiers/Keyed/Keyed.H
View File

@ -79,7 +79,7 @@ public:
inline static List<Keyed<T> > createList
(
const List<T>&,
const List<label>& keys
const labelUList& keys
);

4
src/OpenFOAM/containers/Identifiers/Keyed/KeyedI.H
View File

@ -90,13 +90,13 @@ Foam::Keyed<T>::createList(const List<T>& lst, const label key)
template<class T>
inline Foam::List<Foam::Keyed<T> >
Foam::Keyed<T>::createList(const List<T>& lst, const List<label>& keys)
Foam::Keyed<T>::createList(const List<T>& lst, const labelUList& keys)
{
if (lst.size() != keys.size())
{
FatalErrorIn
(
"Foam::Keyed<T>::createList(const List<T>&, const List<label>&)"
"Foam::Keyed<T>::createList(const List<T>&, const labelUList&)"
)
<< "size mismatch adding keys to a list:" << nl
<< "List has size " << lst.size()

4
src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectList.H
View File

@ -65,7 +65,7 @@ public:
(
const UList<T>& posList,
const UList<T>& negList,
const UList<label>&
const labelUList&
);
//- Construct given the complete list and by transferring addressing
@ -100,7 +100,7 @@ public:
// Edit
//- Reset addressing
inline void resetAddressing(const UList<label>&);
inline void resetAddressing(const labelUList&);
inline void resetAddressing(const Xfer<List<label> >&);

4
src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectListI.H
View File

@ -30,7 +30,7 @@ inline Foam::BiIndirectList<T>::BiIndirectList
(
const UList<T>& posList,
const UList<T>& negList,
const UList<label>& addr
const labelUList& addr
)
:
posList_(const_cast<UList<T>&>(posList)),
@ -94,7 +94,7 @@ inline const Foam::List<Foam::label>& Foam::BiIndirectList<T>::addressing()
template<class T>
inline void Foam::BiIndirectList<T>::resetAddressing
(
const UList<label>& addr
const labelUList& addr
)
{
addressing_ = addr;

6
src/OpenFOAM/containers/Lists/CompactListList/CompactListList.C
View File

@ -59,7 +59,7 @@ Foam::CompactListList<T, Container>::CompactListList(const List<Container>& ll)
template<class T, class Container>
Foam::CompactListList<T, Container>::CompactListList
(
const UList<label>& rowSizes
const labelUList& rowSizes
)
:
size_(rowSizes.size()),
@ -80,7 +80,7 @@ Foam::CompactListList<T, Container>::CompactListList
template<class T, class Container>
Foam::CompactListList<T, Container>::CompactListList
(
const UList<label>& rowSizes,
const labelUList& rowSizes,
const T& t
)
:
@ -178,7 +178,7 @@ void Foam::CompactListList<T, Container>::setSize
template<class T, class Container>
void Foam::CompactListList<T, Container>::setSize(const UList<label>& rowSizes)
void Foam::CompactListList<T, Container>::setSize(const labelUList& rowSizes)
{
size_ = rowSizes.size();
offsets_.setSize(rowSizes.size()+1);

8
src/OpenFOAM/containers/Lists/CompactListList/CompactListList.H
View File

@ -114,10 +114,10 @@ public:
inline CompactListList(const label nRows, const label nData, const T&);
//- Construct given list of row-sizes.
explicit CompactListList(const UList<label>& rowSizes);
explicit CompactListList(const labelUList& rowSizes);
//- Construct given list of row-sizes
CompactListList(const UList<label>& rowSizes, const T&);
CompactListList(const labelUList& rowSizes, const T&);
//- Construct by transferring the parameter contents
explicit CompactListList(const Xfer<CompactListList<T, Container> >&);
@ -168,7 +168,7 @@ public:
void setSize(const label nRows, const label nData, const T&);
//- Reset size of CompactListList.
void setSize(const UList<label>& rowSizes);
void setSize(const labelUList& rowSizes);
//- Reset size of CompactListList.
// This form only allows contraction of the CompactListList.
@ -181,7 +181,7 @@ public:
inline void resize(const label nRows, const label nData, const T&);
//- Reset size of CompactListList.
inline void resize(const UList<label>& rowSizes);
inline void resize(const labelUList& rowSizes);
//- Clear the CompactListList, i.e. set sizes to zero.
void clear();

2
src/OpenFOAM/containers/Lists/CompactListList/CompactListListI.H
View File

@ -207,7 +207,7 @@ inline void Foam::CompactListList<T, Container>::resize
template<class T, class Container>
inline void Foam::CompactListList<T, Container>::resize
(
const UList<label>& rowSizes
const labelUList& rowSizes
)
{
this->setSize(rowSizes);

6
src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H
View File

@ -73,7 +73,7 @@ protected:
// Constructors
//- Construct by copying the addressing array
explicit inline IndirectListAddressing(const UList<label>& addr);
explicit inline IndirectListAddressing(const labelUList& addr);
//- Construct by transferring addressing array
explicit inline IndirectListAddressing(const Xfer<List<label> >& addr);
@ -89,7 +89,7 @@ protected:
// Edit
//- Reset addressing
inline void resetAddressing(const UList<label>&);
inline void resetAddressing(const labelUList&);
inline void resetAddressing(const Xfer<List<label> >&);
};
@ -119,7 +119,7 @@ public:
// Constructors
//- Construct given the complete list and the addressing array
inline IndirectList(const UList<T>&, const UList<label>&);
inline IndirectList(const UList<T>&, const labelUList&);
//- Construct given the complete list and by transferring addressing
inline IndirectList(const UList<T>&, const Xfer<List<label> >&);

6
src/OpenFOAM/containers/Lists/IndirectList/IndirectListI.H
View File

@ -28,7 +28,7 @@ License
inline Foam::IndirectListAddressing::IndirectListAddressing
(
const UList<label>& addr
const labelUList& addr
)
:
addressing_(addr)
@ -48,7 +48,7 @@ template<class T>
inline Foam::IndirectList<T>::IndirectList
(
const UList<T>& completeList,
const UList<label>& addr
const labelUList& addr
)
:
IndirectListAddressing(addr),
@ -117,7 +117,7 @@ Foam::IndirectListAddressing::addressing() const
inline void Foam::IndirectListAddressing::resetAddressing
(
const UList<label>& addr
const labelUList& addr
)
{
addressing_ = addr;

2
src/OpenFOAM/containers/Lists/List/List.C
View File

@ -155,7 +155,7 @@ Foam::List<T>::List(List<T>& a, bool reUse)
// Construct as subset
template<class T>
Foam::List<T>::List(const UList<T>& a, const unallocLabelList& map)
Foam::List<T>::List(const UList<T>& a, const labelUList& map)
:
UList<T>(NULL, map.size())
{

2
src/OpenFOAM/containers/Lists/List/List.H
View File

@ -115,7 +115,7 @@ public:
List(List<T>&, bool reUse);
//- Construct as subset.
List(const UList<T>&, const unallocLabelList& mapAddressing);
List(const UList<T>&, const labelUList& mapAddressing);
//- Construct given start and end iterators.
template<class InputIterator>

6
src/OpenFOAM/containers/Lists/ListOps/ListOps.C
View File

@ -36,7 +36,7 @@ const Foam::labelList Foam::emptyLabelList = Foam::labelList(0);
Foam::labelList Foam::invert
(
const label len,
const UList<label>& map
const labelUList& map
)
{
labelList inverse(len, -1);
@ -49,7 +49,7 @@ Foam::labelList Foam::invert
{
if (inverse[newPos] >= 0)
{
FatalErrorIn("invert(const label, const UList<label>&)")
FatalErrorIn("invert(const label, const labelUList&)")
<< "Map is not one-to-one. At index " << i
<< " element " << newPos << " has already occurred before"
<< nl << "Please use invertOneToMany instead"
@ -66,7 +66,7 @@ Foam::labelList Foam::invert
Foam::labelListList Foam::invertOneToMany
(
const label len,
const UList<label>& map
const labelUList& map
)
{
labelList nElems(len, 0);

20
src/OpenFOAM/containers/Lists/ListOps/ListOps.H
View File

@ -56,23 +56,23 @@ static const List<Type>& emptyList()
//- Renumber the values (not the indices) of a list.
// Negative ListType elements are left as is.
template<class ListType>
ListType renumber(const UList<label>& oldToNew, const ListType&);
ListType renumber(const labelUList& oldToNew, const ListType&);
//- Inplace renumber the values of a list.
// Negative ListType elements are left as is.
template<class ListType>
void inplaceRenumber(const UList<label>& oldToNew, ListType&);
void inplaceRenumber(const labelUList& oldToNew, ListType&);
//- Reorder the elements (indices, not values) of a list.
// Negative ListType elements are left as is.
template<class ListType>
ListType reorder(const UList<label>& oldToNew, const ListType&);
ListType reorder(const labelUList& oldToNew, const ListType&);
//- Inplace reorder the elements of a list.
// Negative ListType elements are left as is.
template<class ListType>
void inplaceReorder(const UList<label>& oldToNew, ListType&);
void inplaceReorder(const labelUList& oldToNew, ListType&);
// Variants to work with iterators and sparse tables.
@ -80,11 +80,11 @@ void inplaceReorder(const UList<label>& oldToNew, ListType&);
//- Map values. Do not map negative values.
template<class Container>
void inplaceMapValue(const UList<label>& oldToNew, Container&);
void inplaceMapValue(const labelUList& oldToNew, Container&);
//- Recreate with mapped keys. Do not map elements with negative key.
template<class Container>
void inplaceMapKey(const UList<label>& oldToNew, Container&);
void inplaceMapKey(const labelUList& oldToNew, Container&);
//- Generate the (stable) sort order for the list
@ -126,10 +126,10 @@ template<class BoolListType, class ListType>
void inplaceSubset(const BoolListType& select, ListType&);
//- Invert one-to-one map. Unmapped elements will be -1.
labelList invert(const label len, const UList<label>&);
labelList invert(const label len, const labelUList&);
//- Invert one-to-many map. Unmapped elements will be size 0.
labelListList invertOneToMany(const label len, const UList<label>&);
labelListList invertOneToMany(const label len, const labelUList&);
//- Invert many-to-many.
// Input and output types need to be inherited from List.
@ -172,7 +172,7 @@ template<class ListType>
void setValues
(
ListType&,
const UList<label>& indices,
const labelUList& indices,
typename ListType::const_reference
);
@ -182,7 +182,7 @@ ListType createWithValues
(
const label sz,
typename ListType::const_reference initValue,
const UList<label>& indices,
const labelUList& indices,
typename ListType::const_reference setValue
);

16
src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
View File

@ -30,7 +30,7 @@ License
template<class ListType>
ListType Foam::renumber
(
const UList<label>& oldToNew,
const labelUList& oldToNew,
const ListType& lst
)
{
@ -55,7 +55,7 @@ ListType Foam::renumber
template<class ListType>
void Foam::inplaceRenumber
(
const UList<label>& oldToNew,
const labelUList& oldToNew,
ListType& lst
)
{
@ -72,7 +72,7 @@ void Foam::inplaceRenumber
template<class ListType>
ListType Foam::reorder
(
const UList<label>& oldToNew,
const labelUList& oldToNew,
const ListType& lst
)
{
@ -100,7 +100,7 @@ ListType Foam::reorder
template<class ListType>
void Foam::inplaceReorder
(
const UList<label>& oldToNew,
const labelUList& oldToNew,
ListType& lst
)
{
@ -129,7 +129,7 @@ void Foam::inplaceReorder
template<class Container>
void Foam::inplaceMapValue
(
const UList<label>& oldToNew,
const labelUList& oldToNew,
Container& lst
)
{
@ -151,7 +151,7 @@ void Foam::inplaceMapValue
template<class Container>
void Foam::inplaceMapKey
(
const UList<label>& oldToNew,
const labelUList& oldToNew,
Container& lst
)
{
@ -483,7 +483,7 @@ template<class ListType>
void Foam::setValues
(
ListType& l,
const UList<label>& indices,
const labelUList& indices,
typename ListType::const_reference t
)
{
@ -499,7 +499,7 @@ ListType Foam::createWithValues
(
const label sz,
const typename ListType::const_reference initValue,
const UList<label>& indices,
const labelUList& indices,
typename ListType::const_reference setValue
)
{

6
src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.C
View File

@ -188,7 +188,7 @@ void Foam::PackedBoolList::set(const PackedList<1>& lst)
}
Foam::label Foam::PackedBoolList::set(const UList<label>& indices)
Foam::label Foam::PackedBoolList::set(const labelUList& indices)
{
return setIndices(indices);
}
@ -216,7 +216,7 @@ void Foam::PackedBoolList::unset(const PackedList<1>& lst)
}
Foam::label Foam::PackedBoolList::unset(const UList<label>& indices)
Foam::label Foam::PackedBoolList::unset(const labelUList& indices)
{
return unsetIndices(indices);
}
@ -249,7 +249,7 @@ void Foam::PackedBoolList::subset(const PackedList<1>& lst)
}
Foam::label Foam::PackedBoolList::subset(const UList<label>& indices)
Foam::label Foam::PackedBoolList::subset(const labelUList& indices)
{
return subsetIndices(indices);
}

18
src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.H
View File

@ -119,7 +119,7 @@ public:
//- Construct from a list of labels
// using the labels as indices to indicate which bits are set
explicit inline PackedBoolList(const UList<label>& indices);
explicit inline PackedBoolList(const labelUList& indices);
//- Construct from a list of labels
// using the labels as indices to indicate which bits are set
@ -141,7 +141,7 @@ public:
//- Set the listed indices. Return number of elements changed.
// Does auto-vivify for non-existent entries.
label set(const UList<label>& indices);
label set(const labelUList& indices);
//- Set the listed indices. Return number of elements changed.
// Does auto-vivify for non-existent entries.
@ -152,7 +152,7 @@ public:
//- Unset the listed indices. Return number of elements changed.
// Never auto-vivify entries.
label unset(const UList<label>& indices);
label unset(const labelUList& indices);
//- Unset the listed indices. Return number of elements changed.
// Never auto-vivify entries.
@ -163,7 +163,7 @@ public:
//- Subset with the listed indices.
// Return number of elements subsetted.
label subset(const UList<label>& indices);
label subset(const labelUList& indices);
//- Subset with the listed indices.
// Return number of elements subsetted.
@ -204,7 +204,7 @@ public:
//- Assignment operator,
// using the labels as indices to indicate which bits are set
inline PackedBoolList& operator=(const UList<label>& indices);
inline PackedBoolList& operator=(const labelUList& indices);
//- Assignment operator,
// using the labels as indices to indicate which bits are set
@ -218,7 +218,7 @@ public:
//- And operator (lists may be dissimilar sizes)
// using the labels as indices to indicate which bits are set
inline PackedBoolList& operator&=(const UList<label>& indices);
inline PackedBoolList& operator&=(const labelUList& indices);
//- And operator (lists may be dissimilar sizes)
// using the labels as indices to indicate which bits are set
@ -233,7 +233,7 @@ public:
//- Or operator (lists may be dissimilar sizes),
// using the labels as indices to indicate which bits are set
inline PackedBoolList& operator|=(const UList<label>& indices);
inline PackedBoolList& operator|=(const labelUList& indices);
//- Or operator (lists may be dissimilar sizes),
// using the labels as indices to indicate which bits are set
@ -244,7 +244,7 @@ public:
inline PackedBoolList& operator+=(const PackedList<1>&);
//- Add entries to this list, synonymous with the or operator
inline PackedBoolList& operator+=(const UList<label>& indices);
inline PackedBoolList& operator+=(const labelUList& indices);
//- Add entries to this list, synonymous with the or operator
inline PackedBoolList& operator+=(const UIndirectList<label>&);
@ -253,7 +253,7 @@ public:
inline PackedBoolList& operator-=(const PackedList<1>&);
//- Remove entries from this list - unset the specified bits
inline PackedBoolList& operator-=(const UList<label>& indices);
inline PackedBoolList& operator-=(const labelUList& indices);
//- Remove entries from this list - unset the specified bits
inline PackedBoolList& operator-=(const UIndirectList<label>&);

12
src/OpenFOAM/containers/Lists/PackedList/PackedBoolListI.H
View File

@ -81,7 +81,7 @@ inline Foam::PackedBoolList::PackedBoolList(const UList<bool>& lst)
}
inline Foam::PackedBoolList::PackedBoolList(const UList<label>& indices)
inline Foam::PackedBoolList::PackedBoolList(const labelUList& indices)
:
PackedList<1>(indices.size(), 0u)
{
@ -151,7 +151,7 @@ Foam::PackedBoolList::operator=(const PackedList<1>& lst)
inline Foam::PackedBoolList&
Foam::PackedBoolList::operator=(const UList<label>& indices)
Foam::PackedBoolList::operator=(const labelUList& indices)
{
clear();
set(indices);
@ -189,7 +189,7 @@ Foam::PackedBoolList::operator&=(const PackedList<1>& lst)
inline Foam::PackedBoolList&
Foam::PackedBoolList::operator&=(const UList<label>& indices)
Foam::PackedBoolList::operator&=(const labelUList& indices)
{
subset(indices);
return *this;
@ -213,7 +213,7 @@ Foam::PackedBoolList::operator|=(const PackedList<1>& lst)
inline Foam::PackedBoolList&
Foam::PackedBoolList::operator|=(const UList<label>& indices)
Foam::PackedBoolList::operator|=(const labelUList& indices)
{
set(indices);
return *this;
@ -236,7 +236,7 @@ Foam::PackedBoolList::operator+=(const PackedList<1>& lst)
inline Foam::PackedBoolList&
Foam::PackedBoolList::operator+=(const UList<label>& indices)
Foam::PackedBoolList::operator+=(const labelUList& indices)
{
return operator|=(indices);
}
@ -258,7 +258,7 @@ Foam::PackedBoolList::operator-=(const PackedList<1>& lst)
inline Foam::PackedBoolList&
Foam::PackedBoolList::operator-=(const UList<label>& indices)
Foam::PackedBoolList::operator-=(const labelUList& indices)
{
unset(indices);
return *this;

2
src/OpenFOAM/containers/Lists/PackedList/PackedList.C
View File

@ -536,7 +536,7 @@ Foam::PackedList<nBits>::operator=(const PackedList<nBits>& lst)
template<unsigned nBits>
Foam::PackedList<nBits>&
Foam::PackedList<nBits>::operator=(const UList<label>& lst)
Foam::PackedList<nBits>::operator=(const labelUList& lst)
{
setCapacity(lst.size());
size_ = lst.size();

4
src/OpenFOAM/containers/Lists/PackedList/PackedList.H
View File

@ -229,7 +229,7 @@ public:
inline PackedList(const Xfer<PackedList<nBits> >&);
//- Construct from a list of labels
explicit inline PackedList(const UList<label>&);
explicit inline PackedList(const labelUList&);
//- Construct from an indirect list of labels
explicit inline PackedList(const UIndirectList<label>&);
@ -404,7 +404,7 @@ public:
PackedList<nBits>& operator=(const PackedList<nBits>&);
//- Assignment operator.
PackedList<nBits>& operator=(const UList<label>&);
PackedList<nBits>& operator=(const labelUList&);
//- Assignment operator.
PackedList<nBits>& operator=(const UIndirectList<label>&);

2
src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
View File

@ -237,7 +237,7 @@ inline Foam::PackedList<nBits>::PackedList(const Xfer<PackedList<nBits> >& lst)
template<unsigned nBits>
inline Foam::PackedList<nBits>::PackedList(const UList<label>& lst)
inline Foam::PackedList<nBits>::PackedList(const labelUList& lst)
:
PackedListCore(),
StorageList(packedLength(lst.size()), 0u),

10
src/OpenFOAM/containers/Lists/PtrList/PtrList.C
View File

@ -204,11 +204,11 @@ void Foam::PtrList<T>::transfer(PtrList<T>& a)
template<class T>
void Foam::PtrList<T>::reorder(const UList<label>& oldToNew)
void Foam::PtrList<T>::reorder(const labelUList& oldToNew)
{
if (oldToNew.size() != size())
{
FatalErrorIn("PtrList<T>::reorder(const UList<label>&)")
FatalErrorIn("PtrList<T>::reorder(const labelUList&)")
<< "Size of map (" << oldToNew.size()
<< ") not equal to list size (" << size()
<< ")." << abort(FatalError);
@ -222,7 +222,7 @@ void Foam::PtrList<T>::reorder(const UList<label>& oldToNew)
if (newI < 0 || newI >= size())
{
FatalErrorIn("PtrList<T>::reorder(const UList<label>&)")
FatalErrorIn("PtrList<T>::reorder(const labelUList&)")
<< "Illegal index " << newI << nl
<< "Valid indices are 0.." << size()-1
<< abort(FatalError);
@ -230,7 +230,7 @@ void Foam::PtrList<T>::reorder(const UList<label>& oldToNew)
if (newPtrs_[newI])
{
FatalErrorIn("PtrList<T>::reorder(const UList<label>&)")
FatalErrorIn("PtrList<T>::reorder(const labelUList&)")
<< "reorder map is not unique; element " << newI
<< " already set." << abort(FatalError);
}
@ -241,7 +241,7 @@ void Foam::PtrList<T>::reorder(const UList<label>& oldToNew)
{
if (!newPtrs_[i])
{
FatalErrorIn("PtrList<T>::reorder(const UList<label>&)")
FatalErrorIn("PtrList<T>::reorder(const labelUList&)")
<< "Element " << i << " not set after reordering." << nl
<< abort(FatalError);
}

2
src/OpenFOAM/containers/Lists/PtrList/PtrList.H
View File

@ -208,7 +208,7 @@ public:
//- Reorders elements. Ordering does not have to be done in
// ascending or descending order. Reordering has to be unique.
// (is shuffle)
void reorder(const UList<label>&);
void reorder(const labelUList&);
// Member operators

4
src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H
View File

@ -58,7 +58,7 @@ class UIndirectList
// Private data
UList<T>& completeList_;
const UList<label>& addressing_;
const labelUList& addressing_;
public:
@ -66,7 +66,7 @@ public:
// Constructors
//- Construct given the complete list and the addressing array
inline UIndirectList(const UList<T>&, const UList<label>&);
inline UIndirectList(const UList<T>&, const labelUList&);
// Member Functions

2
src/OpenFOAM/containers/Lists/UIndirectList/UIndirectListI.H
View File

@ -29,7 +29,7 @@ template<class T>
inline Foam::UIndirectList<T>::UIndirectList
(
const UList<T>& completeList,
const UList<label>& addr
const labelUList& addr
)
:
completeList_(const_cast<UList<T>&>(completeList)),

10
src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C
View File

@ -100,11 +100,11 @@ void Foam::UPtrList<T>::transfer(UPtrList<T>& a)
template<class T>
void Foam::UPtrList<T>::reorder(const UList<label>& oldToNew)
void Foam::UPtrList<T>::reorder(const labelUList& oldToNew)
{
if (oldToNew.size() != size())
{
FatalErrorIn("UPtrList<T>::reorder(const UList<label>&)")
FatalErrorIn("UPtrList<T>::reorder(const labelUList&)")
<< "Size of map (" << oldToNew.size()
<< ") not equal to list size (" << size()
<< ")." << abort(FatalError);
@ -118,7 +118,7 @@ void Foam::UPtrList<T>::reorder(const UList<label>& oldToNew)
if (newI < 0 || newI >= size())
{
FatalErrorIn("UPtrList<T>::reorder(const UList<label>&)")
FatalErrorIn("UPtrList<T>::reorder(const labelUList&)")
<< "Illegal index " << newI << nl
<< "Valid indices are 0.." << size()-1
<< abort(FatalError);
@ -126,7 +126,7 @@ void Foam::UPtrList<T>::reorder(const UList<label>& oldToNew)
if (newPtrs_[newI])
{
FatalErrorIn("UPtrList<T>::reorder(const UList<label>&)")
FatalErrorIn("UPtrList<T>::reorder(const labelUList&)")
<< "reorder map is not unique; element " << newI
<< " already set." << abort(FatalError);
}
@ -137,7 +137,7 @@ void Foam::UPtrList<T>::reorder(const UList<label>& oldToNew)
{
if (!newPtrs_[i])
{
FatalErrorIn("UPtrList<T>::reorder(const UList<label>&)")
FatalErrorIn("UPtrList<T>::reorder(const labelUList&)")
<< "Element " << i << " not set after reordering." << nl
<< abort(FatalError);
}

2
src/OpenFOAM/containers/Lists/UPtrList/UPtrList.H
View File

@ -171,7 +171,7 @@ public:
//- Reorders elements. Ordering does not have to be done in
// ascending or descending order. Reordering has to be unique.
// (is shuffle)
void reorder(const UList<label>&);
void reorder(const labelUList&);
// Member operators

16
src/OpenFOAM/fields/Fields/Field/Field.C
View File

@ -66,7 +66,7 @@ template<class Type>
Field<Type>::Field
(
const UList<Type>& mapF,
const UList<label>& mapAddressing
const labelUList& mapAddressing
)
:
List<Type>(mapAddressing.size())
@ -78,7 +78,7 @@ template<class Type>
Field<Type>::Field
(
const tmp<Field<Type> >& tmapF,
const UList<label>& mapAddressing
const labelUList& mapAddressing
)
:
List<Type>(mapAddressing.size())
@ -297,7 +297,7 @@ template<class Type>
void Field<Type>::map
(
const UList<Type>& mapF,
const UList<label>& mapAddressing
const labelUList& mapAddressing
)
{
Field<Type>& f = *this;
@ -326,7 +326,7 @@ template<class Type>
void Field<Type>::map
(
const tmp<Field<Type> >& tmapF,
const UList<label>& mapAddressing
const labelUList& mapAddressing
)
{
map(tmapF(), mapAddressing);
@ -455,7 +455,7 @@ template<class Type>
void Field<Type>::rmap
(
const UList<Type>& mapF,
const UList<label>& mapAddressing
const labelUList& mapAddressing
)
{
Field<Type>& f = *this;
@ -475,7 +475,7 @@ template<class Type>
void Field<Type>::rmap
(
const tmp<Field<Type> >& tmapF,
const UList<label>& mapAddressing
const labelUList& mapAddressing
)
{
rmap(tmapF(), mapAddressing);
@ -487,7 +487,7 @@ template<class Type>
void Field<Type>::rmap
(
const UList<Type>& mapF,
const UList<label>& mapAddressing,
const labelUList& mapAddressing,
const UList<scalar>& mapWeights
)
{
@ -505,7 +505,7 @@ template<class Type>
void Field<Type>::rmap
(
const tmp<Field<Type> >& tmapF,
const UList<label>& mapAddressing,
const labelUList& mapAddressing,
const UList<scalar>& mapWeights
)
{

16
src/OpenFOAM/fields/Fields/Field/Field.H
View File

@ -127,14 +127,14 @@ public:
Field
(
const UList<Type>& mapF,
const UList<label>& mapAddressing
const labelUList& mapAddressing
);
//- Construct by 1 to 1 mapping from the given tmp field
Field
(
const tmp<Field<Type> >& tmapF,
const UList<label>& mapAddressing
const labelUList& mapAddressing
);
//- Construct by interpolative mapping from the given field
@ -208,14 +208,14 @@ public:
void map
(
const UList<Type>& mapF,
const UList<label>& mapAddressing
const labelUList& mapAddressing
);
//- 1 to 1 map from the given tmp field
void map
(
const tmp<Field<Type> >& tmapF,
const UList<label>& mapAddressing
const labelUList& mapAddressing
);
//- Interpolative map from the given field
@ -258,21 +258,21 @@ public:
void rmap
(
const UList<Type>& mapF,
const UList<label>& mapAddressing
const labelUList& mapAddressing
);
//- 1 to 1 reverse-map from the given tmp field
void rmap
(
const tmp<Field<Type> >& tmapF,
const UList<label>& mapAddressing
const labelUList& mapAddressing
);
//- Interpolative reverse map from the given field
void rmap
(
const UList<Type>& mapF,
const UList<label>& mapAddressing,
const labelUList& mapAddressing,
const UList<scalar>& weights
);
@ -280,7 +280,7 @@ public:
void rmap
(
const tmp<Field<Type> >& tmapF,
const UList<label>& mapAddressing,
const labelUList& mapAddressing,
const UList<scalar>& weights
);

4
src/OpenFOAM/fields/Fields/Field/FieldMapper.H
View File

@ -64,13 +64,13 @@ public:
virtual bool direct() const = 0;
virtual const unallocLabelList& directAddressing() const
virtual const labelUList& directAddressing() const
{
FatalErrorIn("FieldMapper::directAddressing() const")
<< "attempt to access null direct addressing"
<< abort(FatalError);
return unallocLabelList::null();
return labelUList::null();
}
virtual const labelListList& addressing() const

4
src/OpenFOAM/fields/Fields/labelField/labelField.C
View File

@ -52,7 +52,7 @@ template<>
void component
(
labelField& lf,
const UList<label>& f,
const labelUList& f,
const direction
)
{
@ -60,7 +60,7 @@ void component
}
template<>
void labelField::replace(const direction, const UList<label>& lf)
void labelField::replace(const direction, const labelUList& lf)
{
*this = lf;
}

4
src/OpenFOAM/fields/Fields/labelField/labelField.H
View File

@ -61,12 +61,12 @@ template<>
void component
(
labelField& lf,
const UList<label>& f,
const labelUList& f,
const direction
);
template<>
void labelField::replace(const direction, const UList<label>& lf);
void labelField::replace(const direction, const labelUList& lf);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

2
src/OpenFOAM/fields/Fields/transformList/transformList.H
View File

@ -70,7 +70,7 @@ void transformList(const tensorField&, EdgeMap<T>&);
template<>
inline void transformList(const tensorField&, UList<label>&)
inline void transformList(const tensorField&, labelUList&)
{}
template<>
inline void transformList(const tensorField&, Map<label>&)

10
src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.C
View File

@ -42,7 +42,7 @@ void Foam::lduAddressing::calcLosort() const
// and resizing list
labelList nNbrOfFace(size(), 0);
const unallocLabelList& nbr = upperAddr();
const labelUList& nbr = upperAddr();
forAll(nbr, nbrI)
{
@ -181,7 +181,7 @@ Foam::lduAddressing::~lduAddressing()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
const Foam::unallocLabelList& Foam::lduAddressing::losortAddr() const
const Foam::labelUList& Foam::lduAddressing::losortAddr() const
{
if (!losortPtr_)
{
@ -192,7 +192,7 @@ const Foam::unallocLabelList& Foam::lduAddressing::losortAddr() const
}
const Foam::unallocLabelList& Foam::lduAddressing::ownerStartAddr() const
const Foam::labelUList& Foam::lduAddressing::ownerStartAddr() const
{
if (!ownerStartPtr_)
{
@ -203,7 +203,7 @@ const Foam::unallocLabelList& Foam::lduAddressing::ownerStartAddr() const
}
const Foam::unallocLabelList& Foam::lduAddressing::losortStartAddr() const
const Foam::labelUList& Foam::lduAddressing::losortStartAddr() const
{
if (!losortStartPtr_)
{
@ -225,7 +225,7 @@ Foam::label Foam::lduAddressing::triIndex(const label a, const label b) const
label endLabel = ownerStartAddr()[own + 1];
const unallocLabelList& neighbour = upperAddr();
const labelUList& neighbour = upperAddr();
for (label i = startLabel; i < endLabel; i++)
{

12
src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.H
View File

@ -171,13 +171,13 @@ public:
}
//- Return lower addressing
virtual const unallocLabelList& lowerAddr() const = 0;
virtual const labelUList& lowerAddr() const = 0;
//- Return upper addressing
virtual const unallocLabelList& upperAddr() const = 0;
virtual const labelUList& upperAddr() const = 0;
//- Return patch to internal addressing given patch number
virtual const unallocLabelList& patchAddr
virtual const labelUList& patchAddr
(
const label patchNo
) const = 0;
@ -186,13 +186,13 @@ public:
virtual const lduSchedule& patchSchedule() const = 0;
//- Return losort addressing
const unallocLabelList& losortAddr() const;
const labelUList& losortAddr() const;
//- Return owner start addressing
const unallocLabelList& ownerStartAddr() const;
const labelUList& ownerStartAddr() const;
//- Return losort start addressing
const unallocLabelList& losortStartAddr() const;
const labelUList& losortStartAddr() const;
//- Return off-diagonal index given owner and neighbour label
label triIndex(const label a, const label b) const;

8
src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduInterface.H
View File

@ -84,7 +84,7 @@ public:
// Access
//- Return faceCell addressing
virtual const unallocLabelList& faceCells() const = 0;
virtual const labelUList& faceCells() const = 0;
// Interface transfer functions
@ -93,14 +93,14 @@ public:
// the interface as a field
virtual tmp<labelField> interfaceInternalField
(
const unallocLabelList& internalData
const labelUList& internalData
) const = 0;
//- Initialise transfer of internal field adjacent to the interface
virtual void initInternalFieldTransfer
(
const Pstream::commsTypes commsType,
const unallocLabelList& iF
const labelUList& iF
) const
{}
@ -108,7 +108,7 @@ public:
virtual tmp<labelField> internalFieldTransfer
(
const Pstream::commsTypes commsType,
const unallocLabelList& iF
const labelUList& iF
) const = 0;
};

2
src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixATmul.C
View File

@ -188,7 +188,7 @@ void Foam::lduMatrix::sumA
{
if (interfaces.set(patchI))
{
const unallocLabelList& pa = lduAddr().patchAddr(patchI);
const labelUList& pa = lduAddr().patchAddr(patchI);
const scalarField& pCoeffs = interfaceBouCoeffs[patchI];
forAll(pa, face)

16
src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixOperations.C
View File

@ -36,8 +36,8 @@ void Foam::lduMatrix::sumDiag()
const scalarField& Upper = const_cast<const lduMatrix&>(*this).upper();
scalarField& Diag = diag();
const unallocLabelList& l = lduAddr().lowerAddr();
const unallocLabelList& u = lduAddr().upperAddr();
const labelUList& l = lduAddr().lowerAddr();
const labelUList& u = lduAddr().upperAddr();
for (register label face=0; face<l.size(); face++)
{
@ -53,8 +53,8 @@ void Foam::lduMatrix::negSumDiag()
const scalarField& Upper = const_cast<const lduMatrix&>(*this).upper();
scalarField& Diag = diag();
const unallocLabelList& l = lduAddr().lowerAddr();
const unallocLabelList& u = lduAddr().upperAddr();
const labelUList& l = lduAddr().lowerAddr();
const labelUList& u = lduAddr().upperAddr();
for (register label face=0; face<l.size(); face++)
{
@ -72,8 +72,8 @@ void Foam::lduMatrix::sumMagOffDiag
const scalarField& Lower = const_cast<const lduMatrix&>(*this).lower();
const scalarField& Upper = const_cast<const lduMatrix&>(*this).upper();
const unallocLabelList& l = lduAddr().lowerAddr();
const unallocLabelList& u = lduAddr().upperAddr();
const labelUList& l = lduAddr().lowerAddr();
const labelUList& u = lduAddr().upperAddr();
for (register label face = 0; face < l.size(); face++)
{
@ -288,7 +288,7 @@ void Foam::lduMatrix::operator*=(const scalarField& sf)
{
scalarField& upper = *upperPtr_;
const unallocLabelList& l = lduAddr().lowerAddr();
const labelUList& l = lduAddr().lowerAddr();
for (register label face=0; face<upper.size(); face++)
{
@ -300,7 +300,7 @@ void Foam::lduMatrix::operator*=(const scalarField& sf)
{
scalarField& lower = *lowerPtr_;
const unallocLabelList& u = lduAddr().upperAddr();
const labelUList& u = lduAddr().upperAddr();
for (register label face=0; face<lower.size(); face++)
{

4
src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixTemplates.C
View File

@ -83,8 +83,8 @@ Foam::lduMatrix::faceH(const Field<Type>& psi) const
const scalarField& Lower = const_cast<const lduMatrix&>(*this).lower();
const scalarField& Upper = const_cast<const lduMatrix&>(*this).upper();
const unallocLabelList& l = lduAddr().lowerAddr();
const unallocLabelList& u = lduAddr().upperAddr();
const labelUList& l = lduAddr().lowerAddr();
const labelUList& u = lduAddr().upperAddr();
tmp<Field<Type> > tfaceHpsi(new Field<Type> (Lower.size()));
Field<Type> & faceHpsi = tfaceHpsi();

4
src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C
View File

@ -36,8 +36,8 @@ void Foam::GAMGAgglomeration::agglomerateLduAddressing
const lduMesh& fineMesh = meshLevel(fineLevelIndex);
const lduAddressing& fineMeshAddr = fineMesh.lduAddr();
const unallocLabelList& upperAddr = fineMeshAddr.upperAddr();
const unallocLabelList& lowerAddr = fineMeshAddr.lowerAddr();
const labelUList& upperAddr = fineMeshAddr.upperAddr();
const labelUList& lowerAddr = fineMeshAddr.lowerAddr();
label nFineFaces = upperAddr.size();

4
src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomerate.C
View File

@ -37,8 +37,8 @@ Foam::tmp<Foam::labelField> Foam::pairGAMGAgglomeration::agglomerate
{
const label nFineCells = fineMatrixAddressing.size();
const unallocLabelList& upperAddr = fineMatrixAddressing.upperAddr();
const unallocLabelList& lowerAddr = fineMatrixAddressing.lowerAddr();
const labelUList& upperAddr = fineMatrixAddressing.upperAddr();
const labelUList& lowerAddr = fineMatrixAddressing.lowerAddr();
// For each cell calculate faces
labelList cellFaces(upperAddr.size() + lowerAddr.size());

6
src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C
View File

@ -141,9 +141,9 @@ void Foam::GAMGSolver::agglomerateMatrix(const label fineLevelIndex)
const labelList& restrictAddr =
agglomeration_.restrictAddressing(fineLevelIndex);
const unallocLabelList& l = fineMatrix.lduAddr().lowerAddr();
const unallocLabelList& cl = coarseMatrix.lduAddr().lowerAddr();
const unallocLabelList& cu = coarseMatrix.lduAddr().upperAddr();
const labelUList& l = fineMatrix.lduAddr().lowerAddr();
const labelUList& cl = coarseMatrix.lduAddr().lowerAddr();
const labelUList& cu = coarseMatrix.lduAddr().upperAddr();
forAll(faceRestrictAddr, fineFacei)
{

2
src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.C
View File

@ -88,7 +88,7 @@ void Foam::cyclicGAMGInterfaceField::updateInterfaceMatrix
transformCoupleField(pnf, cmpt);
const unallocLabelList& faceCells = cyclicInterface_.faceCells();
const labelUList& faceCells = cyclicInterface_.faceCells();
forAll(faceCells, elemI)
{

2
src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.C
View File

@ -95,7 +95,7 @@ Foam::processorCyclicGAMGInterfaceField::~processorCyclicGAMGInterfaceField()
// );
// transformCoupleField(pnf, cmpt);
//
// const unallocLabelList& faceCells = procInterface_.faceCells();
// const labelUList& faceCells = procInterface_.faceCells();
//
// forAll(faceCells, elemI)
// {

2
src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.C
View File

@ -104,7 +104,7 @@ void Foam::processorGAMGInterfaceField::updateInterfaceMatrix
);
transformCoupleField(pnf, cmpt);
const unallocLabelList& faceCells = procInterface_.faceCells();
const labelUList& faceCells = procInterface_.faceCells();
forAll(faceCells, elemI)
{

2
src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.C
View File

@ -51,7 +51,7 @@ void Foam::GAMGInterface::combine(const GAMGInterface& coarseGi)
Foam::tmp<Foam::labelField> Foam::GAMGInterface::interfaceInternalField
(
const unallocLabelList& internalData
const labelUList& internalData
) const
{
return interfaceInternalField<label>(internalData);

4
src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.H
View File

@ -164,7 +164,7 @@ public:
}
//- Return faceCell addressing
virtual const unallocLabelList& faceCells() const
virtual const labelUList& faceCells() const
{
return faceCells_;
}
@ -192,7 +192,7 @@ public:
// the interface as a field
virtual tmp<labelField> interfaceInternalField
(
const unallocLabelList& internalData
const labelUList& internalData
) const;

4
src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C
View File

@ -250,14 +250,14 @@ Foam::cyclicGAMGInterface::~cyclicGAMGInterface()
Foam::tmp<Foam::labelField> Foam::cyclicGAMGInterface::internalFieldTransfer
(
const Pstream::commsTypes,
const unallocLabelList& iF
const labelUList& iF
) const
{
const cyclicGAMGInterface& nbr = dynamic_cast<const cyclicGAMGInterface&>
(
neighbPatch()
);
const unallocLabelList& nbrFaceCells = nbr.faceCells();
const labelUList& nbrFaceCells = nbr.faceCells();
tmp<labelField> tpnf(new labelField(size()));
labelField& pnf = tpnf();

2
src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.H
View File

@ -100,7 +100,7 @@ public:
virtual tmp<labelField> internalFieldTransfer
(
const Pstream::commsTypes commsType,
const unallocLabelList& iF
const labelUList& iF
) const;

4
src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C
View File

@ -241,7 +241,7 @@ Foam::processorGAMGInterface::~processorGAMGInterface()
void Foam::processorGAMGInterface::initInternalFieldTransfer
(
const Pstream::commsTypes commsType,
const unallocLabelList& iF
const labelUList& iF
) const
{
send(commsType, interfaceInternalField(iF)());
@ -251,7 +251,7 @@ void Foam::processorGAMGInterface::initInternalFieldTransfer
Foam::tmp<Foam::labelField> Foam::processorGAMGInterface::internalFieldTransfer
(
const Pstream::commsTypes commsType,
const unallocLabelList& iF
const labelUList& iF
) const
{
return receive<label>(commsType, this->size());

4
src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.H
View File

@ -100,14 +100,14 @@ public:
virtual void initInternalFieldTransfer
(
const Pstream::commsTypes commsType,
const unallocLabelList& iF
const labelUList& iF
) const;
//- Transfer and return internal field adjacent to the interface
virtual tmp<labelField> internalFieldTransfer
(
const Pstream::commsTypes commsType,
const unallocLabelList& iF
const labelUList& iF
) const;

10
src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.H
View File

@ -86,8 +86,8 @@ public:
lduPrimitiveMesh
(
const label nCells,
const unallocLabelList& l,
const unallocLabelList& u,
const labelUList& l,
const labelUList& u,
const labelListList& pa,
lduInterfacePtrsList interfaces,
const lduSchedule& ps
@ -146,19 +146,19 @@ public:
}
//- Return Lower addressing
virtual const unallocLabelList& lowerAddr() const
virtual const labelUList& lowerAddr() const
{
return lowerAddr_;
}
//- Return Upper addressing
virtual const unallocLabelList& upperAddr() const
virtual const labelUList& upperAddr() const
{
return upperAddr_;
}
//- Return patch addressing
virtual const unallocLabelList& patchAddr(const label i) const
virtual const labelUList& patchAddr(const label i) const
{
return patchAddr_[i];
}

2
src/OpenFOAM/meshes/meshShapes/cell/cell.H
View File

@ -75,7 +75,7 @@ public:
explicit inline cell(label);
//- Construct from list of labels
explicit inline cell(const UList<label>&);
explicit inline cell(const labelUList&);
//- Construct by transferring the parameter contents
explicit inline cell(const Xfer<labelList>&);

2
src/OpenFOAM/meshes/meshShapes/cell/cellI.H
View File

@ -40,7 +40,7 @@ inline Foam::cell::cell(label s)
// Construct from components
inline Foam::cell::cell(const UList<label>& lst)
inline Foam::cell::cell(const labelUList& lst)
:
labelList(lst)
{}

2
src/OpenFOAM/meshes/meshShapes/face/face.H
View File

@ -148,7 +148,7 @@ public:
explicit inline face(label);
//- Construct from list of labels
explicit inline face(const UList<label>&);
explicit inline face(const labelUList&);
//- Construct from list of labels
explicit inline face(const labelList&);

2
src/OpenFOAM/meshes/meshShapes/face/faceI.H
View File

@ -51,7 +51,7 @@ inline Foam::face::face(label s)
{}
inline Foam::face::face(const UList<label>& lst)
inline Foam::face::face(const labelUList& lst)
:
labelList(lst)
{}

4
src/OpenFOAM/meshes/meshShapes/triFace/triFace.H
View File

@ -80,8 +80,8 @@ public:
const label c
);
//- Construct from a UList<label>
explicit inline triFace(const UList<label>&);
//- Construct from a list of labels
explicit inline triFace(const labelUList&);
//- Construct from Istream
inline triFace(Istream&);

2
src/OpenFOAM/meshes/meshShapes/triFace/triFaceI.H
View File

@ -77,7 +77,7 @@ inline Foam::triFace::triFace
}
inline Foam::triFace::triFace(const UList<label>& lst)
inline Foam::triFace::triFace(const labelUList& lst)
:
FixedList<label, 3>(lst)
{}

4
src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.C
View File

@ -233,13 +233,13 @@ Foam::label Foam::pointMapper::sizeBeforeMapping() const
}
const Foam::unallocLabelList& Foam::pointMapper::directAddressing() const
const Foam::labelUList& Foam::pointMapper::directAddressing() const
{
if (!direct())
{
FatalErrorIn
(
"const unallocLabelList& pointMapper::directAddressing() const"
"const labelUList& pointMapper::directAddressing() const"
) << "Requested direct addressing for an interpolative mapper."
<< abort(FatalError);
}

2
src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.H
View File

@ -130,7 +130,7 @@ public:
}
//- Return direct addressing
virtual const unallocLabelList& directAddressing() const;
virtual const labelUList& directAddressing() const;
//- Return interpolated addressing
virtual const labelListList& addressing() const;

4
src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointPatchMapper.C
View File

@ -140,13 +140,13 @@ Foam::pointPatchMapper::~pointPatchMapper()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
const Foam::unallocLabelList& Foam::pointPatchMapper::directAddressing() const
const Foam::labelUList& Foam::pointPatchMapper::directAddressing() const
{
if (!direct())
{
FatalErrorIn
(
"const unallocLabelList& pointPatchMapper::directAddressing() const"
"const labelUList& pointPatchMapper::directAddressing() const"
) << "Requested direct addressing for an interpolative mapper."
<< abort(FatalError);
}

2
src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointPatchMapper.H
View File

@ -143,7 +143,7 @@ public:
}
//- Return direct addressing
virtual const unallocLabelList& directAddressing() const;
virtual const labelUList& directAddressing() const;
//- Return interpolated addressing
virtual const labelListList& addressing() const;

4
src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.C
View File

@ -326,13 +326,13 @@ Foam::label Foam::cellMapper::sizeBeforeMapping() const
}
const Foam::unallocLabelList& Foam::cellMapper::directAddressing() const
const Foam::labelUList& Foam::cellMapper::directAddressing() const
{
if (!direct())
{
FatalErrorIn
(
"const unallocLabelList& cellMapper::directAddressing() const"
"const labelUList& cellMapper::directAddressing() const"
) << "Requested direct addressing for an interpolative mapper."
<< abort(FatalError);
}

2
src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.H
View File

@ -131,7 +131,7 @@ public:
}
//- Return direct addressing
virtual const unallocLabelList& directAddressing() const;
virtual const labelUList& directAddressing() const;
//- Return interpolated addressing
virtual const labelListList& addressing() const;

4
src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.C
View File

@ -302,13 +302,13 @@ Foam::label Foam::faceMapper::internalSizeBeforeMapping() const
}
const Foam::unallocLabelList& Foam::faceMapper::directAddressing() const
const Foam::labelUList& Foam::faceMapper::directAddressing() const
{
if (!direct())
{
FatalErrorIn
(
"const unallocLabelList& faceMapper::directAddressing() const"
"const labelUList& faceMapper::directAddressing() const"
) << "Requested direct addressing for an interpolative mapper."
<< abort(FatalError);
}

2
src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.H
View File

@ -135,7 +135,7 @@ public:
}
//- Return direct addressing
virtual const unallocLabelList& directAddressing() const;
virtual const labelUList& directAddressing() const;
//- Return interpolated addressing
virtual const labelListList& addressing() const;

2
src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
View File

@ -805,7 +805,7 @@ void Foam::polyBoundaryMesh::updateMesh()
}
void Foam::polyBoundaryMesh::reorder(const UList<label>& oldToNew)
void Foam::polyBoundaryMesh::reorder(const labelUList& oldToNew)
{
// Change order of patches
polyPatchList::reorder(oldToNew);

2
src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
View File

@ -188,7 +188,7 @@ public:
// ascending or descending order. Reordering has to be unique.
// (is shuffle) Calls updateMesh() after reordering to recalculate
// data.
void reorder(const UList<label>&);
void reorder(const labelUList&);
//- writeData member function required by regIOobject
bool writeData(Ostream&) const;

2
src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
View File

@ -421,7 +421,7 @@ Foam::coupledPolyPatch::coupledPolyPatch
const coupledPolyPatch& pp,
const polyBoundaryMesh& bm,
const label index,
const unallocLabelList& mapAddressing,
const labelUList& mapAddressing,
const label newStart
)
:

2
src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H
View File

@ -208,7 +208,7 @@ public:
const coupledPolyPatch& pp,
const polyBoundaryMesh& bm,
const label index,
const unallocLabelList& mapAddressing,
const labelUList& mapAddressing,
const label newStart
);

2
src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.C
View File

@ -98,7 +98,7 @@ Foam::genericPolyPatch::genericPolyPatch
const genericPolyPatch& pp,
const polyBoundaryMesh& bm,
const label index,
const unallocLabelList& mapAddressing,
const labelUList& mapAddressing,
const label newStart
)
:

4
src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.H
View File

@ -111,7 +111,7 @@ public:
const genericPolyPatch& pp,
const polyBoundaryMesh& bm,
const label index,
const unallocLabelList& mapAddressing,
const labelUList& mapAddressing,
const label newStart
);
@ -143,7 +143,7 @@ public:
(
const polyBoundaryMesh& bm,
const label index,
const unallocLabelList& mapAddressing,
const labelUList& mapAddressing,
const label newStart
) const
{

2
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
View File

@ -581,7 +581,7 @@ Foam::cyclicPolyPatch::cyclicPolyPatch
const cyclicPolyPatch& pp,
const polyBoundaryMesh& bm,
const label index,
const unallocLabelList& mapAddressing,
const labelUList& mapAddressing,
const label newStart
)
:

4
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H
View File

@ -243,7 +243,7 @@ public:
const cyclicPolyPatch& pp,
const polyBoundaryMesh& bm,
const label index,
const unallocLabelList& mapAddressing,
const labelUList& mapAddressing,
const label newStart
);
@ -283,7 +283,7 @@ public:
(
const polyBoundaryMesh& bm,
const label index,
const unallocLabelList& mapAddressing,
const labelUList& mapAddressing,
const label newStart
) const
{

4
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclicSlip/cyclicSlipPolyPatch.H
View File

@ -117,7 +117,7 @@ public:
const cyclicPolyPatch& pp,
const polyBoundaryMesh& bm,
const label index,
const unallocLabelList& mapAddressing,
const labelUList& mapAddressing,
const label newStart
)
:
@ -161,7 +161,7 @@ public:
(
const polyBoundaryMesh& bm,
const label index,
const unallocLabelList& mapAddressing,
const labelUList& mapAddressing,
const label newStart
) const
{

2
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/empty/emptyPolyPatch.C
View File

@ -91,7 +91,7 @@ Foam::emptyPolyPatch::emptyPolyPatch
const emptyPolyPatch& pp,
const polyBoundaryMesh& bm,
const label index,
const unallocLabelList& mapAddressing,
const labelUList& mapAddressing,
const label newStart
)
:

4
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/empty/emptyPolyPatch.H
View File

@ -97,7 +97,7 @@ public:
const emptyPolyPatch& pp,
const polyBoundaryMesh& bm,
const label index,
const unallocLabelList& mapAddressing,
const labelUList& mapAddressing,
const label newStart
);
@ -129,7 +129,7 @@ public:
(
const polyBoundaryMesh& bm,
const label index,
const unallocLabelList& mapAddressing,
const labelUList& mapAddressing,
const label newStart
) const
{

4
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPolyPatch.H
View File

@ -116,7 +116,7 @@ public:
const nonuniformTransformCyclicPolyPatch& pp,
const polyBoundaryMesh& bm,
const label index,
const unallocLabelList& mapAddressing,
const labelUList& mapAddressing,
const label newStart
)
:
@ -162,7 +162,7 @@ public:
(
const polyBoundaryMesh& bm,
const label index,
const unallocLabelList& mapAddressing,
const labelUList& mapAddressing,
const label newStart
) const
{

2
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
View File

@ -129,7 +129,7 @@ Foam::processorPolyPatch::processorPolyPatch
const processorPolyPatch& pp,
const polyBoundaryMesh& bm,
const label index,
const unallocLabelList& mapAddressing,
const labelUList& mapAddressing,
const label newStart
)
:

4
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H
View File

@ -166,7 +166,7 @@ public:
const processorPolyPatch& pp,
const polyBoundaryMesh& bm,
const label index,
const unallocLabelList& mapAddressing,
const labelUList& mapAddressing,
const label newStart
);
@ -205,7 +205,7 @@ public:
(
const polyBoundaryMesh& bm,
const label index,
const unallocLabelList& mapAddressing,
const labelUList& mapAddressing,
const label newStart
) const
{

2
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C
View File

@ -130,7 +130,7 @@ Foam::processorCyclicPolyPatch::processorCyclicPolyPatch
const processorCyclicPolyPatch& pp,
const polyBoundaryMesh& bm,
const label index,
const unallocLabelList& mapAddressing,
const labelUList& mapAddressing,
const label newStart
)
:

4
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.H
View File

@ -173,7 +173,7 @@ public:
const processorCyclicPolyPatch& pp,
const polyBoundaryMesh& bm,
const label index,
const unallocLabelList& mapAddressing,
const labelUList& mapAddressing,
const label newStart
);
@ -215,7 +215,7 @@ public:
(
const polyBoundaryMesh& bm,
const label index,
const unallocLabelList& mapAddressing,
const labelUList& mapAddressing,
const label newStart
) const
{

2
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/symmetry/symmetryPolyPatch.C
View File

@ -91,7 +91,7 @@ Foam::symmetryPolyPatch::symmetryPolyPatch
const symmetryPolyPatch& pp,
const polyBoundaryMesh& bm,
const label index,
const unallocLabelList& mapAddressing,
const labelUList& mapAddressing,
const label newStart
)
:

4
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/symmetry/symmetryPolyPatch.H
View File

@ -97,7 +97,7 @@ public:
const symmetryPolyPatch& pp,
const polyBoundaryMesh& bm,
const label index,
const unallocLabelList& mapAddressing,
const labelUList& mapAddressing,
const label newStart
);
@ -129,7 +129,7 @@ public:
(
const polyBoundaryMesh& bm,
const label index,
const unallocLabelList& mapAddressing,
const labelUList& mapAddressing,
const label newStart
) const
{

2
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/wedge/wedgePolyPatch.C
View File

@ -164,7 +164,7 @@ Foam::wedgePolyPatch::wedgePolyPatch
const wedgePolyPatch& pp,
const polyBoundaryMesh& bm,
const label index,
const unallocLabelList& mapAddressing,
const labelUList& mapAddressing,
const label newStart
)
:

4
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/wedge/wedgePolyPatch.H
View File

@ -118,7 +118,7 @@ public:
const wedgePolyPatch& pp,
const polyBoundaryMesh& bm,
const label index,
const unallocLabelList& mapAddressing,
const labelUList& mapAddressing,
const label newStart
);
@ -150,7 +150,7 @@ public:
(
const polyBoundaryMesh& bm,
const label index,
const unallocLabelList& mapAddressing,
const labelUList& mapAddressing,
const label newStart
) const
{

2
src/OpenFOAM/meshes/polyMesh/polyPatches/derived/wall/wallPolyPatch.C
View File

@ -91,7 +91,7 @@ Foam::wallPolyPatch::wallPolyPatch
const wallPolyPatch& pp,
const polyBoundaryMesh& bm,
const label index,
const unallocLabelList& mapAddressing,
const labelUList& mapAddressing,
const label newStart
)
:

4
src/OpenFOAM/meshes/polyMesh/polyPatches/derived/wall/wallPolyPatch.H
View File

@ -97,7 +97,7 @@ public:
const wallPolyPatch& pp,
const polyBoundaryMesh& bm,
const label index,
const unallocLabelList& mapAddressing,
const labelUList& mapAddressing,
const label newStart
);
@ -129,7 +129,7 @@ public:
(
const polyBoundaryMesh& bm,
const label index,
const unallocLabelList& mapAddressing,
const labelUList& mapAddressing,
const label newStart
) const
{

6
src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
View File

@ -171,7 +171,7 @@ Foam::polyPatch::polyPatch
const polyPatch& pp,
const polyBoundaryMesh& bm,
const label index,
const unallocLabelList& mapAddressing,
const labelUList& mapAddressing,
const label newStart
)
:
@ -273,7 +273,7 @@ Foam::tmp<Foam::vectorField> Foam::polyPatch::faceCellCentres() const
// get reference to global cell centres
const vectorField& gcc = boundaryMesh_.mesh().cellCentres();
const unallocLabelList& faceCells = this->faceCells();
const labelUList& faceCells = this->faceCells();
forAll(faceCells, facei)
{
@ -284,7 +284,7 @@ Foam::tmp<Foam::vectorField> Foam::polyPatch::faceCellCentres() const
}
const Foam::unallocLabelList& Foam::polyPatch::faceCells() const
const Foam::labelUList& Foam::polyPatch::faceCells() const
{
if (!faceCellsPtr_)
{

6
src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H
View File

@ -199,7 +199,7 @@ public:
const polyPatch& pp,
const polyBoundaryMesh& bm,
const label index,
const unallocLabelList& mapAddressing,
const labelUList& mapAddressing,
const label newStart
);
@ -234,7 +234,7 @@ public:
(
const polyBoundaryMesh& bm,
const label index,
const unallocLabelList& mapAddressing,
const labelUList& mapAddressing,
const label newStart
) const
{
@ -331,7 +331,7 @@ public:
// Addressing into mesh
//- Return face-cell addressing
const unallocLabelList& faceCells() const;
const labelUList& faceCells() const;
//- Return global edge index for local edges
const labelList& meshEdges() const;

6
src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.C
View File

@ -47,7 +47,7 @@ const char * const Foam::cellZone::labelsName = "cellLabels";
Foam::cellZone::cellZone
(
const word& name,
const unallocLabelList& addr,
const labelUList& addr,
const label index,
const cellZoneMesh& zm
)
@ -86,7 +86,7 @@ Foam::cellZone::cellZone
Foam::cellZone::cellZone
(
const cellZone& cz,
const unallocLabelList& addr,
const labelUList& addr,
const label index,
const cellZoneMesh& zm
)
@ -154,7 +154,7 @@ void Foam::cellZone::operator=(const cellZone& zn)
}
void Foam::cellZone::operator=(const unallocLabelList& addr)
void Foam::cellZone::operator=(const labelUList& addr)
{
clearAddressing();
labelList::operator=(addr);

8
src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H
View File

@ -113,7 +113,7 @@ public:
cellZone
(
const word& name,
const unallocLabelList& addr,
const labelUList& addr,
const label index,
const cellZoneMesh&
);
@ -141,7 +141,7 @@ public:
cellZone
(
const cellZone&,
const unallocLabelList& addr,
const labelUList& addr,
const label index,
const cellZoneMesh&
);
@ -169,7 +169,7 @@ public:
// and zone mesh
virtual autoPtr<cellZone> clone
(
const unallocLabelList& addr,
const labelUList& addr,
const label index,
const cellZoneMesh& zm
) const
@ -226,7 +226,7 @@ public:
void operator=(const cellZone&);
//- Assign addressing, clearing demand-driven data
void operator=(const unallocLabelList&);
void operator=(const labelUList&);
//- Assign addressing, clearing demand-driven data
void operator=(const Xfer<labelList>&);

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