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

STYLE: more consistent use of labelUList and labelUIndList typedefs

Browse Source
This commit is contained in:
Mark Olesen
2017-11-19 09:27:47 +01:00
parent a573e0e1aa
commit 7c1d8cb146
107 changed files with 277 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
View File

@ -443,7 +443,6 @@ int main(int argc, char *argv[])
}
indirectPrimitivePatch extrudePatch
(
IndirectList<face>

12
applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C
View File

@ -521,7 +521,7 @@ labelListList globalEdgeFaces
label findUncoveredPatchFace
(
const fvMesh& mesh,
const UIndirectList<label>& extrudeMeshFaces,// mesh faces that are extruded
const labelUIndList& extrudeMeshFaces, // mesh faces that are extruded
const label meshEdgeI // mesh edge
)
{
@ -549,6 +549,7 @@ label findUncoveredPatchFace
return facei;
}
}
return -1;
}
@ -557,7 +558,7 @@ label findUncoveredPatchFace
label findUncoveredCyclicPatchFace
(
const fvMesh& mesh,
const UIndirectList<label>& extrudeMeshFaces,// mesh faces that are extruded
const labelUIndList& extrudeMeshFaces, // mesh faces that are extruded
const label meshEdgeI // mesh edge
)
{
@ -585,6 +586,7 @@ label findUncoveredCyclicPatchFace
return facei;
}
}
return -1;
}
@ -712,7 +714,7 @@ void countExtrudePatches
label facei = findUncoveredPatchFace
(
mesh,
UIndirectList<label>(extrudeMeshFaces, eFaces),
labelUIndList(extrudeMeshFaces, eFaces),
extrudeMeshEdges[edgeI]
);
@ -934,7 +936,7 @@ void addCoupledPatches
label facei = findUncoveredCyclicPatchFace
(
mesh,
UIndirectList<label>(extrudeMeshFaces, eFaces),
labelUIndList(extrudeMeshFaces, eFaces),
extrudeMeshEdges[edgeI]
);
@ -2242,7 +2244,7 @@ int main(int argc, char *argv[])
label facei = findUncoveredPatchFace
(
mesh,
UIndirectList<label>(extrudeMeshFaces, eFaces),
labelUIndList(extrudeMeshFaces, eFaces),
extrudeMeshEdges[edgeI]
);

2
applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
View File

@ -299,7 +299,7 @@ void Foam::conformalVoronoiMesh::writeMesh(const fileName& instance)
// IOobject::AUTO_WRITE,
// false
// ),
// UIndirectList<label>
// labelUIndList
// (
// vertexToDualAddressing,
// pointToDelaunayVertex

12
applications/utilities/mesh/manipulation/polyDualMesh/meshDualiser.C
View File

@ -71,7 +71,7 @@ void Foam::meshDualiser::checkPolyTopoChange(const polyTopoChange& meshMod)
FatalErrorInFunction
<< "duplicate verts:" << newToOld[newI]
<< " coords:"
<< UIndirectList<point>(points, newToOld[newI])()
<< UIndirectList<point>(points, newToOld[newI])
<< abort(FatalError);
}
}
@ -275,7 +275,7 @@ Foam::label Foam::meshDualiser::addInternalFace
//n /= mag(n);
//Pout<< "Generated internal dualFace:" << dualFacei
// << " verts:" << newFace
// << " points:" << UIndirectList<point>(meshMod.points(), newFace)()
// << " points:" << UIndirectList<point>(meshMod.points(), newFace)
// << " n:" << n
// << " between dualowner:" << dualCell0
// << " dualneigbour:" << dualCell1
@ -302,7 +302,7 @@ Foam::label Foam::meshDualiser::addInternalFace
//n /= mag(n);
//Pout<< "Generated internal dualFace:" << dualFacei
// << " verts:" << newFace
// << " points:" << UIndirectList<point>(meshMod.points(), newFace)()
// << " points:" << UIndirectList<point>(meshMod.points(), newFace)
// << " n:" << n
// << " between dualowner:" << dualCell1
// << " dualneigbour:" << dualCell0
@ -359,7 +359,7 @@ Foam::label Foam::meshDualiser::addBoundaryFace
//n /= mag(n);
//Pout<< "Generated boundary dualFace:" << dualFacei
// << " verts:" << newFace
// << " points:" << UIndirectList<point>(meshMod.points(), newFace)()
// << " points:" << UIndirectList<point>(meshMod.points(), newFace)
// << " n:" << n
// << " on dualowner:" << dualCelli
// << endl;
@ -554,7 +554,7 @@ void Foam::meshDualiser::createFaceFromInternalFace
//Pout<< "createFaceFromInternalFace : At face:" << facei
// << " verts:" << f
// << " points:" << UIndirectList<point>(mesh_.points(), f)()
// << " points:" << UIndirectList<point>(mesh_.points(), f)
// << " started walking at edge:" << fEdges[fp]
// << " verts:" << mesh_.edges()[fEdges[fp]]
// << endl;
@ -603,7 +603,7 @@ void Foam::meshDualiser::createFaceFromInternalFace
{
FatalErrorInFunction
<< "face:" << facei << " verts:" << f
<< " points:" << UIndirectList<point>(mesh_.points(), f)()
<< " points:" << UIndirectList<point>(mesh_.points(), f)
<< " no feature edge between " << f[fp]
<< " and " << f[nextFp] << " although have different"
<< " dual cells." << endl

14
applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
View File

@ -497,8 +497,8 @@ autoPtr<mapPolyMesh> reorderMesh
sortedOrder(newAddressing, newToOld);
fZone.resetAddressing
(
UIndirectList<label>(newAddressing, newToOld)(),
UIndirectList<bool>(newFlipMap, newToOld)()
labelUIndList(newAddressing, newToOld)(),
boolUIndList(newFlipMap, newToOld)()
);
}
}
@ -508,7 +508,7 @@ autoPtr<mapPolyMesh> reorderMesh
cellZones.clearAddressing();
forAll(cellZones, zoneI)
{
cellZones[zoneI] = UIndirectList<label>
cellZones[zoneI] = labelUIndList
(
reverseCellOrder,
cellZones[zoneI]
@ -1074,7 +1074,7 @@ int main(int argc, char *argv[])
);
// Combine point reordering into map.
const_cast<labelList&>(map().pointMap()) = UIndirectList<label>
const_cast<labelList&>(map().pointMap()) = labelUIndList
(
map().pointMap(),
pointOrderMap().pointMap()
@ -1101,7 +1101,7 @@ int main(int argc, char *argv[])
cellProcAddressing = labelList
(
UIndirectList<label>(cellProcAddressing, map().cellMap())
labelUIndList(cellProcAddressing, map().cellMap())
);
}
else
@ -1125,7 +1125,7 @@ int main(int argc, char *argv[])
faceProcAddressing = labelList
(
UIndirectList<label>(faceProcAddressing, map().faceMap())
labelUIndList(faceProcAddressing, map().faceMap())
);
// Detect any flips.
@ -1165,7 +1165,7 @@ int main(int argc, char *argv[])
pointProcAddressing = labelList
(
UIndirectList<label>(pointProcAddressing, map().pointMap())
labelUIndList(pointProcAddressing, map().pointMap())
);
}
else

2
applications/utilities/mesh/manipulation/splitMesh/regionSide.C
View File

@ -105,7 +105,7 @@ Foam::label Foam::regionSide::otherEdge
<< "Cannot find other edge on face " << facei << " that uses point "
<< pointi << " but not point " << freePointi << endl
<< "Edges on face:" << fEdges
<< " verts:" << UIndirectList<edge>(mesh.edges(), fEdges)()
<< " verts:" << UIndirectList<edge>(mesh.edges(), fEdges)
<< " Vertices on face:"
<< mesh.faces()[facei]
<< " Vertices on original edge:" << e << abort(FatalError);

2
applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C
View File

@ -453,7 +453,7 @@ int main(int argc, char *argv[])
region,
1,
exposedFaces,
UIndirectList<label>(nearestExposedPatch, exposedFaces)(),
labelUIndList(nearestExposedPatch, exposedFaces)(),
true
);
}

2
applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
View File

@ -396,7 +396,7 @@ void writeCellDistance
forAll(cellProcAddressing, proci)
{
const labelList& pCells = cellProcAddressing[proci];
UIndirectList<label>(cellDecomposition, pCells) = proci;
labelUIndList(cellDecomposition, pCells) = proci;
}
cellDecomposition.write();

2
applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
View File

@ -588,7 +588,7 @@ label dupNonManifoldPoints(triSurface& s, labelList& pointMap)
//s.transfer(dupSurf);
s = dupSurf;
pointMap = UIndirectList<label>(pointMap, dupPointMap)();
pointMap = labelUIndList(pointMap, dupPointMap)();
}
return nNonManifold;

4
applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C
View File

@ -305,7 +305,7 @@ label findEdge
FatalErrorInFunction
<< ' ' << v1 << " in candidates " << edgeLabels
<< " with vertices:" << UIndirectList<edge>(surf.edges(), edgeLabels)()
<< " with vertices:" << UIndirectList<edge>(surf.edges(), edgeLabels)
<< abort(FatalError);
return -1;
@ -345,7 +345,7 @@ label otherEdge
FatalErrorInFunction
<< " verts:" << surf.localPoints()[facei]
<< " connected to point " << pointi
<< " faceEdges:" << UIndirectList<edge>(surf.edges(), fEdges)()
<< " faceEdges:" << UIndirectList<edge>(surf.edges(), fEdges)
<< abort(FatalError);
return -1;

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

