diff --git a/applications/utilities/mesh/conversion/ccm/ccmToFoam/ccmToFoam.C b/applications/utilities/mesh/conversion/ccm/ccmToFoam/ccmToFoam.C
index 52377df3393a533ade4d556a4b0a6e963d0c1a97..3c971ad743b227c76d29720f95aed671d4082c23 100644
--- a/applications/utilities/mesh/conversion/ccm/ccmToFoam/ccmToFoam.C
+++ b/applications/utilities/mesh/conversion/ccm/ccmToFoam/ccmToFoam.C
@@ -45,7 +45,8 @@ Usage
List some information about the geometry
- \par -name \<name\>
- Provide alternative base name for export. Default is <tt>meshExport</tt>.
+ Provide alternative base name for export.
+ Default is <tt>meshExport</tt>.
- \par -noBaffles
Remove any baffles by merging the faces.
@@ -57,7 +58,8 @@ Usage
Use numbered patch/zone (not names) directly from ccm ids.
- \par -remap \<name\>
- use specified remapping dictionary instead of <tt>constant/remapping</tt>
+ Use specified remapping dictionary instead of
+ <tt>constant/remapping</tt>
- \par -scale \<factor\>
Specify an alternative geometry scaling factor.
@@ -92,7 +94,8 @@ int main(int argc, char *argv[])
(
"Reads CCM files as written by PROSTAR/STARCCM and writes an OPENFOAM "
" polyMesh. Multi-region support for PROSTAR meshes should be stable."
- " Multi-region merging for STARCCM meshes will not always be successful."
+ " Multi-region merging for STARCCM meshes will not always be"
+ " successful."
);
argList::noParallel();
diff --git a/applications/utilities/mesh/conversion/ccm/foamToCcm/foamToCcm.C b/applications/utilities/mesh/conversion/ccm/foamToCcm/foamToCcm.C
index 9d64cc09b063abf3e6fb862e797fff8d021402a6..8042faa876c10beae8898cc50d54636a9baeba36 100644
--- a/applications/utilities/mesh/conversion/ccm/foamToCcm/foamToCcm.C
+++ b/applications/utilities/mesh/conversion/ccm/foamToCcm/foamToCcm.C
@@ -44,10 +44,11 @@ Usage
No backup of existing output files.
- \par -remap \<name\>
- use specified remapping dictionary instead of <tt>constant/remapping</tt>
+ Use specified remapping dictionary instead of
+ <tt>constant/remapping</tt>
- \par -results
- convert results only to CCM format
+ Convert results only to CCM format
Note
- No parallel data
@@ -207,7 +208,6 @@ int main(int argc, char *argv[])
// #include "checkHasLagrangian.H"
IOobjectList objects(mesh, timeDirs[timeDirs.size()-1].name());
- // IOobjectList sprayObjects(mesh, Times[Times.size()-1].name(), "lagrangian");
forAll(timeDirs, timeI)
{
diff --git a/src/OpenFOAM/db/IOobject/IOobject.H b/src/OpenFOAM/db/IOobject/IOobject.H
index b41ef980f26d46c3ffa367bf5774b98c1319fdcc..7b89997c8a53dafeb31fafdeca090400f3b1f258 100644
--- a/src/OpenFOAM/db/IOobject/IOobject.H
+++ b/src/OpenFOAM/db/IOobject/IOobject.H
@@ -174,11 +174,11 @@ protected:
// Protected Member Functions
//- Construct and return an IFstream for the object.
- // \Return nullptr if the stream construction failed
+ // \return nullptr if the stream construction failed
Istream* objectStream();
//- Return an IFstream for the object given the exact file.
- // \Return nullptr if the stream construction failed
+ // \return nullptr if the stream construction failed
Istream* objectStream(const fileName& fName);
//- Set the object state to bad
diff --git a/src/OpenFOAM/db/dictionary/entry/entry.H b/src/OpenFOAM/db/dictionary/entry/entry.H
index 6bb08646a4b6c8305d7853d35e167f91113f4826..f71a60d123aade90940a91a39b57560020186dbc 100644
--- a/src/OpenFOAM/db/dictionary/entry/entry.H
+++ b/src/OpenFOAM/db/dictionary/entry/entry.H
@@ -85,7 +85,8 @@ class entry
);
//- Get the next valid keyword.
- // Warn when an invalid token is encountered that is not an end-of-block or eof
+ // Warn when an invalid token is encountered that is not EOF or
+ // end-of-block
// \return True if it is a valid keyType.
static bool getKeyword(keyType& keyword, Istream& is);
diff --git a/src/OpenFOAM/db/dictionary/entry/entryIO.C b/src/OpenFOAM/db/dictionary/entry/entryIO.C
index 86afb024ba0fed087fdab1e7549ad4471c121b98..1aa83a7ae9b59bd680a9343bd9f28869b2246207 100644
--- a/src/OpenFOAM/db/dictionary/entry/entryIO.C
+++ b/src/OpenFOAM/db/dictionary/entry/entryIO.C
@@ -190,8 +190,8 @@ bool Foam::entry::New(dictionary& parentDict, Istream& is)
// Do not allow empty substitutions.
stringOps::inplaceExpand(expanded, parentDict, true, false);
- // Restore the '$' prefix. Use replace since operator= is private
-
+ // Restore the '$' prefix.
+ // Use replace since operator= is private
keyword.std::string::replace(1, keyword.size()-1, expanded);
}
diff --git a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
index 4326acf5be858c2e2f5be274eff32e046e90e6c4..397262386b950a7c2a54dbb590f1dfe741d10044 100644
--- a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
+++ b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
@@ -334,15 +334,15 @@ bool Foam::functionObjectList::readFunctionObject
Foam::functionObjectList::functionObjectList
(
- const Time& t,
+ const Time& runTime,
const bool execution
)
:
PtrList<functionObject>(),
digests_(),
indices_(),
- time_(t),
- parentDict_(t.controlDict()),
+ time_(runTime),
+ parentDict_(runTime.controlDict()),
stateDictPtr_(),
execution_(execution),
updated_(false)
@@ -351,7 +351,7 @@ Foam::functionObjectList::functionObjectList
Foam::functionObjectList::functionObjectList
(
- const Time& t,
+ const Time& runTime,
const dictionary& parentDict,
const bool execution
)
@@ -359,7 +359,7 @@ Foam::functionObjectList::functionObjectList
PtrList<functionObject>(),
digests_(),
indices_(),
- time_(t),
+ time_(runTime),
parentDict_(parentDict),
stateDictPtr_(),
execution_(execution),
diff --git a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H
index 2a3efb45ed3d2e7beb6b0826e1919236ade85c16..c90318727b9bff4165809a885ce4d19c591eeb08 100644
--- a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H
+++ b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H
@@ -130,7 +130,7 @@ public:
//- Construct from Time, a dictionary with "functions" entry
// and the execution setting.
- // \param[in] t - the other Time instance to construct from
+ // \param[in] runTime - the other Time instance to construct from
// \param[in] parentDict - the parent dictionary containing
// a "functions" entry, which can either be a list or a dictionary
// of functionObject specifications.
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.H b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.H
index bf38df03a1f77dd7da17a895c3dfa03102dcef41..a885abcc23be9b9d88ab25d252e945c866b63224 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.H
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.H
@@ -125,8 +125,7 @@ public:
const dictionary&
);
- //- Construct by mapping given outletMappedUniformInletHeatAdditionFvPatchField
- // onto a new patch
+ //- Construct by mapping onto a new patch
outletMappedUniformInletHeatAdditionFvPatchField
(
const outletMappedUniformInletHeatAdditionFvPatchField&,
diff --git a/src/TurbulenceModels/schemes/DEShybrid/DEShybrid.H b/src/TurbulenceModels/schemes/DEShybrid/DEShybrid.H
index b6e2ea466f049f32037ffdce942f9a5d7e8864b8..2b2ed70887d18159acaa5f6a164a8a0e5da8c576 100644
--- a/src/TurbulenceModels/schemes/DEShybrid/DEShybrid.H
+++ b/src/TurbulenceModels/schemes/DEShybrid/DEShybrid.H
@@ -76,14 +76,14 @@ Description
.
.
div(phi,U) Gauss DEShybrid
- linear // scheme 1
- linearUpwind grad(U) // scheme 2
- 0.65 // DES coefficient, typically = 0.65
- 30 // Reference velocity scale
- 2 // Reference length scale
- 0 // Minimum sigma limit (0-1)
- 1 // Maximum sigma limit (0-1)
- 1.0e-03; // Limiter of B function, typically 1.0e-03
+ linear // scheme 1
+ linearUpwind grad(U) // scheme 2
+ 0.65 // DES coefficient, typically = 0.65
+ 30 // Reference velocity scale
+ 2 // Reference length scale
+ 0 // Minimum sigma limit (0-1)
+ 1 // Maximum sigma limit (0-1)
+ 1.0e-03; // Limiter of B function, typically 1e-03
.
.
}
@@ -98,8 +98,9 @@ Notes
solvers by default. In order to use the scheme, add the library as a
run-time loaded library in the \$FOAM\_CASE/system/controlDict
dictionary, e.g.:
-
+ \verbatim
libs ("libturbulenceModelSchemes.so");
+ \endverbatim
SourceFiles
DEShybrid.C
@@ -122,7 +123,7 @@ namespace Foam
{
/*---------------------------------------------------------------------------*\
- class DEShybrid Declaration
+ Class DEShybrid Declaration
\*---------------------------------------------------------------------------*/
template<class Type>
@@ -199,7 +200,11 @@ class DEShybrid
const volScalarField g(tanh(pow4(B)));
const volScalarField A
(
- CH2_*max(scalar(0), CDES_*delta/max(lTurb*g, 1.0e-15*L0_) - 0.5)
+ CH2_*max
+ (
+ scalar(0),
+ CDES_*delta/max(lTurb*g, 1.0e-15*L0_) - 0.5
+ )
);
const volScalarField factor
@@ -266,37 +271,37 @@ public:
if (U0_.value() <= 0)
{
FatalErrorInFunction
- << "U0 coefficient must be greater than 0. "
+ << "U0 coefficient must be > 0. "
<< "Current value: " << U0_ << exit(FatalError);
}
if (L0_.value() <= 0)
{
FatalErrorInFunction
- << "L0 coefficient must be greater than 0. "
+ << "L0 coefficient must be > 0. "
<< "Current value: " << L0_ << exit(FatalError);
}
if (sigmaMin_ < 0)
{
FatalErrorInFunction
- << "sigmaMin coefficient must be greater than or equal to 0. "
+ << "sigmaMin coefficient must be >= 0. "
<< "Current value: " << sigmaMin_ << exit(FatalError);
}
if (sigmaMax_ < 0)
{
FatalErrorInFunction
- << "sigmaMax coefficient must be greater than or equal to 0. "
+ << "sigmaMax coefficient must be >= 0. "
<< "Current value: " << sigmaMax_ << exit(FatalError);
}
if (sigmaMin_ > 1)
{
FatalErrorInFunction
- << "sigmaMin coefficient must be less than or equal to 1. "
+ << "sigmaMin coefficient must be <= 1. "
<< "Current value: " << sigmaMin_ << exit(FatalError);
}
if (sigmaMax_ > 1)
{
FatalErrorInFunction
- << "sigmaMax coefficient must be less than or equal to 1. "
+ << "sigmaMax coefficient must be <= 1. "
<< "Current value: " << sigmaMax_ << exit(FatalError);
}
}
@@ -331,37 +336,37 @@ public:
if (U0_.value() <= 0)
{
FatalErrorInFunction
- << "U0 coefficient must be greater than 0. "
+ << "U0 coefficient must be > 0. "
<< "Current value: " << U0_ << exit(FatalError);
}
if (L0_.value() <= 0)
{
FatalErrorInFunction
- << "L0 coefficient must be greater than 0. "
+ << "L0 coefficient must be > 0. "
<< "Current value: " << U0_ << exit(FatalError);
}
if (sigmaMin_ < 0)
{
FatalErrorInFunction
- << "sigmaMin coefficient must be greater than or equal to 0. "
+ << "sigmaMin coefficient must be >= 0. "
<< "Current value: " << sigmaMin_ << exit(FatalError);
}
if (sigmaMax_ < 0)
{
FatalErrorInFunction
- << "sigmaMax coefficient must be greater than or equal to 0. "
+ << "sigmaMax coefficient must be >= 0. "
<< "Current value: " << sigmaMax_ << exit(FatalError);
}
if (sigmaMin_ > 1)
{
FatalErrorInFunction
- << "sigmaMin coefficient must be less than or equal to 1. "
+ << "sigmaMin coefficient must be <= 1. "
<< "Current value: " << sigmaMin_ << exit(FatalError);
}
if (sigmaMax_ > 1)
{
FatalErrorInFunction
- << "sigmaMax coefficient must be less than or equal to 1. "
+ << "sigmaMax coefficient must be <= 1. "
<< "Current value: " << sigmaMax_ << exit(FatalError);
}
}
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.C b/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.C
index 65330eee0505e8ef8078e26dd6059896825f19fa..cbdbcd0b9b3ca926166da02852d846201e65567e 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/v2f/v2f.C
@@ -75,7 +75,12 @@ tmp<volScalarField> v2f<BasicTurbulenceModel>::Ls() const
max
(
this->nu(),
- dimensionedScalar("zero", this->nu()().dimensions(), 0.0)
+ dimensionedScalar
+ (
+ "zero",
+ this->nu()().dimensions(),
+ 0.0
+ )
)
)/epsilon_
)
diff --git a/src/combustionModels/diffusionMulticomponent/diffusionMulticomponent.C b/src/combustionModels/diffusionMulticomponent/diffusionMulticomponent.C
index aa4893c07877a4b8129eb58f540d9027b829f713..6dbf0d5623148f43af53583a208957ad86044a54 100644
--- a/src/combustionModels/diffusionMulticomponent/diffusionMulticomponent.C
+++ b/src/combustionModels/diffusionMulticomponent/diffusionMulticomponent.C
@@ -380,7 +380,9 @@ Foam::combustionModels::diffusionMulticomponent<CombThermoType, ThermoType>::R
if (this->active())
{
- const label specieI = this->thermo().composition().species()[Y.member()];
+ const label specieI =
+ this->thermo().composition().species()[Y.member()];
+
Su += this->chemistryPtr_->RR(specieI);
}
diff --git a/src/conversion/ccm/reader/ccmReader.C b/src/conversion/ccm/reader/ccmReader.C
index 66b8bd95054ebb4777b672582d6e28dffb216b87..9b16f943bf45ec3e1943b9ba4d5638a39a345dcb 100644
--- a/src/conversion/ccm/reader/ccmReader.C
+++ b/src/conversion/ccm/reader/ccmReader.C
@@ -211,7 +211,8 @@ void Foam::ccm::reader::readProblemDescription
// readInterfaceDefinitions:
-// - get /InterfaceDefinitions. used by STARCCM to define in-place interfaces, etc
+// - get /InterfaceDefinitions.
+// used by STARCCM to define in-place interfaces, etc
// - only handle in-place one here
void Foam::ccm::reader::readInterfaceDefinitions()
{
@@ -388,7 +389,8 @@ void Foam::ccm::reader::readProblemDescription_boundaryRegion
)
{
#ifdef DEBUG_CCMIOREAD
- Info<< "boundary is on an interface: remap name for " << Id << endl;
+ Info<< "boundary is on an interface: remap name for "
+ << Id << endl;
#endif
// Substitute immediately with interface name
str = interfaceDefinitions_.interfaceName(Id);
diff --git a/src/conversion/ccm/reader/ccmReader.H b/src/conversion/ccm/reader/ccmReader.H
index 67d937f1365d1c8c4e3b324a7df3ff69578f2085..d19952298b8bb944257b20c8702bc708af8b15fa 100644
--- a/src/conversion/ccm/reader/ccmReader.H
+++ b/src/conversion/ccm/reader/ccmReader.H
@@ -329,8 +329,9 @@ private:
//- Get interfaces, cellTable and boundaryRegion information
void readProblemDescription(const ccmID& probNode);
- //- Get /InterfaceDefinitions, used by STARCCM to define in-place interfaces, etc
- // only handle in-place (IN_PLACE) ones at the moment
+ //- Get /InterfaceDefinitions, used by STARCCM to define in-place
+ // interfaces, etc.
+ // Only handle in-place (IN_PLACE) ones at the moment
void readInterfaceDefinitions();
//- Get boundaryRegion information
@@ -358,7 +359,8 @@ private:
//- Read the monitoring
void readMonitoring(const ccmID& topoId);
- //- Move solid faces from Default_Boundary_Region -> Default_Boundary_Solid
+ //- Move solid faces from Default_Boundary_Region to
+ // Default_Boundary_Solid
void juggleSolids();
//- Remove unwanted fluid/porous/solid regions
diff --git a/src/conversion/ccm/reader/ccmReaderMesh.C b/src/conversion/ccm/reader/ccmReaderMesh.C
index a7cfd831b3eb7bdb0915687c40b4df98bee19578..cd696c8619475939eaf6bfa212843e1e251ea8bf 100644
--- a/src/conversion/ccm/reader/ccmReaderMesh.C
+++ b/src/conversion/ccm/reader/ccmReaderMesh.C
@@ -1053,7 +1053,11 @@ void Foam::ccm::reader::readMonitoring
//
//- simulate ReadFaceCells with kCCMIOBoundaryFaces
// CCMIOGetNode(nullptr, childNode, "Cells", &subNode);
- // CCMIORead1i(nullptr, subNode, faceCells.begin(), kCCMIOStart, kCCMIOEnd);
+ // CCMIORead1i
+ // (
+ // nullptr, subNode, faceCells.begin(),
+ // kCCMIOStart, kCCMIOEnd
+ // );
//
// Info << "cells: " << faceCells << endl;
}
@@ -1159,7 +1163,8 @@ void Foam::ccm::reader::juggleSolids()
// Adjust start and sizes
patchSizes_[patchIndex] -= adjustPatch;
patchSizes_[patchIndex+1] = adjustPatch;
- patchStarts[patchIndex+1] = patchStarts[patchIndex] + patchSizes_[patchIndex];
+ patchStarts[patchIndex+1] =
+ patchStarts[patchIndex] + patchSizes_[patchIndex];
origBndId_[patchIndex+1] = boundaryRegion_.append
(
@@ -1686,8 +1691,9 @@ void Foam::ccm::reader::cleanupInterfaces()
oldToNew[face0] = pos + nsorted;
oldToNew[face1] = pos + nsorted + nsizeby2;
- // Mark destination of the faces, but cannot renumber yet
- // use negative to potential overlap with other patch regions
+ // Mark destination of the faces, but cannot renumber
+ // yet. Use negative to potential overlap with other
+ // patch regions
bafInterfaces_[elemI][0] = -oldToNew[face0];
bafInterfaces_[elemI][1] = -oldToNew[face1];
@@ -1743,14 +1749,6 @@ void Foam::ccm::reader::cleanupInterfaces()
oldToNew[face1] = oldToNew[face0];
}
-// Info<< "nInternalFaces " << nInternalFaces_ << nl
-// << "oldToNew (internal) "
-// << SubList<label>(oldToNew, nInternalFaces_)
-// << nl
-// << "oldToNew (extern) "
-// << SubList<label>(oldToNew, nFaces_ - nInternalFaces_, nInternalFaces_)
-// << endl;
-
forAllIters(monitoringSets_, iter)
{
inplaceRenumber(oldToNew, iter());
diff --git a/src/conversion/ccm/writer/ccmWriterMesh.C b/src/conversion/ccm/writer/ccmWriterMesh.C
index 1e2bd0f2b28dbe5d80892a29a91da214aafd8d8b..4ac3c621b8215598fa9679fb9b167a3fbbe53a05 100644
--- a/src/conversion/ccm/writer/ccmWriterMesh.C
+++ b/src/conversion/ccm/writer/ccmWriterMesh.C
@@ -162,7 +162,8 @@ void Foam::ccm::writer::writeFaces
if (ccm::debug)
{
- Info<<"CCMIOWriteFaces() size:" << size << " streamSize:" << streamSize << endl;
+ Info<<"CCMIOWriteFaces() size:" << size << " streamSize:"
+ << streamSize << endl;
}
CCMIOWriteFaces
diff --git a/src/conversion/ccm/writer/ccmWriterSolution.C b/src/conversion/ccm/writer/ccmWriterSolution.C
index f277629b1b8eab7fc85de34d11b3b27148d1504d..a4a04aed78d7a01d8f5dcc32efa83b4c1caba5d0 100644
--- a/src/conversion/ccm/writer/ccmWriterSolution.C
+++ b/src/conversion/ccm/writer/ccmWriterSolution.C
@@ -253,8 +253,8 @@ void Foam::ccm::writer::writeSolution
processorNode,
topoFileName.c_str(), &verticesNode,// verticesFile, verticesNode
topoFileName.c_str(), &topoNode, // topologyFile, topologyNode
- nullptr, nullptr, // initialField unchanged
- nullptr, nullptr // no solutionFile, solution unchanged
+ nullptr, nullptr, // initialField unchanged
+ nullptr, nullptr // no solutionFile, solution unchanged
);
}
assertNoError("Error after writing geometry processor");
diff --git a/src/conversion/fire/FIREMeshReader.C b/src/conversion/fire/FIREMeshReader.C
index c57a188615836393f331c44adb891d313f02f114..920272353130503643056023a99fecc2c754363d 100644
--- a/src/conversion/fire/FIREMeshReader.C
+++ b/src/conversion/fire/FIREMeshReader.C
@@ -241,7 +241,8 @@ void Foam::fileFormats::FIREMeshReader::reorganize()
inplaceReorder(oldToNew, neigh_);
inplaceReorder(oldToNew, faceZoneId_);
- // determine the patch sizes - faceNames_ already has extra place for missed faces
+ // Determine the patch sizes
+ // - faceNames_ already has extra place for missed faces
const label zoneMissed = faceNames_.size() - 1;
patchSizes_.setSize(faceNames_.size());
patchSizes_ = 0;
@@ -292,7 +293,8 @@ void Foam::fileFormats::FIREMeshReader::reorganize()
label patchI = faceZoneId_[faceI];
if (patchI == -1)
{
- oldToNew[faceI] = patchStarts_[zoneMissed] + patchSizes_[zoneMissed];
+ oldToNew[faceI] =
+ patchStarts_[zoneMissed] + patchSizes_[zoneMissed];
++patchSizes_[zoneMissed];
}
else
diff --git a/src/conversion/starcd/STARCDMeshReader.C b/src/conversion/starcd/STARCDMeshReader.C
index 0229eaa0d20b854e84bd92c82652e703c7945e62..22af44c6fafc2965a72ceb55cc60f480598647f2 100644
--- a/src/conversion/starcd/STARCDMeshReader.C
+++ b/src/conversion/starcd/STARCDMeshReader.C
@@ -864,7 +864,9 @@ void Foam::fileFormats::STARCDMeshReader::readBoundary
if (prostarShapeLookup.found(mapIndex))
{
mapIndex = prostarShapeLookup[mapIndex];
- cellFaceId = STARCDCore::starToFoamFaceAddr[mapIndex][cellFaceId];
+ cellFaceId =
+ STARCDCore::starToFoamFaceAddr
+ [mapIndex][cellFaceId];
}
}
else
diff --git a/src/conversion/starcd/STARCDMeshWriter.C b/src/conversion/starcd/STARCDMeshWriter.C
index c4ccf80faa70a339cc053cd3ab6b9a3f67fca1b7..a2e6bdb1ffb9d32cc10649d6d4a2e0301a78cb11 100644
--- a/src/conversion/starcd/STARCDMeshWriter.C
+++ b/src/conversion/starcd/STARCDMeshWriter.C
@@ -409,7 +409,8 @@ void Foam::fileFormats::STARCDMeshWriter::writeBoundary
}
mapIndex = prostarShapeLookup[mapIndex];
- cellFaceId = STARCDCore::foamToStarFaceAddr[mapIndex][cellFaceId];
+ cellFaceId =
+ STARCDCore::foamToStarFaceAddr[mapIndex][cellFaceId];
}
// Info<< endl;
diff --git a/src/dynamicMesh/fvMeshTools/fvMeshTools.C b/src/dynamicMesh/fvMeshTools/fvMeshTools.C
index 1222a658701eccc52a2bb8c6897b38b72cc009a2..117ddca4e52cf5946476585e4423b6fa672e11d5 100644
--- a/src/dynamicMesh/fvMeshTools/fvMeshTools.C
+++ b/src/dynamicMesh/fvMeshTools/fvMeshTools.C
@@ -483,7 +483,11 @@ Foam::autoPtr<Foam::fvMesh> Foam::fvMeshTools::newMesh
else
{
// Receive patches
- IPstream fromMaster(Pstream::commsTypes::scheduled, Pstream::masterNo());
+ IPstream fromMaster
+ (
+ Pstream::commsTypes::scheduled,
+ Pstream::masterNo()
+ );
fromMaster >> patchEntries;
}
diff --git a/src/fileFormats/ensight/file/ensightCase.C b/src/fileFormats/ensight/file/ensightCase.C
index dc803f5f990c393b791286dc55b2e5489d9ce57f..9e9053ad4549827f537fb3bbc481aab42821e8df 100644
--- a/src/fileFormats/ensight/file/ensightCase.C
+++ b/src/fileFormats/ensight/file/ensightCase.C
@@ -307,7 +307,8 @@ void Foam::ensightCase::noteCloud
else
{
FatalErrorInFunction
- << "Tried to add a cloud variable for writing without having added a cloud"
+ << "Tried to add a cloud variable for writing"
+ << " - without having added a cloud"
<< abort(FatalError);
}
}
diff --git a/src/fileFormats/ensight/file/ensightCase.H b/src/fileFormats/ensight/file/ensightCase.H
index e6603d9a104e85a76c8d5258def631282f7c4b21..67835f2e7d693ee7248185270e3af957d72e603c 100644
--- a/src/fileFormats/ensight/file/ensightCase.H
+++ b/src/fileFormats/ensight/file/ensightCase.H
@@ -280,12 +280,12 @@ public:
) const;
- //- Open stream for new data file (on master), using the current index.
+ //- Open stream for new data file (on master), with current index.
template<class Type>
autoPtr<ensightFile> newData(const word& varName) const;
- //- Open stream for new cloud data file (on master), using the current index.
+ //- Open stream for new cloud data file (on master), with current index.
template<class Type>
autoPtr<ensightFile> newCloudData
(
diff --git a/src/fileFormats/starcd/STARCDCore.H b/src/fileFormats/starcd/STARCDCore.H
index 21f64cae72c50ad5c6a5fcd43d9d9393d8aa7728..e4f7a03cab7a77fbcd7138c5efd9e437026e0b65 100644
--- a/src/fileFormats/starcd/STARCDCore.H
+++ b/src/fileFormats/starcd/STARCDCore.H
@@ -147,7 +147,11 @@ public:
// Public Member Functions
//- Resolve base file-name for the given file-type
- static fileName starFileName(const fileName& baseName, const enum fileExt);
+ static fileName starFileName
+ (
+ const fileName& baseName,
+ const enum fileExt
+ );
//- Remove existing PROSTAR files for the given base file-name
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C
index 6a86dea0da02ca783b977ba06d3c100a70cbe63d..438d135ff8d4b05cb0ba94934da7e35648b9e91f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C
@@ -287,7 +287,8 @@ void Foam::activePressureForceBaffleVelocityFvPatchVectorField::updateCoeffs()
}
else
{
- Info<< "Area-averaged pressure difference = " << valueDiff << endl;
+ Info<< "Area-averaged pressure difference = "
+ << valueDiff << endl;
}
}
diff --git a/src/functionObjects/graphics/runTimePostProcessing/pointData.C b/src/functionObjects/graphics/runTimePostProcessing/pointData.C
index 42742962888b0de578a1fed1c10cdeab51ae23fc..82872a3bbb26d9cdcf2d2af62a55b99610d928b7 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/pointData.C
+++ b/src/functionObjects/graphics/runTimePostProcessing/pointData.C
@@ -130,7 +130,8 @@ Foam::functionObjects::runTimePostPro::pointData::pointData
// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
-Foam::autoPtr<Foam::functionObjects::runTimePostPro::pointData> Foam::functionObjects::runTimePostPro::pointData::New
+Foam::autoPtr<Foam::functionObjects::runTimePostPro::pointData>
+Foam::functionObjects::runTimePostPro::pointData::New
(
const runTimePostProcessing& parent,
const dictionary& dict,
diff --git a/src/lagrangian/DSMC/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.C b/src/lagrangian/DSMC/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.C
index d81ce400f67f9e0c1dcf8e9a0e90dd2dffd92df6..248c75c9aa8ac8419178f04b95fbb1e272b37a57 100644
--- a/src/lagrangian/DSMC/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.C
+++ b/src/lagrangian/DSMC/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.C
@@ -245,12 +245,14 @@ void Foam::LarsenBorgnakkeVariableHardSphere<CloudType>::collide
if (iDofQ == 2)
{
- scalar energyRatio = 1.0 - pow(rndGen.sample01<scalar>(), (1.0/ChiB));
+ const scalar energyRatio =
+ 1.0 - pow(rndGen.sample01<scalar>(), (1.0/ChiB));
+
EiQ = energyRatio*availableEnergy;
}
else
{
- scalar ChiA = 0.5*iDofQ;
+ const scalar ChiA = 0.5*iDofQ;
EiQ = energyRatio(ChiA, ChiB)*availableEnergy;
}
diff --git a/src/lumpedPointMotion/lumpedPointMovement.C b/src/lumpedPointMotion/lumpedPointMovement.C
index 1f61bc1c36349b924ff3a7ae8cc74bc41fad25e6..7683ab5fd950b48881924e9958e3c97e77075eac 100644
--- a/src/lumpedPointMotion/lumpedPointMovement.C
+++ b/src/lumpedPointMotion/lumpedPointMovement.C
@@ -302,7 +302,8 @@ void Foam::lumpedPointMovement::setBoundBox
centre_ -= (centre_ & axis_) * axis_;
if (lumpedPointIOMovement::debug)
{
- Pout<<"autoCentre on " << centre_ << " boundBox: " << boundBox_ << endl;
+ Pout<<"autoCentre on " << centre_
+ << " boundBox: " << boundBox_ << endl;
}
}
else
@@ -310,7 +311,8 @@ void Foam::lumpedPointMovement::setBoundBox
// User-specified centre
if (lumpedPointIOMovement::debug)
{
- Pout<<"centre on " << centre_ << " boundBox: " << boundBox_ << endl;
+ Pout<<"centre on " << centre_
+ << " boundBox: " << boundBox_ << endl;
}
}
}