STYLE: more consistent use of labelUList and labelUIndList typedefs

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

View File

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

View File

@ -521,8 +521,8 @@ labelListList globalEdgeFaces
label findUncoveredPatchFace
(
const fvMesh& mesh,
const UIndirectList<label>& extrudeMeshFaces,// mesh faces that are extruded
const label meshEdgeI // mesh edge
const labelUIndList& extrudeMeshFaces, // mesh faces that are extruded
const label meshEdgeI // mesh edge
)
{
// Make set of extruded faces.
@ -549,6 +549,7 @@ label findUncoveredPatchFace
return facei;
}
}
return -1;
}
@ -557,8 +558,8 @@ label findUncoveredPatchFace
label findUncoveredCyclicPatchFace
(
const fvMesh& mesh,
const UIndirectList<label>& extrudeMeshFaces,// mesh faces that are extruded
const label meshEdgeI // mesh edge
const labelUIndList& extrudeMeshFaces, // mesh faces that are extruded
const label meshEdgeI // mesh edge
)
{
// Make set of extruded faces.
@ -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]
);

View File

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

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

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

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);

View File

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