@ -81,13 +81,9 @@ protected:
// Member Functions
// Access
//- Return the list addressing
inline const List<label>& addressing() const;
// Edit
//- Reset addressing
inline void resetAddressing(const labelUList& addr);
inline void resetAddressing(const Xfer<List<label>>& addr);
@ -141,14 +137,9 @@ public:
// Member Functions
// Access
//- Return the list addressing
using UIndirectList<T>::addressing;
// Edit
//- Reset addressing
using IndirectListAddressing::resetAddressing;

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

@ -198,7 +198,7 @@ Foam::label Foam::PackedBoolList::set(const labelUList& indices)
}
Foam::label Foam::PackedBoolList::set(const UIndirectList<label>& indices)
Foam::label Foam::PackedBoolList::set(const labelUIndList& indices)
{
return setIndices(indices);
}
@ -226,7 +226,7 @@ Foam::label Foam::PackedBoolList::unset(const labelUList& indices)
}
Foam::label Foam::PackedBoolList::unset(const UIndirectList<label>& indices)
Foam::label Foam::PackedBoolList::unset(const labelUIndList& indices)
{
return unsetIndices(indices);
}
@ -259,7 +259,7 @@ Foam::label Foam::PackedBoolList::subset(const labelUList& indices)
}
Foam::label Foam::PackedBoolList::subset(const UIndirectList<label>& indices)
Foam::label Foam::PackedBoolList::subset(const labelUIndList& indices)
{
return subsetIndices(indices);
}

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

@ -115,18 +115,10 @@ public:
inline PackedBoolList(const Xfer<PackedList<1>>& lst);
//- Construct with given size and list of labels to set as true.
inline PackedBoolList
(
const label size,
const labelUList& indices
);
inline PackedBoolList(const label size, const labelUList& indices);
//- Construct with given size and list of labels to set as true.
inline PackedBoolList
(
const label size,
const UIndirectList<label>& indices
);
inline PackedBoolList(const label size, const labelUIndList& indices);
//- Construct from a list of bools
explicit inline PackedBoolList(const UList<bool>& lst);
@ -137,7 +129,7 @@ public:
//- Construct from a list of labels
// using the labels as indices to indicate which bits are set
explicit inline PackedBoolList(const UIndirectList<label>& indices);
explicit inline PackedBoolList(const labelUIndList& indices);
//- Clone
inline autoPtr<PackedBoolList> clone() const;
@ -159,7 +151,7 @@ public:
//- Set the listed indices. Return number of elements changed.
// Does auto-vivify for non-existent entries.
label set(const UIndirectList<label>& indices);
label set(const labelUIndList& indices);
//- Unset specified bits.
void unset(const PackedList<1>& lst);
@ -170,7 +162,7 @@ public:
//- Unset the listed indices. Return number of elements changed.
// Never auto-vivify entries.
label unset(const UIndirectList<label>& indices);
label unset(const labelUIndList& indices);
//- Subset with the specified list.
void subset(const PackedList<1>& lst);
@ -181,7 +173,7 @@ public:
//- Subset with the listed indices.
// Return number of elements subsetted.
label subset(const UIndirectList<label>& indices);
label subset(const labelUIndList& indices);
//- Return indices of the used (true) elements as a list of labels
@ -222,7 +214,7 @@ public:
//- Assignment operator,
// using the labels as indices to indicate which bits are set
inline void operator=(const UIndirectList<label>& indices);
inline void operator=(const labelUIndList& indices);
//- Complement operator
inline PackedBoolList operator~() const;
@ -236,7 +228,7 @@ public:
//- And operator (lists may be dissimilar sizes)
// using the labels as indices to indicate which bits are set
inline PackedBoolList& operator&=(const UIndirectList<label>& indices);
inline PackedBoolList& operator&=(const labelUIndList& indices);
//- Xor operator (lists may be dissimilar sizes)
// Retains unique entries
@ -251,7 +243,7 @@ public:
//- Or operator (lists may be dissimilar sizes),
// using the labels as indices to indicate which bits are set
inline PackedBoolList& operator|=(const UIndirectList<label>& indices);
inline PackedBoolList& operator|=(const labelUIndList& indices);
//- Add entries to this list, synonymous with the or operator
@ -261,7 +253,7 @@ public:
inline PackedBoolList& operator+=(const labelUList& indices);
//- Add entries to this list, synonymous with the or operator
inline PackedBoolList& operator+=(const UIndirectList<label>& indices);
inline PackedBoolList& operator+=(const labelUIndList& indices);
//- Remove entries from this list - unset the specified bits
inline PackedBoolList& operator-=(const PackedList<1>& lst);
@ -270,7 +262,7 @@ public:
inline PackedBoolList& operator-=(const labelUList& indices);
//- Remove entries from this list - unset the specified bits
inline PackedBoolList& operator-=(const UIndirectList<label>& indices);
inline PackedBoolList& operator-=(const labelUIndList& indices);
};

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

