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: remove spacing around forAll macros and template '> >' closing

Browse Source
This commit is contained in:
Mark Olesen
2018-07-06 11:03:28 +02:00
parent 957d8dc38d
commit 96b65a781d
23 changed files with 151 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
applications/utilities/parallelProcessing/decomposePar/faFieldDecomposer.C
View File

@ -44,7 +44,7 @@ faFieldDecomposer::patchFieldDecomposer::patchFieldDecomposer
sizeBeforeMapping_(sizeBeforeMapping),
directAddressing_(addressingSlice)
{
forAll (directAddressing_, i)
forAll(directAddressing_, i)
{
// Subtract one to align addressing.
// directAddressing_[i] -= addressingOffset + 1;
@ -69,7 +69,7 @@ processorAreaPatchFieldDecomposer
const labelList& own = mesh.edgeOwner();
const labelList& neighb = mesh.edgeNeighbour();
forAll (addressing_, i)
forAll(addressing_, i)
{
// Subtract one to align addressing.
label ai = addressingSlice[i];
@ -119,7 +119,7 @@ processorEdgePatchFieldDecomposer
addressing_(addressingSlice.size()),
weights_(addressingSlice.size())
{
forAll (addressing_, i)
forAll(addressing_, i)
{
addressing_[i].setSize(1);
weights_[i].setSize(1);
@ -160,7 +160,7 @@ faFieldDecomposer::faFieldDecomposer
static_cast<processorEdgePatchFieldDecomposer*>(NULL)
)
{
forAll (boundaryAddressing_, patchi)
forAll(boundaryAddressing_, patchi)
{
if (boundaryAddressing_[patchi] >= 0)
{
@ -205,7 +205,7 @@ faFieldDecomposer::faFieldDecomposer
faFieldDecomposer::~faFieldDecomposer()
{
forAll (patchFieldDecomposerPtrs_, patchi)
forAll(patchFieldDecomposerPtrs_, patchi)
{
if (patchFieldDecomposerPtrs_[patchi])
{
@ -213,7 +213,7 @@ faFieldDecomposer::~faFieldDecomposer()
}
}
forAll (processorAreaPatchFieldDecomposerPtrs_, patchi)
forAll(processorAreaPatchFieldDecomposerPtrs_, patchi)
{
if (processorAreaPatchFieldDecomposerPtrs_[patchi])
{
@ -221,7 +221,7 @@ faFieldDecomposer::~faFieldDecomposer()
}
}
forAll (processorEdgePatchFieldDecomposerPtrs_, patchi)
forAll(processorEdgePatchFieldDecomposerPtrs_, patchi)
{
if (processorEdgePatchFieldDecomposerPtrs_[patchi])
{

4
applications/utilities/parallelProcessing/decomposePar/faFieldDecomposer.H
View File

@ -283,7 +283,7 @@ public:
//- Decompose area field
template<class Type>
tmp<GeometricField<Type, faPatchField, areaMesh> >
tmp<GeometricField<Type, faPatchField, areaMesh>>
decomposeField
(
const GeometricField<Type, faPatchField, areaMesh>& field
@ -291,7 +291,7 @@ public:
//- Decompose surface field
template<class Type>
tmp<GeometricField<Type, faePatchField, edgeMesh> >
tmp<GeometricField<Type, faePatchField, edgeMesh>>
decomposeField
(
const GeometricField<Type, faePatchField, edgeMesh>& field

26
applications/utilities/parallelProcessing/decomposePar/faFieldDecomposerDecomposeFields.C
View File

@ -37,7 +37,7 @@ namespace Foam
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
tmp<GeometricField<Type, faPatchField, areaMesh> >
tmp<GeometricField<Type, faPatchField, areaMesh>>
faFieldDecomposer::decomposeField
(
const GeometricField<Type, faPatchField, areaMesh>& field
@ -47,9 +47,9 @@ faFieldDecomposer::decomposeField
Field<Type> internalField(field.internalField(), faceAddressing_);
// Create and map the patch field values
PtrList<faPatchField<Type> > patchFields(boundaryAddressing_.size());
PtrList<faPatchField<Type>> patchFields(boundaryAddressing_.size());
forAll (boundaryAddressing_, patchi)
forAll(boundaryAddressing_, patchi)
{
if (boundaryAddressing_[patchi] >= 0)
{
@ -85,7 +85,7 @@ faFieldDecomposer::decomposeField
}
// Create the field for the processor
return tmp<GeometricField<Type, faPatchField, areaMesh> >
return tmp<GeometricField<Type, faPatchField, areaMesh>>
(
new GeometricField<Type, faPatchField, areaMesh>
(
@ -107,7 +107,7 @@ faFieldDecomposer::decomposeField
template<class Type>
tmp<GeometricField<Type, faePatchField, edgeMesh> >
tmp<GeometricField<Type, faePatchField, edgeMesh>>
faFieldDecomposer::decomposeField
(
const GeometricField<Type, faePatchField, edgeMesh>& field
@ -121,7 +121,7 @@ faFieldDecomposer::decomposeField
procMesh_.nInternalEdges()
)
);
forAll (mapAddr, i)
forAll(mapAddr, i)
{
mapAddr[i] -= 1;
}
@ -140,27 +140,27 @@ faFieldDecomposer::decomposeField
// (i.e. using slices)
Field<Type> allEdgeField(field.mesh().nEdges());
forAll (field.internalField(), i)
forAll(field.internalField(), i)
{
allEdgeField[i] = field.internalField()[i];
}
forAll (field.boundaryField(), patchi)
forAll(field.boundaryField(), patchi)
{
const Field<Type> & p = field.boundaryField()[patchi];
const label patchStart = field.mesh().boundary()[patchi].start();
forAll (p, i)
forAll(p, i)
{
allEdgeField[patchStart + i] = p[i];
}
}
// Create and map the patch field values
PtrList<faePatchField<Type> > patchFields(boundaryAddressing_.size());
PtrList<faePatchField<Type>> patchFields(boundaryAddressing_.size());
forAll (boundaryAddressing_, patchi)
forAll(boundaryAddressing_, patchi)
{
if (boundaryAddressing_[patchi] >= 0)
{
@ -196,7 +196,7 @@ faFieldDecomposer::decomposeField
}
// Create the field for the processor
return tmp<GeometricField<Type, faePatchField, edgeMesh> >
return tmp<GeometricField<Type, faePatchField, edgeMesh>>
(
new GeometricField<Type, faePatchField, edgeMesh>
(
@ -223,7 +223,7 @@ void faFieldDecomposer::decomposeFields
const PtrList<GeoField>& fields
) const
{
forAll (fields, fieldI)
forAll(fields, fieldI)
{
decomposeField(fields[fieldI])().write();
}

66
applications/utilities/parallelProcessing/decomposePar/faMeshDecomposition.C
View File

@ -112,7 +112,7 @@ void Foam::faMeshDecomposition::distributeFaces()
faceProcAddressingHash.insert(faceProcAddressing[i]);
}
forAll (faceLabels(), faceI)
forAll(faceLabels(), faceI)
{
if (faceProcAddressingHash.found(faceLabels()[faceI] + 1))
{
@ -138,7 +138,7 @@ void Foam::faMeshDecomposition::distributeFaces()
)
);
forAll (faceLabels(), faceI)
forAll(faceLabels(), faceI)
{
if (faceProcAddressingHash.found(faceLabels()[faceI] + 1))
{
@ -217,9 +217,9 @@ void Foam::faMeshDecomposition::decomposeMesh()
// Memory management
{
List<SLList<label> > procFaceList(nProcs());
List<SLList<label>> procFaceList(nProcs());
forAll (faceToProc_, faceI)
forAll(faceToProc_, faceI)
{
if (faceToProc_[faceI] >= nProcs())
{
@ -235,7 +235,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
}
// Convert linked lists into normal lists
forAll (procFaceList, procI)
forAll(procFaceList, procI)
{
procFaceAddressing_[procI] = procFaceList[procI];
}
@ -337,7 +337,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
edgesHash.insert(patch.edges()[curEdge], ++edgeI);
}
forAll (boundary(), patchI)
forAll(boundary(), patchI)
{
// Include emptyFaPatch
@ -402,7 +402,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
// Memory management
{
List<SLList<label> > procEdgeList(nProcs());
List<SLList<label>> procEdgeList(nProcs());
forAll(procEdgeList, procI)
{
@ -416,14 +416,14 @@ void Foam::faMeshDecomposition::decomposeMesh()
// Detect inter-processor boundaries
// Neighbour processor for each subdomain
List<SLList<label> > interProcBoundaries(nProcs());
List<SLList<label>> interProcBoundaries(nProcs());
// Edge labels belonging to each inter-processor boundary
List<SLList<SLList<label> > > interProcBEdges(nProcs());
List<SLList<SLList<label>>> interProcBEdges(nProcs());
List<SLList<label> > procPatchIndex(nProcs());
List<SLList<label>> procPatchIndex(nProcs());
forAll (neighbour, edgeI)
forAll(neighbour, edgeI)
{
if (faceToProc_[owner[edgeI]] != faceToProc_[neighbour[edgeI]])
{
@ -437,7 +437,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
SLList<label>::iterator curInterProcBdrsOwnIter =
interProcBoundaries[ownerProc].begin();
SLList<SLList<label> >::iterator curInterProcBEdgesOwnIter =
SLList<SLList<label>>::iterator curInterProcBEdgesOwnIter =
interProcBEdges[ownerProc].begin();
bool interProcBouFound = false;
@ -464,7 +464,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
SLList<label>::iterator curInterProcBdrsNeiIter =
interProcBoundaries[neighbourProc].begin();
SLList<SLList<label> >::iterator
SLList<SLList<label>>::iterator
curInterProcBEdgesNeiIter =
interProcBEdges[neighbourProc].begin();
@ -536,16 +536,16 @@ void Foam::faMeshDecomposition::decomposeMesh()
// for all processors, set the size of start index and patch size
// lists to the number of patches in the mesh
forAll (procPatchSize_, procI)
forAll(procPatchSize_, procI)
{
procPatchSize_[procI].setSize(patches.size());
procPatchStartIndex_[procI].setSize(patches.size());
}
forAll (patches, patchI)
forAll(patches, patchI)
{
// Reset size and start index for all processors
forAll (procPatchSize_, procI)
forAll(procPatchSize_, procI)
{
procPatchSize_[procI][patchI] = 0;
procPatchStartIndex_[procI][patchI] =
@ -571,7 +571,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
patchEdgeFaces[eI] = eF[patches[patchI][eI]][0];
}
forAll (patchEdgeFaces, edgeI)
forAll(patchEdgeFaces, edgeI)
{
const label curProc = faceToProc_[patchEdgeFaces[edgeI]];
@ -604,7 +604,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
cycOffset
);
forAll (firstEdgeFaces, edgeI)
forAll(firstEdgeFaces, edgeI)
{
if
(
@ -627,7 +627,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
SLList<label>::iterator curInterProcBdrsOwnIter =
interProcBoundaries[ownerProc].begin();
SLList<SLList<label> >::iterator
SLList<SLList<label>>::iterator
curInterProcBEdgesOwnIter =
interProcBEdges[ownerProc].begin();
@ -658,7 +658,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
SLList<label>::iterator curInterProcBdrsNeiIter
= interProcBoundaries[neighbourProc].begin();
SLList<SLList<label> >::iterator
SLList<SLList<label>>::iterator
curInterProcBEdgesNeiIter =
interProcBEdges[neighbourProc].begin();
@ -758,7 +758,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
// Ordering in cyclic boundaries is important.
// Add the other half of cyclic edges for cyclic boundaries
// that remain on the processor
forAll (secondEdgeFaces, edgeI)
forAll(secondEdgeFaces, edgeI)
{
if
(
@ -782,7 +782,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
// Convert linked lists into normal lists
// Add inter-processor boundaries and remember start indices
forAll (procEdgeList, procI)
forAll(procEdgeList, procI)
{
// Get internal and regular boundary processor faces
SLList<label>& curProcEdges = procEdgeList[procI];
@ -804,7 +804,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
for
(
SLList<SLList<label> >::iterator curInterProcBEdgesIter =
SLList<SLList<label>>::iterator curInterProcBEdgesIter =
interProcBEdges[procI].begin();
curInterProcBEdgesIter != interProcBEdges[procI].end();
++curInterProcBEdgesIter
@ -861,7 +861,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
SLList<label>::iterator curInterProcBdrsIter =
interProcBoundaries[procI].begin();
SLList<SLList<label> >::iterator curInterProcBEdgesIter =
SLList<SLList<label>>::iterator curInterProcBEdgesIter =
interProcBEdges[procI].begin();
for
@ -926,7 +926,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
// are omitted. For processor patches, set index to -1.
// At the same time, filter the procPatchSize_ and procPatchStartIndex_
// lists to exclude zero-size patches
forAll (procPatchSize_, procI)
forAll(procPatchSize_, procI)
{
// Make a local copy of old lists
const labelList oldPatchSizes = procPatchSize_[procI];
@ -950,7 +950,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
label nPatches = 0;
forAll (oldPatchSizes, patchI)
forAll(oldPatchSizes, patchI)
{
if (oldPatchSizes[patchI] > 0)
{
@ -968,7 +968,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
curPatchSizes.setSize(nPatches);
curPatchStarts.setSize(nPatches);
forAll (curProcessorPatchSizes, procPatchI)
forAll(curProcessorPatchSizes, procPatchI)
{
curBoundaryAddressing[nPatches] = -1;
@ -1013,7 +1013,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
// Reset the lookup list
pointsUsage = 0;
forAll (curProcessorPatchStarts, patchI)
forAll(curProcessorPatchStarts, patchI)
{
const label curStart = curProcessorPatchStarts[patchI];
const label curEnd = curStart + curProcessorPatchSizes[patchI];
@ -1031,7 +1031,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
const edge& e = edges[curE];
forAll (e, pointI)
forAll(e, pointI)
{
if (pointsUsage[e[pointI]] == 0)
{
@ -1164,7 +1164,7 @@ bool Foam::faMeshDecomposition::writeDecomposition()
// Make a lookup map for globally shared points
Map<label> sharedPointLookup(2*globallySharedPoints_.size());
forAll (globallySharedPoints_, pointi)
forAll(globallySharedPoints_, pointi)
{
sharedPointLookup.insert(globallySharedPoints_[pointi], pointi);
}
@ -1249,7 +1249,7 @@ bool Foam::faMeshDecomposition::writeDecomposition()
label nPatches = 0;
forAll (curPatchSizes, patchi)
forAll(curPatchSizes, patchi)
{
const labelList& curEdgeLabels = curPatchEdgeLabels[nPatches];
@ -1272,7 +1272,7 @@ bool Foam::faMeshDecomposition::writeDecomposition()
nPatches++;
}
forAll (curProcessorPatchSizes, procPatchI)
forAll(curProcessorPatchSizes, procPatchI)
{
const labelList& curEdgeLabels = curPatchEdgeLabels[nPatches];
@ -1310,7 +1310,7 @@ bool Foam::faMeshDecomposition::writeDecomposition()
label nProcPatches = 0;
label nProcEdges = 0;
forAll (procMesh.boundary(), patchi)
forAll(procMesh.boundary(), patchi)
{
if
(

4
applications/utilities/parallelProcessing/decomposePar/faMeshDecomposition.H
View File

@ -80,13 +80,13 @@ class faMeshDecomposition
labelListList procFaceLabels_;
//-
List<Map<label> > procMeshEdgesMap_;
List<Map<label>> procMeshEdgesMap_;
//- Number of internal edges for each processor mesh
labelList procNInternalEdges_;
//- Edge labels for patches of processor meshes
List<List<List<label> > > procPatchEdgeLabels_;
List<List<List<label>>> procPatchEdgeLabels_;
//- Labels of points for each processor
labelListList procPatchPointAddressing_;

4
applications/utilities/parallelProcessing/reconstructPar/faFieldReconstructor.H
View File

@ -158,7 +158,7 @@ public:
//- Reconstruct area field
template<class Type>
tmp<GeometricField<Type, faPatchField, areaMesh> >
tmp<GeometricField<Type, faPatchField, areaMesh>>
reconstructFaAreaField
(
const IOobject& fieldIoObject
@ -166,7 +166,7 @@ public:
//- Reconstruct edge field
template<class Type>
tmp<GeometricField<Type, faePatchField, edgeMesh> >
tmp<GeometricField<Type, faePatchField, edgeMesh>>
reconstructFaEdgeField
(
const IOobject& fieldIoObject

30
applications/utilities/parallelProcessing/reconstructPar/faFieldReconstructorReconstructFields.C
View File

@ -36,19 +36,19 @@ License
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
Foam::tmp<Foam::GeometricField<Type, Foam::faPatchField, Foam::areaMesh> >
Foam::tmp<Foam::GeometricField<Type, Foam::faPatchField, Foam::areaMesh>>
Foam::faFieldReconstructor::reconstructFaAreaField
(
const IOobject& fieldIoObject
)
{
// Read the field for all the processors
PtrList<GeometricField<Type, faPatchField, areaMesh> > procFields
PtrList<GeometricField<Type, faPatchField, areaMesh>> procFields
(
procMeshes_.size()
);
forAll (procMeshes_, procI)
forAll(procMeshes_, procI)
{
procFields.set
(
@ -72,7 +72,7 @@ Foam::faFieldReconstructor::reconstructFaAreaField
Field<Type> internalField(mesh_.nFaces());
// Create the patch fields
PtrList<faPatchField<Type> > patchFields(mesh_.boundary().size());
PtrList<faPatchField<Type>> patchFields(mesh_.boundary().size());
// Create global mesh patches starts
@ -89,7 +89,7 @@ Foam::faFieldReconstructor::reconstructFaAreaField
gStarts[i] = gStarts[i-1] + mesh_.boundary()[i-1].labelList::size();
}
forAll (procMeshes_, procI)
forAll(procMeshes_, procI)
{
const GeometricField<Type, faPatchField, areaMesh>& procField =
procFields[procI];
@ -203,7 +203,7 @@ Foam::faFieldReconstructor::reconstructFaAreaField
// label curBPatch = mesh_.boundary().whichPatch(curE);
label curBPatch = -1;
forAll (mesh_.boundary(), pI)
forAll(mesh_.boundary(), pI)
{
if
(
@ -273,7 +273,7 @@ Foam::faFieldReconstructor::reconstructFaAreaField
// Now construct and write the field
// setting the internalField and patchFields
return tmp<GeometricField<Type, faPatchField, areaMesh> >
return tmp<GeometricField<Type, faPatchField, areaMesh>>
(
new GeometricField<Type, faPatchField, areaMesh>
(
@ -295,19 +295,19 @@ Foam::faFieldReconstructor::reconstructFaAreaField
template<class Type>
Foam::tmp<Foam::GeometricField<Type, Foam::faePatchField, Foam::edgeMesh> >
Foam::tmp<Foam::GeometricField<Type, Foam::faePatchField, Foam::edgeMesh>>
Foam::faFieldReconstructor::reconstructFaEdgeField
(
const IOobject& fieldIoObject
)
{
// Read the field for all the processors
PtrList<GeometricField<Type, faePatchField, edgeMesh> > procFields
PtrList<GeometricField<Type, faePatchField, edgeMesh>> procFields
(
procMeshes_.size()
);
forAll (procMeshes_, procI)
forAll(procMeshes_, procI)
{
procFields.set
(
@ -332,7 +332,7 @@ Foam::faFieldReconstructor::reconstructFaEdgeField
Field<Type> internalField(mesh_.nInternalEdges());
// Create the patch fields
PtrList<faePatchField<Type> > patchFields(mesh_.boundary().size());
PtrList<faePatchField<Type>> patchFields(mesh_.boundary().size());
labelList gStarts(mesh_.boundary().size(), -1);
@ -348,7 +348,7 @@ Foam::faFieldReconstructor::reconstructFaEdgeField
}
forAll (procMeshes_, procI)
forAll(procMeshes_, procI)
{
const GeometricField<Type, faePatchField, edgeMesh>& procField =
procFields[procI];
@ -361,7 +361,7 @@ Foam::faFieldReconstructor::reconstructFaEdgeField
{
labelList curAddr(edgeProcAddressing_[procI]);
// forAll (curAddr, addrI)
// forAll(curAddr, addrI)
// {
// curAddr[addrI] -= 1;
// }
@ -476,7 +476,7 @@ Foam::faFieldReconstructor::reconstructFaEdgeField
label curBPatch = -1;
forAll (mesh_.boundary(), pI)
forAll(mesh_.boundary(), pI)
{
if
(
@ -553,7 +553,7 @@ Foam::faFieldReconstructor::reconstructFaEdgeField
// Now construct and write the field
// setting the internalField and patchFields
return tmp<GeometricField<Type, faePatchField, edgeMesh> >
return tmp<GeometricField<Type, faePatchField, edgeMesh>>
(
new GeometricField<Type, faePatchField, edgeMesh>
(

8
applications/utilities/parallelProcessing/reconstructPar/processorFaMeshes.C
View File

@ -32,7 +32,7 @@ License
void Foam::processorFaMeshes::read()
{
forAll (fvMeshes_, procI)
forAll(fvMeshes_, procI)
{
meshes_.set
(
@ -151,7 +151,7 @@ Foam::processorFaMeshes::processorFaMeshes
// {
// fvMesh::readUpdateState stat = fvMesh::UNCHANGED;
// forAll (databases_, procI)
// forAll(databases_, procI)
// {
// // Check if any new meshes need to be read.
// fvMesh::readUpdateState procStat = meshes_[procI].readUpdate();
@ -206,7 +206,7 @@ Foam::processorFaMeshes::processorFaMeshes
// // Read the field for all the processors
// PtrList<pointIOField> procsPoints(meshes_.size());
// forAll (meshes_, procI)
// forAll(meshes_, procI)
// {
// procsPoints.set
// (
@ -229,7 +229,7 @@ Foam::processorFaMeshes::processorFaMeshes
// // Create the new points
// vectorField newPoints(mesh.nPoints());
// forAll (meshes_, procI)
// forAll(meshes_, procI)
// {
// const vectorField& procPoints = procsPoints[procI];