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

2
applications/solvers/finiteArea/sphereSurfactantFoam/createFaFields.H
View File

@ -48,7 +48,7 @@ areaVectorField Us
dimensioned<scalar> Uinf("Uinf", dimVelocity, 1.0); dimensioned<scalar> Uinf("Uinf", dimVelocity, 1.0);
forAll (Us, faceI) forAll(Us, faceI)
{ {
Us[faceI].x() = Us[faceI].x() =
Uinf.value()*(0.25*(3.0 + sqr(R[faceI].x()/mag(R[faceI]))) - 1.0); Uinf.value()*(0.25*(3.0 + sqr(R[faceI].x()/mag(R[faceI]))) - 1.0);

2
applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/laserDTRM.C
View File

@ -720,7 +720,7 @@ void Foam::radiation::laserDTRM::calculate()
{ {
const pointField& pos = positions[proci]; const pointField& pos = positions[proci];
const pointField& pfinal = p0[proci]; const pointField& pfinal = p0[proci];
forAll (pos, i) forAll(pos, i)
{ {
meshTools::writeOBJ(osRef, pos[i]); meshTools::writeOBJ(osRef, pos[i]);
vertI++; vertI++;

19
applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/InterfaceCompositionModel/InterfaceCompositionModel.H
View File

@ -172,13 +172,12 @@ public:
// Instantiation for multi-component (from) to single-component (to) // Instantiation for multi-component (from) to single-component (to)
#define makeInterfaceDispSpecieMixtureType(Type, Thermo, Comp, Mix, Phys, OtherThermo, OtherComp, OtherMix, OtherPhys)\ #define makeInterfaceDispSpecieMixtureType(Type, Thermo, Comp, Mix, Phys, OtherThermo, OtherComp, OtherMix, OtherPhys)\
\ \
typedef Thermo<Comp, SpecieMixture<Mix<Phys> > > \ typedef Thermo<Comp, SpecieMixture<Mix<Phys>>> \
Type##Thermo##Comp##Mix##Phys; \ Type##Thermo##Comp##Mix##Phys; \
\ \
typedef OtherThermo<OtherComp, OtherMix<OtherPhys> > \ typedef OtherThermo<OtherComp, OtherMix<OtherPhys>> \
Type##Other##OtherThermo##OtherComp##OtherMix##OtherPhys; \ Type##Other##OtherThermo##OtherComp##OtherMix##OtherPhys; \
\ \
\
addInterfaceCompositionToRunTimeSelectionTable \ addInterfaceCompositionToRunTimeSelectionTable \
( \ ( \
Type, \ Type, \
@ -190,13 +189,12 @@ public:
// Instantiation for single-component (from) to multi-component (to) // Instantiation for single-component (from) to multi-component (to)
#define makeInterfaceContSpecieMixtureType(Type, Thermo, Comp, Mix, Phys, OtherThermo, OtherComp, OtherMix, OtherPhys)\ #define makeInterfaceContSpecieMixtureType(Type, Thermo, Comp, Mix, Phys, OtherThermo, OtherComp, OtherMix, OtherPhys)\
\ \
typedef Thermo<Comp, Mix<Phys> > \ typedef Thermo<Comp, Mix<Phys>> \
Type##Thermo##Comp##Mix##Phys; \ Type##Thermo##Comp##Mix##Phys; \
\ \
typedef OtherThermo<OtherComp, SpecieMixture<OtherMix<OtherPhys> > > \ typedef OtherThermo<OtherComp, SpecieMixture<OtherMix<OtherPhys>>> \
Type##Other##OtherThermo##OtherComp##OtherMix##OtherPhys; \ Type##Other##OtherThermo##OtherComp##OtherMix##OtherPhys; \
\ \
\
addInterfaceCompositionToRunTimeSelectionTable \ addInterfaceCompositionToRunTimeSelectionTable \
( \ ( \
Type, \ Type, \
@ -208,13 +206,12 @@ public:
// Instantiation for single-component-single-component pairs // Instantiation for single-component-single-component pairs
#define makeInterfacePureType(Type, Thermo, Comp, Mix, Phys, OtherThermo, OtherComp, OtherMix, OtherPhys)\ #define makeInterfacePureType(Type, Thermo, Comp, Mix, Phys, OtherThermo, OtherComp, OtherMix, OtherPhys)\
\ \
typedef Thermo<Comp, Mix<Phys> > \ typedef Thermo<Comp, Mix<Phys>> \
Type##Thermo##Comp##Mix##Phys; \ Type##Thermo##Comp##Mix##Phys; \
\ \
typedef OtherThermo<OtherComp, OtherMix<OtherPhys> > \ typedef OtherThermo<OtherComp, OtherMix<OtherPhys>> \
Type##Other##OtherThermo##OtherComp##OtherMix##OtherPhys; \ Type##Other##OtherThermo##OtherComp##OtherMix##OtherPhys; \
\ \
\
addInterfaceCompositionToRunTimeSelectionTable \ addInterfaceCompositionToRunTimeSelectionTable \
( \ ( \
Type, \ Type, \
@ -226,10 +223,10 @@ public:
// Instantiation for multi-component-multi-component pairs // Instantiation for multi-component-multi-component pairs
#define makeSpecieInterfaceSpecieMixtures(Type, Thermo, Comp, Mix, Phys, OtherThermo, OtherComp, OtherMix, OtherPhys)\ #define makeSpecieInterfaceSpecieMixtures(Type, Thermo, Comp, Mix, Phys, OtherThermo, OtherComp, OtherMix, OtherPhys)\
\ \
typedef Thermo<Comp, SpecieMixture<Mix<Phys> > > \ typedef Thermo<Comp, SpecieMixture<Mix<Phys>>> \
Type##Thermo##Comp##Mix##Phys; \ Type##Thermo##Comp##Mix##Phys; \
\ \
typedef OtherThermo<OtherComp, SpecieMixture<OtherMix<OtherPhys> > > \ typedef OtherThermo<OtherComp, SpecieMixture<OtherMix<OtherPhys>>> \
Type##Other##OtherThermo##OtherComp##OtherMix##OtherPhys; \ Type##Other##OtherThermo##OtherComp##OtherMix##OtherPhys; \
\ \
addInterfaceCompositionToRunTimeSelectionTable \ addInterfaceCompositionToRunTimeSelectionTable \

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

@ -202,7 +202,7 @@ void Foam::fluentFvMesh::writeFluentMesh() const
// Note: In Fluent, all boundary faces point inwards, which is // Note: In Fluent, all boundary faces point inwards, which is
// opposite from the OpenFOAM convention. // opposite from the OpenFOAM convention.
// Turn them around on printout // Turn them around on printout
forAllReverse (l, lI) forAllReverse(l, lI)
{ {
fluentMeshFile << l[lI] + 1 << " "; fluentMeshFile << l[lI] + 1 << " ";
} }

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

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

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

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

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

@ -37,7 +37,7 @@ namespace Foam
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type> template<class Type>
tmp<GeometricField<Type, faPatchField, areaMesh> > tmp<GeometricField<Type, faPatchField, areaMesh>>
faFieldDecomposer::decomposeField faFieldDecomposer::decomposeField
( (
const GeometricField<Type, faPatchField, areaMesh>& field const GeometricField<Type, faPatchField, areaMesh>& field
@ -47,9 +47,9 @@ faFieldDecomposer::decomposeField
Field<Type> internalField(field.internalField(), faceAddressing_); Field<Type> internalField(field.internalField(), faceAddressing_);
// Create and map the patch field values // 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) if (boundaryAddressing_[patchi] >= 0)
{ {
@ -85,7 +85,7 @@ faFieldDecomposer::decomposeField
} }
// Create the field for the processor // Create the field for the processor
return tmp<GeometricField<Type, faPatchField, areaMesh> > return tmp<GeometricField<Type, faPatchField, areaMesh>>
( (
new GeometricField<Type, faPatchField, areaMesh> new GeometricField<Type, faPatchField, areaMesh>
( (
@ -107,7 +107,7 @@ faFieldDecomposer::decomposeField
template<class Type> template<class Type>
tmp<GeometricField<Type, faePatchField, edgeMesh> > tmp<GeometricField<Type, faePatchField, edgeMesh>>
faFieldDecomposer::decomposeField faFieldDecomposer::decomposeField
( (
const GeometricField<Type, faePatchField, edgeMesh>& field const GeometricField<Type, faePatchField, edgeMesh>& field
@ -121,7 +121,7 @@ faFieldDecomposer::decomposeField
procMesh_.nInternalEdges() procMesh_.nInternalEdges()
) )
); );
forAll (mapAddr, i) forAll(mapAddr, i)
{ {
mapAddr[i] -= 1; mapAddr[i] -= 1;
} }
@ -140,27 +140,27 @@ faFieldDecomposer::decomposeField
// (i.e. using slices) // (i.e. using slices)
Field<Type> allEdgeField(field.mesh().nEdges()); Field<Type> allEdgeField(field.mesh().nEdges());
forAll (field.internalField(), i) forAll(field.internalField(), i)
{ {
allEdgeField[i] = field.internalField()[i]; allEdgeField[i] = field.internalField()[i];
} }
forAll (field.boundaryField(), patchi) forAll(field.boundaryField(), patchi)
{ {
const Field<Type> & p = field.boundaryField()[patchi]; const Field<Type> & p = field.boundaryField()[patchi];
const label patchStart = field.mesh().boundary()[patchi].start(); const label patchStart = field.mesh().boundary()[patchi].start();
forAll (p, i) forAll(p, i)
{ {
allEdgeField[patchStart + i] = p[i]; allEdgeField[patchStart + i] = p[i];
} }
} }
// Create and map the patch field values // 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) if (boundaryAddressing_[patchi] >= 0)
{ {
@ -196,7 +196,7 @@ faFieldDecomposer::decomposeField
} }
// Create the field for the processor // Create the field for the processor
return tmp<GeometricField<Type, faePatchField, edgeMesh> > return tmp<GeometricField<Type, faePatchField, edgeMesh>>
( (
new GeometricField<Type, faePatchField, edgeMesh> new GeometricField<Type, faePatchField, edgeMesh>
( (
@ -223,7 +223,7 @@ void faFieldDecomposer::decomposeFields
const PtrList<GeoField>& fields const PtrList<GeoField>& fields
) const ) const
{ {
forAll (fields, fieldI) forAll(fields, fieldI)
{ {
decomposeField(fields[fieldI])().write(); 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]); faceProcAddressingHash.insert(faceProcAddressing[i]);
} }
forAll (faceLabels(), faceI) forAll(faceLabels(), faceI)
{ {
if (faceProcAddressingHash.found(faceLabels()[faceI] + 1)) 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)) if (faceProcAddressingHash.found(faceLabels()[faceI] + 1))
{ {
@ -217,9 +217,9 @@ void Foam::faMeshDecomposition::decomposeMesh()
// Memory management // Memory management
{ {
List<SLList<label> > procFaceList(nProcs()); List<SLList<label>> procFaceList(nProcs());
forAll (faceToProc_, faceI) forAll(faceToProc_, faceI)
{ {
if (faceToProc_[faceI] >= nProcs()) if (faceToProc_[faceI] >= nProcs())
{ {
@ -235,7 +235,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
} }
// Convert linked lists into normal lists // Convert linked lists into normal lists
forAll (procFaceList, procI) forAll(procFaceList, procI)
{ {
procFaceAddressing_[procI] = procFaceList[procI]; procFaceAddressing_[procI] = procFaceList[procI];
} }
@ -337,7 +337,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
edgesHash.insert(patch.edges()[curEdge], ++edgeI); edgesHash.insert(patch.edges()[curEdge], ++edgeI);
} }
forAll (boundary(), patchI) forAll(boundary(), patchI)
{ {
// Include emptyFaPatch // Include emptyFaPatch
@ -402,7 +402,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
// Memory management // Memory management
{ {
List<SLList<label> > procEdgeList(nProcs()); List<SLList<label>> procEdgeList(nProcs());
forAll(procEdgeList, procI) forAll(procEdgeList, procI)
{ {
@ -416,14 +416,14 @@ void Foam::faMeshDecomposition::decomposeMesh()
// Detect inter-processor boundaries // Detect inter-processor boundaries
// Neighbour processor for each subdomain // Neighbour processor for each subdomain
List<SLList<label> > interProcBoundaries(nProcs()); List<SLList<label>> interProcBoundaries(nProcs());
// Edge labels belonging to each inter-processor boundary // 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]]) if (faceToProc_[owner[edgeI]] != faceToProc_[neighbour[edgeI]])
{ {
@ -437,7 +437,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
SLList<label>::iterator curInterProcBdrsOwnIter = SLList<label>::iterator curInterProcBdrsOwnIter =
interProcBoundaries[ownerProc].begin(); interProcBoundaries[ownerProc].begin();
SLList<SLList<label> >::iterator curInterProcBEdgesOwnIter = SLList<SLList<label>>::iterator curInterProcBEdgesOwnIter =
interProcBEdges[ownerProc].begin(); interProcBEdges[ownerProc].begin();
bool interProcBouFound = false; bool interProcBouFound = false;
@ -464,7 +464,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
SLList<label>::iterator curInterProcBdrsNeiIter = SLList<label>::iterator curInterProcBdrsNeiIter =
interProcBoundaries[neighbourProc].begin(); interProcBoundaries[neighbourProc].begin();
SLList<SLList<label> >::iterator SLList<SLList<label>>::iterator
curInterProcBEdgesNeiIter = curInterProcBEdgesNeiIter =
interProcBEdges[neighbourProc].begin(); interProcBEdges[neighbourProc].begin();
@ -536,16 +536,16 @@ void Foam::faMeshDecomposition::decomposeMesh()
// for all processors, set the size of start index and patch size // for all processors, set the size of start index and patch size
// lists to the number of patches in the mesh // lists to the number of patches in the mesh
forAll (procPatchSize_, procI) forAll(procPatchSize_, procI)
{ {
procPatchSize_[procI].setSize(patches.size()); procPatchSize_[procI].setSize(patches.size());
procPatchStartIndex_[procI].setSize(patches.size()); procPatchStartIndex_[procI].setSize(patches.size());
} }
forAll (patches, patchI) forAll(patches, patchI)
{ {
// Reset size and start index for all processors // Reset size and start index for all processors
forAll (procPatchSize_, procI) forAll(procPatchSize_, procI)
{ {
procPatchSize_[procI][patchI] = 0; procPatchSize_[procI][patchI] = 0;
procPatchStartIndex_[procI][patchI] = procPatchStartIndex_[procI][patchI] =
@ -571,7 +571,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
patchEdgeFaces[eI] = eF[patches[patchI][eI]][0]; patchEdgeFaces[eI] = eF[patches[patchI][eI]][0];
} }
forAll (patchEdgeFaces, edgeI) forAll(patchEdgeFaces, edgeI)
{ {
const label curProc = faceToProc_[patchEdgeFaces[edgeI]]; const label curProc = faceToProc_[patchEdgeFaces[edgeI]];
@ -604,7 +604,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
cycOffset cycOffset
); );
forAll (firstEdgeFaces, edgeI) forAll(firstEdgeFaces, edgeI)
{ {
if if
( (
@ -627,7 +627,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
SLList<label>::iterator curInterProcBdrsOwnIter = SLList<label>::iterator curInterProcBdrsOwnIter =
interProcBoundaries[ownerProc].begin(); interProcBoundaries[ownerProc].begin();
SLList<SLList<label> >::iterator SLList<SLList<label>>::iterator
curInterProcBEdgesOwnIter = curInterProcBEdgesOwnIter =
interProcBEdges[ownerProc].begin(); interProcBEdges[ownerProc].begin();
@ -658,7 +658,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
SLList<label>::iterator curInterProcBdrsNeiIter SLList<label>::iterator curInterProcBdrsNeiIter
= interProcBoundaries[neighbourProc].begin(); = interProcBoundaries[neighbourProc].begin();
SLList<SLList<label> >::iterator SLList<SLList<label>>::iterator
curInterProcBEdgesNeiIter = curInterProcBEdgesNeiIter =
interProcBEdges[neighbourProc].begin(); interProcBEdges[neighbourProc].begin();
@ -758,7 +758,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
// Ordering in cyclic boundaries is important. // Ordering in cyclic boundaries is important.
// Add the other half of cyclic edges for cyclic boundaries // Add the other half of cyclic edges for cyclic boundaries
// that remain on the processor // that remain on the processor
forAll (secondEdgeFaces, edgeI) forAll(secondEdgeFaces, edgeI)
{ {
if if
( (
@ -782,7 +782,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
// Convert linked lists into normal lists // Convert linked lists into normal lists
// Add inter-processor boundaries and remember start indices // Add inter-processor boundaries and remember start indices
forAll (procEdgeList, procI) forAll(procEdgeList, procI)
{ {
// Get internal and regular boundary processor faces // Get internal and regular boundary processor faces
SLList<label>& curProcEdges = procEdgeList[procI]; SLList<label>& curProcEdges = procEdgeList[procI];
@ -804,7 +804,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
for for
( (
SLList<SLList<label> >::iterator curInterProcBEdgesIter = SLList<SLList<label>>::iterator curInterProcBEdgesIter =
interProcBEdges[procI].begin(); interProcBEdges[procI].begin();
curInterProcBEdgesIter != interProcBEdges[procI].end(); curInterProcBEdgesIter != interProcBEdges[procI].end();
++curInterProcBEdgesIter ++curInterProcBEdgesIter
@ -861,7 +861,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
SLList<label>::iterator curInterProcBdrsIter = SLList<label>::iterator curInterProcBdrsIter =
interProcBoundaries[procI].begin(); interProcBoundaries[procI].begin();
SLList<SLList<label> >::iterator curInterProcBEdgesIter = SLList<SLList<label>>::iterator curInterProcBEdgesIter =
interProcBEdges[procI].begin(); interProcBEdges[procI].begin();
for for
@ -926,7 +926,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
// are omitted. For processor patches, set index to -1. // are omitted. For processor patches, set index to -1.
// At the same time, filter the procPatchSize_ and procPatchStartIndex_ // At the same time, filter the procPatchSize_ and procPatchStartIndex_
// lists to exclude zero-size patches // lists to exclude zero-size patches
forAll (procPatchSize_, procI) forAll(procPatchSize_, procI)
{ {
// Make a local copy of old lists // Make a local copy of old lists
const labelList oldPatchSizes = procPatchSize_[procI]; const labelList oldPatchSizes = procPatchSize_[procI];
@ -950,7 +950,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
label nPatches = 0; label nPatches = 0;
forAll (oldPatchSizes, patchI) forAll(oldPatchSizes, patchI)
{ {
if (oldPatchSizes[patchI] > 0) if (oldPatchSizes[patchI] > 0)
{ {
@ -968,7 +968,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
curPatchSizes.setSize(nPatches); curPatchSizes.setSize(nPatches);
curPatchStarts.setSize(nPatches); curPatchStarts.setSize(nPatches);
forAll (curProcessorPatchSizes, procPatchI) forAll(curProcessorPatchSizes, procPatchI)
{ {
curBoundaryAddressing[nPatches] = -1; curBoundaryAddressing[nPatches] = -1;
@ -1013,7 +1013,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
// Reset the lookup list // Reset the lookup list
pointsUsage = 0; pointsUsage = 0;
forAll (curProcessorPatchStarts, patchI) forAll(curProcessorPatchStarts, patchI)
{ {
const label curStart = curProcessorPatchStarts[patchI]; const label curStart = curProcessorPatchStarts[patchI];
const label curEnd = curStart + curProcessorPatchSizes[patchI]; const label curEnd = curStart + curProcessorPatchSizes[patchI];
@ -1031,7 +1031,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
const edge& e = edges[curE]; const edge& e = edges[curE];
forAll (e, pointI) forAll(e, pointI)
{ {
if (pointsUsage[e[pointI]] == 0) if (pointsUsage[e[pointI]] == 0)
{ {
@ -1164,7 +1164,7 @@ bool Foam::faMeshDecomposition::writeDecomposition()
// Make a lookup map for globally shared points // Make a lookup map for globally shared points
Map<label> sharedPointLookup(2*globallySharedPoints_.size()); Map<label> sharedPointLookup(2*globallySharedPoints_.size());
forAll (globallySharedPoints_, pointi) forAll(globallySharedPoints_, pointi)
{ {
sharedPointLookup.insert(globallySharedPoints_[pointi], pointi); sharedPointLookup.insert(globallySharedPoints_[pointi], pointi);
} }
@ -1249,7 +1249,7 @@ bool Foam::faMeshDecomposition::writeDecomposition()
label nPatches = 0; label nPatches = 0;
forAll (curPatchSizes, patchi) forAll(curPatchSizes, patchi)
{ {
const labelList& curEdgeLabels = curPatchEdgeLabels[nPatches]; const labelList& curEdgeLabels = curPatchEdgeLabels[nPatches];
@ -1272,7 +1272,7 @@ bool Foam::faMeshDecomposition::writeDecomposition()
nPatches++; nPatches++;
} }
forAll (curProcessorPatchSizes, procPatchI) forAll(curProcessorPatchSizes, procPatchI)
{ {
const labelList& curEdgeLabels = curPatchEdgeLabels[nPatches]; const labelList& curEdgeLabels = curPatchEdgeLabels[nPatches];
@ -1310,7 +1310,7 @@ bool Foam::faMeshDecomposition::writeDecomposition()
label nProcPatches = 0; label nProcPatches = 0;
label nProcEdges = 0; label nProcEdges = 0;
forAll (procMesh.boundary(), patchi) forAll(procMesh.boundary(), patchi)
{ {
if if
( (

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

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

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

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

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

@ -36,19 +36,19 @@ License
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type> template<class Type>
Foam::tmp<Foam::GeometricField<Type, Foam::faPatchField, Foam::areaMesh> > Foam::tmp<Foam::GeometricField<Type, Foam::faPatchField, Foam::areaMesh>>
Foam::faFieldReconstructor::reconstructFaAreaField Foam::faFieldReconstructor::reconstructFaAreaField
( (
const IOobject& fieldIoObject const IOobject& fieldIoObject
) )
{ {
// Read the field for all the processors // Read the field for all the processors
PtrList<GeometricField<Type, faPatchField, areaMesh> > procFields PtrList<GeometricField<Type, faPatchField, areaMesh>> procFields
( (
procMeshes_.size() procMeshes_.size()
); );
forAll (procMeshes_, procI) forAll(procMeshes_, procI)
{ {
procFields.set procFields.set
( (
@ -72,7 +72,7 @@ Foam::faFieldReconstructor::reconstructFaAreaField
Field<Type> internalField(mesh_.nFaces()); Field<Type> internalField(mesh_.nFaces());
// Create the patch fields // Create the patch fields
PtrList<faPatchField<Type> > patchFields(mesh_.boundary().size()); PtrList<faPatchField<Type>> patchFields(mesh_.boundary().size());
// Create global mesh patches starts // Create global mesh patches starts
@ -89,7 +89,7 @@ Foam::faFieldReconstructor::reconstructFaAreaField
gStarts[i] = gStarts[i-1] + mesh_.boundary()[i-1].labelList::size(); gStarts[i] = gStarts[i-1] + mesh_.boundary()[i-1].labelList::size();
} }
forAll (procMeshes_, procI) forAll(procMeshes_, procI)
{ {
const GeometricField<Type, faPatchField, areaMesh>& procField = const GeometricField<Type, faPatchField, areaMesh>& procField =
procFields[procI]; procFields[procI];
@ -203,7 +203,7 @@ Foam::faFieldReconstructor::reconstructFaAreaField
// label curBPatch = mesh_.boundary().whichPatch(curE); // label curBPatch = mesh_.boundary().whichPatch(curE);
label curBPatch = -1; label curBPatch = -1;
forAll (mesh_.boundary(), pI) forAll(mesh_.boundary(), pI)
{ {
if if
( (
@ -273,7 +273,7 @@ Foam::faFieldReconstructor::reconstructFaAreaField
// Now construct and write the field // Now construct and write the field
// setting the internalField and patchFields // setting the internalField and patchFields
return tmp<GeometricField<Type, faPatchField, areaMesh> > return tmp<GeometricField<Type, faPatchField, areaMesh>>
( (
new GeometricField<Type, faPatchField, areaMesh> new GeometricField<Type, faPatchField, areaMesh>
( (
@ -295,19 +295,19 @@ Foam::faFieldReconstructor::reconstructFaAreaField
template<class Type> template<class Type>
Foam::tmp<Foam::GeometricField<Type, Foam::faePatchField, Foam::edgeMesh> > Foam::tmp<Foam::GeometricField<Type, Foam::faePatchField, Foam::edgeMesh>>
Foam::faFieldReconstructor::reconstructFaEdgeField Foam::faFieldReconstructor::reconstructFaEdgeField
( (
const IOobject& fieldIoObject const IOobject& fieldIoObject
) )
{ {
// Read the field for all the processors // Read the field for all the processors
PtrList<GeometricField<Type, faePatchField, edgeMesh> > procFields PtrList<GeometricField<Type, faePatchField, edgeMesh>> procFields
( (
procMeshes_.size() procMeshes_.size()
); );
forAll (procMeshes_, procI) forAll(procMeshes_, procI)
{ {
procFields.set procFields.set
( (
@ -332,7 +332,7 @@ Foam::faFieldReconstructor::reconstructFaEdgeField
Field<Type> internalField(mesh_.nInternalEdges()); Field<Type> internalField(mesh_.nInternalEdges());
// Create the patch fields // Create the patch fields
PtrList<faePatchField<Type> > patchFields(mesh_.boundary().size()); PtrList<faePatchField<Type>> patchFields(mesh_.boundary().size());
labelList gStarts(mesh_.boundary().size(), -1); 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 = const GeometricField<Type, faePatchField, edgeMesh>& procField =
procFields[procI]; procFields[procI];
@ -361,7 +361,7 @@ Foam::faFieldReconstructor::reconstructFaEdgeField
{ {
labelList curAddr(edgeProcAddressing_[procI]); labelList curAddr(edgeProcAddressing_[procI]);
// forAll (curAddr, addrI) // forAll(curAddr, addrI)
// { // {
// curAddr[addrI] -= 1; // curAddr[addrI] -= 1;
// } // }
@ -476,7 +476,7 @@ Foam::faFieldReconstructor::reconstructFaEdgeField
label curBPatch = -1; label curBPatch = -1;
forAll (mesh_.boundary(), pI) forAll(mesh_.boundary(), pI)
{ {
if if
( (
@ -553,7 +553,7 @@ Foam::faFieldReconstructor::reconstructFaEdgeField
// Now construct and write the field // Now construct and write the field
// setting the internalField and patchFields // setting the internalField and patchFields
return tmp<GeometricField<Type, faePatchField, edgeMesh> > return tmp<GeometricField<Type, faePatchField, edgeMesh>>
( (
new 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() void Foam::processorFaMeshes::read()
{ {
forAll (fvMeshes_, procI) forAll(fvMeshes_, procI)
{ {
meshes_.set meshes_.set
( (
@ -151,7 +151,7 @@ Foam::processorFaMeshes::processorFaMeshes
// { // {
// fvMesh::readUpdateState stat = fvMesh::UNCHANGED; // fvMesh::readUpdateState stat = fvMesh::UNCHANGED;
// forAll (databases_, procI) // forAll(databases_, procI)
// { // {
// // Check if any new meshes need to be read. // // Check if any new meshes need to be read.
// fvMesh::readUpdateState procStat = meshes_[procI].readUpdate(); // fvMesh::readUpdateState procStat = meshes_[procI].readUpdate();
@ -206,7 +206,7 @@ Foam::processorFaMeshes::processorFaMeshes
// // Read the field for all the processors // // Read the field for all the processors
// PtrList<pointIOField> procsPoints(meshes_.size()); // PtrList<pointIOField> procsPoints(meshes_.size());
// forAll (meshes_, procI) // forAll(meshes_, procI)
// { // {
// procsPoints.set // procsPoints.set
// ( // (
@ -229,7 +229,7 @@ Foam::processorFaMeshes::processorFaMeshes
// // Create the new points // // Create the new points
// vectorField newPoints(mesh.nPoints()); // vectorField newPoints(mesh.nPoints());
// forAll (meshes_, procI) // forAll(meshes_, procI)
// { // {
// const vectorField& procPoints = procsPoints[procI]; // const vectorField& procPoints = procsPoints[procI];

38
src/finiteArea/finiteArea/d2dt2Schemes/EulerFaD2dt2Scheme/EulerFaD2dt2Scheme.C
View File

@ -23,7 +23,7 @@ License
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "EulerFaD2dt2Scheme.H" #include "EulerFaD2dt2Scheme.H"
@ -60,7 +60,7 @@ template<class Type>
tmp<GeometricField<Type, faPatchField, areaMesh>> tmp<GeometricField<Type, faPatchField, areaMesh>>
EulerFaD2dt2Scheme<Type>::facD2dt2 EulerFaD2dt2Scheme<Type>::facD2dt2
( (
const dimensioned<Type> dt const dimensioned<Type> dt
) )
{ {
@ -89,7 +89,7 @@ EulerFaD2dt2Scheme<Type>::facD2dt2
scalarField SS0 = mesh().S() + mesh().S0(); scalarField SS0 = mesh().S() + mesh().S0();
scalarField S0S00 = mesh().S0() + mesh().S00(); scalarField S0S00 = mesh().S0() + mesh().S00();
tmp<GeometricField<Type, faPatchField, areaMesh> > tdt2dt2 tmp<GeometricField<Type, faPatchField, areaMesh>> tdt2dt2
( (
new GeometricField<Type, faPatchField, areaMesh> new GeometricField<Type, faPatchField, areaMesh>
( (
@ -113,7 +113,7 @@ EulerFaD2dt2Scheme<Type>::facD2dt2
} }
else else
{ {
return tmp<GeometricField<Type, faPatchField, areaMesh> > return tmp<GeometricField<Type, faPatchField, areaMesh>>
( (
new GeometricField<Type, faPatchField, areaMesh> new GeometricField<Type, faPatchField, areaMesh>
( (
@ -165,7 +165,7 @@ EulerFaD2dt2Scheme<Type>::facD2dt2
scalarField SS0 = mesh().S() + mesh().S0(); scalarField SS0 = mesh().S() + mesh().S0();
scalarField S0S00 = mesh().S0() + mesh().S00(); scalarField S0S00 = mesh().S0() + mesh().S00();
return tmp<GeometricField<Type, faPatchField, areaMesh> > return tmp<GeometricField<Type, faPatchField, areaMesh>>
( (
new GeometricField<Type, faPatchField, areaMesh> new GeometricField<Type, faPatchField, areaMesh>
( (
@ -192,7 +192,7 @@ EulerFaD2dt2Scheme<Type>::facD2dt2
} }
else else
{ {
return tmp<GeometricField<Type, faPatchField, areaMesh> > return tmp<GeometricField<Type, faPatchField, areaMesh>>
( (
new GeometricField<Type, faPatchField, areaMesh> new GeometricField<Type, faPatchField, areaMesh>
( (
@ -234,7 +234,7 @@ EulerFaD2dt2Scheme<Type>::facD2dt2
scalar coefft = (deltaT + deltaT0)/(2*deltaT); scalar coefft = (deltaT + deltaT0)/(2*deltaT);
scalar coefft00 = (deltaT + deltaT0)/(2*deltaT0); scalar coefft00 = (deltaT + deltaT0)/(2*deltaT0);
scalar coefft0 = coefft + coefft00; scalar coefft0 = coefft + coefft00;
if (mesh().moving()) if (mesh().moving())
{ {
@ -248,7 +248,7 @@ EulerFaD2dt2Scheme<Type>::facD2dt2
(mesh().S0() + mesh().S00()) (mesh().S0() + mesh().S00())
*rho.value(); *rho.value();
return tmp<GeometricField<Type, faPatchField, areaMesh> > return tmp<GeometricField<Type, faPatchField, areaMesh>>
( (
new GeometricField<Type, faPatchField, areaMesh> new GeometricField<Type, faPatchField, areaMesh>
( (
@ -277,12 +277,12 @@ EulerFaD2dt2Scheme<Type>::facD2dt2
else else
{ {
return tmp<GeometricField<Type, faPatchField, areaMesh> > return tmp<GeometricField<Type, faPatchField, areaMesh>>
( (
new GeometricField<Type, faPatchField, areaMesh> new GeometricField<Type, faPatchField, areaMesh>
( (
d2dt2IOobject, d2dt2IOobject,
rDeltaT2 * rho.value() * rDeltaT2 * rho.value() *
( (
coefft*vf coefft*vf
- coefft0*vf.oldTime() - coefft0*vf.oldTime()
@ -340,7 +340,7 @@ EulerFaD2dt2Scheme<Type>::facD2dt2
) )
); );
return tmp<GeometricField<Type, faPatchField, areaMesh> > return tmp<GeometricField<Type, faPatchField, areaMesh>>
( (
new GeometricField<Type, faPatchField, areaMesh> new GeometricField<Type, faPatchField, areaMesh>
( (
@ -362,7 +362,7 @@ EulerFaD2dt2Scheme<Type>::facD2dt2
coefft coefft
*(rho.boundaryField() + rho.oldTime().boundaryField()) *(rho.boundaryField() + rho.oldTime().boundaryField())
*vf.boundaryField() *vf.boundaryField()
- ( - (
coefft coefft
*( *(
@ -392,7 +392,7 @@ EulerFaD2dt2Scheme<Type>::facD2dt2
areaScalarField rhoRho0(rho + rho.oldTime()); areaScalarField rhoRho0(rho + rho.oldTime());
areaScalarField rho0Rho00(rho.oldTime() + rho.oldTime().oldTime()); areaScalarField rho0Rho00(rho.oldTime() + rho.oldTime().oldTime());
return tmp<GeometricField<Type, faPatchField, areaMesh> > return tmp<GeometricField<Type, faPatchField, areaMesh>>
( (
new GeometricField<Type, faPatchField, areaMesh> new GeometricField<Type, faPatchField, areaMesh>
( (
@ -416,7 +416,7 @@ EulerFaD2dt2Scheme<Type>::famD2dt2
const GeometricField<Type, faPatchField, areaMesh>& vf const GeometricField<Type, faPatchField, areaMesh>& vf
) )
{ {
tmp<faMatrix<Type> > tfam tmp<faMatrix<Type>> tfam
( (
new faMatrix<Type> new faMatrix<Type>
( (
@ -428,7 +428,7 @@ EulerFaD2dt2Scheme<Type>::famD2dt2
faMatrix<Type>& fam = tfam.ref(); faMatrix<Type>& fam = tfam.ref();
scalar deltaT = deltaT_(); scalar deltaT = deltaT_();
scalar deltaT0 = deltaT0_(); scalar deltaT0 = deltaT0_();
scalar coefft = (deltaT + deltaT0)/(2*deltaT); scalar coefft = (deltaT + deltaT0)/(2*deltaT);
scalar coefft00 = (deltaT + deltaT0)/(2*deltaT0); scalar coefft00 = (deltaT + deltaT0)/(2*deltaT0);
@ -469,14 +469,14 @@ EulerFaD2dt2Scheme<Type>::famD2dt2
template<class Type> template<class Type>
tmp<faMatrix<Type> > tmp<faMatrix<Type>>
EulerFaD2dt2Scheme<Type>::famD2dt2 EulerFaD2dt2Scheme<Type>::famD2dt2
( (
const dimensionedScalar& rho, const dimensionedScalar& rho,
const GeometricField<Type, faPatchField, areaMesh>& vf const GeometricField<Type, faPatchField, areaMesh>& vf
) )
{ {
tmp<faMatrix<Type> > tfam tmp<faMatrix<Type>> tfam
( (
new faMatrix<Type> new faMatrix<Type>
( (
@ -489,7 +489,7 @@ EulerFaD2dt2Scheme<Type>::famD2dt2
faMatrix<Type>& fam = tfam.ref(); faMatrix<Type>& fam = tfam.ref();
scalar deltaT = deltaT_(); scalar deltaT = deltaT_();
scalar deltaT0 = deltaT0_(); scalar deltaT0 = deltaT0_();
scalar coefft = (deltaT + deltaT0)/(2*deltaT); scalar coefft = (deltaT + deltaT0)/(2*deltaT);
scalar coefft00 = (deltaT + deltaT0)/(2*deltaT0); scalar coefft00 = (deltaT + deltaT0)/(2*deltaT0);
@ -537,7 +537,7 @@ EulerFaD2dt2Scheme<Type>::famD2dt2
const GeometricField<Type, faPatchField, areaMesh>& vf const GeometricField<Type, faPatchField, areaMesh>& vf
) )
{ {
tmp<faMatrix<Type> > tfam tmp<faMatrix<Type>> tfam
( (
new faMatrix<Type> new faMatrix<Type>
( (

14
src/finiteArea/finiteArea/d2dt2Schemes/EulerFaD2dt2Scheme/EulerFaD2dt2Scheme.H
View File

@ -104,40 +104,40 @@ public:
return fa::faD2dt2Scheme<Type>::mesh(); return fa::faD2dt2Scheme<Type>::mesh();
} }
tmp<GeometricField<Type, faPatchField, areaMesh> > facD2dt2 tmp<GeometricField<Type, faPatchField, areaMesh>> facD2dt2
( (
const dimensioned<Type> const dimensioned<Type>
); );
tmp<GeometricField<Type, faPatchField, areaMesh> > facD2dt2 tmp<GeometricField<Type, faPatchField, areaMesh>> facD2dt2
( (
const GeometricField<Type, faPatchField, areaMesh>& const GeometricField<Type, faPatchField, areaMesh>&
); );
tmp<GeometricField<Type, faPatchField, areaMesh> > facD2dt2 tmp<GeometricField<Type, faPatchField, areaMesh>> facD2dt2
( (
const dimensionedScalar&, const dimensionedScalar&,
const GeometricField<Type, faPatchField, areaMesh>& const GeometricField<Type, faPatchField, areaMesh>&
); );
tmp<GeometricField<Type, faPatchField, areaMesh> > facD2dt2 tmp<GeometricField<Type, faPatchField, areaMesh>> facD2dt2
( (
const areaScalarField&, const areaScalarField&,
const GeometricField<Type, faPatchField, areaMesh>& const GeometricField<Type, faPatchField, areaMesh>&
); );
tmp<faMatrix<Type> > famD2dt2 tmp<faMatrix<Type>> famD2dt2
( (
const GeometricField<Type, faPatchField, areaMesh>& const GeometricField<Type, faPatchField, areaMesh>&
); );
tmp<faMatrix<Type> > famD2dt2 tmp<faMatrix<Type>> famD2dt2
( (
const dimensionedScalar&, const dimensionedScalar&,
const GeometricField<Type, faPatchField, areaMesh>& const GeometricField<Type, faPatchField, areaMesh>&
); );
tmp<faMatrix<Type> > famD2dt2 tmp<faMatrix<Type>> famD2dt2
( (
const areaScalarField&, const areaScalarField&,
const GeometricField<Type, faPatchField, areaMesh>& const GeometricField<Type, faPatchField, areaMesh>&

2
src/finiteArea/finiteArea/d2dt2Schemes/faD2dt2Scheme/faD2dt2Scheme.C
View File

@ -45,7 +45,7 @@ namespace fa
// * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
template<class Type> template<class Type>
tmp<faD2dt2Scheme<Type> > faD2dt2Scheme<Type>::New tmp<faD2dt2Scheme<Type>> faD2dt2Scheme<Type>::New
( (
const faMesh& mesh, const faMesh& mesh,
Istream& schemeData Istream& schemeData

38
src/finiteArea/finiteArea/d2dt2Schemes/faD2dt2Scheme/faD2dt2Scheme.H
View File

@ -122,7 +122,7 @@ public:
// Selectors // Selectors
//- Return a pointer to a new d2dt2Scheme created on freestore //- Return a pointer to a new d2dt2Scheme created on freestore
static tmp<faD2dt2Scheme<Type> > New static tmp<faD2dt2Scheme<Type>> New
( (
const faMesh& mesh, const faMesh& mesh,
Istream& schemeData Istream& schemeData
@ -141,40 +141,40 @@ public:
return mesh_; return mesh_;
} }
virtual tmp<GeometricField<Type, faPatchField, areaMesh> > facD2dt2 virtual tmp<GeometricField<Type, faPatchField, areaMesh>> facD2dt2
( (
const dimensioned<Type> const dimensioned<Type>
) = 0; ) = 0;
virtual tmp<GeometricField<Type, faPatchField, areaMesh> > facD2dt2 virtual tmp<GeometricField<Type, faPatchField, areaMesh>> facD2dt2
( (
const GeometricField<Type, faPatchField, areaMesh>& const GeometricField<Type, faPatchField, areaMesh>&
) = 0; ) = 0;
virtual tmp<GeometricField<Type, faPatchField, areaMesh> > facD2dt2 virtual tmp<GeometricField<Type, faPatchField, areaMesh>> facD2dt2
( (
const dimensionedScalar&, const dimensionedScalar&,
const GeometricField<Type, faPatchField, areaMesh>& const GeometricField<Type, faPatchField, areaMesh>&
) = 0; ) = 0;
virtual tmp<GeometricField<Type, faPatchField, areaMesh> > facD2dt2 virtual tmp<GeometricField<Type, faPatchField, areaMesh>> facD2dt2
( (
const areaScalarField&, const areaScalarField&,
const GeometricField<Type, faPatchField, areaMesh>& const GeometricField<Type, faPatchField, areaMesh>&
) = 0; ) = 0;
virtual tmp<faMatrix<Type> > famD2dt2 virtual tmp<faMatrix<Type>> famD2dt2
( (
const GeometricField<Type, faPatchField, areaMesh>& const GeometricField<Type, faPatchField, areaMesh>&
) = 0; ) = 0;
virtual tmp<faMatrix<Type> > famD2dt2 virtual tmp<faMatrix<Type>> famD2dt2
( (
const dimensionedScalar&, const dimensionedScalar&,
const GeometricField<Type, faPatchField, areaMesh>& const GeometricField<Type, faPatchField, areaMesh>&
) = 0; ) = 0;
virtual tmp<faMatrix<Type> > famD2dt2 virtual tmp<faMatrix<Type>> famD2dt2
( (
const areaScalarField&, const areaScalarField&,
const GeometricField<Type, faPatchField, areaMesh>& const GeometricField<Type, faPatchField, areaMesh>&
@ -194,17 +194,17 @@ public:
// Add the patch constructor functions to the hash tables // Add the patch constructor functions to the hash tables
#define makeFaD2dt2TypeScheme(SS, Type) \ #define makeFaD2dt2TypeScheme(SS, Type) \
\ \
defineNamedTemplateTypeNameAndDebug(Foam::fa::SS<Foam::Type>, 0); \ defineNamedTemplateTypeNameAndDebug(Foam::fa::SS<Foam::Type>, 0); \
\ \
namespace Foam \ namespace Foam \
{ \ { \
namespace fa \ namespace fa \
{ \ { \
faD2dt2Scheme<Type>::addIstreamConstructorToTable<SS<Type> > \ faD2dt2Scheme<Type>::addIstreamConstructorToTable<SS<Type>> \
add##SS##Type##IstreamConstructorToTable_; \ add##SS##Type##IstreamConstructorToTable_; \
} \ } \
} }

8
src/finiteArea/finiteArea/fac/facD2dt2.H
View File

@ -56,27 +56,27 @@ namespace Foam
namespace fac namespace fac
{ {
template<class Type> template<class Type>
tmp<GeometricField<Type, faPatchField, areaMesh> > d2dt2 tmp<GeometricField<Type, faPatchField, areaMesh>> d2dt2
( (
const dimensioned<Type>, const dimensioned<Type>,
const faMesh& const faMesh&
); );
template<class Type> template<class Type>
tmp<GeometricField<Type, faPatchField, areaMesh> > d2dt2 tmp<GeometricField<Type, faPatchField, areaMesh>> d2dt2
( (
const GeometricField<Type, faPatchField, areaMesh>& const GeometricField<Type, faPatchField, areaMesh>&
); );
template<class Type> template<class Type>
tmp<GeometricField<Type, faPatchField, areaMesh> > d2dt2 tmp<GeometricField<Type, faPatchField, areaMesh>> d2dt2
( (
const dimensionedScalar&, const dimensionedScalar&,
const GeometricField<Type, faPatchField, areaMesh>& const GeometricField<Type, faPatchField, areaMesh>&
); );
template<class Type> template<class Type>
tmp<GeometricField<Type, faPatchField, areaMesh> > d2dt2 tmp<GeometricField<Type, faPatchField, areaMesh>> d2dt2
( (
const areaScalarField&, const areaScalarField&,
const GeometricField<Type, faPatchField, areaMesh>& const GeometricField<Type, faPatchField, areaMesh>&

6
src/finiteArea/finiteArea/fam/famD2dt2.H
View File

@ -53,20 +53,20 @@ namespace Foam
namespace fam namespace fam
{ {
template<class Type> template<class Type>
tmp<faMatrix<Type> > d2dt2 tmp<faMatrix<Type>> d2dt2
( (
const GeometricField<Type, faPatchField, areaMesh>& const GeometricField<Type, faPatchField, areaMesh>&
); );
template<class Type> template<class Type>
tmp<faMatrix<Type> > d2dt2 tmp<faMatrix<Type>> d2dt2
( (
const dimensionedScalar&, const dimensionedScalar&,
const GeometricField<Type, faPatchField, areaMesh>& const GeometricField<Type, faPatchField, areaMesh>&
); );
template<class Type> template<class Type>
tmp<faMatrix<Type> > d2dt2 tmp<faMatrix<Type>> d2dt2
( (
const areaScalarField&, const areaScalarField&,
const GeometricField<Type, faPatchField, areaMesh>& const GeometricField<Type, faPatchField, areaMesh>&

2
src/finiteVolume/fvMatrices/solvers/isoAdvection/isoAdvection/isoAdvection.C
View File

@ -184,7 +184,7 @@ void Foam::isoAdvection::timeIntegratedFlux()
} }
// Storage for isoFace points. Only used if writeIsoFacesToFile_ // Storage for isoFace points. Only used if writeIsoFacesToFile_
DynamicList<List<point> > isoFacePts; DynamicList<List<point>> isoFacePts;
// Loop through all cells // Loop through all cells
forAll(alpha1In_, celli) forAll(alpha1In_, celli)

8
src/overset/oversetPolyPatch/semiImplicitOversetFvPatchField.H
View File

@ -111,9 +111,9 @@ public:
); );
//- Construct and return a clone //- Construct and return a clone
virtual tmp<fvPatchField<Type> > clone() const virtual tmp<fvPatchField<Type>> clone() const
{ {
return tmp<fvPatchField<Type> > return tmp<fvPatchField<Type>>
( (
new semiImplicitOversetFvPatchField<Type>(*this) new semiImplicitOversetFvPatchField<Type>(*this)
); );
@ -127,12 +127,12 @@ public:
); );
//- Construct and return a clone setting internal field reference //- Construct and return a clone setting internal field reference
virtual tmp<fvPatchField<Type> > clone virtual tmp<fvPatchField<Type>> clone
( (
const DimensionedField<Type, volMesh>& iF const DimensionedField<Type, volMesh>& iF
) const ) const
{ {
return tmp<fvPatchField<Type> > return tmp<fvPatchField<Type>>
( (
new semiImplicitOversetFvPatchField<Type>(*this, iF) new semiImplicitOversetFvPatchField<Type>(*this, iF)
); );

2
src/regionModels/regionModel/regionModel1D/regionModel1D.C
View File

@ -250,7 +250,7 @@ Foam::tmp<Foam::labelField> Foam::regionModels::regionModel1D::moveMesh
vectorField newDelta(cells.size() + 1, vector::zero); vectorField newDelta(cells.size() + 1, vector::zero);
label j = 0; label j = 0;
forAllReverse (cells, i) forAllReverse(cells, i)
{ {
const label celli = cells[i]; const label celli = cells[i];
newDelta[j+1] = (deltaV[celli]/mag(sf))*n + newDelta[j]; newDelta[j+1] = (deltaV[celli]/mag(sf))*n + newDelta[j];

4
src/thermophysicalModels/chemistryModel/functionObjects/specieReactionRates/specieReactionRates.C
View File

@ -47,9 +47,9 @@ writeFileHeader
const wordList& speciesNames = const wordList& speciesNames =
chemistryModel_.thermo().composition().species(); chemistryModel_.thermo().composition().species();
forAll (speciesNames, si) for (const word& speciesName : speciesNames)
{ {
writeTabbed(os, speciesNames[si]); writeTabbed(os, speciesName);
} }
os << endl; os << endl;

2
src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModelI.H
View File

@ -126,7 +126,7 @@ Foam::solidChemistryModel<CompType, SolidThermo>::RRsHs() const
for (label i=0; i < nSolids_; i++) for (label i=0; i < nSolids_; i++)
{ {
forAll (RRs, cellI) forAll(RRs, cellI)
{ {
RRs[cellI] += RRs[cellI] +=
RRs_[i][cellI]*solidThermo_[i].Hs(p[cellI], T[cellI]); RRs_[i][cellI]*solidThermo_[i].Hs(p[cellI], T[cellI]);