@ -96,7 +96,7 @@ inline Foam::PackedBoolList::PackedBoolList(const labelUList& indices)
{}
inline Foam::PackedBoolList::PackedBoolList(const UIndirectList<label>& indices)
inline Foam::PackedBoolList::PackedBoolList(const labelUIndList& indices)
:
PackedBoolList(indices.size(), indices)
{}
@ -117,7 +117,7 @@ inline Foam::PackedBoolList::PackedBoolList
inline Foam::PackedBoolList::PackedBoolList
(
const label size,
const UIndirectList<label>& indices
const labelUIndList& indices
)
:
PackedList<1>(size)
@ -180,7 +180,7 @@ inline void Foam::PackedBoolList::operator=(const labelUList& indices)
}
inline void Foam::PackedBoolList::operator=(const UIndirectList<label>& indices)
inline void Foam::PackedBoolList::operator=(const labelUIndList& indices)
{
clear();
set(indices);
@ -214,7 +214,7 @@ Foam::PackedBoolList::operator&=(const labelUList& indices)
inline Foam::PackedBoolList&
Foam::PackedBoolList::operator&=(const UIndirectList<label>& indices)
Foam::PackedBoolList::operator&=(const labelUIndList& indices)
{
subset(indices);
return *this;
@ -238,7 +238,7 @@ Foam::PackedBoolList::operator|=(const labelUList& indices)
inline Foam::PackedBoolList&
Foam::PackedBoolList::operator|=(const UIndirectList<label>& indices)
Foam::PackedBoolList::operator|=(const labelUIndList& indices)
{
set(indices);
return *this;
@ -260,7 +260,7 @@ Foam::PackedBoolList::operator+=(const labelUList& indices)
inline Foam::PackedBoolList&
Foam::PackedBoolList::operator+=(const UIndirectList<label>& indices)
Foam::PackedBoolList::operator+=(const labelUIndList& indices)
{
return operator|=(indices);
}
@ -283,7 +283,7 @@ Foam::PackedBoolList::operator-=(const labelUList& indices)
inline Foam::PackedBoolList&
Foam::PackedBoolList::operator-=(const UIndirectList<label>& indices)
Foam::PackedBoolList::operator-=(const labelUIndList& indices)
{
unset(indices);
return *this;

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

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

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

@ -245,7 +245,7 @@ public:
explicit inline PackedList(const labelUList& lst);
//- Construct from an indirect list of labels
explicit inline PackedList(const UIndirectList<label>& lst);
explicit inline PackedList(const labelUIndList& lst);
//- Clone
inline autoPtr<PackedList<nBits>> clone() const;
@ -414,7 +414,7 @@ public:
void operator=(const labelUList& lst);
//- Assignment operator.
void operator=(const UIndirectList<label>& lst);
void operator=(const labelUIndList& lst);
// Iterators and helpers

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

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

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

@ -52,6 +52,10 @@ namespace Foam
template<class T> class UIndirectList;
template<class T> Ostream& operator<<(Ostream&, const UIndirectList<T>&);
// Commonly required list types
typedef UIndirectList<bool> boolUIndList;
typedef UIndirectList<label> labelUIndList;
/*---------------------------------------------------------------------------*\
Class UIndirectList Declaration
\*---------------------------------------------------------------------------*/

1
src/OpenFOAM/containers/Lists/UList/UList.H
View File

@ -67,6 +67,7 @@ template<class T> class UList;
template<class T> Ostream& operator<<(Ostream&, const UList<T>&);
template<class T> Istream& operator>>(Istream&, UList<T>&);
// Commonly required list types
typedef UList<char> charUList;
typedef UList<label> labelUList;

2
src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGProcAgglomerations/procFacesGAMGProcAgglomeration/procFacesGAMGProcAgglomeration.C
View File

@ -192,7 +192,7 @@ Foam::procFacesGAMGProcAgglomeration::processorAgglomeration
sortedOrder(coarseToMaster, newToOld);
labelList oldToNew(invert(newToOld.size(), newToOld));
fineToCoarse = UIndirectList<label>(oldToNew, fineToCoarse)();
fineToCoarse = labelUIndList(oldToNew, fineToCoarse)();
}
Pstream::scatter(fineToCoarse, Pstream::msgType(), mesh.comm());

2
src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.C
View File

@ -328,7 +328,7 @@ Foam::lduPrimitiveMesh::lduPrimitiveMesh
<< " agglomerates to " << procAgglomMap[procIDs[i]]
<< " whereas other processors " << procIDs
<< " agglomerate to "
<< UIndirectList<label>(procAgglomMap, procIDs)
<< labelUIndList(procAgglomMap, procIDs)
<< exit(FatalError);
}
}

2
src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.H
View File

@ -170,7 +170,7 @@ protected:
template<class T, class CombineOp, class negateOp>
static void flipAndCombine
(
const UList<label>& map,
const labelUList& map,
const bool hasFlip,
const UList<T>& rhs,
const CombineOp& cop,

2
src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBaseTemplates.C
View File

@ -33,7 +33,7 @@ License
template<class T, class CombineOp, class negateOp>
void Foam::mapDistributeBase::flipAndCombine
(
const UList<label>& map,
const labelUList& map,
const bool hasFlip,
const UList<T>& rhs,
const CombineOp& cop,

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

@ -1415,7 +1415,7 @@ bool Foam::cyclicPolyPatch::order
<< " : "
<< "Cannot find point on face " << pp[oldFacei]
<< " with vertices "
<< IndirectList<point>(pp.points(), pp[oldFacei])()
<< UIndirectList<point>(pp.points(), pp[oldFacei])
<< " that matches point " << wantedAnchor
<< " when matching the halves of processor patch " << name()
<< "Continuing with incorrect face ordering from now on!"

2
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.C
View File

@ -497,7 +497,7 @@ bool Foam::oldCyclicPolyPatch::matchAnchors
<< "Patch:" << name() << " : "
<< "Cannot find point on face " << f
<< " with vertices:"
<< UIndirectList<point>(pp.points(), f)()
<< UIndirectList<point>(pp.points(), f)
<< " that matches point " << wantedAnchor
<< " when matching the halves of cyclic patch " << name()
<< endl

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

@ -293,7 +293,7 @@ void Foam::processorPolyPatch::calcGeometry(PstreamBuffers& pBufs)
<< endl
<< "Mesh face:" << start()+facei
<< " vertices:"
<< UIndirectList<point>(points(), operator[](facei))()
<< UIndirectList<point>(points(), operator[](facei))
<< endl
<< "If you are certain your matching is correct"
<< " you can increase the 'matchTolerance' setting"
@ -1084,7 +1084,7 @@ bool Foam::processorPolyPatch::order
<< " : "
<< "Cannot find point on face " << pp[oldFacei]
<< " with vertices "
<< UIndirectList<point>(pp.points(), pp[oldFacei])()
<< UIndirectList<point>(pp.points(), pp[oldFacei])
<< " that matches point " << wantedAnchor
<< " when matching the halves of processor patch "
<< name()

2
src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsEdgeOwner.C
View File

@ -77,7 +77,7 @@ Foam::PatchTools::edgeOwner
<< "Edge " << edgeI << " vertices:" << edges[edgeI]
<< " is used by faces " << nbrFaces
<< " vertices:"
<< UIndirectList<Face>(localFaces, nbrFaces)()
<< UIndirectList<Face>(localFaces, nbrFaces)
<< " none of which use the edge vertices in the same order"
<< nl << "I give up" << abort(FatalError);
}

2
src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsSortEdges.C
View File

@ -142,7 +142,7 @@ Foam::PatchTools::sortedEdgeFaces
faceAngles.sort();
sortedEdgeFaces[edgeI] = UIndirectList<label>
sortedEdgeFaces[edgeI] = labelUIndList
(
faceNbs,
faceAngles.indices()

20
src/OpenFOAM/primitives/bools/lists/boolList.H
View File

@ -21,17 +21,23 @@ License
You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Typedef
Foam::boolUList
Description
A UList of bool
Typedef
Foam::boolList
Description
Bool container classes
A List of bools.
Typedef
Foam::boolUList
Description
A UList of bools.
Typedef
Foam::boolListList
Description
A List of boolList.
\*---------------------------------------------------------------------------*/

2
src/OpenFOAM/primitives/ints/lists/labelIndList.H
View File

@ -47,8 +47,8 @@ Description
namespace Foam
{
// NB: labelUIndList is defined in UIndirectList itself
typedef IndirectList<label> labelIndList;
typedef UIndirectList<label> labelUIndList;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

9
src/OpenFOAM/primitives/ints/lists/labelList.H
View File

@ -33,6 +33,12 @@ Typedef
Description
A SubList of labels.
Typedef
Foam::labelUList
Description
A UList of labels.
Typedef
Foam::labelListList
@ -58,8 +64,7 @@ Description
namespace Foam
{
// Note: frequently used labelUList is defined in UList itself
// NB: labelUList is defined in UList itself
typedef List<label> labelList;
typedef SubList<label> labelSubList;
typedef List<labelList> labelListList;

4
src/conversion/vtk/output/foamVtkOutputFields.H
View File

@ -63,7 +63,7 @@ namespace vtk
(
vtk::formatter& fmt,
const DimensionedField<Type, volMesh>& fld,
const UList<label>& cellMap
const labelUList& cellMap
);
//- Write internalField for mesh
@ -82,7 +82,7 @@ namespace vtk
(
vtk::formatter& fmt,
const GeometricField<Type, fvPatchField, volMesh>& fld,
const UList<label>& cellMap
const labelUList& cellMap
);

4
src/conversion/vtk/output/foamVtkOutputFieldsTemplates.C
View File

@ -50,7 +50,7 @@ void Foam::vtk::writeField
(
vtk::formatter& fmt,
const DimensionedField<Type, volMesh>& fld,
const UList<label>& cellMap
const labelUList& cellMap
)
{
const uint64_t payLoad =
@ -89,7 +89,7 @@ void Foam::vtk::writeField
(
vtk::formatter& fmt,
const GeometricField<Type, fvPatchField, volMesh>& fld,
const UList<label>& cellMap
const labelUList& cellMap
)
{
const uint64_t payLoad =

4
src/conversion/vtk/part/foamVtkMeshMaps.C
View File

@ -28,14 +28,14 @@ License
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void Foam::foamVtkMeshMaps::renumberCells(const UList<label>& mapping)
void Foam::foamVtkMeshMaps::renumberCells(const labelUList& mapping)
{
inplaceRenumber(mapping, cellMap_);
inplaceRenumber(mapping, additionalIds_);
}
void Foam::foamVtkMeshMaps::renumberPoints(const UList<label>& mapping)
void Foam::foamVtkMeshMaps::renumberPoints(const labelUList& mapping)
{
inplaceRenumber(mapping, pointMap_);
}

4
src/conversion/vtk/part/foamVtkMeshMaps.H
View File

@ -105,10 +105,10 @@ public:
//- Renumber cell ids (cellMap and additionalIds) to account for
// subset meshes
void renumberCells(const UList<label>& mapping);
void renumberCells(const labelUList& mapping);
//- Renumber point ids (pointMap) to account for subset meshes
void renumberPoints(const UList<label>& mapping);
void renumberPoints(const labelUList& mapping);
//- Original cell ids for all cells (regular and decomposed).

4
src/conversion/vtk/part/foamVtuCells.C
View File

@ -171,13 +171,13 @@ void Foam::vtk::vtuCells::reset
}
void Foam::vtk::vtuCells::renumberCells(const UList<label>& mapping)
void Foam::vtk::vtuCells::renumberCells(const labelUList& mapping)
{
maps_.renumberCells(mapping);
}
void Foam::vtk::vtuCells::renumberPoints(const UList<label>& mapping)
void Foam::vtk::vtuCells::renumberPoints(const labelUList& mapping)
{
maps_.renumberPoints(mapping);
}

4
src/conversion/vtk/part/foamVtuCells.H
View File

@ -194,10 +194,10 @@ public:
);
//- Renumber cell ids to account for subset meshes
void renumberCells(const UList<label>& mapping);
void renumberCells(const labelUList& mapping);
//- Renumber point ids to account for subset meshes
void renumberPoints(const UList<label>& mapping);
void renumberPoints(const labelUList& mapping);
// Storage Access

22
src/conversion/vtk/part/foamVtuSizing.C
View File

@ -272,7 +272,7 @@ void Foam::vtk::vtuSizing::populateLegacy
(
const polyMesh& mesh,
UList<uint8_t>& cellTypes,
UList<label>& vertLabels,
labelUList& vertLabels,
foamVtkMeshMaps& maps
) const
{
@ -301,10 +301,10 @@ void Foam::vtk::vtuSizing::populateXml
(
const polyMesh& mesh,
UList<uint8_t>& cellTypes,
UList<label>& connectivity,
UList<label>& offsets,
UList<label>& faces,
UList<label>& facesOffsets,
labelUList& connectivity,
labelUList& offsets,
labelUList& faces,
labelUList& facesOffsets,
foamVtkMeshMaps& maps
) const
{
@ -421,8 +421,8 @@ void Foam::vtk::vtuSizing::populateInternal
UList<int>& offsets,
UList<int>& faces,
UList<int>& facesOffsets,
UList<label>& cellMap,
UList<label>& addPointsIds
labelUList& cellMap,
labelUList& addPointsIds
) const
{
populateArrays
@ -449,8 +449,8 @@ void Foam::vtk::vtuSizing::populateInternal
UList<long>& offsets,
UList<long>& faces,
UList<long>& facesOffsets,
UList<label>& cellMap,
UList<label>& addPointsIds
labelUList& cellMap,
labelUList& addPointsIds
) const
{
populateArrays
@ -477,8 +477,8 @@ void Foam::vtk::vtuSizing::populateInternal
UList<long long>& offsets,
UList<long long>& faces,
UList<long long>& facesOffsets,
UList<label>& cellMap,
UList<label>& addPointsIds
labelUList& cellMap,
labelUList& addPointsIds
) const
{
populateArrays

22
src/conversion/vtk/part/foamVtuSizing.H
View File

@ -288,7 +288,7 @@ public:
(
const polyMesh& mesh,
UList<uint8_t>& cellTypes,
UList<label>& connectivity,
labelUList& connectivity,
foamVtkMeshMaps& maps
) const;
@ -297,10 +297,10 @@ public:
(
const polyMesh& mesh,
UList<uint8_t>& cellTypes,
UList<label>& connectivity,
UList<label>& offsets,
UList<label>& faces,
UList<label>& facesOffsets,
labelUList& connectivity,
labelUList& offsets,
labelUList& faces,
labelUList& facesOffsets,
foamVtkMeshMaps& maps
) const;
@ -349,8 +349,8 @@ public:
UList<int>& offsets,
UList<int>& faces,
UList<int>& facesOffsets,
UList<label>& cellMap,
UList<label>& addPointsIds
labelUList& cellMap,
labelUList& addPointsIds
) const;
//- Populate lists for Internal VTK format
@ -362,8 +362,8 @@ public:
UList<long>& offsets,
UList<long>& faces,
UList<long>& facesOffsets,
UList<label>& cellMap,
UList<label>& addPointsIds
labelUList& cellMap,
labelUList& addPointsIds
) const;
//- Populate lists for Internal VTK format
@ -375,8 +375,8 @@ public:
UList<long long>& offsets,
UList<long long>& faces,
UList<long long>& facesOffsets,
UList<label>& cellMap,
UList<label>& addPointsIds
labelUList& cellMap,
labelUList& addPointsIds
) const;

4
src/dummyThirdParty/kahipDecomp/dummyKahipDecomp.C vendored
View File

@ -56,8 +56,8 @@ namespace Foam
Foam::label Foam::kahipDecomp::decomposeSerial
(
const UList<label>& adjncy,
const UList<label>& xadj,
const labelUList& adjncy,
const labelUList& xadj,
const UList<scalar>& cellWeights,
List<label>& decomp
)

4
src/dummyThirdParty/metisDecomp/dummyMetisDecomp.C vendored
View File

@ -56,8 +56,8 @@ namespace Foam
Foam::label Foam::metisDecomp::decomposeSerial
(
const UList<label>& adjncy,
const UList<label>& xadj,
const labelUList& adjncy,
const labelUList& xadj,
const UList<scalar>& cellWeights,
List<label>& decomp
)

4
src/dummyThirdParty/ptscotchDecomp/dummyPtscotchDecomp.C vendored
View File

@ -64,8 +64,8 @@ void Foam::ptscotchDecomp::check(const int retVal, const char* str)
Foam::label Foam::ptscotchDecomp::decompose
(
const UList<label>& initxadj,
const UList<label>& initadjncy,
const labelUList& initxadj,
const labelUList& initadjncy,
const UList<scalar>& initcWeights,
List<label>& finalDecomp
) const

4
src/dummyThirdParty/scotchDecomp/dummyScotchDecomp.C vendored
View File

@ -63,8 +63,8 @@ void Foam::scotchDecomp::check(const int retVal, const char* str)
Foam::label Foam::scotchDecomp::decomposeSerial
(
const UList<label>& adjncy,
const UList<label>& xadj,
const labelUList& adjncy,
const labelUList& xadj,
const UList<scalar>& cWeights,
List<label>& decomp
)

4
src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
View File

@ -789,7 +789,7 @@ void Foam::fvMeshDistribute::getNeighbourData
// Which processor they will end up on
SubList<label>(nbrNewNbrProc, pp.size(), offset) =
UIndirectList<label>(distribution, pp.faceCells())();
labelUIndList(distribution, pp.faceCells())();
}
}
@ -1413,7 +1413,7 @@ void Foam::fvMeshDistribute::sendMesh
//
// forAll(cellZones, zoneI)
// {
// UIndirectList<label>(cellZoneID, cellZones[zoneI]) = zoneI;
// labelUIndList(cellZoneID, cellZones[zoneI]) = zoneI;
// }
//}

8
src/dynamicMesh/fvMeshSubset/fvMeshSubset.C
View File

@ -1384,14 +1384,14 @@ void Foam::fvMeshSubset::setLargeCellSubset
void Foam::fvMeshSubset::setLargeCellSubset
(
const UList<label>& globalCellMap,
const labelUList& globalCellMap,
const label patchID,
const bool syncPar
)
{
labelList region(baseMesh().nCells(), 0);
for (auto cellId : globalCellMap)
for (const label cellId : globalCellMap)
{
region[cellId] = 1;
}
@ -1408,9 +1408,9 @@ void Foam::fvMeshSubset::setLargeCellSubset
{
labelList region(baseMesh().nCells(), 0);
forAllConstIter(labelHashSet, globalCellMap, iter)
for (const label cellId : globalCellMap)
{
region[iter.key()] = 1;
region[cellId] = 1;
}
setLargeCellSubset(region, 1, patchID, syncPar);
}

2
src/dynamicMesh/fvMeshSubset/fvMeshSubset.H
View File

@ -180,7 +180,7 @@ public:
//- setLargeCellSubset but only marking certain cells
void setLargeCellSubset
(
const UList<label>& globalCellMap,
const labelUList& globalCellMap,
const label patchID = -1,
const bool syncPar = true
);

2
src/dynamicMesh/meshCut/cellLooper/hexCellLooper.C
View File

@ -261,7 +261,7 @@ bool Foam::hexCellLooper::cut
{
FatalErrorInFunction
<< " on points:" << facePoints << endl
<< UIndirectList<point>(facePoints, faceVerts)()
<< UIndirectList<point>(facePoints, faceVerts)
<< abort(FatalError);
}
}

8
src/dynamicMesh/motionSmoother/motionSmootherAlgo.C
View File

@ -92,12 +92,12 @@ void Foam::motionSmootherAlgo::checkFld(const pointScalarField& fld)
Foam::labelHashSet Foam::motionSmootherAlgo::getPoints
(
const UList<label>& faceLabels
const labelUList& faceLabels
) const
{
labelHashSet usedPoints(mesh_.nPoints()/100);
for (auto faceId : faceLabels)
for (const label faceId : faceLabels)
{
usedPoints.insert(mesh_.faces()[faceId]);
}
@ -113,9 +113,9 @@ Foam::labelHashSet Foam::motionSmootherAlgo::getPoints
{
labelHashSet usedPoints(mesh_.nPoints()/100);
forAllConstIter(labelHashSet, faceLabels, iter)
for (const label faceId : faceLabels)
{
usedPoints.insert(mesh_.faces()[iter.key()]);
usedPoints.insert(mesh_.faces()[faceId]);
}
return usedPoints;

2
src/dynamicMesh/motionSmoother/motionSmootherAlgo.H
View File

@ -209,7 +209,7 @@ class motionSmootherAlgo
static void checkFld(const pointScalarField&);
//- Get points used by given faces
labelHashSet getPoints(const UList<label>& faceLabels) const;
labelHashSet getPoints(const labelUList& faceLabels) const;
//- Get points used by given faces
labelHashSet getPoints(const labelHashSet& faceLabels) const;

16
src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C
View File

@ -392,7 +392,7 @@ Foam::label Foam::faceCoupleInfo::mostAlignedCutEdge
if (report)
{
Pout<< "mostAlignedEdge : finding nearest edge among "
<< UIndirectList<edge>(cutFaces().edges(), pEdges)()
<< UIndirectList<edge>(cutFaces().edges(), pEdges)
<< " connected to point " << pointi
<< " coord:" << localPoints[pointi]
<< " running between " << edgeStart << " coord:"
@ -603,7 +603,7 @@ void Foam::faceCoupleInfo::setCutEdgeToPoints(const labelList& cutToMasterEdges)
FatalErrorInFunction
<< " unsplitEdge:" << unsplitEdge
<< " does not correspond to split edges "
<< UIndirectList<edge>(cutEdges, stringedEdges)()
<< UIndirectList<edge>(cutEdges, stringedEdges)
<< abort(FatalError);
}
}
@ -615,7 +615,7 @@ void Foam::faceCoupleInfo::setCutEdgeToPoints(const labelList& cutToMasterEdges)
// (
// cutFaces().localPoints(),
// splitPoints.shrink()
// )()
// )
// << endl;
cutEdgeToPoints_.insert(unsplitEdge, splitPoints.shrink());
@ -638,9 +638,9 @@ Foam::label Foam::faceCoupleInfo::matchFaces
{
FatalErrorInFunction
<< "Different sizes for supposedly matching faces." << nl
<< "f0:" << f0 << " coords:" << UIndirectList<point>(points0, f0)()
<< "f0:" << f0 << " coords:" << UIndirectList<point>(points0, f0)
<< nl
<< "f1:" << f1 << " coords:" << UIndirectList<point>(points1, f1)()
<< "f1:" << f1 << " coords:" << UIndirectList<point>(points1, f1)
<< abort(FatalError);
}
@ -691,9 +691,9 @@ Foam::label Foam::faceCoupleInfo::matchFaces
FatalErrorInFunction
<< "No unique match between two faces" << nl
<< "Face " << f0 << " coords "
<< UIndirectList<point>(points0, f0)() << nl
<< UIndirectList<point>(points0, f0) << nl
<< "Face " << f1 << " coords "
<< UIndirectList<point>(points1, f1)()
<< UIndirectList<point>(points1, f1)
<< "when using tolerance " << absTol
<< " and forwardMatching:" << sameOrientation
<< abort(FatalError);
@ -1841,7 +1841,7 @@ void Foam::faceCoupleInfo::subDivisionMatch
FatalErrorInFunction
<< "Did not match all of cutFaces to a master face" << nl
<< "First unmatched cut face:" << cutFacei << " with points:"
<< UIndirectList<point>(cutFaces().points(), cutF)()
<< UIndirectList<point>(cutFaces().points(), cutF)
<< nl
<< "This usually means that the slave patch is not a"
<< " subdivision of the master patch"

4
src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
View File

@ -1183,8 +1183,8 @@ void Foam::polyMeshAdder::mergeFaceZones
labelList order;
sortedOrder(fzFaces[i], order);
fzFaces[i] = UIndirectList<label>(fzFaces[i], order)();
fzFlips[i] = UIndirectList<bool>(fzFlips[i], order)();
fzFaces[i] = labelUIndList(fzFaces[i], order)();
fzFlips[i] = boolUIndList(fzFlips[i], order)();
}
}

8
src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
View File

@ -520,7 +520,7 @@ void Foam::addPatchCellLayer::findZoneFace
const polyMesh& mesh,
const indirectPrimitivePatch& pp,
const label ppEdgeI,
const UIndirectList<label>& excludeFaces,
const labelUIndList& excludeFaces,
const labelList& meshFaces,
label& inflateFaceI,
@ -789,7 +789,7 @@ void Foam::addPatchCellLayer::calcExtrudeInfo
{
if (edgePatchID[edgei] == -1)
{
UIndirectList<label> ppFaces(pp.addressing(), edgeFaces[edgei]);
labelUIndList ppFaces(pp.addressing(), edgeFaces[edgei]);
label meshEdgei = meshEdges[edgei];
const labelList& meshFaces = mesh.edgeFaces
@ -1113,7 +1113,7 @@ void Foam::addPatchCellLayer::setRefinement
{
labelList n(mesh_.nPoints(), 0);
UIndirectList<label>(n, meshPoints) = nPointLayers;
labelUIndList(n, meshPoints) = nPointLayers;
syncTools::syncPointList(mesh_, n, maxEqOp<label>(), label(0));
// Non-synced
@ -1916,7 +1916,7 @@ void Foam::addPatchCellLayer::setRefinement
stringedVerts
) << nl
<< "stringNLayers:"
<< UIndirectList<label>
<< labelUIndList
(
nPointLayers,
stringedVerts

2
src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.H
View File

@ -270,7 +270,7 @@ class addPatchCellLayer
const polyMesh& mesh,
const indirectPrimitivePatch& pp,
const label ppEdgeI,
const UIndirectList<label>& excludeFaces,
const labelUIndList& excludeFaces,
const labelList& meshFaces,
label& inflateFaceI,

22
src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
View File

@ -475,7 +475,7 @@ Foam::scalar Foam::hexRef8::getLevel0EdgeLength() const
if (debug)
{
Pout<< "hexRef8::getLevel0EdgeLength() :"
<< " Crappy Edgelengths (squared) per refinementlevel:"
<< " Poor Edgelengths (squared) per refinementlevel:"
<< maxEdgeLenSqr << endl;
}
@ -756,7 +756,7 @@ Foam::label Foam::hexRef8::findLevel
FatalErrorInFunction
<< "face:" << f
<< " level:" << UIndirectList<label>(pointLevel_, f)()
<< " level:" << labelUIndList(pointLevel_, f)
<< " startFp:" << startFp
<< " wantedLevel:" << wantedLevel
<< abort(FatalError);
@ -784,7 +784,7 @@ Foam::label Foam::hexRef8::findLevel
FatalErrorInFunction
<< "face:" << f
<< " level:" << UIndirectList<label>(pointLevel_, f)()
<< " level:" << labelUIndList(pointLevel_, f)
<< " startFp:" << startFp
<< " wantedLevel:" << wantedLevel
<< abort(FatalError);
@ -1318,11 +1318,11 @@ void Foam::hexRef8::createInternalFaces
<< "cell:" << celli << " cLevel:" << cLevel
<< " cell points:" << cPoints
<< " pointLevel:"
<< UIndirectList<label>(pointLevel_, cPoints)()
<< labelUIndList(pointLevel_, cPoints)
<< " face:" << facei
<< " f:" << f
<< " pointLevel:"
<< UIndirectList<label>(pointLevel_, f)()
<< labelUIndList(pointLevel_, f)
<< " faceAnchorLevel:" << faceAnchorLevel[facei]
<< " faceMidPoint:" << faceMidPoint[facei]
<< " faceMidPointi:" << faceMidPointi
@ -1391,11 +1391,11 @@ void Foam::hexRef8::createInternalFaces
<< "cell:" << celli << " cLevel:" << cLevel
<< " cell points:" << cPoints
<< " pointLevel:"
<< UIndirectList<label>(pointLevel_, cPoints)()
<< labelUIndList(pointLevel_, cPoints)
<< " face:" << facei
<< " f:" << f
<< " pointLevel:"
<< UIndirectList<label>(pointLevel_, f)()
<< labelUIndList(pointLevel_, f)
<< " faceAnchorLevel:" << faceAnchorLevel[facei]
<< " faceMidPoint:" << faceMidPoint[facei]
<< " faceMidPointi:" << faceMidPointi
@ -3725,7 +3725,7 @@ Foam::labelListList Foam::hexRef8::setRefinement
<< " lower level" << endl
<< "cellPoints:" << cPoints << endl
<< "pointLevels:"
<< UIndirectList<label>(pointLevel_, cPoints)() << endl
<< labelUIndList(pointLevel_, cPoints) << endl
<< abort(FatalError);
}
}
@ -4692,7 +4692,7 @@ void Foam::hexRef8::checkMesh() const
<< "Coupled face " << facei
<< " on patch " << patchi
<< " " << mesh_.boundaryMesh()[patchi].name()
<< " coords:" << UIndirectList<point>(mesh_.points(), f)()
<< " coords:" << UIndirectList<point>(mesh_.points(), f)
<< " has face area:" << magArea
<< " (coupled) neighbour face area differs:"
<< neiFaceAreas[i]
@ -4734,7 +4734,7 @@ void Foam::hexRef8::checkMesh() const
<< "Coupled face " << facei
<< " on patch " << patchi
<< " " << mesh_.boundaryMesh()[patchi].name()
<< " coords:" << UIndirectList<point>(mesh_.points(), f)()
<< " coords:" << UIndirectList<point>(mesh_.points(), f)
<< " has size:" << f.size()
<< " (coupled) neighbour face has size:"
<< nVerts[i]
@ -4784,7 +4784,7 @@ void Foam::hexRef8::checkMesh() const
<< "Coupled face " << facei
<< " on patch " << patchi
<< " " << mesh_.boundaryMesh()[patchi].name()
<< " coords:" << UIndirectList<point>(mesh_.points(), f)()
<< " coords:" << UIndirectList<point>(mesh_.points(), f)
<< " has anchor vector:" << anchorVec
<< " (coupled) neighbour face anchor vector differs:"
<< anchorPoints[i]

8
src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.C
View File

@ -115,7 +115,7 @@ Foam::hexRef8Data::hexRef8Data
new labelIOList
(
rio,
UIndirectList<label>(data.cellLevelPtr_(), cellMap)()
labelUIndList(data.cellLevelPtr_(), cellMap)()
)
);
}
@ -129,7 +129,7 @@ Foam::hexRef8Data::hexRef8Data
new labelIOList
(
rio,
UIndirectList<label>(data.pointLevelPtr_(), pointMap)()
labelUIndList(data.pointLevelPtr_(), pointMap)()
)
);
}
@ -176,7 +176,7 @@ Foam::hexRef8Data::hexRef8Data
forAll(procDatas, procI)
{
const labelList& procCellLevel = procDatas[procI].cellLevelPtr_();
UIndirectList<label>(cellLevel, cellMaps[procI]) = procCellLevel;
labelUIndList(cellLevel, cellMaps[procI]) = procCellLevel;
}
}
@ -194,7 +194,7 @@ Foam::hexRef8Data::hexRef8Data
forAll(procDatas, procI)
{
const labelList& procPointLevel = procDatas[procI].pointLevelPtr_();
UIndirectList<label>(pointLevel, pointMaps[procI]) = procPointLevel;
labelUIndList(pointLevel, pointMaps[procI]) = procPointLevel;
}
}

