diff --git a/applications/solvers/multiphase/interFoam/LTSInterFoam/MULESTemplates.C b/applications/solvers/multiphase/interFoam/LTSInterFoam/MULESTemplates.C
index a6d3a3f6b246e2463979604d84ad33dd108c5c01..280d7d6d5514ee42e91a761b6d1f8593c30cc716 100644
--- a/applications/solvers/multiphase/interFoam/LTSInterFoam/MULESTemplates.C
+++ b/applications/solvers/multiphase/interFoam/LTSInterFoam/MULESTemplates.C
@@ -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();
diff --git a/applications/test/PackedList4/PackedListTest4.C b/applications/test/PackedList4/PackedListTest4.C
index a500de01d36f283481ca92c62ef038d22cfe4e1e..27ad9d96c62b348ce69392d77d05117d6c6b63b6 100644
--- a/applications/test/PackedList4/PackedListTest4.C
+++ b/applications/test/PackedList4/PackedListTest4.C
@@ -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);
diff --git a/applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.C b/applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.C
index d66c7bc110fec29a108c8a4f120ffd6ddf99191e..32218f79a65ade8821143cc223f6be161157e16a 100644
--- a/applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.C
+++ b/applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.C
@@ -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();
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
index 09fb5484e9e10fd6f021c11a2d0a93f365d5394d..1d926ed93d284aa208d6b87775e45818da6b0a54 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
@@ -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)
{
diff --git a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.C b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.C
index c40a2c7aa9d2f4e05f0a90d3a287c5334ced622a..17e1b2c0cbb288fcbad7bac1347c3cb0a12732ea 100644
--- a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.C
+++ b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.C
@@ -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)
diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
index 5894a1e1c44ebfe113cb5c55f4471c46c2e3db39..5e4433c6e72134910d7afe7aff89646727e93f7d 100644
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
@@ -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
diff --git a/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.C b/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.C
index 0fdb960abd9575dc00c6786595ad934a2126e4e7..02d06bdc01a5225ba1b0005f6f4585025bcd313e 100644
--- a/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.C
+++ b/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.C
@@ -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
(
diff --git a/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.H b/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.H
index 92d679c4e5bd8aa8e36d7f2655c944eaef72cdfe..5e7daf91cff2cc71c2aa2015f1296c604552158a 100644
--- a/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.H
+++ b/applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.H
@@ -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
);
diff --git a/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.H b/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.H
index e4be50670c0fd61c492aab8353c13de81770812d..a271675c6272bfad042fff79b487443a5d41a96d 100644
--- a/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.H
+++ b/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.H
@@ -88,7 +88,7 @@ public:
return true;
}
- const unallocLabelList& directAddressing() const
+ const labelUList& directAddressing() const
{
return directAddressing_;
}
diff --git a/src/OpenFOAM/containers/Identifiers/Keyed/Keyed.H b/src/OpenFOAM/containers/Identifiers/Keyed/Keyed.H
index 19a87ec641cc7cc645eabaaae73b43e12422a7ac..95c774957bc32173932f8423c3949ebc03f694c5 100644
--- a/src/OpenFOAM/containers/Identifiers/Keyed/Keyed.H
+++ b/src/OpenFOAM/containers/Identifiers/Keyed/Keyed.H
@@ -79,7 +79,7 @@ public:
inline static List<Keyed<T> > createList
(
const List<T>&,
- const List<label>& keys
+ const labelUList& keys
);
diff --git a/src/OpenFOAM/containers/Identifiers/Keyed/KeyedI.H b/src/OpenFOAM/containers/Identifiers/Keyed/KeyedI.H
index 40c9c5b43595cbbc768a1deccf941652608a6119..940c66c86736fc3b7ab9de8fbca409123e2f30b1 100644
--- a/src/OpenFOAM/containers/Identifiers/Keyed/KeyedI.H
+++ b/src/OpenFOAM/containers/Identifiers/Keyed/KeyedI.H
@@ -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()
diff --git a/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectList.H b/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectList.H
index 468170e6ac43646a2b13c8e72cf72c04cbbaca65..2f7def375502691a829dee2edf1c5ec1c22b2108 100644
--- a/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectList.H
+++ b/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectList.H
@@ -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> >&);
diff --git a/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectListI.H b/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectListI.H
index 8eee46ed1afe1184af6f773f2e4d38e79811f5b8..5b407bfac7c645181788e332f43d9b7c65143047 100644
--- a/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectListI.H
+++ b/src/OpenFOAM/containers/Lists/BiIndirectList/BiIndirectListI.H
@@ -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;
diff --git a/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.C b/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.C
index 99053dc1214e9679a2dbdc499c574237c064f49e..56697a934c88ad8ee5be796bfe7c6b7b3d8aad20 100644
--- a/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.C
+++ b/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.C
@@ -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);
diff --git a/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.H b/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.H
index 2f73bc4c673cabcf96525cf9c080862bcefbfe66..521b6b341d08fbf4f4da615642efcd5794e512c6 100644
--- a/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.H
+++ b/src/OpenFOAM/containers/Lists/CompactListList/CompactListList.H
@@ -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();
diff --git a/src/OpenFOAM/containers/Lists/CompactListList/CompactListListI.H b/src/OpenFOAM/containers/Lists/CompactListList/CompactListListI.H
index d149ec5956484d7483d77c3453b64336432d828f..1441428511de9f54df45ff38f2b3531551f61efb 100644
--- a/src/OpenFOAM/containers/Lists/CompactListList/CompactListListI.H
+++ b/src/OpenFOAM/containers/Lists/CompactListList/CompactListListI.H
@@ -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);
diff --git a/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H b/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H
index ec65a14a1bfb4f4994026069c549676f809fb105..3e6026315f51bcaf07df5dc6ca46f74574eb177a 100644
--- a/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H
+++ b/src/OpenFOAM/containers/Lists/IndirectList/IndirectList.H
@@ -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> >&);
diff --git a/src/OpenFOAM/containers/Lists/IndirectList/IndirectListI.H b/src/OpenFOAM/containers/Lists/IndirectList/IndirectListI.H
index 0303ba2d5eb9164eef9e428fdc8ddb39e33d05c8..78e0a4a3b647a690b1f6cda5bd9a34c8f0ed0f6a 100644
--- a/src/OpenFOAM/containers/Lists/IndirectList/IndirectListI.H
+++ b/src/OpenFOAM/containers/Lists/IndirectList/IndirectListI.H
@@ -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;
diff --git a/src/OpenFOAM/containers/Lists/List/List.C b/src/OpenFOAM/containers/Lists/List/List.C
index ae4a36a805856686cd3d42816d674bbb98154621..f1c5be5ed1d7b14e36246cd92bfb3ed4e6b6bc9a 100644
--- a/src/OpenFOAM/containers/Lists/List/List.C
+++ b/src/OpenFOAM/containers/Lists/List/List.C
@@ -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())
{
diff --git a/src/OpenFOAM/containers/Lists/List/List.H b/src/OpenFOAM/containers/Lists/List/List.H
index d51a1f9eefcfeb47d113e2ab8966745dcd579edf..c3d631ad67e731541811e4e95a365b72fc080d76 100644
--- a/src/OpenFOAM/containers/Lists/List/List.H
+++ b/src/OpenFOAM/containers/Lists/List/List.H
@@ -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>
diff --git a/src/OpenFOAM/containers/Lists/ListOps/ListOps.C b/src/OpenFOAM/containers/Lists/ListOps/ListOps.C
index 96b1b301828acdaaa170148db703344c034a2c45..35c4b31d4094e263e774a359bcf5a7270f88d599 100644
--- a/src/OpenFOAM/containers/Lists/ListOps/ListOps.C
+++ b/src/OpenFOAM/containers/Lists/ListOps/ListOps.C
@@ -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);
diff --git a/src/OpenFOAM/containers/Lists/ListOps/ListOps.H b/src/OpenFOAM/containers/Lists/ListOps/ListOps.H
index ce16f5431a63823ca51c8bf8886f80f202068550..973d40480b952d0eb52c0facca938dba90c7fb77 100644
--- a/src/OpenFOAM/containers/Lists/ListOps/ListOps.H
+++ b/src/OpenFOAM/containers/Lists/ListOps/ListOps.H
@@ -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
);
diff --git a/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C b/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
index 65bd73563dee93ded8b7aeda9f89c1e9527840a2..cfe1d6482552b875738ba0451f9e448dce8c4145 100644
--- a/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
+++ b/src/OpenFOAM/containers/Lists/ListOps/ListOpsTemplates.C
@@ -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
)
{
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.C b/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.C
index 79a383a685e76556b0e3be9372e913d39b9f117d..94d63086587a3d1095010f317f955e6f10695f0a 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.C
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.C
@@ -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);
}
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.H b/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.H
index fb790a3e05cce58808ffd68de4794c908f4fddef..1949c49ba123084d8393662b832eb9af29d08ea5 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.H
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedBoolList.H
@@ -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>&);
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolListI.H b/src/OpenFOAM/containers/Lists/PackedList/PackedBoolListI.H
index 793959e59b3aeb73d955fa272a996e83494f4356..219fb79b3755a6f72d9476007546a10e1cca2cf4 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedBoolListI.H
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedBoolListI.H
@@ -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;
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedList.C b/src/OpenFOAM/containers/Lists/PackedList/PackedList.C
index 98a6d2740ad13e8aa10072c59533e468ecf9f990..265088056b8db193219801ff6cf8e12d49f4bb5e 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedList.C
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedList.C
@@ -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();
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedList.H b/src/OpenFOAM/containers/Lists/PackedList/PackedList.H
index 9d970ec05504d29f718b7a2462a5a61d4683bc43..9b68420c11d2ccd661c51a7830d2dff384aba6fc 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedList.H
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedList.H
@@ -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>&);
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H b/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
index 4b2a00d2511661126d0174463222d40e513c6b6a..f1a69236c18eff9fb8402d52db87ddf939a2b3d2 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
@@ -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),
diff --git a/src/OpenFOAM/containers/Lists/PtrList/PtrList.C b/src/OpenFOAM/containers/Lists/PtrList/PtrList.C
index e4e4b10481f2d7b2f7a4b4d7672e67bc13df1cd6..613fa30a475cad79374bbba4e67e7e6ae62f82e6 100644
--- a/src/OpenFOAM/containers/Lists/PtrList/PtrList.C
+++ b/src/OpenFOAM/containers/Lists/PtrList/PtrList.C
@@ -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);
}
diff --git a/src/OpenFOAM/containers/Lists/PtrList/PtrList.H b/src/OpenFOAM/containers/Lists/PtrList/PtrList.H
index 42bcd8bc35f7241badb4c823e1d7f818ce08bc95..e4ea26ea5d8c54db5c62a81efd7db60ff94333ea 100644
--- a/src/OpenFOAM/containers/Lists/PtrList/PtrList.H
+++ b/src/OpenFOAM/containers/Lists/PtrList/PtrList.H
@@ -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
diff --git a/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H b/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H
index 2519c70086ba010b8015c2385e2383053fa671f2..7fbff38236785962f72fd647fcb04c361ea2cc65 100644
--- a/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H
+++ b/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H
@@ -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
diff --git a/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectListI.H b/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectListI.H
index 709aba9995a0a36265b8fdb5dee19b37a7caad17..e7e10e67e776b77f99edea56abac4358630d2585 100644
--- a/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectListI.H
+++ b/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectListI.H
@@ -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)),
diff --git a/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C b/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C
index 85d493724ac5632c30c5f6fae146b67d9226c6a9..a5f9ea6fd5362be511098a166948d5996608ec9a 100644
--- a/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C
+++ b/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C
@@ -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);
}
diff --git a/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.H b/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.H
index 2508a9f6790b0bc2348377e4b39397851408ee0a..4927110d0a0339fb2783d617e8a692d58db128d9 100644
--- a/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.H
+++ b/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.H
@@ -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
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.C b/src/OpenFOAM/fields/Fields/Field/Field.C
index e5c5a7cced083a4fc9704fcb49e281ea53081e2f..979442ac86d166088054a3b0c45503af5816853c 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.C
+++ b/src/OpenFOAM/fields/Fields/Field/Field.C
@@ -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
)
{
diff --git a/src/OpenFOAM/fields/Fields/Field/Field.H b/src/OpenFOAM/fields/Fields/Field/Field.H
index 0682366211b480d6d1f29650268480fa9a949bb6..a886dd37555983b7dc77bd05354abda4c7c9fc97 100644
--- a/src/OpenFOAM/fields/Fields/Field/Field.H
+++ b/src/OpenFOAM/fields/Fields/Field/Field.H
@@ -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
);
diff --git a/src/OpenFOAM/fields/Fields/Field/FieldMapper.H b/src/OpenFOAM/fields/Fields/Field/FieldMapper.H
index cb311a9cbd0acb508ec7c0712f35382e4e176076..50076825ef1356c06b5af4aa04ab69881f4b9a4e 100644
--- a/src/OpenFOAM/fields/Fields/Field/FieldMapper.H
+++ b/src/OpenFOAM/fields/Fields/Field/FieldMapper.H
@@ -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
diff --git a/src/OpenFOAM/fields/Fields/labelField/labelField.C b/src/OpenFOAM/fields/Fields/labelField/labelField.C
index 73e59a8d428d82ebce2de862b3a91afcba4cc2a4..46ab6a2bcef3a43221f173d508f1aaa7f8a815ed 100644
--- a/src/OpenFOAM/fields/Fields/labelField/labelField.C
+++ b/src/OpenFOAM/fields/Fields/labelField/labelField.C
@@ -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;
}
diff --git a/src/OpenFOAM/fields/Fields/labelField/labelField.H b/src/OpenFOAM/fields/Fields/labelField/labelField.H
index 235002c24bf644d5b52f8733addfc4f0e1f5c951..fe5132e3bb87644740fc9fcd39fed748713e48a7 100644
--- a/src/OpenFOAM/fields/Fields/labelField/labelField.H
+++ b/src/OpenFOAM/fields/Fields/labelField/labelField.H
@@ -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);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/Fields/transformList/transformList.H b/src/OpenFOAM/fields/Fields/transformList/transformList.H
index b74d165b04fe109d4445ac074dc8e13fafa64f05..6cc9944de8bb61bb61d2a2ab96d8b45ca2cba419 100644
--- a/src/OpenFOAM/fields/Fields/transformList/transformList.H
+++ b/src/OpenFOAM/fields/Fields/transformList/transformList.H
@@ -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>&)
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.C b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.C
index ea8e0d40fe60ff010adbc65e50007df9989de7c2..bd8b56b49c3f0dc4c7e5932139ffb7793f0c153c 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.C
@@ -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++)
{
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.H
index 6a55754bd1d701c5315b9e8229f4ed0f415473f9..d88c772c3d6bf8a9ef14f380d345af3124ee44ce 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduAddressing.H
@@ -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;
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduInterface.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduInterface.H
index 5cb7b22de5481aae1a2418c0cf4481ca5958271a..5e76b0ebf60e8b03fc02ab9658a0d55e55b200bc 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduInterface.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/lduInterface.H
@@ -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;
};
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixATmul.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixATmul.C
index 78769a06067f8d2bdc365d0f05206adbad2aa9dd..714f7c3deec3bda1f0c8be8d4d9309055f8c9731 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixATmul.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixATmul.C
@@ -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)
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixOperations.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixOperations.C
index b13ffeb5f82ff6b23ee127a29687b6c0eeb4211b..c55002a38b0cda689692920d49bd4f9298102f74 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixOperations.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixOperations.C
@@ -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++)
{
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixTemplates.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixTemplates.C
index f23831271f458e79c224da70a03aec46bc66b417..dc83c1923e46171be4c8074e9e82eaba36cb0c5a 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixTemplates.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixTemplates.C
@@ -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();
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C
index b2f23d05fed95505554d60cb0be7b8ddb279e413..82e0c570bf675c35c0ff2cc53f6805001a984215 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomerateLduAddressing.C
@@ -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();
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomerate.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomerate.C
index 520763fccf1614f8013152bf0246bc88e7c766c0..3551b3327a3fb36729c6eb1c32cdae2e0c982d9b 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomerate.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/pairGAMGAgglomeration/pairGAMGAgglomerate.C
@@ -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());
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C
index 50b8cf1a2549ec4c377f2ac7c72f9bb1168bacb2..364a118db4daed28be61b4a4e6b3d4bdfd677d1f 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverAgglomerateMatrix.C
@@ -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)
{
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.C
index d54510dc66919294ab37c88ce157af513921b65b..ba5ebe3bc61e0e480ce2fc0b6caed3f3ffc9e063 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/cyclicGAMGInterfaceField/cyclicGAMGInterfaceField.C
@@ -88,7 +88,7 @@ void Foam::cyclicGAMGInterfaceField::updateInterfaceMatrix
transformCoupleField(pnf, cmpt);
- const unallocLabelList& faceCells = cyclicInterface_.faceCells();
+ const labelUList& faceCells = cyclicInterface_.faceCells();
forAll(faceCells, elemI)
{
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.C
index 22e1f95fded190a1216837ae50f851ccb8388ef3..37028f2fe6daa68658e0c163a8e5163e7a98c153 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.C
@@ -95,7 +95,7 @@ Foam::processorCyclicGAMGInterfaceField::~processorCyclicGAMGInterfaceField()
// );
// transformCoupleField(pnf, cmpt);
//
-// const unallocLabelList& faceCells = procInterface_.faceCells();
+// const labelUList& faceCells = procInterface_.faceCells();
//
// forAll(faceCells, elemI)
// {
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.C
index 09fb8699a8677cdffefbfe00ea1deeafbc3bf113..13e713ace45c6b2cb3c5b17f239c14e26a247612 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorGAMGInterfaceField/processorGAMGInterfaceField.C
@@ -104,7 +104,7 @@ void Foam::processorGAMGInterfaceField::updateInterfaceMatrix
);
transformCoupleField(pnf, cmpt);
- const unallocLabelList& faceCells = procInterface_.faceCells();
+ const labelUList& faceCells = procInterface_.faceCells();
forAll(faceCells, elemI)
{
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.C
index 1c4a032cd25ab960176310c8e38c2f28c14be307..66cc20f50d3c81ba255b9a9686acc528ea10c806 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.C
@@ -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);
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.H
index dfaddd03fd237752f1fe7a1c572b4f1928d3500a..78e22aa3ad5743bccf4cb468a32256009ffcffc8 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.H
@@ -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;
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C
index a0f328a1ae6ba97e9e5916bf2c8eff77688adbff..58ffbd380d4ad115df95ffa36a08d00c66ea6504 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C
@@ -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();
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.H
index 556d690136896cac1358d061eaff50d007e91fde..3251353dfccea5e0720a2e25402271b4083dbfb9 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.H
@@ -100,7 +100,7 @@ public:
virtual tmp<labelField> internalFieldTransfer
(
const Pstream::commsTypes commsType,
- const unallocLabelList& iF
+ const labelUList& iF
) const;
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C
index 6d5afa621839ab4f56bd9abd3fff7fae551023f9..7bdd5480092029cd957deda4df88c28e0e646471 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C
@@ -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());
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.H
index e6325bdc403988cd6f7a06c49f4a14542513e202..4d27ecaf8a38d6dc876d742ade4f3844be1896bd 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.H
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.H
@@ -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;
diff --git a/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.H b/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.H
index 993953fa520169d271dcf2463e6ebab5283fa983..d1767dc5b220bf0f6bcd2068760e17a5ac4e45fb 100644
--- a/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.H
+++ b/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.H
@@ -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];
}
diff --git a/src/OpenFOAM/meshes/meshShapes/cell/cell.H b/src/OpenFOAM/meshes/meshShapes/cell/cell.H
index 8533b85508322d428d078e6552436e8a879ac0cd..099456d8042617a0bd9594e62b846e5176968025 100644
--- a/src/OpenFOAM/meshes/meshShapes/cell/cell.H
+++ b/src/OpenFOAM/meshes/meshShapes/cell/cell.H
@@ -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>&);
diff --git a/src/OpenFOAM/meshes/meshShapes/cell/cellI.H b/src/OpenFOAM/meshes/meshShapes/cell/cellI.H
index bdfdf5bd3ff154e63d47c7b4bca2c1dbbdb8cc7f..a5aeae3eeac9e22370127f21debaa51f42080d0d 100644
--- a/src/OpenFOAM/meshes/meshShapes/cell/cellI.H
+++ b/src/OpenFOAM/meshes/meshShapes/cell/cellI.H
@@ -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)
{}
diff --git a/src/OpenFOAM/meshes/meshShapes/face/face.H b/src/OpenFOAM/meshes/meshShapes/face/face.H
index dd5fc4a832b4265e0cd9aa0dd5842c224c13ba22..2b96610fca6bfb71e5c1f62d5996508eee486382 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/face.H
+++ b/src/OpenFOAM/meshes/meshShapes/face/face.H
@@ -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&);
diff --git a/src/OpenFOAM/meshes/meshShapes/face/faceI.H b/src/OpenFOAM/meshes/meshShapes/face/faceI.H
index 9b4c4f9b2ce93259373f45835ab68530b590c9ac..165a11fd1a660b9d3904e802590fa268a6634272 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/faceI.H
+++ b/src/OpenFOAM/meshes/meshShapes/face/faceI.H
@@ -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)
{}
diff --git a/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H b/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H
index a0aee7375d9b90cc69c6a5c45a87b780f85521fc..09a8faeeefd024ca3db229434ebb9ba6ebd77a1f 100644
--- a/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H
+++ b/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H
@@ -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&);
diff --git a/src/OpenFOAM/meshes/meshShapes/triFace/triFaceI.H b/src/OpenFOAM/meshes/meshShapes/triFace/triFaceI.H
index 1396307ea124c13c710705176722c7b0f0a0f125..1cac003d26d31e231cb777174ed2d46c627f49c1 100644
--- a/src/OpenFOAM/meshes/meshShapes/triFace/triFaceI.H
+++ b/src/OpenFOAM/meshes/meshShapes/triFace/triFaceI.H
@@ -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)
{}
diff --git a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.C b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.C
index 23b8993c24f97c2ce3c691a62828a31a342681b7..6b33e4307234ce2ac20fa6b10e40c6e5649188b7 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.C
+++ b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.C
@@ -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);
}
diff --git a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.H b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.H
index 660b1b42155887a5ee731e1f48b9fe6ba894bc42..7cab7be708e6e7df245937d4f9dadbf4b8885a29 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMapper.H
@@ -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;
diff --git a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointPatchMapper.C b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointPatchMapper.C
index ecccce8277f38edbcd3d02520323fbef3cf75fec..06454d16ed0d5ec753e05c21667fdc22b44ff41b 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointPatchMapper.C
+++ b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointPatchMapper.C
@@ -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);
}
diff --git a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointPatchMapper.H b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointPatchMapper.H
index 813e977620de9f82bc9652c99ecbb6ed14808f28..ff102944174f893732d5756f713c08830c6ed038 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointPatchMapper.H
+++ b/src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointPatchMapper.H
@@ -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;
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.C
index 1950a97b84ad11ed2a21bb1bdfcd146220d38980..133946431a266e510b984e60effa38b029075aff 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.C
@@ -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);
}
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.H
index 10fd09cddbc6e7e12a3b3935998f63e7f4fc34c0..9f05f393c9f1584e9bedc3c6a91f03d098f6e975 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/cellMapper/cellMapper.H
@@ -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;
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.C
index 6377fefedd72ecd097e778de9efafb2425bd7ace..9104231352d150bc45cb9f8dcd57496291b012c9 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.C
@@ -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);
}
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.H
index 410e2819e02d2067ceaeec3999bab4df65701ebc..4e4830e4dd1a7a67e19345b233ddf05f6d54ca03 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.H
@@ -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;
diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
index c11b9056bdc01db6689b2a141ee36a0ed9aae4ed..881eed693389b35d6b2e912de9a84b1f809079cc 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
@@ -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);
diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
index 89bd78a17ae0b16fce0c5f2f7fbbd58ed2c8dbea..755e649e07e460352f0c9b514c6046e6a5f456d2 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
@@ -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;
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
index 122ee9a791ae2f929282fc91f273cc8dada21d87..7bd9149b041d952e9dc7068435fe8e303fa6281b 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
@@ -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
)
:
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H
index c2dcbbe6e3a3d0e6a58e2f6a0b579976839a812b..47af3fa3b31b6de2eb149dd43761d23c37d554e9 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H
@@ -208,7 +208,7 @@ public:
const coupledPolyPatch& pp,
const polyBoundaryMesh& bm,
const label index,
- const unallocLabelList& mapAddressing,
+ const labelUList& mapAddressing,
const label newStart
);
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.C
index 94fe6df9ec453961aca2e1bd9c0b40b28b05116a..647d449f6131ae321f40bc5dea20a9f58e094d9d 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.C
@@ -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
)
:
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.H
index d89207b140246120bc7ae8dcbaf3dd513474ec54..f8ba8600f1c47a8faecc849b6d8f383b67e319a6 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.H
@@ -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
{
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
index 370a90c89e5919dbe90202aba0d3b79be9bd5ff7..3dace6a53e06dab9c8e3417f0f90e68df1aa0181 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
@@ -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
)
:
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H
index f628e2c01899de551e2f7f76128ff078f4cdac3f..9e9e3510edd44877b35da74d4dea7a573691ff3f 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H
@@ -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
{
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclicSlip/cyclicSlipPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclicSlip/cyclicSlipPolyPatch.H
index f44540f2a3f713edc058ebc3b5923695e32a41d8..9d87d0a668785ca37fbf943778c22897ee7289f7 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclicSlip/cyclicSlipPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclicSlip/cyclicSlipPolyPatch.H
@@ -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
{
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/empty/emptyPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/empty/emptyPolyPatch.C
index 8569ed67ca05fa345fd499f702ab73b88319baa7..23a9c379bd44602b871d7ce03946ec56090c9b6c 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/empty/emptyPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/empty/emptyPolyPatch.C
@@ -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
)
:
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/empty/emptyPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/empty/emptyPolyPatch.H
index 9b6f1812beabf8aaf48d609c4bbf3705ab838af1..9c52b5a1e8cdf7a28330ef2bce770ec9f0b4dbff 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/empty/emptyPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/empty/emptyPolyPatch.H
@@ -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
{
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPolyPatch.H
index b3d65a67c8b9b6ef847fd46f583f16b48da20631..6d603ed6127ca5ff3c39a4a52d65dd5b41410076 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPolyPatch.H
@@ -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
{
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
index ce8322b3258be412b21ce463c044c6c641edf252..c85a498abd31d173ebee2c38099579c08f6429a6 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
@@ -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
)
:
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H
index bda2eb19d6ca454461bebb6e1416e3b4f2a3b937..7861856afd40068934ed63f7cbe360e1f803fae3 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H
@@ -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
{
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C
index 351ff780fb78fb6ceb99d7906f2beb0ae2951d98..6bc517ec25b02b46eb6127a21424fcfa2ef7f3a3 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C
@@ -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
)
:
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.H
index 3206469d8ecf903bf4eb6d271d42ff0eea5ceef4..fdf4b8e03ce344a578e934f9d4174cc74b4836d1 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.H
@@ -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
{
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/symmetry/symmetryPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/symmetry/symmetryPolyPatch.C
index ec1d258268a64d8106b6fa2852ee9d8ad83ebedd..0d0b601bc273720dd90a5ee2e0929e79769c954e 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/symmetry/symmetryPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/symmetry/symmetryPolyPatch.C
@@ -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
)
:
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/symmetry/symmetryPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/symmetry/symmetryPolyPatch.H
index 4a910c19ce91a534b201be84113c8b089c027308..7fbcf9481f815d4ea8706b2515993321e07a6bea 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/symmetry/symmetryPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/symmetry/symmetryPolyPatch.H
@@ -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
{
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/wedge/wedgePolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/wedge/wedgePolyPatch.C
index 0e2c4e962028683040ea3ddcebde2fecb654c2d9..e876374511b00c28489f5fc699e899f810a96cea 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/wedge/wedgePolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/wedge/wedgePolyPatch.C
@@ -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
)
:
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/wedge/wedgePolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/wedge/wedgePolyPatch.H
index 552735cb9c02363b24f372c357aa816397210979..6233f4e5240c2206ddadc4700eec335b03f6e61b 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/wedge/wedgePolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/wedge/wedgePolyPatch.H
@@ -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
{
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/derived/wall/wallPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/derived/wall/wallPolyPatch.C
index f8ed338c2a85ba705ea8435984421a4aaf679f9a..62925b30146d23e1414b9659027095fe76254a22 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/derived/wall/wallPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/derived/wall/wallPolyPatch.C
@@ -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
)
:
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/derived/wall/wallPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/derived/wall/wallPolyPatch.H
index bd0d03af9d22c313fdd1942a4fcf9c3f31e12651..c6cd9ca6649fbdeb05e6a37781c50bd3c39dc3ba 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/derived/wall/wallPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/derived/wall/wallPolyPatch.H
@@ -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
{
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
index aca74ce5217ace60d039327786d570aa658d4978..c030abc40afbc57918a134b82612be9a93c236a0 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
@@ -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_)
{
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H
index 5449cbf16089a5cf90b67f0f8c943801e54686f9..4c4c3ac54fbd2606675326d245fd522455880c93 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H
@@ -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;
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.C b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.C
index 2464e980471b713a390d7599c530a0fdc9d19e76..7b575db4e6b518c674fbdc28752caa0e59fb6984 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.C
@@ -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);
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H
index 71d686339f4e0fdff9dce627063b9864776c3828..16e3b8a3f13c0d981c59508904896e923183bbcf 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/cellZone/cellZone.H
@@ -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>&);
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
index 47b61806da80cb5f993262e9bf0e7031908d2f4c..7db8062bb24c49f2bb8380e31b04ac4bbd0a4f23 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C
@@ -180,7 +180,7 @@ void Foam::faceZone::checkAddressing() const
Foam::faceZone::faceZone
(
const word& name,
- const unallocLabelList& addr,
+ const labelUList& addr,
const boolList& fm,
const label index,
const faceZoneMesh& zm
@@ -242,7 +242,7 @@ Foam::faceZone::faceZone
Foam::faceZone::faceZone
(
const faceZone& fz,
- const unallocLabelList& addr,
+ const labelUList& addr,
const boolList& fm,
const label index,
const faceZoneMesh& zm
@@ -392,7 +392,7 @@ void Foam::faceZone::clearAddressing()
void Foam::faceZone::resetAddressing
(
- const unallocLabelList& addr,
+ const labelUList& addr,
const boolList& flipMap
)
{
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H
index 19c6cf7ab1adab9996a0d0ffa96be7d3dc54e2bc..17c1973eb45c30178df4078d53a02d00f9ec5bf1 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.H
@@ -154,7 +154,7 @@ public:
faceZone
(
const word& name,
- const unallocLabelList& addr,
+ const labelUList& addr,
const boolList& fm,
const label index,
const faceZoneMesh& zm
@@ -184,7 +184,7 @@ public:
faceZone
(
const faceZone&,
- const unallocLabelList& addr,
+ const labelUList& addr,
const boolList& fm,
const label index,
const faceZoneMesh&
@@ -214,7 +214,7 @@ public:
// and zone mesh
virtual autoPtr<faceZone> clone
(
- const unallocLabelList& addr,
+ const labelUList& addr,
const boolList& fm,
const label index,
const faceZoneMesh& zm
@@ -279,7 +279,7 @@ public:
virtual void clearAddressing();
//- Reset addressing and flip map (clearing demand-driven data)
- virtual void resetAddressing(const unallocLabelList&, const boolList&);
+ virtual void resetAddressing(const labelUList&, const boolList&);
//- Check zone definition. Return true if in error.
virtual bool checkDefinition(const bool report = false) const;
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.C b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.C
index 071387bd8ddcf232ec874e6660f1cee4c1eac9c6..500ea7ac520e91a66e38b7e36977bf44e4d5b825 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.C
@@ -47,7 +47,7 @@ const char* const Foam::pointZone::labelsName = "pointLabels";
Foam::pointZone::pointZone
(
const word& name,
- const unallocLabelList& addr,
+ const labelUList& addr,
const label index,
const pointZoneMesh& zm
)
@@ -86,7 +86,7 @@ Foam::pointZone::pointZone
Foam::pointZone::pointZone
(
const pointZone& pz,
- const unallocLabelList& addr,
+ const labelUList& addr,
const label index,
const pointZoneMesh& zm
)
@@ -198,7 +198,7 @@ void Foam::pointZone::operator=(const pointZone& zn)
}
-void Foam::pointZone::operator=(const unallocLabelList& addr)
+void Foam::pointZone::operator=(const labelUList& addr)
{
clearAddressing();
labelList::operator=(addr);
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.H b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.H
index 858dae3a95cf31fdb61491c5b711d67e0cafcfdf..760f7c05ac4b87e493bf8fc46456cb66cc8865e8 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/pointZone/pointZone.H
@@ -112,7 +112,7 @@ public:
pointZone
(
const word& name,
- const unallocLabelList& addr,
+ const labelUList& addr,
const label index,
const pointZoneMesh&
);
@@ -140,7 +140,7 @@ public:
pointZone
(
const pointZone&,
- const unallocLabelList& addr,
+ const labelUList& addr,
const label index,
const pointZoneMesh&
);
@@ -170,7 +170,7 @@ public:
(
const pointZoneMesh& zm,
const label index,
- const unallocLabelList& addr
+ const labelUList& addr
) const
{
return autoPtr<pointZone>
@@ -226,7 +226,7 @@ public:
void operator=(const pointZone&);
//- 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>&);
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.C b/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.C
index 31af839b084d28ec77fa1011b42f01bc74a3328a..4ee225e5a757f5c93deee2a5422220b73f17ef92 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.C
+++ b/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.C
@@ -85,7 +85,7 @@ void Foam::zone::calcLookupMap() const
Foam::zone::zone
(
const word& name,
- const unallocLabelList& addr,
+ const labelUList& addr,
const label index
)
:
@@ -128,7 +128,7 @@ Foam::zone::zone
Foam::zone::zone
(
const zone& z,
- const unallocLabelList& addr,
+ const labelUList& addr,
const label index
)
:
diff --git a/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.H b/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.H
index e7f3a920b15053a702e38ba7b244661a3dedea7c..f2363e9511182c32e9503a146743f96fd1b8ea57 100644
--- a/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.H
+++ b/src/OpenFOAM/meshes/polyMesh/zones/zone/zone.H
@@ -101,7 +101,7 @@ public:
zone
(
const word& name,
- const unallocLabelList& addr,
+ const labelUList& addr,
const label index
);
@@ -127,7 +127,7 @@ public:
zone
(
const zone&,
- const unallocLabelList& addr,
+ const labelUList& addr,
const label index
);
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H
index a0b52f63d1ede03ab740756a06c061c4c53bf33e..83babd70166b830e1238077ceadac3e97049160e 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMesh.H
@@ -444,8 +444,8 @@ public:
static void calcCells
(
cellList&,
- const unallocLabelList& own,
- const unallocLabelList& nei,
+ const labelUList& own,
+ const labelUList& nei,
const label nCells = -1
);
diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCells.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCells.C
index 37af41dffc279c2f8ea58a88df5805de86ea09b8..55f26858852ecba840771331492753bcff0595e9 100644
--- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCells.C
+++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshCells.C
@@ -30,8 +30,8 @@ License
void Foam::primitiveMesh::calcCells
(
cellList& cellFaceAddr,
- const unallocLabelList& own,
- const unallocLabelList& nei,
+ const labelUList& own,
+ const labelUList& nei,
const label inNCells
)
{
diff --git a/src/conversion/ensight/part/ensightPart.H b/src/conversion/ensight/part/ensightPart.H
index 957d09706e4963c7eb21f6f59fc5e65bba08338f..9f1fa0013e59e9d9d180bba75940959e115299e8 100644
--- a/src/conversion/ensight/part/ensightPart.H
+++ b/src/conversion/ensight/part/ensightPart.H
@@ -136,7 +136,7 @@ protected:
(
ensightFile& os,
const List<scalar>& field,
- const List<label>& idList
+ const labelUList& idList
) const;
//- track points used
diff --git a/src/conversion/ensight/part/ensightPartIO.C b/src/conversion/ensight/part/ensightPartIO.C
index 3a0020ac83a27f619e0999d156a48c9af1fa10c4..c3866cdd36f6f799eaa2c22e6f9eed2468ec8fa6 100644
--- a/src/conversion/ensight/part/ensightPartIO.C
+++ b/src/conversion/ensight/part/ensightPartIO.C
@@ -56,7 +56,7 @@ void Foam::ensightPart::writeFieldList
(
ensightFile& os,
const List<scalar>& field,
- const List<label>& idList
+ const labelUList& idList
) const
{
forAll(idList, i)
diff --git a/src/dynamicMesh/fvMeshAdder/fvMeshAdder.H b/src/dynamicMesh/fvMeshAdder/fvMeshAdder.H
index d54e6a242d38cfb562fd32e06ef2f5e9498ded3e..2ca6759507c871d6af7cc7bf2d04755d888681e1 100644
--- a/src/dynamicMesh/fvMeshAdder/fvMeshAdder.H
+++ b/src/dynamicMesh/fvMeshAdder/fvMeshAdder.H
@@ -107,7 +107,7 @@ private:
return true;
}
- const unallocLabelList& directAddressing() const
+ const labelUList& directAddressing() const
{
return directAddressing_;
}
diff --git a/src/errorEstimation/errorEstimate/resErrorDiv.C b/src/errorEstimation/errorEstimate/resErrorDiv.C
index 74f3c1e55492bb350d511cf66eea9b9f208cce6a..d374b180ea6ba93afbf342905bffac8a53272d21 100644
--- a/src/errorEstimation/errorEstimate/resErrorDiv.C
+++ b/src/errorEstimation/errorEstimate/resErrorDiv.C
@@ -50,8 +50,8 @@ div
const surfaceVectorField& faceCentres = mesh.Cf();
const volVectorField& cellCentres = mesh.C();
const fvPatchList& patches = mesh.boundary();
- const unallocLabelList& owner = mesh.owner();
- const unallocLabelList& neighbour = mesh.neighbour();
+ const labelUList& owner = mesh.owner();
+ const labelUList& neighbour = mesh.neighbour();
Field<Type> res(vols.size(), pTraits<Type>::zero);
scalarField aNorm(vols.size(), 0.0);
diff --git a/src/errorEstimation/errorEstimate/resErrorLaplacian.C b/src/errorEstimation/errorEstimate/resErrorLaplacian.C
index aa6a521e74e46098fdde6d5b40a92f772b99f476..c310a583b304434be3ef9d727ad954e35904d6b0 100644
--- a/src/errorEstimation/errorEstimate/resErrorLaplacian.C
+++ b/src/errorEstimation/errorEstimate/resErrorLaplacian.C
@@ -124,8 +124,8 @@ laplacian
const surfaceVectorField& Sf = mesh.Sf();
const surfaceScalarField magSf = mesh.magSf();
const fvPatchList& patches = mesh.boundary();
- const unallocLabelList& owner = mesh.owner();
- const unallocLabelList& neighbour = mesh.neighbour();
+ const labelUList& owner = mesh.owner();
+ const labelUList& neighbour = mesh.neighbour();
const surfaceScalarField& delta =
mesh.surfaceInterpolation::deltaCoeffs();
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
index c3949a6ac0715bf305a1256a8a98ce1c617f843a..674e89fc323984341e116abb7c974a2b4e659920 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
@@ -142,7 +142,7 @@ template<class Type>
tmp<Field<Type> > cyclicFvPatchField<Type>::patchNeighbourField() const
{
const Field<Type>& iField = this->internalField();
- const unallocLabelList& nbrFaceCells =
+ const labelUList& nbrFaceCells =
cyclicPatch().cyclicPatch().neighbPatch().faceCells();
tmp<Field<Type> > tpnf(new Field<Type>(this->size()));
@@ -201,7 +201,7 @@ void cyclicFvPatchField<Type>::updateInterfaceMatrix
{
scalarField pnf(this->size());
- const unallocLabelList& nbrFaceCells =
+ const labelUList& nbrFaceCells =
cyclicPatch().cyclicPatch().neighbPatch().faceCells();
forAll(pnf, facei)
@@ -213,7 +213,7 @@ void cyclicFvPatchField<Type>::updateInterfaceMatrix
transformCoupleField(pnf, cmpt);
// Multiply the field by coefficients and add into the result
- const unallocLabelList& faceCells = cyclicPatch_.faceCells();
+ const labelUList& faceCells = cyclicPatch_.faceCells();
forAll(faceCells, elemI)
{
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.C
index 0ebe40ee01b6462fc45e81a4402144a734e905e3..ca38f3b30f8c85dfb44515e4ae21d9d3bb0fa988 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.C
@@ -99,7 +99,7 @@ template<class Type>
tmp<Field<Type> > jumpCyclicFvPatchField<Type>::patchNeighbourField() const
{
const Field<Type>& iField = this->internalField();
- const unallocLabelList& nbrFaceCells =
+ const labelUList& nbrFaceCells =
this->cyclicPatch().neighbFvPatch().faceCells();
tmp<Field<Type> > tpnf(new Field<Type>(this->size()));
@@ -147,7 +147,7 @@ void jumpCyclicFvPatchField<Type>::updateInterfaceMatrix
{
scalarField pnf(this->size());
- const unallocLabelList& nbrFaceCells =
+ const labelUList& nbrFaceCells =
this->cyclicPatch().neighbFvPatch().faceCells();
if (&psiInternal == &this->internalField())
@@ -176,7 +176,7 @@ void jumpCyclicFvPatchField<Type>::updateInterfaceMatrix
this->transformCoupleField(pnf, cmpt);
// Multiply the field by coefficients and add into the result
- const unallocLabelList& faceCells = this->cyclicPatch().faceCells();
+ const labelUList& faceCells = this->cyclicPatch().faceCells();
forAll(faceCells, elemI)
{
result[faceCells[elemI]] -= coeffs[elemI]*pnf[elemI];
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
index 733654344f047cbb832016eebbd1a6f55eedeca8..7c938afd18ce14492a9ad3683afec0f875bdf8ae 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C
@@ -244,7 +244,7 @@ void processorFvPatchField<Type>::updateInterfaceMatrix
// Multiply the field by coefficients and add into the result
- const unallocLabelList& faceCells = this->patch().faceCells();
+ const labelUList& faceCells = this->patch().faceCells();
forAll(faceCells, elemI)
{
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchScalarField.C
index 1171259fa04f76c5843efa3461425d32509edd0b..24b54aedf08d298668fa8476b2d91f96f4108b3d 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchScalarField.C
@@ -67,7 +67,7 @@ void processorFvPatchField<scalar>::updateInterfaceMatrix
procPatch_.compressedReceive<scalar>(commsType, this->size())()
);
- const unallocLabelList& faceCells = patch().faceCells();
+ const labelUList& faceCells = patch().faceCells();
forAll(faceCells, facei)
{
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C
index 22394cc17f67c69b1f5a6727dcd2b4b33a51aa69..48cc8d4251856e8d81001686c7b7f39e617a7a2c 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C
@@ -264,7 +264,7 @@ processorCyclicFvPatchField<Type>::~processorCyclicFvPatchField()
//
// // Multiply the field by coefficients and add into the result
//
-// const unallocLabelList& faceCells = this->patch().faceCells();
+// const labelUList& faceCells = this->patch().faceCells();
//
// forAll(faceCells, elemI)
// {
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchScalarField.C
index 51daf5762962b747bcfe579478fcbc1d74ca867f..cb047d7c0de64fa287516f1bf2739825e6b6a4d7 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchScalarField.C
@@ -67,7 +67,7 @@ namespace Foam
// procPatch_.compressedReceive<scalar>(commsType, this->size())()
// );
//
-// const unallocLabelList& faceCells = patch().faceCells();
+// const labelUList& faceCells = patch().faceCells();
//
// forAll(faceCells, facei)
// {
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
index 88bc0b0afdeda1f5c3a31ebc2d13c993d508cda6..654a260ef548446b0ba8b60a6b93960b69754c30 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
@@ -63,8 +63,8 @@ tmp<volScalarField> CoEulerDdtScheme<Type>::CorDeltaT() const
volScalarField& corDeltaT = tcorDeltaT();
- const unallocLabelList& owner = mesh().owner();
- const unallocLabelList& neighbour = mesh().neighbour();
+ const labelUList& owner = mesh().owner();
+ const labelUList& neighbour = mesh().neighbour();
forAll(owner, faceI)
{
@@ -81,7 +81,7 @@ tmp<volScalarField> CoEulerDdtScheme<Type>::CorDeltaT() const
cofrDeltaT.boundaryField()[patchi];
const fvPatch& p = pcofrDeltaT.patch();
- const unallocLabelList& faceCells = p.patch().faceCells();
+ const labelUList& faceCells = p.patch().faceCells();
forAll(pcofrDeltaT, patchFacei)
{
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
index 1c150a2cbd3220d3e8ef9a6bc5d364284c84b094..8b5fe573a2fc87b411b9db95e6d07729e21edb91 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
@@ -46,8 +46,8 @@ void SLTSDdtScheme<Type>::relaxedDiag
const surfaceScalarField& phi
) const
{
- const unallocLabelList& owner = mesh().owner();
- const unallocLabelList& neighbour = mesh().neighbour();
+ const labelUList& owner = mesh().owner();
+ const labelUList& neighbour = mesh().neighbour();
scalarField diag(rD.size(), 0.0);
forAll(owner, faceI)
@@ -67,7 +67,7 @@ void SLTSDdtScheme<Type>::relaxedDiag
forAll(phi.boundaryField(), patchi)
{
const fvsPatchScalarField& pphi = phi.boundaryField()[patchi];
- const unallocLabelList& faceCells = pphi.patch().patch().faceCells();
+ const labelUList& faceCells = pphi.patch().patch().faceCells();
forAll(pphi, patchFacei)
{
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcSmooth/fvcSmooth.C b/src/finiteVolume/finiteVolume/fvc/fvcSmooth/fvcSmooth.C
index 4ef505b3f90cfed5392722e6d68a43d7f054392e..dd803cec72b32feea9b884b2789745981c812ee7 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcSmooth/fvcSmooth.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcSmooth/fvcSmooth.C
@@ -45,8 +45,8 @@ void Foam::fvc::smooth
DynamicList<label> changedFaces(mesh.nFaces()/100 + 100);
DynamicList<smoothData> changedFacesInfo(changedFaces.size());
- const unallocLabelList& owner = mesh.owner();
- const unallocLabelList& neighbour = mesh.neighbour();
+ const labelUList& owner = mesh.owner();
+ const labelUList& neighbour = mesh.neighbour();
forAll(owner, facei)
{
@@ -146,8 +146,8 @@ void Foam::fvc::spread
// Set initial field on faces
List<smoothData> faceData(mesh.nFaces());
- const unallocLabelList& owner = mesh.owner();
- const unallocLabelList& neighbour = mesh.neighbour();
+ const labelUList& owner = mesh.owner();
+ const labelUList& neighbour = mesh.neighbour();
forAll(owner, facei)
{
@@ -248,8 +248,8 @@ void Foam::fvc::sweep
// Set initial field on faces
List<sweepData> faceData(mesh.nFaces());
- const unallocLabelList& owner = mesh.owner();
- const unallocLabelList& neighbour = mesh.neighbour();
+ const labelUList& owner = mesh.owner();
+ const labelUList& neighbour = mesh.neighbour();
const vectorField& Cf = mesh.faceCentres();
forAll(owner, facei)
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.C b/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.C
index 595d59dcbac346f5f8860fc25c2a3a86ada89089..5cbed1fc1752d53fca552a6564785a0be68c8558 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.C
@@ -48,8 +48,8 @@ void surfaceIntegrate
{
const fvMesh& mesh = ssf.mesh();
- const unallocLabelList& owner = mesh.owner();
- const unallocLabelList& neighbour = mesh.neighbour();
+ const labelUList& owner = mesh.owner();
+ const labelUList& neighbour = mesh.neighbour();
const Field<Type>& issf = ssf;
@@ -61,7 +61,7 @@ void surfaceIntegrate
forAll(mesh.boundary(), patchi)
{
- const unallocLabelList& pFaceCells =
+ const labelUList& pFaceCells =
mesh.boundary()[patchi].faceCells();
const fvsPatchField<Type>& pssf = ssf.boundaryField()[patchi];
@@ -160,8 +160,8 @@ surfaceSum
);
GeometricField<Type, fvPatchField, volMesh>& vf = tvf();
- const unallocLabelList& owner = mesh.owner();
- const unallocLabelList& neighbour = mesh.neighbour();
+ const labelUList& owner = mesh.owner();
+ const labelUList& neighbour = mesh.neighbour();
forAll(owner, facei)
{
@@ -171,7 +171,7 @@ surfaceSum
forAll(mesh.boundary(), patchi)
{
- const unallocLabelList& pFaceCells =
+ const labelUList& pFaceCells =
mesh.boundary()[patchi].faceCells();
const fvsPatchField<Type>& pssf = ssf.boundaryField()[patchi];
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresGrad.C b/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresGrad.C
index 70434b69e23cd94179b061e560bbb2d13fb7f700..722bbf329088f76349e4e449b07ad8324a227311 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresGrad.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresGrad.C
@@ -88,8 +88,8 @@ Foam::fv::extendedLeastSquaresGrad<Type>::calcGrad
const surfaceVectorField& ownLs = lsv.pVectors();
const surfaceVectorField& neiLs = lsv.nVectors();
- const unallocLabelList& owner = mesh.owner();
- const unallocLabelList& neighbour = mesh.neighbour();
+ const labelUList& owner = mesh.owner();
+ const labelUList& neighbour = mesh.neighbour();
forAll(owner, facei)
{
@@ -107,7 +107,7 @@ Foam::fv::extendedLeastSquaresGrad<Type>::calcGrad
{
const fvsPatchVectorField& patchOwnLs = ownLs.boundaryField()[patchi];
- const unallocLabelList& faceCells =
+ const labelUList& faceCells =
lsGrad.boundaryField()[patchi].patch().faceCells();
if (vsf.boundaryField()[patchi].coupled())
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresVectors.C b/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresVectors.C
index 5ac9121284c8918c5984360f060e81513f261d55..54da2b8bc262a3c0a6907396e519fd899dbf7807 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresVectors.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresVectors.C
@@ -107,8 +107,8 @@ void Foam::extendedLeastSquaresVectors::makeLeastSquaresVectors() const
surfaceVectorField& lsN = *nVectorsPtr_;
// Set local references to mesh data
- const unallocLabelList& owner = mesh_.owner();
- const unallocLabelList& neighbour = mesh_.neighbour();
+ const labelUList& owner = mesh_.owner();
+ const labelUList& neighbour = mesh_.neighbour();
// Build the d-vectors
surfaceVectorField d = mesh_.Sf()/(mesh_.magSf()*mesh_.deltaCoeffs());
@@ -137,7 +137,7 @@ void Foam::extendedLeastSquaresVectors::makeLeastSquaresVectors() const
const fvsPatchVectorField& pd = d.boundaryField()[patchI];
const fvPatch& p = pd.patch();
- const unallocLabelList& faceCells = p.faceCells();
+ const labelUList& faceCells = p.faceCells();
forAll(pd, patchFaceI)
{
@@ -245,7 +245,7 @@ void Foam::extendedLeastSquaresVectors::makeLeastSquaresVectors() const
fvsPatchVectorField& patchLsP = lsP.boundaryField()[patchI];
const fvPatch& p = patchLsP.patch();
- const unallocLabelList& faceCells = p.faceCells();
+ const labelUList& faceCells = p.faceCells();
forAll(p, patchFaceI)
{
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/fourthGrad/fourthGrad.C b/src/finiteVolume/finiteVolume/gradSchemes/fourthGrad/fourthGrad.C
index faa7fe5be2657d00bbba75d84dabd10838fe0ac3..efbacc24aae213b48b5d867c21aa68bd8409e7f9 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/fourthGrad/fourthGrad.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/fourthGrad/fourthGrad.C
@@ -93,8 +93,8 @@ Foam::fv::fourthGrad<Type>::calcGrad
const surfaceVectorField& neiLs = lsv.nVectors();
// owner/neighbour addressing
- const unallocLabelList& own = mesh.owner();
- const unallocLabelList& nei = mesh.neighbour();
+ const labelUList& own = mesh.owner();
+ const labelUList& nei = mesh.neighbour();
// Assemble the fourth-order gradient
@@ -135,7 +135,7 @@ Foam::fv::fourthGrad<Type>::calcGrad
/mesh.deltaCoeffs().boundaryField()[patchi];
}
- const unallocLabelList& faceCells =
+ const labelUList& faceCells =
fGrad.boundaryField()[patchi].patch().faceCells();
Field<GradType> neighbourSecondfGrad =
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.C b/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.C
index cbc140a6bb13a330ede3897f2d1eedcdaf68d574..562285d2d0585a9e7908717ce5a1040f33a73798 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.C
@@ -72,8 +72,8 @@ Foam::fv::gaussGrad<Type>::gradf
);
GeometricField<GradType, fvPatchField, volMesh>& gGrad = tgGrad();
- const unallocLabelList& owner = mesh.owner();
- const unallocLabelList& neighbour = mesh.neighbour();
+ const labelUList& owner = mesh.owner();
+ const labelUList& neighbour = mesh.neighbour();
const vectorField& Sf = mesh.Sf();
Field<GradType>& igGrad = gGrad;
@@ -89,7 +89,7 @@ Foam::fv::gaussGrad<Type>::gradf
forAll(mesh.boundary(), patchi)
{
- const unallocLabelList& pFaceCells =
+ const labelUList& pFaceCells =
mesh.boundary()[patchi].faceCells();
const vectorField& pSf = mesh.Sf().boundaryField()[patchi];
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.C b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.C
index 4cb697e9db636127343e8916250d46123dcedb1a..708d578779c073b95f030dac62a1bfc2ac093059 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.C
@@ -84,8 +84,8 @@ Foam::fv::leastSquaresGrad<Type>::calcGrad
const surfaceVectorField& ownLs = lsv.pVectors();
const surfaceVectorField& neiLs = lsv.nVectors();
- const unallocLabelList& own = mesh.owner();
- const unallocLabelList& nei = mesh.neighbour();
+ const labelUList& own = mesh.owner();
+ const labelUList& nei = mesh.neighbour();
forAll(own, facei)
{
@@ -103,7 +103,7 @@ Foam::fv::leastSquaresGrad<Type>::calcGrad
{
const fvsPatchVectorField& patchOwnLs = ownLs.boundaryField()[patchi];
- const unallocLabelList& faceCells =
+ const labelUList& faceCells =
lsGrad.boundaryField()[patchi].patch().faceCells();
if (vsf.boundaryField()[patchi].coupled())
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.C b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.C
index ac721ce8a2323ae0d8c5820eb0af8d2fc772e92b..b6735d483475debcb34a601d3c45a86c71040f2c 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.C
@@ -97,8 +97,8 @@ void Foam::leastSquaresVectors::makeLeastSquaresVectors() const
surfaceVectorField& lsN = *nVectorsPtr_;
// Set local references to mesh data
- const unallocLabelList& owner = mesh_.owner();
- const unallocLabelList& neighbour = mesh_.neighbour();
+ const labelUList& owner = mesh_.owner();
+ const labelUList& neighbour = mesh_.neighbour();
const volVectorField& C = mesh.C();
const surfaceScalarField& w = mesh.weights();
@@ -127,7 +127,7 @@ void Foam::leastSquaresVectors::makeLeastSquaresVectors() const
const fvsPatchScalarField& pMagSf = magSf.boundaryField()[patchi];
const fvPatch& p = pw.patch();
- const unallocLabelList& faceCells = p.patch().faceCells();
+ const labelUList& faceCells = p.patch().faceCells();
// Build the d-vectors
vectorField pd =
@@ -191,7 +191,7 @@ void Foam::leastSquaresVectors::makeLeastSquaresVectors() const
const fvsPatchScalarField& pMagSf = magSf.boundaryField()[patchi];
const fvPatch& p = pw.patch();
- const unallocLabelList& faceCells = p.faceCells();
+ const labelUList& faceCells = p.faceCells();
// Build the d-vectors
vectorField pd =
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrads.C b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrads.C
index d679586bae5b56fe2942436018141bb8275acdca..7fa5683a9559344751e1436208ea0fe86100d2a6 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrads.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrads.C
@@ -62,8 +62,8 @@ Foam::fv::cellLimitedGrad<Foam::scalar>::calcGrad
volVectorField& g = tGrad();
- const unallocLabelList& owner = mesh.owner();
- const unallocLabelList& neighbour = mesh.neighbour();
+ const labelUList& owner = mesh.owner();
+ const labelUList& neighbour = mesh.neighbour();
const volVectorField& C = mesh.C();
const surfaceVectorField& Cf = mesh.Cf();
@@ -93,7 +93,7 @@ Foam::fv::cellLimitedGrad<Foam::scalar>::calcGrad
{
const fvPatchScalarField& psf = bsf[patchi];
- const unallocLabelList& pOwner = mesh.boundary()[patchi].faceCells();
+ const labelUList& pOwner = mesh.boundary()[patchi].faceCells();
if (psf.coupled())
{
@@ -164,7 +164,7 @@ Foam::fv::cellLimitedGrad<Foam::scalar>::calcGrad
forAll(bsf, patchi)
{
- const unallocLabelList& pOwner = mesh.boundary()[patchi].faceCells();
+ const labelUList& pOwner = mesh.boundary()[patchi].faceCells();
const vectorField& pCf = Cf.boundaryField()[patchi];
forAll(pOwner, pFacei)
@@ -216,8 +216,8 @@ Foam::fv::cellLimitedGrad<Foam::vector>::calcGrad
volTensorField& g = tGrad();
- const unallocLabelList& owner = mesh.owner();
- const unallocLabelList& neighbour = mesh.neighbour();
+ const labelUList& owner = mesh.owner();
+ const labelUList& neighbour = mesh.neighbour();
const volVectorField& C = mesh.C();
const surfaceVectorField& Cf = mesh.Cf();
@@ -246,7 +246,7 @@ Foam::fv::cellLimitedGrad<Foam::vector>::calcGrad
forAll(bsf, patchi)
{
const fvPatchVectorField& psf = bsf[patchi];
- const unallocLabelList& pOwner = mesh.boundary()[patchi].faceCells();
+ const labelUList& pOwner = mesh.boundary()[patchi].faceCells();
if (psf.coupled())
{
@@ -317,7 +317,7 @@ Foam::fv::cellLimitedGrad<Foam::vector>::calcGrad
forAll(bsf, patchi)
{
- const unallocLabelList& pOwner = mesh.boundary()[patchi].faceCells();
+ const labelUList& pOwner = mesh.boundary()[patchi].faceCells();
const vectorField& pCf = Cf.boundaryField()[patchi];
forAll(pOwner, pFacei)
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrads.C b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrads.C
index e5d1881f843d4b6d2c6a989302fd3a45b48788c7..2a1fa06e64eaa1e30e13a897683939daab410f04 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrads.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrads.C
@@ -63,8 +63,8 @@ Foam::fv::cellMDLimitedGrad<Foam::scalar>::calcGrad
volVectorField& g = tGrad();
- const unallocLabelList& owner = mesh.owner();
- const unallocLabelList& neighbour = mesh.neighbour();
+ const labelUList& owner = mesh.owner();
+ const labelUList& neighbour = mesh.neighbour();
const volVectorField& C = mesh.C();
const surfaceVectorField& Cf = mesh.Cf();
@@ -94,7 +94,7 @@ Foam::fv::cellMDLimitedGrad<Foam::scalar>::calcGrad
{
const fvPatchScalarField& psf = bsf[patchi];
- const unallocLabelList& pOwner = mesh.boundary()[patchi].faceCells();
+ const labelUList& pOwner = mesh.boundary()[patchi].faceCells();
if (psf.coupled())
{
@@ -163,7 +163,7 @@ Foam::fv::cellMDLimitedGrad<Foam::scalar>::calcGrad
forAll(bsf, patchi)
{
- const unallocLabelList& pOwner = mesh.boundary()[patchi].faceCells();
+ const labelUList& pOwner = mesh.boundary()[patchi].faceCells();
const vectorField& pCf = Cf.boundaryField()[patchi];
forAll(pOwner, pFacei)
@@ -206,8 +206,8 @@ Foam::fv::cellMDLimitedGrad<Foam::vector>::calcGrad
volTensorField& g = tGrad();
- const unallocLabelList& owner = mesh.owner();
- const unallocLabelList& neighbour = mesh.neighbour();
+ const labelUList& owner = mesh.owner();
+ const labelUList& neighbour = mesh.neighbour();
const volVectorField& C = mesh.C();
const surfaceVectorField& Cf = mesh.Cf();
@@ -236,7 +236,7 @@ Foam::fv::cellMDLimitedGrad<Foam::vector>::calcGrad
forAll(bsf, patchi)
{
const fvPatchVectorField& psf = bsf[patchi];
- const unallocLabelList& pOwner = mesh.boundary()[patchi].faceCells();
+ const labelUList& pOwner = mesh.boundary()[patchi].faceCells();
if (psf.coupled())
{
@@ -305,7 +305,7 @@ Foam::fv::cellMDLimitedGrad<Foam::vector>::calcGrad
forAll(bsf, patchi)
{
- const unallocLabelList& pOwner = mesh.boundary()[patchi].faceCells();
+ const labelUList& pOwner = mesh.boundary()[patchi].faceCells();
const vectorField& pCf = Cf.boundaryField()[patchi];
forAll(pOwner, pFacei)
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceLimitedGrad/faceLimitedGrads.C b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceLimitedGrad/faceLimitedGrads.C
index eaad2c97a2218c55235518ce094ca9919af5e72f..febc19eb17d1c5ba17cdc6ac5745cfaf49431e64 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceLimitedGrad/faceLimitedGrads.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceLimitedGrad/faceLimitedGrads.C
@@ -63,8 +63,8 @@ Foam::fv::faceLimitedGrad<Foam::scalar>::calcGrad
volVectorField& g = tGrad();
- const unallocLabelList& owner = mesh.owner();
- const unallocLabelList& neighbour = mesh.neighbour();
+ const labelUList& owner = mesh.owner();
+ const labelUList& neighbour = mesh.neighbour();
const volVectorField& C = mesh.C();
const surfaceVectorField& Cf = mesh.Cf();
@@ -111,7 +111,7 @@ Foam::fv::faceLimitedGrad<Foam::scalar>::calcGrad
{
const fvPatchScalarField& psf = bsf[patchi];
- const unallocLabelList& pOwner = mesh.boundary()[patchi].faceCells();
+ const labelUList& pOwner = mesh.boundary()[patchi].faceCells();
const vectorField& pCf = Cf.boundaryField()[patchi];
if (psf.coupled())
@@ -199,8 +199,8 @@ Foam::fv::faceLimitedGrad<Foam::vector>::calcGrad
volTensorField& g = tGrad();
- const unallocLabelList& owner = mesh.owner();
- const unallocLabelList& neighbour = mesh.neighbour();
+ const labelUList& owner = mesh.owner();
+ const labelUList& neighbour = mesh.neighbour();
const volVectorField& C = mesh.C();
const surfaceVectorField& Cf = mesh.Cf();
@@ -262,7 +262,7 @@ Foam::fv::faceLimitedGrad<Foam::vector>::calcGrad
{
const fvPatchVectorField& psf = bvf[patchi];
- const unallocLabelList& pOwner = mesh.boundary()[patchi].faceCells();
+ const labelUList& pOwner = mesh.boundary()[patchi].faceCells();
const vectorField& pCf = Cf.boundaryField()[patchi];
if (psf.coupled())
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceMDLimitedGrad/faceMDLimitedGrads.C b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceMDLimitedGrad/faceMDLimitedGrads.C
index 0d557ba44dbc281f26a78926767df43f0d543069..906324e0ebd5ed229db248cc3338f6d101143f72 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceMDLimitedGrad/faceMDLimitedGrads.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceMDLimitedGrad/faceMDLimitedGrads.C
@@ -63,8 +63,8 @@ Foam::fv::faceMDLimitedGrad<Foam::scalar>::calcGrad
volVectorField& g = tGrad();
- const unallocLabelList& owner = mesh.owner();
- const unallocLabelList& neighbour = mesh.neighbour();
+ const labelUList& owner = mesh.owner();
+ const labelUList& neighbour = mesh.neighbour();
const volVectorField& C = mesh.C();
const surfaceVectorField& Cf = mesh.Cf();
@@ -114,7 +114,7 @@ Foam::fv::faceMDLimitedGrad<Foam::scalar>::calcGrad
{
const fvPatchScalarField& psf = bsf[patchi];
- const unallocLabelList& pOwner = mesh.boundary()[patchi].faceCells();
+ const labelUList& pOwner = mesh.boundary()[patchi].faceCells();
const vectorField& pCf = Cf.boundaryField()[patchi];
if (psf.coupled())
@@ -203,8 +203,8 @@ Foam::fv::faceMDLimitedGrad<Foam::vector>::calcGrad
volTensorField& g = tGrad();
- const unallocLabelList& owner = mesh.owner();
- const unallocLabelList& neighbour = mesh.neighbour();
+ const labelUList& owner = mesh.owner();
+ const labelUList& neighbour = mesh.neighbour();
const volVectorField& C = mesh.C();
const surfaceVectorField& Cf = mesh.Cf();
@@ -256,7 +256,7 @@ Foam::fv::faceMDLimitedGrad<Foam::vector>::calcGrad
{
const fvPatchVectorField& psf = bvf[patchi];
- const unallocLabelList& pOwner = mesh.boundary()[patchi].faceCells();
+ const labelUList& pOwner = mesh.boundary()[patchi].faceCells();
const vectorField& pCf = Cf.boundaryField()[patchi];
if (psf.coupled())
diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C
index bba48999f0beeb7b45fede49111c28e29a897538..758aa3f5b60264bf73c9f2e73dfc739c31290713 100644
--- a/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C
+++ b/src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C
@@ -133,8 +133,8 @@ snGradScheme<Type>::snGrad
const scalarField& deltaCoeffs = tdeltaCoeffs().internalField();
// owner/neighbour addressing
- const unallocLabelList& owner = mesh.owner();
- const unallocLabelList& neighbour = mesh.neighbour();
+ const labelUList& owner = mesh.owner();
+ const labelUList& neighbour = mesh.neighbour();
forAll(owner, faceI)
{
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
index 21c53e43816d353e0f636726f70eafa2b864b0e2..b0c18e3c68fd5f48f1cf99710a07c2f4105dada3 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C
@@ -36,7 +36,7 @@ template<class Type>
template<class Type2>
void Foam::fvMatrix<Type>::addToInternalField
(
- const unallocLabelList& addr,
+ const labelUList& addr,
const Field<Type2>& pf,
Field<Type2>& intf
) const
@@ -45,7 +45,7 @@ void Foam::fvMatrix<Type>::addToInternalField
{
FatalErrorIn
(
- "fvMatrix<Type>::addToInternalField(const unallocLabelList&, "
+ "fvMatrix<Type>::addToInternalField(const labelUList&, "
"const Field&, Field&)"
) << "sizes of addressing and field are different"
<< abort(FatalError);
@@ -62,7 +62,7 @@ template<class Type>
template<class Type2>
void Foam::fvMatrix<Type>::addToInternalField
(
- const unallocLabelList& addr,
+ const labelUList& addr,
const tmp<Field<Type2> >& tpf,
Field<Type2>& intf
) const
@@ -76,7 +76,7 @@ template<class Type>
template<class Type2>
void Foam::fvMatrix<Type>::subtractFromInternalField
(
- const unallocLabelList& addr,
+ const labelUList& addr,
const Field<Type2>& pf,
Field<Type2>& intf
) const
@@ -85,7 +85,7 @@ void Foam::fvMatrix<Type>::subtractFromInternalField
{
FatalErrorIn
(
- "fvMatrix<Type>::addToInternalField(const unallocLabelList&, "
+ "fvMatrix<Type>::addToInternalField(const labelUList&, "
"const Field&, Field&)"
) << "sizes of addressing and field are different"
<< abort(FatalError);
@@ -102,7 +102,7 @@ template<class Type>
template<class Type2>
void Foam::fvMatrix<Type>::subtractFromInternalField
(
- const unallocLabelList& addr,
+ const labelUList& addr,
const tmp<Field<Type2> >& tpf,
Field<Type2>& intf
) const
@@ -167,7 +167,7 @@ void Foam::fvMatrix<Type>::addBoundarySource
tmp<Field<Type> > tpnf = ptf.patchNeighbourField();
const Field<Type>& pnf = tpnf();
- const unallocLabelList& addr = lduAddr().patchAddr(patchI);
+ const labelUList& addr = lduAddr().patchAddr(patchI);
forAll(addr, facei)
{
@@ -182,15 +182,15 @@ template<class Type>
template<template<class> class ListType>
void Foam::fvMatrix<Type>::setValuesFromList
(
- const unallocLabelList& cellLabels,
+ const labelUList& cellLabels,
const ListType<Type>& values
)
{
const fvMesh& mesh = psi_.mesh();
const cellList& cells = mesh.cells();
- const unallocLabelList& own = mesh.owner();
- const unallocLabelList& nei = mesh.neighbour();
+ const labelUList& own = mesh.owner();
+ const labelUList& nei = mesh.neighbour();
scalarField& Diag = diag();
Field<Type>& psi =
@@ -486,7 +486,7 @@ Foam::fvMatrix<Type>::~fvMatrix()
template<class Type>
void Foam::fvMatrix<Type>::setValues
(
- const unallocLabelList& cellLabels,
+ const labelUList& cellLabels,
const UList<Type>& values
)
{
@@ -497,7 +497,7 @@ void Foam::fvMatrix<Type>::setValues
template<class Type>
void Foam::fvMatrix<Type>::setValues
(
- const unallocLabelList& cellLabels,
+ const labelUList& cellLabels,
const UIndirectList<Type>& values
)
{
@@ -553,7 +553,7 @@ void Foam::fvMatrix<Type>::relax(const scalar alpha)
if (ptf.size())
{
- const unallocLabelList& pa = lduAddr().patchAddr(patchI);
+ const labelUList& pa = lduAddr().patchAddr(patchI);
Field<Type>& iCoeffs = internalCoeffs_[patchI];
if (ptf.coupled())
@@ -600,7 +600,7 @@ void Foam::fvMatrix<Type>::relax(const scalar alpha)
if (ptf.size())
{
- const unallocLabelList& pa = lduAddr().patchAddr(patchI);
+ const labelUList& pa = lduAddr().patchAddr(patchI);
Field<Type>& iCoeffs = internalCoeffs_[patchI];
if (ptf.coupled())
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
index 2b8fa3c6ee12bcd7a080e19b89c8365953b66142..adff2f03b9ea4c6be9f4c88fbb023ffb56391d53 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H
@@ -150,7 +150,7 @@ protected:
template<class Type2>
void addToInternalField
(
- const unallocLabelList& addr,
+ const labelUList& addr,
const Field<Type2>& pf,
Field<Type2>& intf
) const;
@@ -158,7 +158,7 @@ protected:
template<class Type2>
void addToInternalField
(
- const unallocLabelList& addr,
+ const labelUList& addr,
const tmp<Field<Type2> >& tpf,
Field<Type2>& intf
) const;
@@ -167,7 +167,7 @@ protected:
template<class Type2>
void subtractFromInternalField
(
- const unallocLabelList& addr,
+ const labelUList& addr,
const Field<Type2>& pf,
Field<Type2>& intf
) const;
@@ -175,7 +175,7 @@ protected:
template<class Type2>
void subtractFromInternalField
(
- const unallocLabelList& addr,
+ const labelUList& addr,
const tmp<Field<Type2> >& tpf,
Field<Type2>& intf
) const;
@@ -203,7 +203,7 @@ protected:
template<template<class> class ListType>
void setValuesFromList
(
- const unallocLabelList& cells,
+ const labelUList& cells,
const ListType<Type>& values
);
@@ -327,7 +327,7 @@ public:
// and eliminate the corresponding equations from the matrix.
void setValues
(
- const unallocLabelList& cells,
+ const labelUList& cells,
const UList<Type>& values
);
@@ -335,7 +335,7 @@ public:
// and eliminate the corresponding equations from the matrix.
void setValues
(
- const unallocLabelList& cells,
+ const labelUList& cells,
const UIndirectList<Type>& values
);
diff --git a/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C b/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
index 0b0acc68f540d62b71abcf10ff0ad54b7f9d6e6c..eafec93b65d6d09f2318622034a3bd3cb73348dc 100644
--- a/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
+++ b/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
@@ -324,8 +324,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();
const scalar deltaT = mesh.time().deltaTValue();
diff --git a/src/finiteVolume/fvMesh/fvMesh.H b/src/finiteVolume/fvMesh/fvMesh.H
index dae61ddc4cac296e53f559da3c8a135e541df1b2..55af1e68bb0be025f0f7a920a33aad739f21d0af 100644
--- a/src/finiteVolume/fvMesh/fvMesh.H
+++ b/src/finiteVolume/fvMesh/fvMesh.H
@@ -253,13 +253,13 @@ public:
}
//- Internal face owner
- const unallocLabelList& owner() const
+ const labelUList& owner() const
{
return lduAddr().lowerAddr();
}
//- Internal face neighbour
- const unallocLabelList& neighbour() const
+ const labelUList& neighbour() const
{
return lduAddr().upperAddr();
}
diff --git a/src/finiteVolume/fvMesh/fvMeshLduAddressing.H b/src/finiteVolume/fvMesh/fvMeshLduAddressing.H
index 6ecc9a17aec3b493c302e6eb4181d0b99edfd1a9..20954aeb36e6077af247622fc2212db0f7338498 100644
--- a/src/finiteVolume/fvMesh/fvMeshLduAddressing.H
+++ b/src/finiteVolume/fvMesh/fvMeshLduAddressing.H
@@ -110,19 +110,19 @@ public:
// Member Functions
//- Return lower addressing (i.e. lower label = upper triangle)
- const unallocLabelList& lowerAddr() const
+ const labelUList& lowerAddr() const
{
return lowerAddr_;
}
//- Return upper addressing (i.e. upper label)
- const unallocLabelList& upperAddr() const
+ const labelUList& upperAddr() const
{
return upperAddr_;
}
//- Return patch addressing
- const unallocLabelList& patchAddr(const label i) const
+ const labelUList& patchAddr(const label i) const
{
return *patchAddr_[i];
}
diff --git a/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.C b/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.C
index 2bb3a98955efe02e1440a9386efff0a632f8f412..1a805bd83d7fad8d0de24a8f4f18b827a98066d9 100644
--- a/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.C
+++ b/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.C
@@ -231,13 +231,13 @@ Foam::fvPatchMapper::~fvPatchMapper()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-const Foam::unallocLabelList& Foam::fvPatchMapper::directAddressing() const
+const Foam::labelUList& Foam::fvPatchMapper::directAddressing() const
{
if (!direct())
{
FatalErrorIn
(
- "const unallocLabelList& fvPatchMapper::directAddressing() const"
+ "const labelUList& fvPatchMapper::directAddressing() const"
) << "Requested direct addressing for an interpolative mapper."
<< abort(FatalError);
}
diff --git a/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.H b/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.H
index 82212c5a91d87171edec9a0f2c573c31d3ef02b0..2865d90effc9ee72c9e6d9b13699d9a8f13f79ee 100644
--- a/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.H
+++ b/src/finiteVolume/fvMesh/fvMeshMapper/fvPatchMapper.H
@@ -139,7 +139,7 @@ public:
}
//- Return direct addressing
- virtual const unallocLabelList& directAddressing() const;
+ virtual const labelUList& directAddressing() const;
//- Return interpolated addressing
virtual const labelListList& addressing() const;
diff --git a/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.C b/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.C
index eb171967203a62f0eaa8c4611f482219021c0bc3..f11229cb6eae496a0c727d93b0a36b4bcb8a995b 100644
--- a/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.C
+++ b/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.C
@@ -170,13 +170,13 @@ Foam::fvSurfaceMapper::~fvSurfaceMapper()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-const Foam::unallocLabelList& Foam::fvSurfaceMapper::directAddressing() const
+const Foam::labelUList& Foam::fvSurfaceMapper::directAddressing() const
{
if (!direct())
{
FatalErrorIn
(
- "const unallocLabelList& fvSurfaceMapper::"
+ "const labelUList& fvSurfaceMapper::"
"directAddressing() const"
) << "Requested direct addressing for an interpolative mapper."
<< abort(FatalError);
diff --git a/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.H b/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.H
index 564874194efd20d7a5127ac05e4d6d815b2aeb86..540439ef4232fde27d1e3ab804acd13e803fea09 100644
--- a/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.H
+++ b/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.H
@@ -134,7 +134,7 @@ public:
}
//- Return direct addressing
- virtual const unallocLabelList& directAddressing() const;
+ virtual const labelUList& directAddressing() const;
//- Return interpolated addressing
virtual const labelListList& addressing() const;
diff --git a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.H b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.H
index dea6f81a4a709b4c56f81dbd76f2546e46616950..45c47b828cd5fb026a82ebb0e5fef9f69bd29c1b 100644
--- a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.H
+++ b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.H
@@ -110,7 +110,7 @@ public:
return true;
}
- const unallocLabelList& directAddressing() const
+ const labelUList& directAddressing() const
{
return directAddressing_;
}
@@ -151,7 +151,7 @@ public:
return true;
}
- const unallocLabelList& directAddressing() const
+ const labelUList& directAddressing() const
{
return directAddressing_;
}
diff --git a/src/finiteVolume/fvMesh/fvPatches/basic/coupled/coupledFvPatch.H b/src/finiteVolume/fvMesh/fvPatches/basic/coupled/coupledFvPatch.H
index 62315f66970e3acb0205fc609342d302454bd394..842ab72bd64aba73cae9c78339030c09239fcc60 100644
--- a/src/finiteVolume/fvMesh/fvPatches/basic/coupled/coupledFvPatch.H
+++ b/src/finiteVolume/fvMesh/fvPatches/basic/coupled/coupledFvPatch.H
@@ -113,7 +113,7 @@ public:
virtual const tensorField& reverseT() const = 0;
//- Return faceCell addressing
- virtual const unallocLabelList& faceCells() const
+ virtual const labelUList& faceCells() const
{
return fvPatch::faceCells();
}
@@ -128,14 +128,14 @@ public:
// the interface as a field
virtual tmp<labelField> interfaceInternalField
(
- const unallocLabelList& internalData
+ const labelUList& internalData
) const = 0;
//- Initialise neighbour field transfer
virtual void initInternalFieldTransfer
(
const Pstream::commsTypes commsType,
- unallocLabelList& iF
+ labelUList& iF
) const
{}
@@ -143,7 +143,7 @@ public:
virtual tmp<labelField> internalFieldTransfer
(
const Pstream::commsTypes commsType,
- const unallocLabelList& iF
+ const labelUList& iF
) const = 0;
};
diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.C
index 2e0a07a787c479df74b6d49070b841195f705bf3..bdf117c3a5683a051c93a926a86b54ae9de1e67d 100644
--- a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.C
+++ b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.C
@@ -129,7 +129,7 @@ tmp<vectorField> cyclicFvPatch::delta() const
tmp<labelField> cyclicFvPatch::interfaceInternalField
(
- const unallocLabelList& internalData
+ const labelUList& internalData
) const
{
return patchInternalField(internalData);
@@ -139,7 +139,7 @@ tmp<labelField> cyclicFvPatch::interfaceInternalField
tmp<labelField> cyclicFvPatch::internalFieldTransfer
(
const Pstream::commsTypes commsType,
- const unallocLabelList& iF
+ const labelUList& iF
) const
{
return neighbFvPatch().patchInternalField(iF);
diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.H b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.H
index b12e3d347b0c1a9e8e6ca6e192aa0e95b2cecf56..b992037bda77a7c36f852101641f22de8cecdcca 100644
--- a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.H
+++ b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.H
@@ -153,14 +153,14 @@ public:
// the interface as a field
virtual tmp<labelField> interfaceInternalField
(
- const unallocLabelList& internalData
+ const labelUList& internalData
) const;
//- Return neighbour field
virtual tmp<labelField> internalFieldTransfer
(
const Pstream::commsTypes commsType,
- const unallocLabelList& internalData
+ const labelUList& internalData
) const;
};
diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/empty/emptyFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/constraint/empty/emptyFvPatch.C
index 12fd10ad458875962d35f33fa4e3bdb50cbf73d9..1b283449e300610450a1da8eb7efb5627e3a2790 100644
--- a/src/finiteVolume/fvMesh/fvPatches/constraint/empty/emptyFvPatch.C
+++ b/src/finiteVolume/fvMesh/fvPatches/constraint/empty/emptyFvPatch.C
@@ -56,7 +56,7 @@ emptyFvPatch::emptyFvPatch(const polyPatch& patch, const fvBoundaryMesh& bm)
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-const unallocLabelList& emptyFvPatch::faceCells() const
+const labelUList& emptyFvPatch::faceCells() const
{
return faceCells_;
}
diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/empty/emptyFvPatch.H b/src/finiteVolume/fvMesh/fvPatches/constraint/empty/emptyFvPatch.H
index eee1837cbbc30d903ed8e4622c0c0e53de45fe10..da5255a95bbd78647ceeb287983baea481b63d11 100644
--- a/src/finiteVolume/fvMesh/fvPatches/constraint/empty/emptyFvPatch.H
+++ b/src/finiteVolume/fvMesh/fvPatches/constraint/empty/emptyFvPatch.H
@@ -80,7 +80,7 @@ public:
}
//- Return faceCells
- virtual const unallocLabelList& faceCells() const;
+ virtual const labelUList& faceCells() const;
};
diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/processor/processorFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/constraint/processor/processorFvPatch.C
index 2d1a23c806d8c9223fa4ba36afee7ba5db3a2733..09653153da2e63c695720fe9cf39a7e1e3788be4 100644
--- a/src/finiteVolume/fvMesh/fvPatches/constraint/processor/processorFvPatch.C
+++ b/src/finiteVolume/fvMesh/fvPatches/constraint/processor/processorFvPatch.C
@@ -115,7 +115,7 @@ tmp<vectorField> processorFvPatch::delta() const
tmp<labelField> processorFvPatch::interfaceInternalField
(
- const unallocLabelList& internalData
+ const labelUList& internalData
) const
{
return patchInternalField(internalData);
@@ -125,7 +125,7 @@ tmp<labelField> processorFvPatch::interfaceInternalField
void processorFvPatch::initInternalFieldTransfer
(
const Pstream::commsTypes commsType,
- const unallocLabelList& iF
+ const labelUList& iF
) const
{
send(commsType, patchInternalField(iF)());
@@ -135,7 +135,7 @@ void processorFvPatch::initInternalFieldTransfer
tmp<labelField> processorFvPatch::internalFieldTransfer
(
const Pstream::commsTypes commsType,
- const unallocLabelList&
+ const labelUList&
) const
{
return receive<label>(commsType, this->size());
diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/processor/processorFvPatch.H b/src/finiteVolume/fvMesh/fvPatches/constraint/processor/processorFvPatch.H
index 0f20317753599168d40ef8ee4898fefea879d817..47b7bd89309daeb631a08e2f9f5df892cb31d49e 100644
--- a/src/finiteVolume/fvMesh/fvPatches/constraint/processor/processorFvPatch.H
+++ b/src/finiteVolume/fvMesh/fvPatches/constraint/processor/processorFvPatch.H
@@ -151,21 +151,21 @@ public:
// the interface as a field
virtual tmp<labelField> interfaceInternalField
(
- const unallocLabelList& internalData
+ const labelUList& internalData
) const;
//- Initialise neighbour field transfer
virtual void initInternalFieldTransfer
(
const Pstream::commsTypes commsType,
- const unallocLabelList& internalData
+ const labelUList& internalData
) const;
//- Return neighbour field
virtual tmp<labelField> internalFieldTransfer
(
const Pstream::commsTypes commsType,
- const unallocLabelList& internalData
+ const labelUList& internalData
) const;
};
diff --git a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.C b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.C
index 0b42c7f6bb7b983867676169c36a187b35db7b49..927249ac53ca3cae2fc723e9963542acaff44717 100644
--- a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.C
+++ b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.C
@@ -89,7 +89,7 @@ Foam::wordList Foam::fvPatch::constraintTypes()
}
-const Foam::unallocLabelList& Foam::fvPatch::faceCells() const
+const Foam::labelUList& Foam::fvPatch::faceCells() const
{
return polyPatch_.faceCells();
}
@@ -106,7 +106,7 @@ Foam::tmp<Foam::vectorField> Foam::fvPatch::Cn() const
tmp<vectorField> tcc(new vectorField(size()));
vectorField& cc = tcc();
- const unallocLabelList& faceCells = this->faceCells();
+ const labelUList& faceCells = this->faceCells();
// get reference to global cell centres
const vectorField& gcc = boundaryMesh().mesh().cellCentres();
diff --git a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.H b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.H
index 7d9cd8a7b93c607f0c69f19c4138db5fffae1df9..c32d333a36b7c2b9d86a2fab611aeff7bcfdd0d3 100644
--- a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.H
+++ b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.H
@@ -199,7 +199,7 @@ public:
}
//- Return faceCells
- virtual const unallocLabelList& faceCells() const;
+ virtual const labelUList& faceCells() const;
// Access functions for geometrical data
diff --git a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchTemplates.C b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchTemplates.C
index 398fba0170defe9c7d4c9db1cf3a58fcccea80fe..fb8d0c94bd08710033d9485fd4e1fbe16d49186b 100644
--- a/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchTemplates.C
+++ b/src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchTemplates.C
@@ -36,7 +36,7 @@ Foam::tmp<Foam::Field<Type> > Foam::fvPatch::patchInternalField
tmp<Field<Type> > tpif(new Field<Type>(size()));
Field<Type>& pif = tpif();
- const unallocLabelList& faceCells = this->faceCells();
+ const labelUList& faceCells = this->faceCells();
forAll(pif, facei)
{
diff --git a/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.H b/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.H
index 184be0a56606f77e7ae3cec7042aaea7fb2bd73f..c2e4eb838f7dcde40b9048032482861137413cc7 100644
--- a/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.H
+++ b/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.H
@@ -94,12 +94,12 @@ public:
{
// Private data
- const unallocLabelList& directAddressing_;
+ const labelUList& directAddressing_;
public:
//- Construct given addressing
- directPatchFieldMapper(const unallocLabelList& directAddressing)
+ directPatchFieldMapper(const labelUList& directAddressing)
:
directAddressing_(directAddressing)
{}
@@ -114,7 +114,7 @@ public:
return true;
}
- virtual const unallocLabelList& directAddressing() const
+ virtual const labelUList& directAddressing() const
{
return directAddressing_;
}
diff --git a/src/finiteVolume/fvMesh/wallDist/nearWallDist.C b/src/finiteVolume/fvMesh/wallDist/nearWallDist.C
index a5fffd975bec173b5efed2e531fed2708f28ed50..7a5907de4a030fc30ec98d73d79d1b82095ee478 100644
--- a/src/finiteVolume/fvMesh/wallDist/nearWallDist.C
+++ b/src/finiteVolume/fvMesh/wallDist/nearWallDist.C
@@ -57,7 +57,7 @@ void Foam::nearWallDist::doAll()
{
const polyPatch& pPatch = patch.patch();
- const unallocLabelList& faceCells = patch.faceCells();
+ const labelUList& faceCells = patch.faceCells();
// Check cells with face on wall
forAll(patch, patchFaceI)
diff --git a/src/finiteVolume/fvMesh/wallDist/nearWallDistNoSearch.C b/src/finiteVolume/fvMesh/wallDist/nearWallDistNoSearch.C
index e196158294702f95792627136f5c4f0f2b994996..94bc67a1d01685013431f9722b331be4e3b46b73 100644
--- a/src/finiteVolume/fvMesh/wallDist/nearWallDistNoSearch.C
+++ b/src/finiteVolume/fvMesh/wallDist/nearWallDistNoSearch.C
@@ -41,7 +41,7 @@ void Foam::nearWallDistNoSearch::doAll()
if (isA<wallFvPatch>(patches[patchI]))
{
- const unallocLabelList& faceCells = patches[patchI].faceCells();
+ const labelUList& faceCells = patches[patchI].faceCells();
const fvPatchVectorField& patchCentres
= cellCentres.boundaryField()[patchI];
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.C
index 8dacd9545e434a1bf016c516892d267f261971b5..be8ca144ae695ab1d5e4786ec0d49b3e2704437c 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.C
@@ -72,8 +72,8 @@ tmp<surfaceScalarField> LimitedScheme<Type, Limiter, LimitFunc>::limiter
const surfaceScalarField& CDweights = mesh.surfaceInterpolation::weights();
- const unallocLabelList& owner = mesh.owner();
- const unallocLabelList& neighbour = mesh.neighbour();
+ const labelUList& owner = mesh.owner();
+ const labelUList& neighbour = mesh.neighbour();
const vectorField& C = mesh.C();
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.C
index f2ad61bfb2c8fe1be51b1a4f2ae5598a918b46ae..8df15c9726d0d466a0680251d0fa2afe0ab571b8 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/PhiScheme/PhiScheme.C
@@ -65,8 +65,8 @@ tmp<surfaceScalarField> PhiScheme<Type, PhiLimiter>::limiter
const surfaceVectorField& Sf = mesh.Sf();
const surfaceScalarField& magSf = mesh.magSf();
- const unallocLabelList& owner = mesh.owner();
- const unallocLabelList& neighbour = mesh.neighbour();
+ const labelUList& owner = mesh.owner();
+ const labelUList& neighbour = mesh.neighbour();
tmp<surfaceScalarField> tUflux = this->faceFlux_;
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwind.C b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwind.C
index 467614652a9237e6cf205927b3a30dee4cae2301..07f81f4ab361995e4219e6a6aa8fa323f1ef2529 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwind.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwind.C
@@ -107,7 +107,7 @@ Foam::linearUpwind<Type>::correction
if (pSfCorr.coupled())
{
- const unallocLabelList& pOwner =
+ const labelUList& pOwner =
mesh.boundary()[patchi].faceCells();
const vectorField& pCf = Cf.boundaryField()[patchi];
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMax/localMax.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMax/localMax.H
index 32bca7b54cdb23893256c6a52d5285e19d732249..cf107e6d969637399396206188230b573c388d22 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMax/localMax.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMax/localMax.H
@@ -147,8 +147,8 @@ public:
vff.boundaryField()[patchi] = vf.boundaryField()[patchi];
}
- const unallocLabelList& own = mesh.owner();
- const unallocLabelList& nei = mesh.neighbour();
+ const labelUList& own = mesh.owner();
+ const labelUList& nei = mesh.neighbour();
forAll(vff, facei)
{
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMin/localMin.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMin/localMin.H
index e6fa28cbaf42af8d94f752102fbc35e92d75548e..e3e7e27da99f75f5934cd3a3aa9aeb0a78c79268 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMin/localMin.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/localMin/localMin.H
@@ -147,8 +147,8 @@ public:
vff.boundaryField()[patchi] = vf.boundaryField()[patchi];
}
- const unallocLabelList& own = mesh.owner();
- const unallocLabelList& nei = mesh.neighbour();
+ const labelUList& own = mesh.owner();
+ const labelUList& nei = mesh.neighbour();
forAll(vff, facei)
{
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrectionVectors.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrectionVectors.C
index 0da3c4c63825c6d6368df515bfc51bf771e648c5..f434d6e62bb3491c3ece4fff3ccf603d71307159 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrectionVectors.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrectionVectors.C
@@ -81,7 +81,7 @@ void Foam::skewCorrectionVectors::makeSkewCorrectionVectors() const
const surfaceVectorField& Cf = mesh_.Cf();
const surfaceVectorField& Sf = mesh_.Sf();
- const unallocLabelList& owner = mesh_.owner();
+ const labelUList& owner = mesh_.owner();
// Build the d-vectors
surfaceVectorField d = Sf/(mesh_.magSf()*mesh_.deltaCoeffs());
@@ -112,7 +112,7 @@ void Foam::skewCorrectionVectors::makeSkewCorrectionVectors() const
else
{
const fvPatch& p = patchSkewCorrVecs.patch();
- const unallocLabelList& faceCells = p.faceCells();
+ const labelUList& faceCells = p.faceCells();
const vectorField& patchFaceCentres = Cf.boundaryField()[patchI];
const vectorField& patchSf = Sf.boundaryField()[patchI];
const vectorField& patchD = d.boundaryField()[patchI];
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C
index 068f9947e28c501808b0c554028fee7e2debf903..543b6932c3f62e0e13d6c4addc029c3a9ad98e54 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C
@@ -162,8 +162,8 @@ void surfaceInterpolation::makeWeights() const
// (note that we should not use fvMesh sliced fields at this point yet
// since this causes a loop when generating weighting factors in
// coupledFvPatchField evaluation phase)
- const unallocLabelList& owner = mesh_.owner();
- const unallocLabelList& neighbour = mesh_.neighbour();
+ const labelUList& owner = mesh_.owner();
+ const labelUList& neighbour = mesh_.neighbour();
const vectorField& Cf = mesh_.faceCentres();
const vectorField& C = mesh_.cellCentres();
@@ -231,8 +231,8 @@ void surfaceInterpolation::makeDeltaCoeffs() const
// Set local references to mesh data
const volVectorField& C = mesh_.C();
- const unallocLabelList& owner = mesh_.owner();
- const unallocLabelList& neighbour = mesh_.neighbour();
+ const labelUList& owner = mesh_.owner();
+ const labelUList& neighbour = mesh_.neighbour();
const surfaceVectorField& Sf = mesh_.Sf();
const surfaceScalarField& magSf = mesh_.magSf();
@@ -288,8 +288,8 @@ void surfaceInterpolation::makeCorrectionVectors() const
// Set local references to mesh data
const volVectorField& C = mesh_.C();
- const unallocLabelList& owner = mesh_.owner();
- const unallocLabelList& neighbour = mesh_.neighbour();
+ const labelUList& owner = mesh_.owner();
+ const labelUList& neighbour = mesh_.neighbour();
const surfaceVectorField& Sf = mesh_.Sf();
const surfaceScalarField& magSf = mesh_.magSf();
const surfaceScalarField& DeltaCoeffs = deltaCoeffs();
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
index 89e3523435adb2493fd3a2f753dd08c043671e1b..3f8eb050953d0e758311db2244c930a4de3f4bea 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolationScheme/surfaceInterpolationScheme.C
@@ -184,8 +184,8 @@ surfaceInterpolationScheme<Type>::interpolate
const scalarField& y = ys.internalField();
const fvMesh& mesh = vf.mesh();
- const unallocLabelList& P = mesh.owner();
- const unallocLabelList& N = mesh.neighbour();
+ const labelUList& P = mesh.owner();
+ const labelUList& N = mesh.neighbour();
tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > tsf
(
@@ -263,8 +263,8 @@ surfaceInterpolationScheme<Type>::interpolate
const scalarField& lambda = lambdas.internalField();
const fvMesh& mesh = vf.mesh();
- const unallocLabelList& P = mesh.owner();
- const unallocLabelList& N = mesh.neighbour();
+ const labelUList& P = mesh.owner();
+ const labelUList& N = mesh.neighbour();
tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > tsf
(
diff --git a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomerate.C b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomerate.C
index 456eaedbc69cfeb64fa34151f1b6d946ed231d6e..33e721cac34de72e8f1857a104e180882b0b00bc 100644
--- a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomerate.C
+++ b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomerate.C
@@ -50,8 +50,8 @@ makeCompactCellFaceAddressingAndFaceWeights
const label nFineCells = fineAddressing.size();
const label nFineFaces = fineAddressing.upperAddr().size();
- const unallocLabelList& upperAddr = fineAddressing.upperAddr();
- const unallocLabelList& lowerAddr = fineAddressing.lowerAddr();
+ const labelUList& upperAddr = fineAddressing.upperAddr();
+ const labelUList& lowerAddr = fineAddressing.lowerAddr();
// Number of neighbours for each cell
labelList nNbrs(nFineCells, 0);
diff --git a/src/fvMotionSolver/motionDiffusivity/inverseFaceDistance/inverseFaceDistanceDiffusivity.C b/src/fvMotionSolver/motionDiffusivity/inverseFaceDistance/inverseFaceDistanceDiffusivity.C
index 02db9ad941ab5838d4e031bba1cbcca56ab45e7c..62587d26ff87473072bac6903fe0b40d56dab195 100644
--- a/src/fvMotionSolver/motionDiffusivity/inverseFaceDistance/inverseFaceDistanceDiffusivity.C
+++ b/src/fvMotionSolver/motionDiffusivity/inverseFaceDistance/inverseFaceDistanceDiffusivity.C
@@ -132,7 +132,7 @@ void Foam::inverseFaceDistanceDiffusivity::correct()
{
fvsPatchScalarField& bfld = faceDiffusivity_.boundaryField()[patchI];
- const unallocLabelList& faceCells = bfld.patch().faceCells();
+ const labelUList& faceCells = bfld.patch().faceCells();
if (patchSet.found(patchI))
{
diff --git a/src/fvMotionSolver/motionDiffusivity/inversePointDistance/inversePointDistanceDiffusivity.C b/src/fvMotionSolver/motionDiffusivity/inversePointDistance/inversePointDistanceDiffusivity.C
index ff49bc7dbb6c8beb6e99f74ed303daf850bfbdab..7ed2a34bba36e11a5d4655f7ef12a6dc4ffa17c2 100644
--- a/src/fvMotionSolver/motionDiffusivity/inversePointDistance/inversePointDistanceDiffusivity.C
+++ b/src/fvMotionSolver/motionDiffusivity/inversePointDistance/inversePointDistanceDiffusivity.C
@@ -161,7 +161,7 @@ void Foam::inversePointDistanceDiffusivity::correct()
if (patchSet.found(patchI))
{
- const unallocLabelList& faceCells = bfld.patch().faceCells();
+ const labelUList& faceCells = bfld.patch().faceCells();
forAll(bfld, i)
{
diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
index 3c124b59f308ee680a6b5120ce0c55eab2f14c10..512c6514493934c337cbfec9a51be4dc10d287b6 100644
--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C
@@ -89,7 +89,7 @@ void Foam::meshRefinement::calcNeighbourData
{
const polyPatch& pp = patches[patchI];
- const unallocLabelList& faceCells = pp.faceCells();
+ const labelUList& faceCells = pp.faceCells();
const vectorField::subField faceCentres = pp.faceCentres();
const vectorField::subField faceAreas = pp.faceAreas();
diff --git a/src/meshTools/cellQuality/cellQuality.C b/src/meshTools/cellQuality/cellQuality.C
index a5ea0c6b5bc758068190a15d06eee8c43821e100..13a294feea520179c70eeaab3f24359941963031 100644
--- a/src/meshTools/cellQuality/cellQuality.C
+++ b/src/meshTools/cellQuality/cellQuality.C
@@ -73,7 +73,7 @@ Foam::tmp<Foam::scalarField> Foam::cellQuality::nonOrthogonality() const
forAll(mesh_.boundaryMesh(), patchI)
{
- const unallocLabelList& faceCells =
+ const labelUList& faceCells =
mesh_.boundaryMesh()[patchI].faceCells();
const vectorField::subField faceCentres =
@@ -146,7 +146,7 @@ Foam::tmp<Foam::scalarField> Foam::cellQuality::skewness() const
forAll(mesh_.boundaryMesh(), patchI)
{
- const unallocLabelList& faceCells =
+ const labelUList& faceCells =
mesh_.boundaryMesh()[patchI].faceCells();
const vectorField::subField faceCentres =
@@ -212,7 +212,7 @@ Foam::tmp<Foam::scalarField> Foam::cellQuality::faceNonOrthogonality() const
forAll(mesh_.boundaryMesh(), patchI)
{
- const unallocLabelList& faceCells =
+ const labelUList& faceCells =
mesh_.boundaryMesh()[patchI].faceCells();
const vectorField::subField faceCentres =
@@ -283,7 +283,7 @@ Foam::tmp<Foam::scalarField> Foam::cellQuality::faceSkewness() const
forAll(mesh_.boundaryMesh(), patchI)
{
- const unallocLabelList& faceCells =
+ const labelUList& faceCells =
mesh_.boundaryMesh()[patchI].faceCells();
const vectorField::subField faceCentres =
diff --git a/src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.C b/src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.C
index f48abc08eb24e6bf75875766d6764ef18f3398bd..f3b679154c182ded48ef7b6a45e7559dcd598999 100644
--- a/src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.C
+++ b/src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.C
@@ -703,7 +703,7 @@ Foam::directMappedPatchBase::directMappedPatchBase
(
const polyPatch& pp,
const directMappedPatchBase& dmp,
- const unallocLabelList& mapAddressing
+ const labelUList& mapAddressing
)
:
patch_(pp),
diff --git a/src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.H b/src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.H
index 577f014dee7c54016aace419511fe32e7d413497..281e24ec6e916842f6590e302bb29e38b69b9ee0 100644
--- a/src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.H
+++ b/src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.H
@@ -177,7 +177,7 @@ public:
(
const polyPatch&,
const directMappedPatchBase&,
- const unallocLabelList& mapAddressing
+ const labelUList& mapAddressing
);
diff --git a/src/meshTools/directMapped/directMappedPolyPatch/directMappedPolyPatch.C b/src/meshTools/directMapped/directMappedPolyPatch/directMappedPolyPatch.C
index 3d751e17fefe69c0848d11f3264b0667224d9b88..cf2f63b24e162ccdfc288128f2bc2e3260eb66be 100644
--- a/src/meshTools/directMapped/directMappedPolyPatch/directMappedPolyPatch.C
+++ b/src/meshTools/directMapped/directMappedPolyPatch/directMappedPolyPatch.C
@@ -149,7 +149,7 @@ Foam::directMappedPolyPatch::directMappedPolyPatch
const directMappedPolyPatch& pp,
const polyBoundaryMesh& bm,
const label index,
- const unallocLabelList& mapAddressing,
+ const labelUList& mapAddressing,
const label newStart
)
:
diff --git a/src/meshTools/directMapped/directMappedPolyPatch/directMappedPolyPatch.H b/src/meshTools/directMapped/directMappedPolyPatch/directMappedPolyPatch.H
index d31abbe063aa135045cb8ace1f737808f4590c2d..7598c1959b36a8b8bf96801dbf4c26d8ec38d1b8 100644
--- a/src/meshTools/directMapped/directMappedPolyPatch/directMappedPolyPatch.H
+++ b/src/meshTools/directMapped/directMappedPolyPatch/directMappedPolyPatch.H
@@ -161,7 +161,7 @@ public:
const directMappedPolyPatch& pp,
const polyBoundaryMesh& bm,
const label index,
- const unallocLabelList& mapAddressing,
+ const labelUList& mapAddressing,
const label newStart
);
@@ -193,7 +193,7 @@ public:
(
const polyBoundaryMesh& bm,
const label index,
- const unallocLabelList& mapAddressing,
+ const labelUList& mapAddressing,
const label newStart
) const
{
diff --git a/src/meshTools/directMapped/directMappedPolyPatch/directMappedWallPolyPatch.C b/src/meshTools/directMapped/directMappedPolyPatch/directMappedWallPolyPatch.C
index 78143b912c118b2d385e1222e056ba3a60182d34..1cf56feeb0e143fb1311bc326a16de9084a7b16a 100644
--- a/src/meshTools/directMapped/directMappedPolyPatch/directMappedWallPolyPatch.C
+++ b/src/meshTools/directMapped/directMappedPolyPatch/directMappedWallPolyPatch.C
@@ -154,7 +154,7 @@ Foam::directMappedWallPolyPatch::directMappedWallPolyPatch
const directMappedWallPolyPatch& pp,
const polyBoundaryMesh& bm,
const label index,
- const unallocLabelList& mapAddressing,
+ const labelUList& mapAddressing,
const label newStart
)
:
diff --git a/src/meshTools/directMapped/directMappedPolyPatch/directMappedWallPolyPatch.H b/src/meshTools/directMapped/directMappedPolyPatch/directMappedWallPolyPatch.H
index 4fff29f752854c79db34784ba19ef42b36aeeb53..60214cf462f2a080f7d474c57d4262422276004b 100644
--- a/src/meshTools/directMapped/directMappedPolyPatch/directMappedWallPolyPatch.H
+++ b/src/meshTools/directMapped/directMappedPolyPatch/directMappedWallPolyPatch.H
@@ -161,7 +161,7 @@ public:
const directMappedWallPolyPatch& pp,
const polyBoundaryMesh& bm,
const label index,
- const unallocLabelList& mapAddressing,
+ const labelUList& mapAddressing,
const label newStart
);
@@ -200,7 +200,7 @@ public:
(
const polyBoundaryMesh& bm,
const label index,
- const unallocLabelList& mapAddressing,
+ const labelUList& mapAddressing,
const label newStart
) const
{
diff --git a/src/meshTools/indexedOctree/treeDataCell.C b/src/meshTools/indexedOctree/treeDataCell.C
index 8492f59c4f8cfe7436a05c42c05c4e9d18d4cdda..e6d6424434bb8c5befef9ea12865e2abd99bdb92 100644
--- a/src/meshTools/indexedOctree/treeDataCell.C
+++ b/src/meshTools/indexedOctree/treeDataCell.C
@@ -84,7 +84,7 @@ Foam::treeDataCell::treeDataCell
(
const bool cacheBb,
const primitiveMesh& mesh,
- const unallocLabelList& cellLabels
+ const labelUList& cellLabels
)
:
mesh_(mesh),
@@ -171,7 +171,7 @@ bool Foam::treeDataCell::contains
// nearestPoint.
void Foam::treeDataCell::findNearest
(
- const unallocLabelList& indices,
+ const labelUList& indices,
const point& sample,
scalar& nearestDistSqr,
diff --git a/src/meshTools/indexedOctree/treeDataCell.H b/src/meshTools/indexedOctree/treeDataCell.H
index 4bf5ddb5c2379d33f23610a53bd23afa73754075..12ab64e2bf0fce59d4f34f2d9d20c7e6d7d202ed 100644
--- a/src/meshTools/indexedOctree/treeDataCell.H
+++ b/src/meshTools/indexedOctree/treeDataCell.H
@@ -88,7 +88,7 @@ public:
(
const bool cacheBb,
const primitiveMesh&,
- const unallocLabelList&
+ const labelUList&
);
//- Construct from mesh and subset of cells, transferring contents
@@ -164,7 +164,7 @@ public:
// Returns actual point and distance (squared)
void findNearest
(
- const unallocLabelList& indices,
+ const labelUList& indices,
const point& sample,
scalar& nearestDistSqr,
@@ -176,7 +176,7 @@ public:
// Returns point and distance (squared)
void findNearest
(
- const unallocLabelList& indices,
+ const labelUList& indices,
const linePointRef& ln,
treeBoundBox& tightest,
@@ -188,7 +188,7 @@ public:
notImplemented
(
"treeDataCell::findNearest"
- "(const unallocLabelList&, const linePointRef&, ..)"
+ "(const labelUList&, const linePointRef&, ..)"
);
}
diff --git a/src/meshTools/indexedOctree/treeDataEdge.C b/src/meshTools/indexedOctree/treeDataEdge.C
index 0a65f8ece811c654f65dc1685ada1ee25208e6d1..6dde7b8a6b3261a5f9f9ca8a6d7ba40bc036e150 100644
--- a/src/meshTools/indexedOctree/treeDataEdge.C
+++ b/src/meshTools/indexedOctree/treeDataEdge.C
@@ -64,7 +64,7 @@ Foam::treeDataEdge::treeDataEdge
const bool cacheBb,
const edgeList& edges,
const pointField& points,
- const unallocLabelList& edgeLabels
+ const labelUList& edgeLabels
)
:
edges_(edges),
@@ -143,7 +143,7 @@ bool Foam::treeDataEdge::overlaps
// nearestPoint.
void Foam::treeDataEdge::findNearest
(
- const unallocLabelList& indices,
+ const labelUList& indices,
const point& sample,
scalar& nearestDistSqr,
@@ -175,7 +175,7 @@ void Foam::treeDataEdge::findNearest
// Returns point and distance (squared)
void Foam::treeDataEdge::findNearest
(
- const unallocLabelList& indices,
+ const labelUList& indices,
const linePointRef& ln,
treeBoundBox& tightest,
diff --git a/src/meshTools/indexedOctree/treeDataEdge.H b/src/meshTools/indexedOctree/treeDataEdge.H
index 8b7e54879fad4f58a0a0013c6e64de273ccc5dca..8a02a8df9e4f67bc24d55d130f66a7a28a56d16d 100644
--- a/src/meshTools/indexedOctree/treeDataEdge.H
+++ b/src/meshTools/indexedOctree/treeDataEdge.H
@@ -98,7 +98,7 @@ public:
const bool cacheBb,
const edgeList& edges,
const pointField& points,
- const unallocLabelList& edgeLabels
+ const labelUList& edgeLabels
);
//- Construct from selected edges, transferring contents.
@@ -152,7 +152,7 @@ public:
// Returns actual point and distance (squared)
void findNearest
(
- const unallocLabelList& indices,
+ const labelUList& indices,
const point& sample,
scalar& nearestDistSqr,
@@ -164,7 +164,7 @@ public:
// Returns point and distance (squared)
void findNearest
(
- const unallocLabelList& indices,
+ const labelUList& indices,
const linePointRef& ln,
treeBoundBox& tightest,
diff --git a/src/meshTools/indexedOctree/treeDataFace.C b/src/meshTools/indexedOctree/treeDataFace.C
index f8273bec03a5fb0220bf01e9381d109365332f7b..7114781de712d2189a4e272c8f4af4666248392c 100644
--- a/src/meshTools/indexedOctree/treeDataFace.C
+++ b/src/meshTools/indexedOctree/treeDataFace.C
@@ -80,7 +80,7 @@ Foam::treeDataFace::treeDataFace
(
const bool cacheBb,
const primitiveMesh& mesh,
- const unallocLabelList& faceLabels
+ const labelUList& faceLabels
)
:
mesh_(mesh),
@@ -482,7 +482,7 @@ bool Foam::treeDataFace::overlaps
// nearestPoint.
void Foam::treeDataFace::findNearest
(
- const unallocLabelList& indices,
+ const labelUList& indices,
const point& sample,
scalar& nearestDistSqr,
diff --git a/src/meshTools/indexedOctree/treeDataFace.H b/src/meshTools/indexedOctree/treeDataFace.H
index 6dbb881dbb5b70715d80a7c854f1f02fda84da94..1e6e53690c06bd3f761b839744482fb50f30d99e 100644
--- a/src/meshTools/indexedOctree/treeDataFace.H
+++ b/src/meshTools/indexedOctree/treeDataFace.H
@@ -101,7 +101,7 @@ public:
(
const bool cacheBb,
const primitiveMesh&,
- const unallocLabelList&
+ const labelUList&
);
//- Construct from mesh and subset of faces, transferring contents
@@ -164,7 +164,7 @@ public:
// Returns actual point and distance (squared)
void findNearest
(
- const unallocLabelList& indices,
+ const labelUList& indices,
const point& sample,
scalar& nearestDistSqr,
@@ -176,7 +176,7 @@ public:
// Returns point and distance (squared)
void findNearest
(
- const unallocLabelList& indices,
+ const labelUList& indices,
const linePointRef& ln,
treeBoundBox& tightest,
@@ -188,7 +188,7 @@ public:
notImplemented
(
"treeDataFace::findNearest"
- "(const unallocLabelList&, const linePointRef&, ..)"
+ "(const labelUList&, const linePointRef&, ..)"
);
}
diff --git a/src/meshTools/indexedOctree/treeDataPoint.C b/src/meshTools/indexedOctree/treeDataPoint.C
index ffdbfdd4e091b0777aa5be7fc38cd5ce842a51e5..0c3e628c6f91d959d2a862a0b06d60cb8e8cf6f3 100644
--- a/src/meshTools/indexedOctree/treeDataPoint.C
+++ b/src/meshTools/indexedOctree/treeDataPoint.C
@@ -77,7 +77,7 @@ bool Foam::treeDataPoint::overlaps
// nearestPoint.
void Foam::treeDataPoint::findNearest
(
- const unallocLabelList& indices,
+ const labelUList& indices,
const point& sample,
scalar& nearestDistSqr,
@@ -107,7 +107,7 @@ void Foam::treeDataPoint::findNearest
// Returns point and distance (squared)
void Foam::treeDataPoint::findNearest
(
- const unallocLabelList& indices,
+ const labelUList& indices,
const linePointRef& ln,
treeBoundBox& tightest,
diff --git a/src/meshTools/indexedOctree/treeDataPoint.H b/src/meshTools/indexedOctree/treeDataPoint.H
index 236f8139b8dd38f457b2e8408e645b3f9f3e6386..58cabd3fd3499b735e0cfe92f55431611c6abff6 100644
--- a/src/meshTools/indexedOctree/treeDataPoint.H
+++ b/src/meshTools/indexedOctree/treeDataPoint.H
@@ -107,7 +107,7 @@ public:
// Returns actual point and distance (squared)
void findNearest
(
- const unallocLabelList& indices,
+ const labelUList& indices,
const point& sample,
scalar& nearestDistSqr,
@@ -119,7 +119,7 @@ public:
// Returns point and distance (squared)
void findNearest
(
- const unallocLabelList& indices,
+ const labelUList& indices,
const linePointRef& ln,
treeBoundBox& tightest,
diff --git a/src/meshTools/indexedOctree/treeDataPrimitivePatch.C b/src/meshTools/indexedOctree/treeDataPrimitivePatch.C
index 8fc75b77c500f168f206b89c2942b3d6d09f7bb5..1267b1342f47bed5ea955017994a73fd2683b94f 100644
--- a/src/meshTools/indexedOctree/treeDataPrimitivePatch.C
+++ b/src/meshTools/indexedOctree/treeDataPrimitivePatch.C
@@ -477,7 +477,7 @@ void
Foam::treeDataPrimitivePatch<Face, FaceList, PointField, PointType>::
findNearest
(
- const unallocLabelList& indices,
+ const labelUList& indices,
const point& sample,
scalar& nearestDistSqr,
diff --git a/src/meshTools/indexedOctree/treeDataPrimitivePatch.H b/src/meshTools/indexedOctree/treeDataPrimitivePatch.H
index 7c3757504b63cf07c8a4460fd72bd50027ee68d9..ca40e7118f2a313d5c2a50a500e4a0fa8ba8d7f4 100644
--- a/src/meshTools/indexedOctree/treeDataPrimitivePatch.H
+++ b/src/meshTools/indexedOctree/treeDataPrimitivePatch.H
@@ -151,7 +151,7 @@ public:
// Returns actual point and distance (squared)
void findNearest
(
- const unallocLabelList& indices,
+ const labelUList& indices,
const point& sample,
scalar& nearestDistSqr,
@@ -163,7 +163,7 @@ public:
// Returns point and distance (squared)
void findNearest
(
- const unallocLabelList& indices,
+ const labelUList& indices,
const linePointRef& ln,
treeBoundBox& tightest,
@@ -175,7 +175,7 @@ public:
notImplemented
(
"treeDataPrimitivePatch::findNearest"
- "(const unallocLabelList&, const linePointRef&, ..)"
+ "(const labelUList&, const linePointRef&, ..)"
);
}
diff --git a/src/meshTools/indexedOctree/treeDataTriSurface.C b/src/meshTools/indexedOctree/treeDataTriSurface.C
index f380167174481939ae61a056bae233485239d815..81cad2948bf6fc99630e881f7a59a0254bc5de1a 100644
--- a/src/meshTools/indexedOctree/treeDataTriSurface.C
+++ b/src/meshTools/indexedOctree/treeDataTriSurface.C
@@ -311,7 +311,7 @@ bool Foam::treeDataTriSurface::overlaps
// nearestPoint.
void Foam::treeDataTriSurface::findNearest
(
- const unallocLabelList& indices,
+ const labelUList& indices,
const point& sample,
scalar& nearestDistSqr,
@@ -398,7 +398,7 @@ void Foam::treeDataTriSurface::findNearest
// nearestPoint.
void Foam::treeDataTriSurface::findNearest
(
- const unallocLabelList& indices,
+ const labelUList& indices,
const linePointRef& ln,
treeBoundBox& tightest,
@@ -409,7 +409,7 @@ void Foam::treeDataTriSurface::findNearest
{
notImplemented
(
- "treeDataTriSurface::findNearest(const unallocLabelList&"
+ "treeDataTriSurface::findNearest(const labelUList&"
", const linePointRef&, treeBoundBox&, label&, point&, point&) const"
);
}
diff --git a/src/meshTools/indexedOctree/treeDataTriSurface.H b/src/meshTools/indexedOctree/treeDataTriSurface.H
index dc959f78ff69ec71bb0f201d5fe9366f9afcc5a1..979e3a78016030e58cc053fd0df8699cd924a4aa 100644
--- a/src/meshTools/indexedOctree/treeDataTriSurface.H
+++ b/src/meshTools/indexedOctree/treeDataTriSurface.H
@@ -127,7 +127,7 @@ public:
// Returns actual point and distance (squared)
void findNearest
(
- const unallocLabelList& indices,
+ const labelUList& indices,
const point& sample,
scalar& nearestDistSqr,
@@ -139,7 +139,7 @@ public:
// Returns point and distance (squared)
void findNearest
(
- const unallocLabelList& indices,
+ const labelUList& indices,
const linePointRef& ln,
treeBoundBox& tightest,
diff --git a/src/meshTools/octree/treeBoundBox.C b/src/meshTools/octree/treeBoundBox.C
index e4f4c14543569b6ca0a9a2cd9c196e9bcb249c4d..eab4694b3b31d4a64a5f1a9f85ca90e1af532d7d 100644
--- a/src/meshTools/octree/treeBoundBox.C
+++ b/src/meshTools/octree/treeBoundBox.C
@@ -155,7 +155,7 @@ Foam::treeBoundBox::treeBoundBox(const UList<point>& points)
Foam::treeBoundBox::treeBoundBox
(
const UList<point>& points,
- const UList<label>& meshPoints
+ const labelUList& meshPoints
)
:
boundBox()
@@ -165,7 +165,7 @@ Foam::treeBoundBox::treeBoundBox
WarningIn
(
"treeBoundBox::treeBoundBox"
- "(const UList<point>&, const UList<label>&)"
+ "(const UList<point>&, const labelUList&)"
) << "cannot find bounding box for zero-sized pointField"
<< "returning zero" << endl;
diff --git a/src/meshTools/octree/treeBoundBox.H b/src/meshTools/octree/treeBoundBox.H
index fff34115927888d3cb40d37b211b55c42e6ebed3..f462c719ae8c9fbba7a1e7fc8692cea1ffafdece 100644
--- a/src/meshTools/octree/treeBoundBox.H
+++ b/src/meshTools/octree/treeBoundBox.H
@@ -177,7 +177,7 @@ public:
//- Construct as subset of points
// Local processor domain only (no reduce as in boundBox)
- treeBoundBox(const UList<point>&, const UList<label>& meshPoints);
+ treeBoundBox(const UList<point>&, const labelUList& meshPoints);
//- Construct from Istream
treeBoundBox(Istream&);
diff --git a/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
index d405e779cc69a204c23fa77ea03fca756c81035b..4b375640cd31cc957782ff9ae9c10c36d7b3df23 100644
--- a/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
+++ b/src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
@@ -238,8 +238,8 @@ Foam::label Foam::decompositionMethod::masterFace
// pbm[patchI]
// );
//
-// const unallocLabelList& faceCells = cycPatch.faceCells();
-// const unallocLabelList& nbrCells =
+// const labelUList& faceCells = cycPatch.faceCells();
+// const labelUList& nbrCells =
// cycPatch.neighbPatch().faceCells();
//
// forAll(faceCells, facei)
@@ -308,8 +308,8 @@ Foam::label Foam::decompositionMethod::masterFace
// pbm[patchI]
// );
//
-// const unallocLabelList& faceCells = cycPatch.faceCells();
-// const unallocLabelList& nbrCells =
+// const labelUList& faceCells = cycPatch.faceCells();
+// const labelUList& nbrCells =
// cycPatch.neighbPatch().faceCells();
//
// forAll(faceCells, facei)
diff --git a/src/parallel/decompose/decompositionMethods/structuredDecomp/structuredDecomp.C b/src/parallel/decompose/decompositionMethods/structuredDecomp/structuredDecomp.C
index 04338dc46b9af2a45633cc0682ddbb1940b22110..0e837a88f896a19946bf1097a143b8536634dda6 100644
--- a/src/parallel/decompose/decompositionMethods/structuredDecomp/structuredDecomp.C
+++ b/src/parallel/decompose/decompositionMethods/structuredDecomp/structuredDecomp.C
@@ -95,7 +95,7 @@ Foam::labelList Foam::structuredDecomp::decompose
labelHashSet patchCells(2*nFaces);
forAll(patchIDs, i)
{
- const unallocLabelList& fc = pbm[patchIDs[i]].faceCells();
+ const labelUList& fc = pbm[patchIDs[i]].faceCells();
forAll(fc, i)
{
patchCells.insert(fc[i]);
@@ -131,7 +131,7 @@ Foam::labelList Foam::structuredDecomp::decompose
forAll(patchIDs, i)
{
const polyPatch& pp = pbm[patchIDs[i]];
- const unallocLabelList& fc = pp.faceCells();
+ const labelUList& fc = pp.faceCells();
forAll(fc, i)
{
patchFaces[nFaces] = pp.start()+i;
diff --git a/src/parallel/reconstruct/reconstruct/fvFieldReconstructor.H b/src/parallel/reconstruct/reconstruct/fvFieldReconstructor.H
index 81d40b634dbbfac1972b4ebbcae057e4d0a39bf0..c2df14ba473ff04959d0658a6abe9c6ea1f15695 100644
--- a/src/parallel/reconstruct/reconstruct/fvFieldReconstructor.H
+++ b/src/parallel/reconstruct/reconstruct/fvFieldReconstructor.H
@@ -115,7 +115,7 @@ public:
return true;
}
- const unallocLabelList& directAddressing() const
+ const labelUList& directAddressing() const
{
return unallocLabelList::null();
}
diff --git a/src/parallel/reconstruct/reconstruct/pointFieldReconstructor.H b/src/parallel/reconstruct/reconstruct/pointFieldReconstructor.H
index faafb1d291ba8a74428e5a1921c80b2642f7f7ea..dbb6728c9cc453913d87a871205efd75688cd6dc 100644
--- a/src/parallel/reconstruct/reconstruct/pointFieldReconstructor.H
+++ b/src/parallel/reconstruct/reconstruct/pointFieldReconstructor.H
@@ -112,7 +112,7 @@ public:
return true;
}
- const unallocLabelList& directAddressing() const
+ const labelUList& directAddressing() const
{
return unallocLabelList::null();
}
diff --git a/src/sampling/cuttingPlane/cuttingPlane.C b/src/sampling/cuttingPlane/cuttingPlane.C
index 35e98239aa7e5f1e51f3c0b8c680ecf68065077b..f2ed510a5522f88cfda40272c67059b1c8a01f15 100644
--- a/src/sampling/cuttingPlane/cuttingPlane.C
+++ b/src/sampling/cuttingPlane/cuttingPlane.C
@@ -44,7 +44,7 @@ void Foam::cuttingPlane::calcCutCells
(
const primitiveMesh& mesh,
const scalarField& dotProducts,
- const UList<label>& cellIdLabels
+ const labelUList& cellIdLabels
)
{
const labelListList& cellEdges = mesh.cellEdges();
@@ -165,7 +165,7 @@ void Foam::cuttingPlane::intersectEdges
bool Foam::cuttingPlane::walkCell
(
const primitiveMesh& mesh,
- const UList<label>& edgePoint,
+ const labelUList& edgePoint,
const label cellI,
const label startEdgeI,
DynamicList<label>& faceVerts
@@ -258,7 +258,7 @@ void Foam::cuttingPlane::walkCellCuts
(
const primitiveMesh& mesh,
const bool triangulate,
- const UList<label>& edgePoint
+ const labelUList& edgePoint
)
{
const pointField& cutPoints = this->points();
@@ -355,7 +355,7 @@ Foam::cuttingPlane::cuttingPlane
const plane& pln,
const primitiveMesh& mesh,
const bool triangulate,
- const UList<label>& cellIdLabels
+ const labelUList& cellIdLabels
)
:
plane(pln)
@@ -372,7 +372,7 @@ void Foam::cuttingPlane::reCut
(
const primitiveMesh& mesh,
const bool triangulate,
- const UList<label>& cellIdLabels
+ const labelUList& cellIdLabels
)
{
MeshStorage::clear();
@@ -396,7 +396,7 @@ void Foam::cuttingPlane::reCut
// remap action on triangulation
void Foam::cuttingPlane::remapFaces
(
- const UList<label>& faceMap
+ const labelUList& faceMap
)
{
// recalculate the cells cut
diff --git a/src/sampling/cuttingPlane/cuttingPlane.H b/src/sampling/cuttingPlane/cuttingPlane.H
index 22ef553bd91d4210bd3f4be386baefca618ad8e5..27651362f7478f3cd16778b9043585fc94129f27 100644
--- a/src/sampling/cuttingPlane/cuttingPlane.H
+++ b/src/sampling/cuttingPlane/cuttingPlane.H
@@ -78,7 +78,7 @@ class cuttingPlane
(
const primitiveMesh&,
const scalarField& dotProducts,
- const UList<label>& cellIdLabels = UList<label>::null()
+ const labelUList& cellIdLabels = labelUList::null()
);
//- Determine intersection points (cutPoints).
@@ -94,7 +94,7 @@ class cuttingPlane
static bool walkCell
(
const primitiveMesh&,
- const UList<label>& edgePoint,
+ const labelUList& edgePoint,
const label cellI,
const label startEdgeI,
DynamicList<label>& faceVerts
@@ -105,7 +105,7 @@ class cuttingPlane
(
const primitiveMesh& mesh,
const bool triangulate,
- const UList<label>& edgePoint
+ const labelUList& edgePoint
);
@@ -123,11 +123,11 @@ protected:
(
const primitiveMesh&,
const bool triangulate,
- const UList<label>& cellIdLabels = UList<label>::null()
+ const labelUList& cellIdLabels = labelUList::null()
);
//- remap action on triangulation or cleanup
- virtual void remapFaces(const UList<label>& faceMap);
+ virtual void remapFaces(const labelUList& faceMap);
public:
@@ -140,7 +140,7 @@ public:
const plane&,
const primitiveMesh&,
const bool triangulate,
- const UList<label>& cellIdLabels = UList<label>::null()
+ const labelUList& cellIdLabels = labelUList::null()
);
diff --git a/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshAddressing.C b/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshAddressing.C
index 0248c41d30e6f03bb36b20c530318afeaaacfafe..423efb0fdf18be1ce5b7e44f53f6c49954e7c8bb 100644
--- a/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshAddressing.C
+++ b/src/sampling/meshToMeshInterpolation/meshToMesh/calculateMeshToMeshAddressing.C
@@ -74,7 +74,7 @@ void Foam::meshToMesh::calcAddressing()
forAll(patchesFrom, patchI)
{
// get reference to cells next to the boundary
- const unallocLabelList& bCells = patchesFrom[patchI].faceCells();
+ const labelUList& bCells = patchesFrom[patchI].faceCells();
forAll(bCells, faceI)
{
diff --git a/src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C b/src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C
index 6f33f00f112394cf812bbc5799b6b7fac5f4a7a6..5adbcdb5cf57a5f4c257910e80395a9b93f717c3 100644
--- a/src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C
+++ b/src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C
@@ -102,7 +102,7 @@ Foam::isoSurface::adaptPatchFields
// Note: cannot use patchInternalField since uses emptyFvPatch::size
// Do our own internalField instead.
- const unallocLabelList& faceCells =
+ const labelUList& faceCells =
mesh.boundary()[patchI].patch().faceCells();
Field<Type>& pfld = sliceFld.boundaryField()[patchI];
diff --git a/src/sampling/sampledSurface/sampledPatch/sampledPatch.C b/src/sampling/sampledSurface/sampledPatch/sampledPatch.C
index 4dfd6351f1ee445fb9b6aade11e839dc03245cb3..9ed86afef8a9f63d6d9c942a96b59662e0ba1524 100644
--- a/src/sampling/sampledSurface/sampledPatch/sampledPatch.C
+++ b/src/sampling/sampledSurface/sampledPatch/sampledPatch.C
@@ -150,7 +150,7 @@ bool Foam::sampledPatch::update()
// remap action on triangulation
void Foam::sampledPatch::remapFaces
(
- const UList<label>& faceMap
+ const labelUList& faceMap
)
{
// recalculate the cells cut
diff --git a/src/sampling/sampledSurface/sampledPatch/sampledPatch.H b/src/sampling/sampledSurface/sampledPatch/sampledPatch.H
index 8466197ca860bc77739fc9b0e5e2f2a51b649ddc..2fdfe38c6a187308f82ec79f2d3b9987a34e2688 100644
--- a/src/sampling/sampledSurface/sampledPatch/sampledPatch.H
+++ b/src/sampling/sampledSurface/sampledPatch/sampledPatch.H
@@ -86,7 +86,7 @@ class sampledPatch
//- remap action on triangulation or cleanup
- virtual void remapFaces(const UList<label>& faceMap);
+ virtual void remapFaces(const labelUList& faceMap);
public:
diff --git a/src/surfMesh/MeshedSurface/MeshedSurface.C b/src/surfMesh/MeshedSurface/MeshedSurface.C
index 91f50409368fefe913e9691a7ff6acf01e00ab5a..f3c4c5bde81ccfa40a01c911bf6fc25cd61afbe7 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurface.C
+++ b/src/surfMesh/MeshedSurface/MeshedSurface.C
@@ -187,7 +187,7 @@ Foam::MeshedSurface<Face>::MeshedSurface
(
const Xfer<pointField>& pointLst,
const Xfer<List<Face> >& faceLst,
- const UList<label>& zoneSizes,
+ const labelUList& zoneSizes,
const UList<word>& zoneNames
)
:
@@ -430,7 +430,7 @@ Foam::MeshedSurface<Face>::~MeshedSurface()
template<class Face>
void Foam::MeshedSurface<Face>::remapFaces
(
- const UList<label>& faceMap
+ const labelUList& faceMap
)
{
// recalculate the zone start/size
@@ -920,7 +920,7 @@ Foam::label Foam::MeshedSurface<Face>::triangulate
{
newFaces[newFaceI] = Face
(
- static_cast<UList<label>&>(tmpTri[triI])
+ static_cast<labelUList&>(tmpTri[triI])
);
faceMap[newFaceI] = faceI;
newFaceI++;
diff --git a/src/surfMesh/MeshedSurface/MeshedSurface.H b/src/surfMesh/MeshedSurface/MeshedSurface.H
index eb4021d3bc9485d63c512c226493db097c3e5ae4..b47e2c98d71e0778fd17b4d451fda2f11bda708b 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurface.H
+++ b/src/surfMesh/MeshedSurface/MeshedSurface.H
@@ -151,7 +151,7 @@ protected:
);
//- Set new zones from faceMap
- virtual void remapFaces(const UList<label>& faceMap);
+ virtual void remapFaces(const labelUList& faceMap);
public:
@@ -197,7 +197,7 @@ public:
(
const Xfer<pointField>&,
const Xfer<List<Face> >&,
- const UList<label>& zoneSizes = UList<label>(),
+ const labelUList& zoneSizes = labelUList(),
const UList<word>& zoneNames = UList<word>()
);
@@ -317,7 +317,7 @@ public:
//- Add surface zones
virtual void addZones
(
- const UList<label>& sizes,
+ const labelUList& sizes,
const UList<word>& names,
const bool cullEmpty=false
);
@@ -325,7 +325,7 @@ public:
//- Add surface zones
virtual void addZones
(
- const UList<label>& sizes,
+ const labelUList& sizes,
const bool cullEmpty=false
);
diff --git a/src/surfMesh/MeshedSurface/MeshedSurfaceCore.C b/src/surfMesh/MeshedSurface/MeshedSurfaceCore.C
index 17362de3a7c389f47777cc2680047c6ccf94a557..9efc4ba7fd0da236cb658a63fcf5ab56d54a8212 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurfaceCore.C
+++ b/src/surfMesh/MeshedSurface/MeshedSurfaceCore.C
@@ -46,7 +46,7 @@ namespace Foam
{
newFaces[faceI] = triFace
(
- static_cast<const UList<label>&>(origFaces[faceI])
+ static_cast<const labelUList&>(origFaces[faceI])
);
}
surf.clear();
diff --git a/src/surfMesh/MeshedSurface/MeshedSurfaceZones.C b/src/surfMesh/MeshedSurface/MeshedSurfaceZones.C
index b6846303027e268410aa9c1e2fec0887fe13fd01..a61ca0f1b721fb671c9d88f1337a1ff29d867199 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurfaceZones.C
+++ b/src/surfMesh/MeshedSurface/MeshedSurfaceZones.C
@@ -132,7 +132,7 @@ void Foam::MeshedSurface<Face>::addZones
template<class Face>
void Foam::MeshedSurface<Face>::addZones
(
- const UList<label>& sizes,
+ const labelUList& sizes,
const UList<word>& names,
const bool cullEmpty
)
@@ -164,7 +164,7 @@ void Foam::MeshedSurface<Face>::addZones
template<class Face>
void Foam::MeshedSurface<Face>::addZones
(
- const UList<label>& sizes,
+ const labelUList& sizes,
const bool cullEmpty
)
{
diff --git a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
index a80c45bfdda4f13ba7760e4fac3564bcc8f76f81..660365b28b1ee74722bff8640a7d96e2e06b7e32 100644
--- a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
+++ b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
@@ -175,7 +175,7 @@ Foam::UnsortedMeshedSurface<Face>::UnsortedMeshedSurface
(
const Xfer<pointField>& pointLst,
const Xfer<List<Face> >& faceLst,
- const UList<label>& zoneSizes,
+ const labelUList& zoneSizes,
const UList<word>& zoneNames
)
:
@@ -346,7 +346,7 @@ void Foam::UnsortedMeshedSurface<Face>::setZones
template<class Face>
void Foam::UnsortedMeshedSurface<Face>::setZones
(
- const UList<label>& sizes,
+ const labelUList& sizes,
const UList<word>& names
)
{
@@ -370,7 +370,7 @@ void Foam::UnsortedMeshedSurface<Face>::setZones
template<class Face>
void Foam::UnsortedMeshedSurface<Face>::setZones
(
- const UList<label>& sizes
+ const labelUList& sizes
)
{
zoneIds_.setSize(size());
@@ -397,7 +397,7 @@ void Foam::UnsortedMeshedSurface<Face>::setZones
template<class Face>
void Foam::UnsortedMeshedSurface<Face>::remapFaces
(
- const UList<label>& faceMap
+ const labelUList& faceMap
)
{
// re-assign the zone Ids
diff --git a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H
index 71db5183201995afcc03574159ff6ecf8840cfe5..61359a938125c8cbde27bdddecbf95f6fb0cc278 100644
--- a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H
+++ b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.H
@@ -127,7 +127,7 @@ protected:
}
//- Set new zones from faceMap
- virtual void remapFaces(const UList<label>& faceMap);
+ virtual void remapFaces(const labelUList& faceMap);
public:
@@ -172,7 +172,7 @@ public:
(
const Xfer<pointField>&,
const Xfer<List<Face> >&,
- const UList<label>& zoneSizes = UList<label>(),
+ const labelUList& zoneSizes = labelUList(),
const UList<word>& zoneNames = UList<word>()
);
@@ -284,10 +284,10 @@ public:
void setZones(const surfZoneList&);
//- Set zone ids and zones
- void setZones(const UList<label>& sizes, const UList<word>& names);
+ void setZones(const labelUList& sizes, const UList<word>& names);
//- Set zone ids and zones with default names
- void setZones(const UList<label>& sizes);
+ void setZones(const labelUList& sizes);
// Edit
diff --git a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C
index 6593d5ba3ec84b5f1fbfe4b3d8df3e2ba5e30927..70b5455eaad5fea4dfeab35a9ca37a6a65574675 100644
--- a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C
@@ -213,7 +213,7 @@ bool Foam::fileFormats::AC3DsurfaceFormat<Face>::read
verts[vertI] = parse<int>(line) + vertexOffset;
}
- UList<label>& f = static_cast<UList<label>&>(verts);
+ labelUList& f = static_cast<labelUList&>(verts);
if (mustTriangulate && f.size() > 3)
{
diff --git a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C
index 6718e49be53105df692ed5906daffcb134adaf32..0fa63e42255e5d7fba4dfd95328aaf4eddf5a96d 100644
--- a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C
@@ -228,7 +228,7 @@ bool Foam::fileFormats::NASsurfaceFormat<Face>::read
else if (cmd == "CQUAD4")
{
face fQuad(4);
- UList<label>& f = static_cast<UList<label>&>(fQuad);
+ labelUList& f = static_cast<labelUList&>(fQuad);
label groupId = readLabel(IStringStream(line.substr(16,8))());
fQuad[0] = readLabel(IStringStream(line.substr(24,8))());
diff --git a/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C b/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C
index d304c743f2ed15fc70bc5185440c05c8758ab00a..bc54486cc335add284204d7fbf3bf63ad43f0f48 100644
--- a/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C
@@ -174,7 +174,7 @@ bool Foam::fileFormats::OBJsurfaceFormat<Face>::read
}
dynVertices.shrink();
- UList<label>& f = static_cast<UList<label>&>(dynVertices);
+ labelUList& f = static_cast<labelUList&>(dynVertices);
if (mustTriangulate && f.size() > 3)
{
diff --git a/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.C b/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.C
index e31f217772815eb2aff6076c84a5ee1fe481d2fd..523791017601a1159f0de20da0bb0f2a26cc6608 100644
--- a/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.C
@@ -120,7 +120,7 @@ bool Foam::fileFormats::OFFsurfaceFormat<Face>::read
lineStream >> verts[vertI];
}
- UList<label>& f = static_cast<UList<label>&>(verts);
+ labelUList& f = static_cast<labelUList&>(verts);
if (mustTriangulate && f.size() > 3)
{
diff --git a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C
index 4d66a8282c94d6d6707ed1b3d9de427eadfa84b5..a46884780b920bca9a4514539cc2922f6170a025 100644
--- a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C
@@ -217,7 +217,7 @@ bool Foam::fileFormats::STARCDsurfaceFormat<Face>::read
(
triFace
(
- static_cast<UList<label>&>(triFaces[faceI])
+ static_cast<labelUList&>(triFaces[faceI])
)
);
dynZones.append(zoneI);
diff --git a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.C b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.C
index daaf9f3578d3bd21c966dcc58224f6c2dc2e82fa..c5fe7b28850237ead220545c5395f19750369d41 100644
--- a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.C
+++ b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.C
@@ -96,7 +96,7 @@ void Foam::fileFormats::VTKsurfaceFormatCore::writeTail
void Foam::fileFormats::VTKsurfaceFormatCore::writeTail
(
Ostream& os,
- const UList<label>& zoneIds
+ const labelUList& zoneIds
)
{
// Print zone numbers
diff --git a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.H b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.H
index 466b66f8f46847aa5ab2e43aec17f389a1bf9273..b5e6b6bfb46037664b7020ad35be9384bff3248e 100644
--- a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.H
+++ b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormatCore.H
@@ -67,7 +67,7 @@ protected:
static void writeTail(Ostream&, const UList<surfZone>&);
//- Write trailing information with zone Ids
- static void writeTail(Ostream&, const UList<label>& zoneIds);
+ static void writeTail(Ostream&, const labelUList& zoneIds);
};
diff --git a/src/surfaceFilmModels/surfaceFilmModel/thermoSingleLayer/thermoSingleLayer.C b/src/surfaceFilmModels/surfaceFilmModel/thermoSingleLayer/thermoSingleLayer.C
index aa9194942e1368eae04f16b0cf97036c0f5a16d7..07036083a86a0aa1f409e1b87b632232901ba0e9 100644
--- a/src/surfaceFilmModels/surfaceFilmModel/thermoSingleLayer/thermoSingleLayer.C
+++ b/src/surfaceFilmModels/surfaceFilmModel/thermoSingleLayer/thermoSingleLayer.C
@@ -621,7 +621,7 @@ Foam::surfaceFilmModels::thermoSingleLayer::Srho() const
distMap.distribute(patchMass);
- const unallocLabelList& cells = wpp.faceCells();
+ const labelUList& cells = wpp.faceCells();
forAll(patchMass, j)
{
@@ -681,7 +681,7 @@ Foam::surfaceFilmModels::thermoSingleLayer::Srho(const label i) const
distMap.distribute(patchMass);
- const unallocLabelList& cells = wpp.faceCells();
+ const labelUList& cells = wpp.faceCells();
forAll(patchMass, j)
{
@@ -739,7 +739,7 @@ Foam::surfaceFilmModels::thermoSingleLayer::Sh() const
energyPhaseChangeForPrimary_.boundaryField()[filmPatchI];
distMap.distribute(patchEnergy);
- const unallocLabelList& cells = wpp.faceCells();
+ const labelUList& cells = wpp.faceCells();
forAll(patchMass, j)
{