2
src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchCutFaces.C
View File

@ -215,7 +215,7 @@ void Foam::enrichedPatch::calcCutFaces() const
const labelList& nextPoints = pp[curPointLabel];
// Pout<< "nextPoints: "
// << UIndirectList<label>(mp, nextPoints)
// << labelUIndList(mp, nextPoints)
// << endl;
// Get the vector along the edge and the right vector

2
src/fileFormats/ensight/part/ensightCells.C
View File

@ -230,7 +230,7 @@ void Foam::ensightCells::classify
}
// eg, the processor local cellId
UList<label> slice = address_[slices_[what]];
labelUList slice = address_[slices_[what]];
slice[sizes_[what]] = id;
sizes_[what]++;

2
src/fileFormats/vtk/output/foamVtkOutput.H
View File

@ -114,7 +114,7 @@ namespace vtk
(
vtk::formatter& fmt,
const UList<Type>& lst,
const UList<label>& addressing
const labelUList& addressing
);

2
src/fileFormats/vtk/output/foamVtkOutputTemplates.C
View File

@ -73,7 +73,7 @@ void Foam::vtk::writeList
(
vtk::formatter& fmt,
const UList<Type>& lst,
const UList<label>& addressing
const labelUList& addressing
)
{
forAll(addressing, i)

2
src/functionObjects/field/fluxSummary/fluxSummary.C
View File

@ -412,7 +412,7 @@ void Foam::functionObjects::fluxSummary::initialiseCellZoneAndDirection
labelList cellAddr(mesh_.nCells(), -1);
const labelList& cellIDs = mesh_.cellZones()[cellZonei];
UIndirectList<label>(cellAddr, cellIDs) = identity(cellIDs.size());
labelUIndList(cellAddr, cellIDs) = identity(cellIDs.size());
labelList nbrFaceCellAddr(mesh_.nFaces() - nInternalFaces, -1);
forAll(pbm, patchi)

3
src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H
View File

@ -229,8 +229,7 @@ class regionSizeDistribution
//- Get data in order
template<class Type>
List<Type> extractData(const UList<label>& keys, const Map<Type>&)
const;
List<Type> extractData(const labelUList& keys, const Map<Type>&) const;
void writeGraph
(

2
src/functionObjects/field/regionSizeDistribution/regionSizeDistributionTemplates.C
View File

@ -63,7 +63,7 @@ Foam::Map<Type> Foam::functionObjects::regionSizeDistribution::regionSum
template<class Type>
Foam::List<Type> Foam::functionObjects::regionSizeDistribution::extractData
(
const UList<label>& keys,
const labelUList& keys,
const Map<Type>& regionData
) const
{

2
src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
View File

@ -140,7 +140,7 @@ void Foam::fv::rotorDiskSource::setFaceArea(vector& axis, const bool correct)
// Calculate cell addressing for selected cells
labelList cellAddr(mesh_.nCells(), -1);
UIndirectList<label>(cellAddr, cells_) = identity(cells_.size());
labelUIndList(cellAddr, cells_) = identity(cells_.size());
labelList nbrFaceCellAddr(mesh_.nFaces() - nInternalFaces, -1);
forAll(pbm, patchi)
{

2
src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H
View File

@ -1353,7 +1353,7 @@ public:
// Pick up faces of cells of faces in set.
labelList growFaceCellFace
(
const UList<label>& set
const labelUList& set
) const;
// Pick up faces of cells of faces in set.

5
src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
View File

@ -693,10 +693,9 @@ Foam::List<Foam::labelPair> Foam::meshRefinement::subsetBaffles
// Mark zone per face
labelList faceToZone(mesh.nFaces(), -1);
forAll(zoneIDs, i)
for (const label zoneID : zoneIDs)
{
label zoneID = zoneIDs[i];
UIndirectList<label>(faceToZone, faceZones[zoneID]) = zoneID;
labelUIndList(faceToZone, faceZones[zoneID]) = zoneID;
}

10
src/mesh/snappyHexMesh/meshRefinement/meshRefinementGapRefine.C
View File

@ -651,7 +651,7 @@ Foam::label Foam::meshRefinement::markSurfaceGapRefinement
// map.setSize(compactI);
// oppositeInfo.setSize(compactI);
//
// nearMap = UIndirectList<label>(nearMap, map)();
// nearMap = labelUIndList(nearMap, map)();
// nearGap = UIndirectList<scalar>(nearGap, map)();
// nearInfo = UIndirectList<pointIndexHit>(nearInfo, map)();
// nearNormal = UIndirectList<vector>(nearNormal, map)();
@ -675,7 +675,7 @@ Foam::label Foam::meshRefinement::markSurfaceGapRefinement
// << returnReduce(map.size(), sumOp<label>()) << endl;
// map.setSize(compactI);
//
// nearMap = UIndirectList<label>(nearMap, map)();
// nearMap = labelUIndList(nearMap, map)();
// nearGap = UIndirectList<scalar>(nearGap, map)();
// nearInfo = UIndirectList<pointIndexHit>(nearInfo, map)();
// oppositeInfo = UIndirectList<pointIndexHit>(oppositeInfo, map)();
@ -1025,7 +1025,7 @@ void Foam::meshRefinement::selectGapCandidates
shells_.findHigherGapLevel
(
pointField(cellCentres, cellMap),
UIndirectList<label>(cellLevel, cellMap)(),
labelUIndList(cellLevel, cellMap)(),
shellGapInfo,
shellGapMode
);
@ -1047,7 +1047,7 @@ void Foam::meshRefinement::selectGapCandidates
<< mesh_.globalData().nTotalCells() << endl;
map.setSize(compactI);
cellMap = UIndirectList<label>(cellMap, map)();
cellMap = labelUIndList(cellMap, map)();
shellGapInfo = UIndirectList<FixedList<label, 3>>(shellGapInfo, map)();
shellGapMode = UIndirectList<volumeType>(shellGapMode, map)();
}
@ -1248,7 +1248,7 @@ Foam::label Foam::meshRefinement::markInternalGapRefinement
rayEnd2.shrink();
gapSize2.shrink();
cellMap = UIndirectList<label>(cellMap, map)();
cellMap = labelUIndList(cellMap, map)();
nearNormal = UIndirectList<vector>(nearNormal, map)();
shellGapInfo.clear();
shellGapMode.clear();

2
src/mesh/snappyHexMesh/meshRefinement/meshRefinementMerge.C
View File

@ -826,7 +826,7 @@ namespace Foam
// Pick up faces of cells of faces in set.
Foam::labelList Foam::meshRefinement::growFaceCellFace
(
const UList<label>& set
const labelUList& set
) const
{
boolList selected(mesh_.nFaces(), false);

2
src/mesh/snappyHexMesh/meshRefinement/meshRefinementRefine.C
View File

@ -1219,7 +1219,7 @@ Foam::label Foam::meshRefinement::markSurfaceCurvatureRefinement
sortedOrder(pNormals, visitOrder, normalLess(pNormals));
pNormals = List<point>(pNormals, visitOrder);
pLevel = UIndirectList<label>(pLevel, visitOrder);
pLevel = labelUIndList(pLevel, visitOrder);
}
// Clear out unnecessary data

12
src/mesh/snappyHexMesh/refinementSurfaces/refinementSurfaces.C
View File

@ -103,7 +103,7 @@ Foam::labelList Foam::refinementSurfaces::findHigherLevel
shells.findHigherLevel
(
samples,
UIndirectList<label>(surfaceLevel, retestSet)(),
labelUIndList(surfaceLevel, retestSet)(),
shellLevel
);
forAll(retestSet, i)
@ -1435,7 +1435,7 @@ void Foam::refinementSurfaces::findNearest
List<pointIndexHit>& hitInfo
) const
{
labelList geometries(UIndirectList<label>(surfaces_, surfacesToTest));
labelList geometries(labelUIndList(surfaces_, surfacesToTest));
// Do the tests. Note that findNearest returns index in geometries.
searchableSurfacesQueries::findNearest
@ -1468,7 +1468,7 @@ void Foam::refinementSurfaces::findNearestRegion
labelList& hitRegion
) const
{
labelList geometries(UIndirectList<label>(surfaces_, surfacesToTest));
labelList geometries(labelUIndList(surfaces_, surfacesToTest));
// Do the tests. Note that findNearest returns index in geometries.
List<pointIndexHit> hitInfo;
@ -1533,7 +1533,7 @@ void Foam::refinementSurfaces::findNearestRegion
vectorField& hitNormal
) const
{
labelList geometries(UIndirectList<label>(surfaces_, surfacesToTest));
labelList geometries(labelUIndList(surfaces_, surfacesToTest));
// Do the tests. Note that findNearest returns index in geometries.
searchableSurfacesQueries::findNearest
@ -1718,7 +1718,7 @@ void Foam::refinementSurfaces::findNearest
List<pointIndexHit>& hitInfo
) const
{
labelList geometries(UIndirectList<label>(surfaces_, surfacesToTest));
labelList geometries(labelUIndList(surfaces_, surfacesToTest));
// Do the tests. Note that findNearest returns index in geometries.
searchableSurfacesQueries::findNearest
@ -1757,7 +1757,7 @@ void Foam::refinementSurfaces::findNearestRegion
vectorField& hitNormal
) const
{
labelList geometries(UIndirectList<label>(surfaces_, surfacesToTest));
labelList geometries(labelUIndList(surfaces_, surfacesToTest));
// Do the tests. Note that findNearest returns index in geometries.
searchableSurfacesQueries::findNearest

2
src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
View File

@ -4347,7 +4347,7 @@ void Foam::snappyLayerDriver::addLayers
{
labelList meshPoints
(
UIndirectList<label>(candidates, oldPoints)
labelUIndList(candidates, oldPoints)
);
label masteri = min(meshPoints);
forAll(meshPoints, i)

2
src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C
View File

@ -679,7 +679,7 @@ void Foam::snappySnapDriver::calcNearestFacePointProperties
pNormals = List<point>(pNormals, visitOrder);
pDisp = List<point>(pDisp, visitOrder);
pFc = List<point>(pFc, visitOrder);
pFid = UIndirectList<label>(pFid, visitOrder)();
pFid = labelUIndList(pFid, visitOrder)();
}
}

14
src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C
View File

@ -1693,7 +1693,7 @@ void Foam::extendedEdgeMesh::autoMap
const labelList& eNormals = edgeNormals()[edgeI];
labelList& subNormals = subEdgeNormals[subEdgeI];
subNormals = UIndirectList<label>(reverseNormalMap, eNormals);
subNormals = labelUIndList(reverseNormalMap, eNormals);
}
labelListList subPointNormals(pointMap.size());
@ -1703,7 +1703,7 @@ void Foam::extendedEdgeMesh::autoMap
const labelList& pNormals = featurePointNormals()[pointI];
labelList& subNormals = subPointNormals[subPointI];
subNormals = UIndirectList<label>(reverseNormalMap, pNormals);
subNormals = labelUIndList(reverseNormalMap, pNormals);
}
// Use compaction map to compact normal data
@ -1793,8 +1793,8 @@ void Foam::extendedEdgeMesh::trim
select(surf, volType, subPointMap, subEdgeMap);
// Update overall point maps
pointMap = UIndirectList<label>(allPointMap, subPointMap);
edgeMap = UIndirectList<label>(allEdgeMap, subEdgeMap);
pointMap = labelUIndList(allPointMap, subPointMap);
edgeMap = labelUIndList(allEdgeMap, subEdgeMap);
// Extract current point and edge status
List<edgeStatus> edgeStat(edges().size());
@ -1836,8 +1836,8 @@ void Foam::extendedEdgeMesh::trim
);
// Update the overall pointMap, edgeMap
pointMap = UIndirectList<label>(pointMap, sortedToOriginalPoint)();
edgeMap = UIndirectList<label>(edgeMap, sortedToOriginalEdge)();
pointMap = labelUIndList(pointMap, sortedToOriginalPoint)();
edgeMap = labelUIndList(edgeMap, sortedToOriginalEdge)();
}
@ -1992,7 +1992,7 @@ bool Foam::extendedEdgeMesh::mergePointsAndSort
sortedToOriginalPoint,
edgeMap // point merging above did not affect edge order
);
pointMap = UIndirectList<label>(pointMap, sortedToOriginalPoint)();
pointMap = labelUIndList(pointMap, sortedToOriginalPoint)();
return nNewPoints != nOldPoints;
}

16
src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C
View File

@ -634,8 +634,8 @@ void Foam::mappedPatchBase::calcMapping() const
);
// Insert
UIndirectList<label>(sampleProcs, subMap) = subSampleProcs;
UIndirectList<label>(sampleIndices, subMap) = subSampleIndices;
labelUIndList(sampleProcs, subMap) = subSampleProcs;
labelUIndList(sampleIndices, subMap) = subSampleIndices;
UIndirectList<point>(sampleLocations, subMap) = subSampleLocations;
}
}
@ -697,16 +697,8 @@ void Foam::mappedPatchBase::calcMapping() const
forAll(subMap, proci)
{
subMap[proci] = UIndirectList<label>
(
sampleIndices,
subMap[proci]
);
constructMap[proci] = UIndirectList<label>
(
patchFaces,
constructMap[proci]
);
subMap[proci] = labelUIndList(sampleIndices, subMap[proci]);
constructMap[proci] = labelUIndList(patchFaces, constructMap[proci]);
//if (debug)
//{

2
src/meshTools/meshTools/meshTools.C
View File

@ -550,7 +550,7 @@ Foam::label Foam::meshTools::otherEdge
FatalErrorInFunction
<< "Can not find edge in "
<< UIndirectList<edge>(mesh.edges(), edgeLabels)()
<< UIndirectList<edge>(mesh.edges(), edgeLabels)
<< " connected to edge "
<< thisEdgeI << " with vertices " << mesh.edges()[thisEdgeI]
<< " on side " << thisVertI << abort(FatalError);

2
src/meshTools/sets/topoSets/cellSet.C
View File

@ -104,7 +104,7 @@ Foam::cellSet::cellSet
(
const polyMesh& mesh,
const word& name,
const UList<label>& set,
const labelUList& set,
writeOption w
)
:

2
src/meshTools/sets/topoSets/cellSet.H
View File

@ -108,7 +108,7 @@ public:
(
const polyMesh& mesh,
const word& name,
const UList<label>& set,
const labelUList& set,
writeOption w=NO_WRITE
);

2
src/meshTools/sets/topoSets/faceSet.C
View File

@ -104,7 +104,7 @@ Foam::faceSet::faceSet
(
const polyMesh& mesh,
const word& name,
const UList<label>& set,
const labelUList& set,
writeOption w
)
:

2
src/meshTools/sets/topoSets/faceSet.H
View File

@ -103,7 +103,7 @@ public:
(
const polyMesh& mesh,
const word& name,
const UList<label>& set,
const labelUList& set,
writeOption w=NO_WRITE
);

4
src/meshTools/sets/topoSets/faceZoneSet.C
View File

@ -49,8 +49,8 @@ void Foam::faceZoneSet::updateSet()
{
labelList order;
sortedOrder(addressing_, order);
addressing_ = UIndirectList<label>(addressing_, order)();
flipMap_ = UIndirectList<bool>(flipMap_, order)();
addressing_ = labelUIndList(addressing_, order)();
flipMap_ = boolUIndList(flipMap_, order)();
faceSet::clearStorage();
faceSet::resize(2*addressing_.size());

2
src/meshTools/sets/topoSets/pointSet.C
View File

@ -103,7 +103,7 @@ Foam::pointSet::pointSet
(
const polyMesh& mesh,
const word& name,
const UList<label>& set,
const labelUList& set,
writeOption w
)
:

2
src/meshTools/sets/topoSets/pointSet.H
View File

@ -104,7 +104,7 @@ public:
(
const polyMesh& mesh,
const word& name,
const UList<label>& set,
const labelUList& set,
writeOption w=NO_WRITE
);

2
src/meshTools/sets/topoSets/topoSet.C
View File

@ -430,7 +430,7 @@ Foam::topoSet::topoSet
(
const polyMesh& mesh,
const word& name,
const UList<label>& set,
const labelUList& set,
writeOption w
)
:

3
src/meshTools/sets/topoSets/topoSet.H
View File

@ -51,7 +51,6 @@ SourceFiles
namespace Foam
{
class mapPolyMesh;
class polyMesh;
class primitiveMesh;
@ -239,7 +238,7 @@ public:
(
const polyMesh& mesh,
const word& name,
const UList<label>&,
const labelUList& set,
writeOption w=NO_WRITE
);

8
src/meshTools/triSurface/faceTriangulation/faceTriangulation.C
View File

@ -418,7 +418,7 @@ bool Foam::faceTriangulation::split
{
WarningInFunction
<< "Illegal face:" << f
<< " with points " << UIndirectList<point>(points, f)()
<< " with points " << UIndirectList<point>(points, f)
<< endl;
return false;
@ -494,7 +494,7 @@ bool Foam::faceTriangulation::split
WarningInFunction
<< "Cannot find valid diagonal on face " << f
<< " with points " << UIndirectList<point>(points, f)()
<< " with points " << UIndirectList<point>(points, f)
<< nl
<< "Returning naive triangulation starting from "
<< f[maxIndex] << " which might not be correct for a"
@ -521,7 +521,7 @@ bool Foam::faceTriangulation::split
{
WarningInFunction
<< "Cannot find valid diagonal on face " << f
<< " with points " << UIndirectList<point>(points, f)()
<< " with points " << UIndirectList<point>(points, f)
<< nl
<< "Returning empty triFaceList" << endl;
@ -553,7 +553,7 @@ bool Foam::faceTriangulation::split
{
FatalErrorInFunction
<< "Illegal split of face:" << f
<< " with points " << UIndirectList<point>(points, f)()
<< " with points " << UIndirectList<point>(points, f)
<< " at indices " << index1 << " and " << index2
<< abort(FatalError);
}

14
src/overset/cellCellStencil/cellVolumeWeight/cellVolumeWeightCellCellStencil.C
View File

@ -381,7 +381,7 @@ void Foam::cellCellStencils::cellVolumeWeight::findHoles
Pstream::listCombineScatter(regionType);
// Communicate region status through interpolative cells
labelList cellRegionType(UIndirectList<label>(regionType, cellRegion));
labelList cellRegionType(labelUIndList(regionType, cellRegion));
map.distribute(cellRegionType);
@ -643,11 +643,7 @@ void Foam::cellCellStencils::cellVolumeWeight::combineCellTypes
{
allWeights[cellI] = weights[subCellI];
allStencil[cellI] =
UIndirectList<label>
(
otherCells,
addressing[subCellI]
);
labelUIndList(otherCells, addressing[subCellI]);
allDonorID[cellI] = donorZoneID;
}
}
@ -802,7 +798,7 @@ bool Foam::cellCellStencils::cellVolumeWeight::update()
(
mapper.tgtMap(), // How to get remote data local
mapper.srcToTgtCellAddr(),
labelList(UIndirectList<label>(allPatchTypes, tgtCellMap)),
labelList(labelUIndList(allPatchTypes, tgtCellMap)),
interpolatedTgtPatchTypes
);
@ -847,7 +843,7 @@ bool Foam::cellCellStencils::cellVolumeWeight::update()
(
mapper.srcMap(), // How to get remote data local
mapper.tgtToSrcCellAddr(),
labelList(UIndirectList<label>(allPatchTypes, srcCellMap)),
labelList(labelUIndList(allPatchTypes, srcCellMap)),
interpolatedSrcPatchTypes
);
@ -1073,7 +1069,7 @@ bool Foam::cellCellStencils::cellVolumeWeight::update()
Pout<< "cellI:" << cellI << " at:"
<< mesh_.cellCentres()[cellI]
<< " calculated from slots:" << slots
<< " cc:" << UIndirectList<point>(cc, slots)()
<< " cc:" << UIndirectList<point>(cc, slots)
<< " weights:" << cellInterpolationWeights_[cellI]
<< endl;

2
src/overset/cellCellStencil/inverseDistance/inverseDistanceCellCellStencil.C
View File

@ -1087,7 +1087,7 @@ void Foam::cellCellStencils::inverseDistance::findHoles
DebugInfo<< FUNCTION_NAME << " : Gathered region type" << endl;
// Communicate region status through interpolative cells
labelList cellRegionType(UIndirectList<label>(regionType, cellRegion));
labelList cellRegionType(labelUIndList(regionType, cellRegion));
map.distribute(cellRegionType);
DebugInfo<< FUNCTION_NAME << " : Interpolated region type" << endl;

4
src/parallel/decompose/decompositionMethods/metisLikeDecomp/metisLikeDecomp.C
View File

@ -31,8 +31,8 @@ License
Foam::label Foam::metisLikeDecomp::decomposeGeneral
(
const UList<label>& adjncy,
const UList<label>& xadj,
const labelUList& adjncy,
const labelUList& xadj,
const UList<scalar>& cWeights,
List<label>& decomp
)

8
src/parallel/decompose/decompositionMethods/metisLikeDecomp/metisLikeDecomp.H
View File

@ -65,8 +65,8 @@ protected:
//- Serial and/or collect/distribute for parallel operation
virtual label decomposeGeneral
(
const UList<label>& adjncy,
const UList<label>& xadj,
const labelUList& adjncy,
const labelUList& xadj,
const UList<scalar>& cellWeights,
List<label>& decomp
);
@ -74,8 +74,8 @@ protected:
//- Decomposition with metis-like parameters
virtual label decomposeSerial
(
const UList<label>& adjncy,
const UList<label>& xadj,
const labelUList& adjncy,
const labelUList& xadj,
const UList<scalar>& cellWeights,
List<label>& decomp
) = 0;

2
src/parallel/decompose/decompositionMethods/multiLevelDecomp/multiLevelDecomp.C
View File

@ -207,7 +207,7 @@ void Foam::multiLevelDecomp::decompose
// Subset point-wise data.
pointField subPoints(points, domainPoints);
scalarField subWeights(pointWeights, domainPoints);
labelList subPointMap(UIndirectList<label>(pointMap, domainPoints));
labelList subPointMap(labelUIndList(pointMap, domainPoints));
// Subset point-point addressing (adapt global numbering)
labelListList subPointPoints;
labelList nOutsideConnections;

4
src/parallel/decompose/kahipDecomp/kahipDecomp.C
View File

@ -61,8 +61,8 @@ Foam::kahipDecomp::configNames
Foam::label Foam::kahipDecomp::decomposeSerial
(
const UList<label>& adjncy,
const UList<label>& xadj,
const labelUList& adjncy,
const labelUList& xadj,
const UList<scalar>& cWeights,
List<label>& decomp
)

4
src/parallel/decompose/kahipDecomp/kahipDecomp.H
View File

@ -78,8 +78,8 @@ class kahipDecomp
//- Call kahip with options from dictionary.
virtual label decomposeSerial
(
const UList<label>& adjncy,
const UList<label>& xadj,
const labelUList& adjncy,
const labelUList& xadj,
const UList<scalar>& cellWeights,
List<label>& decomp
);

12
src/parallel/decompose/metisDecomp/metisDecomp.C
View File

@ -47,8 +47,8 @@ namespace Foam
Foam::label Foam::metisDecomp::decomposeSerial
(
const UList<label>& adjncy,
const UList<label>& xadj,
const labelUList& adjncy,
const labelUList& xadj,
const UList<scalar>& cWeights,
List<label>& decomp
)
@ -174,8 +174,8 @@ Foam::label Foam::metisDecomp::decomposeSerial
(
&numCells, // num vertices in graph
&ncon, // num balancing constraints
const_cast<UList<label>&>(xadj).begin(), // indexing into adjncy
const_cast<UList<label>&>(adjncy).begin(), // neighbour info
const_cast<labelUList&>(xadj).begin(), // indexing into adjncy
const_cast<labelUList&>(adjncy).begin(), // neighbour info
cellWeights.begin(),// vertex wts
nullptr, // vsize: total communication vol
faceWeights.begin(),// edge wts
@ -193,8 +193,8 @@ Foam::label Foam::metisDecomp::decomposeSerial
(
&numCells, // num vertices in graph
&ncon, // num balancing constraints
const_cast<UList<label>&>(xadj).begin(), // indexing into adjncy
const_cast<UList<label>&>(adjncy).begin(), // neighbour info
const_cast<labelUList&>(xadj).begin(), // indexing into adjncy
const_cast<labelUList&>(adjncy).begin(), // neighbour info
cellWeights.begin(),// vertex wts
nullptr, // vsize: total communication vol
faceWeights.begin(),// edge wts

4
src/parallel/decompose/metisDecomp/metisDecomp.H
View File

@ -77,8 +77,8 @@ class metisDecomp
//- Call Metis with options from dictionary.
virtual label decomposeSerial
(
const UList<label>& adjncy,
const UList<label>& xadj,
const labelUList& adjncy,
const labelUList& xadj,
const UList<scalar>& cellWeights,
List<label>& decomp
);

8
src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.C
View File

@ -253,8 +253,8 @@ void Foam::ptscotchDecomp::check(const int retVal, const char* str)
////- Does prevention of 0 cell domains and calls ptscotch.
//Foam::label Foam::ptscotchDecomp::decomposeZeroDomains
//(
// const UList<label>& initadjncy,
// const UList<label>& initxadj,
// const labelUList& initadjncy,
// const labelUList& initxadj,
// const UList<scalar>& initcWeights,
// List<label>& finalDecomp
//) const
@ -441,8 +441,8 @@ void Foam::ptscotchDecomp::check(const int retVal, const char* str)
Foam::label Foam::ptscotchDecomp::decompose
(
const UList<label>& adjncy,
const UList<label>& xadj,
const labelUList& adjncy,
const labelUList& xadj,
const UList<scalar>& cWeights,
List<label>& finalDecomp
) const

4
src/parallel/decompose/ptscotchDecomp/ptscotchDecomp.H
View File

@ -81,8 +81,8 @@ class ptscotchDecomp
//- Decompose. Handles size 0 arrays
label decompose
(
const UList<label>& adjncy,
const UList<label>& xadj,
const labelUList& adjncy,
const labelUList& xadj,
const UList<scalar>& cWeights,
List<label>& finalDecomp
) const;

4
src/parallel/decompose/scotchDecomp/scotchDecomp.C
View File

@ -178,8 +178,8 @@ void Foam::scotchDecomp::check(const int retVal, const char* str)
Foam::label Foam::scotchDecomp::decomposeSerial
(
const UList<label>& adjncy,
const UList<label>& xadj,
const labelUList& adjncy,
const labelUList& xadj,
const UList<scalar>& cWeights,
List<label>& decomp
)

4
src/parallel/decompose/scotchDecomp/scotchDecomp.H
View File

@ -243,8 +243,8 @@ class scotchDecomp
//- Decompose non-parallel
virtual label decomposeSerial
(
const UList<label>& adjncy,
const UList<label>& xadj,
const labelUList& adjncy,
const labelUList& xadj,
const UList<scalar>& cWeights,
List<label>& decomp
);

2
src/sampling/meshToMesh/calcMethod/cellVolumeWeight/cellVolumeWeightMethod.C
View File

@ -377,7 +377,7 @@ void Foam::cellVolumeWeightMethod::calculate
// list to keep track of whether src cell can be mapped
boolList mapFlag(src_.nCells(), false);
UIndirectList<bool>(mapFlag, srcCellIDs) = true;
boolUIndList(mapFlag, srcCellIDs) = true;
// find initial point in tgt mesh
label srcSeedI = -1;

2
src/sampling/meshToMesh/calcMethod/correctedCellVolumeWeight/correctedCellVolumeWeightMethod.C
View File

@ -245,7 +245,7 @@ void Foam::correctedCellVolumeWeightMethod::calculate
// list to keep track of whether src cell can be mapped
boolList mapFlag(src_.nCells(), false);
UIndirectList<bool>(mapFlag, srcCellIDs) = true;
boolUIndList(mapFlag, srcCellIDs) = true;
// find initial point in tgt mesh
label srcSeedI = -1;

2
src/sampling/meshToMesh/calcMethod/direct/directMethod.C
View File

@ -266,7 +266,7 @@ void Foam::directMethod::calculate
// list to keep track of whether src cell can be mapped
boolList mapFlag(src_.nCells(), false);
UIndirectList<bool>(mapFlag, srcCellIDs) = true;
boolUIndList(mapFlag, srcCellIDs) = true;
// find initial point in tgt mesh
label srcSeedI = -1;

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