From 00985638d8bb03381567fe7b70a4935e5c5a292e Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Wed, 2 Dec 2009 15:34:52 +0100
Subject: [PATCH] remove fvCFD.H usage from remaining library source
- exception calcType.H since it'll most likely be used for building
applications anyhow
- use quailified names in more of the lagrangian code
- killed some tab indents in various places.
---
.../rhoCentralFoam/BCs/Make/options | 2 +-
.../estimateScalarError/Make/options | 2 +-
.../icoErrorEstimate/Make/options | 2 +-
.../icoMomentError/Make/options | 2 +-
.../momentScalarError/Make/options | 2 +-
.../Optional/ccm26ToFoam/ccm26ToFoam.C | 116 +++++++++---------
.../conversion/tetgenToFoam/tetgenToFoam.C | 45 +++----
.../manipulation/flattenMesh/Make/options | 2 +-
.../ensightOutputFunctions.C | 18 +--
.../fieldview9Reader/fieldview9Reader.C | 13 +-
.../postProcessing/sampling/sample/sampleDict | 6 +-
.../preProcessing/mapFields/mapLagrangian.C | 2 +-
.../surface/surfaceCoarsen/surfaceCoarsen.C | 10 +-
etc/bashrc | 2 +-
src/ODE/ODESolvers/RK/RK.C | 29 +++--
src/ODE/ODESolvers/RK/RK.H | 21 ++--
src/OSspecific/POSIX/timer.C | 14 +--
.../PrimitivePatchInterpolation.C | 8 +-
.../mapPolyMesh/faceMapper/faceMapper.H | 6 +-
src/Pstream/gamma/Pstream.C | 22 ++--
src/conversion/meshTables/README | 2 +-
.../meshWriter/starcd/STARCDMeshWriter.C | 2 +-
.../dynamicRefineFvMesh/dynamicRefineFvMesh.C | 66 +++++-----
.../polyMeshAdder/faceCoupleInfo.C | 2 +-
.../fvMatrices/solvers/MULES/MULES.C | 3 +-
.../fvMatrices/solvers/MULES/MULESTemplates.C | 5 +-
.../commonRailInjector/commonRailInjector.C | 1 -
.../definedInjector/definedInjector.C | 1 -
.../dieselSpray/injector/injector/injector.H | 2 +-
.../dieselSpray/injector/injector/injectorI.H | 21 ++--
.../injector/injectorType/injectorType.C | 1 -
.../multiHoleInjector/multiHoleInjector.C | 1 -
.../injector/unitInjector/unitInjector.C | 1 -
.../dieselSpray/parcel/boundaryTreatment.H | 2 +-
src/lagrangian/dieselSpray/spray/spray.C | 5 +-
.../atomizationModel/LISA/LISA.C | 32 ++---
.../atomizationModel/atomizationModel.C | 18 +--
.../blobsSheetAtomization.C | 33 +++--
.../noAtomization/noAtomization.C | 32 ++---
.../spraySubModels/breakupModel/ETAB/ETAB.C | 30 ++---
.../spraySubModels/breakupModel/SHF/SHF.C | 33 ++---
.../spraySubModels/breakupModel/TAB/TAB.C | 33 +++--
.../breakupModel/breakupModel/breakupModel.C | 21 ++--
.../breakupModel/noBreakup/noBreakup.C | 32 +++--
.../breakupModel/reitzDiwakar/reitzDiwakar.C | 33 ++---
.../breakupModel/reitzKHRT/reitzKHRT.C | 31 ++---
.../ORourke/ORourkeCollisionModel.C | 33 ++---
.../collisionModel/collisionModel.C | 21 ++--
.../collisionModel/noCollision/noCollision.C | 33 ++---
.../trajectoryModel/trajectoryModel.C | 33 ++---
.../dispersionLESModel/dispersionLESModel.C | 17 +--
.../dispersionModel/dispersionModel.C | 20 +--
.../dispersionRASModel/dispersionRASModel.C | 17 +--
.../gradientDispersionRAS.C | 39 +++---
.../noDispersion/noDispersion.C | 33 ++---
.../stochasticDispersionRAS.C | 45 +++----
.../dragModel/dragModel/dragModel.C | 19 +--
.../dragModel/dragModel/dragModel.H | 3 +-
.../dragModel/noDragModel/noDragModel.C | 34 +++--
.../standardDragModel/standardDragModel.C | 34 +++--
.../RutlandFlashBoil/RutlandFlashBoil.C | 45 +++----
.../RutlandFlashBoil/RutlandFlashBoil.H | 6 +-
.../evaporationModel/evaporationModel.C | 23 ++--
.../evaporationModel/evaporationModel.H | 10 +-
.../evaporationModel/newEvaporationModel.C | 22 +---
.../noEvaporation/noEvaporation.C | 44 +++----
.../noEvaporation/noEvaporation.H | 6 +-
.../saturateEvaporationModel.C | 45 +++----
.../saturateEvaporationModel.H | 7 +-
.../standardEvaporationModel.C | 45 +++----
.../standardEvaporationModel.H | 6 +-
.../RanzMarshall/RanzMarshall.C | 38 +++---
.../heatTransferModel/heatTransferModel.C | 20 +--
.../noHeatTransfer/noHeatTransfer.C | 39 +++---
.../injectorModel/Chomiak/Chomiak.C | 37 +++---
.../blobsSwirl/blobsSwirlInjector.C | 47 +++----
.../injectorModel/constant/constInjector.C | 51 ++++----
.../definedHollowCone/definedHollowCone.C | 38 +++---
.../definedPressureSwirl.C | 44 +++----
.../injectorModel/hollowCone/hollowCone.C | 37 +++---
.../injectorModel/injectorModel.C | 19 +--
.../pressureSwirl/pressureSwirlInjector.C | 43 +++----
.../wallModel/reflectParcel/reflectParcel.C | 37 +++---
.../wallModel/removeParcel/removeParcel.C | 35 ++----
.../wallModel/wallModel/wallModel.C | 19 +--
.../wallModel/wallModel/wallModel.H | 12 +-
.../molecularDynamics/molecule/Make/options | 2 +-
src/meshTools/octree/treeBoundBox.H | 2 +-
src/meshTools/octree/treeBoundBoxI.H | 68 +++++-----
.../interpolationLookUpTable.C | 9 +-
.../interpolationLookUpTable.H | 26 ++--
91 files changed, 852 insertions(+), 1178 deletions(-)
diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/Make/options b/applications/solvers/compressible/rhoCentralFoam/BCs/Make/options
index d4fb23181c0..87f38a6a032 100644
--- a/applications/solvers/compressible/rhoCentralFoam/BCs/Make/options
+++ b/applications/solvers/compressible/rhoCentralFoam/BCs/Make/options
@@ -6,5 +6,5 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
-lbasicThermophysicalModels \
- -lspecie
+ -lspecie
diff --git a/applications/utilities/errorEstimation/estimateScalarError/Make/options b/applications/utilities/errorEstimation/estimateScalarError/Make/options
index 566a5d46d44..fa5bda2896f 100644
--- a/applications/utilities/errorEstimation/estimateScalarError/Make/options
+++ b/applications/utilities/errorEstimation/estimateScalarError/Make/options
@@ -1,5 +1,5 @@
EXE_INC = \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/errorEstimation/lnInclude
EXE_LIBS = \
diff --git a/applications/utilities/errorEstimation/icoErrorEstimate/Make/options b/applications/utilities/errorEstimation/icoErrorEstimate/Make/options
index 88c40f5079d..e9a68290c02 100644
--- a/applications/utilities/errorEstimation/icoErrorEstimate/Make/options
+++ b/applications/utilities/errorEstimation/icoErrorEstimate/Make/options
@@ -1,5 +1,5 @@
EXE_INC = \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/errorEstimation/lnInclude
EXE_LIBS = \
diff --git a/applications/utilities/errorEstimation/icoMomentError/Make/options b/applications/utilities/errorEstimation/icoMomentError/Make/options
index 88c40f5079d..e9a68290c02 100644
--- a/applications/utilities/errorEstimation/icoMomentError/Make/options
+++ b/applications/utilities/errorEstimation/icoMomentError/Make/options
@@ -1,5 +1,5 @@
EXE_INC = \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/errorEstimation/lnInclude
EXE_LIBS = \
diff --git a/applications/utilities/errorEstimation/momentScalarError/Make/options b/applications/utilities/errorEstimation/momentScalarError/Make/options
index 88c40f5079d..e9a68290c02 100644
--- a/applications/utilities/errorEstimation/momentScalarError/Make/options
+++ b/applications/utilities/errorEstimation/momentScalarError/Make/options
@@ -1,5 +1,5 @@
EXE_INC = \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/errorEstimation/lnInclude
EXE_LIBS = \
diff --git a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C
index f4bf559009d..671c9e7a7ef 100644
--- a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C
+++ b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C
@@ -198,8 +198,11 @@ void ReadVertices
int dims = 1;
float scale;
CCMIOID mapID;
- CCMIOReadVerticesf(&err, vertices, &dims, &scale, &mapID, verts.begin(),
- offset, offsetPlusSize);
+ CCMIOReadVerticesf
+ (
+ &err, vertices, &dims, &scale, &mapID, verts.begin(),
+ offset, offsetPlusSize
+ );
CCMIOReadMap(&err, mapID, mapData.begin(), offset, offsetPlusSize);
//CCMIOSize size;
@@ -245,35 +248,34 @@ void ReadProblem
== kCCMIONoErr
)
{
- char *name;
- int size;
+ char *name;
+ int size;
int cellType;
- // ... if it has a material type. (Note that we do not pass in
- // an array to get the name because we do not know how long the
- // string is yet. Many parameters to CCMIO functions that
+ // ... if it has a material type. (Note that we do not pass in
+ // an array to get the name because we do not know how long the
+ // string is yet. Many parameters to CCMIO functions that
// return
- // data can be NULL if that data is not needed.)
- if
+ // data can be NULL if that data is not needed.)
+ if
(
CCMIOReadOptstr(NULL, next, "MaterialType", &size, NULL)
== kCCMIONoErr
)
- {
- name = new char[size + 1];
- CCMIOReadOptstr(&err, next, "MaterialType", &size, name);
- CCMIOGetEntityIndex(&err, next, &cellType);
+ {
+ name = new char[size + 1];
+ CCMIOReadOptstr(&err, next, "MaterialType", &size, name);
+ CCMIOGetEntityIndex(&err, next, &cellType);
foamCellTypeNames.insert(cellType, name);
Pout<< "Celltype:" << cellType << " name:" << name << endl;
- delete [] name;
- }
+ delete [] name;
+ }
}
// ... walk through each region description and print it...
-
CCMIOID boundary;
label regionI = 0;
int k = 0;
@@ -320,13 +322,13 @@ void ReadProblem
CCMIOReadOptstr(NULL, boundary, "BoundaryType", &size, NULL)
== kCCMIONoErr
)
- {
- char* s = new char[size + 1];
- CCMIOReadOptstr(NULL, boundary, "BoundaryType", &size, s);
+ {
+ char* s = new char[size + 1];
+ CCMIOReadOptstr(NULL, boundary, "BoundaryType", &size, s);
s[size] = '\0';
foamPatchTypes[foamPatchI] = string::validate<word>(string(s));
- delete [] s;
- }
+ delete [] s;
+ }
//foamPatchMap.append(prostarI);
@@ -342,28 +344,28 @@ void ReadProblem
CCMIOReadOptstr(NULL, boundary, "BoundaryName", &size, NULL)
== kCCMIONoErr
)
- {
- char* name = new char[size + 1];
- CCMIOReadOptstr(NULL, boundary, "BoundaryName", &size, name);
+ {
+ char* name = new char[size + 1];
+ CCMIOReadOptstr(NULL, boundary, "BoundaryName", &size, name);
name[size] = '\0';
foamPatchNames[foamPatchI] = string::validate<word>(string(name));
- delete [] name;
- }
+ delete [] name;
+ }
else if
(
CCMIOReadOptstr(NULL, boundary, "Label", &size, NULL)
== kCCMIONoErr
)
- {
- char* name = new char[size + 1];
- CCMIOReadOptstr(NULL, boundary, "Label", &size, name);
+ {
+ char* name = new char[size + 1];
+ CCMIOReadOptstr(NULL, boundary, "Label", &size, name);
name[size] = '\0';
foamPatchNames[foamPatchI] = string::validate<word>(string(name));
- delete [] name;
- }
+ delete [] name;
+ }
else
{
- foamPatchNames[foamPatchI] =
+ foamPatchNames[foamPatchI] =
foamPatchTypes[foamPatchI]
+ Foam::name(foamPatchI);
Pout<< "Made up name:" << foamPatchNames[foamPatchI]
@@ -440,8 +442,8 @@ void ReadCells
== kCCMIONoErr
)
{
- CCMIOSize size;
- CCMIOEntitySize(&err, id, &size, NULL);
+ CCMIOSize size;
+ CCMIOEntitySize(&err, id, &size, NULL);
Pout<< "Read kCCMIOBoundaryFaces entry with " << size
<< " faces." << endl;
@@ -461,13 +463,13 @@ void ReadCells
CCMIOGetEntity(&err, topology, kCCMIOInternalFaces, 0, &id);
CCMIOSize size;
CCMIOReadFaces(&err, id, kCCMIOInternalFaces, NULL, &size, NULL,
- kCCMIOStart, kCCMIOEnd);
+ kCCMIOStart, kCCMIOEnd);
std::vector<int> faces(size);
CCMIOReadFaces(&err, id, kCCMIOInternalFaces, &mapID, NULL, &faces[0],
- kCCMIOStart, kCCMIOEnd);
+ kCCMIOStart, kCCMIOEnd);
std::vector<int> faceCells(2*nInternalFaces);
CCMIOReadFaceCells(&err, id, kCCMIOInternalFaces, &faceCells[0],
- kCCMIOStart, kCCMIOEnd);
+ kCCMIOStart, kCCMIOEnd);
CCMIOReadMap(&err, mapID, &mapData[0], kCCMIOStart, kCCMIOEnd);
CheckError(err, "Error reading internal faces");
@@ -505,19 +507,19 @@ void ReadCells
)
{
CCMIOSize nFaces;
- CCMIOEntitySize(&err, id, &nFaces, NULL);
-
- mapData.resize(nFaces);
- faceCells.resize(nFaces);
- CCMIOReadFaces(&err, id, kCCMIOBoundaryFaces, NULL, &size, NULL,
- kCCMIOStart, kCCMIOEnd);
- faces.resize(size);
- CCMIOReadFaces(&err, id, kCCMIOBoundaryFaces, &mapID, NULL, &faces[0],
- kCCMIOStart, kCCMIOEnd);
- CCMIOReadFaceCells(&err, id, kCCMIOBoundaryFaces, &faceCells[0],
- kCCMIOStart, kCCMIOEnd);
- CCMIOReadMap(&err, mapID, &mapData[0], kCCMIOStart, kCCMIOEnd);
- CheckError(err, "Error reading boundary faces");
+ CCMIOEntitySize(&err, id, &nFaces, NULL);
+
+ mapData.resize(nFaces);
+ faceCells.resize(nFaces);
+ CCMIOReadFaces(&err, id, kCCMIOBoundaryFaces, NULL, &size, NULL,
+ kCCMIOStart, kCCMIOEnd);
+ faces.resize(size);
+ CCMIOReadFaces(&err, id, kCCMIOBoundaryFaces, &mapID, NULL, &faces[0],
+ kCCMIOStart, kCCMIOEnd);
+ CCMIOReadFaceCells(&err, id, kCCMIOBoundaryFaces, &faceCells[0],
+ kCCMIOStart, kCCMIOEnd);
+ CCMIOReadMap(&err, mapID, &mapData[0], kCCMIOStart, kCCMIOEnd);
+ CheckError(err, "Error reading boundary faces");
// Read prostar id
int prostarI;
@@ -672,9 +674,9 @@ int main(int argc, char *argv[])
if (err != kCCMIONoErr)
{
- // Maybe no solution; try again
- err = kCCMIONoErr;
- CCMIOReadProcessor
+ // Maybe no solution; try again
+ err = kCCMIONoErr;
+ CCMIOReadProcessor
(
&err,
processor,
@@ -683,12 +685,12 @@ int main(int argc, char *argv[])
NULL,
NULL
);
- if (err != kCCMIONoErr)
- {
- FatalErrorIn(args.executable())
+ if (err != kCCMIONoErr)
+ {
+ FatalErrorIn(args.executable())
<< "Could not read the file."
<< exit(FatalError);
- }
+ }
}
ReadVertices(err, vertices, foamPointMap, foamPoints);
diff --git a/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C b/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
index 91b8d865951..eaf44fed137 100644
--- a/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
+++ b/applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
@@ -30,33 +30,34 @@ Description
and run tetgen with -f option.
Sample smesh file:
-
+ @verbatim
# cube.smesh -- A 10x10x10 cube
8 3
- 1 0 0 0
- 2 0 10 0
- 3 10 10 0
- 4 10 0 0
- 5 0 0 10
- 6 0 10 10
- 7 10 10 10
- 8 10 0 10
+ 1 0 0 0
+ 2 0 10 0
+ 3 10 10 0
+ 4 10 0 0
+ 5 0 0 10
+ 6 0 10 10
+ 7 10 10 10
+ 8 10 0 10
6 1 # 1 for boundary info present
- 4 1 2 3 4 11 # region number 11
- 4 5 6 7 8 21 # region number 21
- 4 1 2 6 5 3
- 4 4 3 7 8 43
- 4 1 5 8 4 5
- 4 2 6 7 3 65
+ 4 1 2 3 4 11 # region number 11
+ 4 5 6 7 8 21 # region number 21
+ 4 1 2 6 5 3
+ 4 4 3 7 8 43
+ 4 1 5 8 4 5
+ 4 2 6 7 3 65
0
0
-
-NOTE:
-- for some reason boundary faces point inwards. I just reverse them
-always. Might use some geometric check instead.
-- marked faces might not actually be boundary faces of mesh.
-This is hopefully handled now by first constructing without boundaries
-and then reconstructing with boundary faces.
+ @endverbatim
+
+Note
+ - for some reason boundary faces point inwards. I just reverse them
+ always. Might use some geometric check instead.
+ - marked faces might not actually be boundary faces of mesh.
+ This is hopefully handled now by first constructing without boundaries
+ and then reconstructing with boundary faces.
\*---------------------------------------------------------------------------*/
diff --git a/applications/utilities/mesh/manipulation/flattenMesh/Make/options b/applications/utilities/mesh/manipulation/flattenMesh/Make/options
index 03ae115fb9a..73f34b0f85f 100644
--- a/applications/utilities/mesh/manipulation/flattenMesh/Make/options
+++ b/applications/utilities/mesh/manipulation/flattenMesh/Make/options
@@ -3,5 +3,5 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \
- -ldynamicMesh \
+ -ldynamicMesh \
-lmeshTools
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputFunctions.C b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputFunctions.C
index e62b10064c7..4f7f8fdedae 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputFunctions.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputFunctions.C
@@ -34,12 +34,10 @@ License
#include "OFstream.H"
#include "IOmanip.H"
-namespace Foam
-{
// * * * * * * * * * * * * * * * Global Functions * * * * * * * * * * * * * //
-void ensightCaseEntry
+void Foam::ensightCaseEntry
(
OFstream& caseFile,
const string& ensightType,
@@ -89,7 +87,7 @@ void ensightCaseEntry
}
-void ensightParticlePositions
+void Foam::ensightParticlePositions
(
const polyMesh& mesh,
const fileName& dataDir,
@@ -113,7 +111,7 @@ void ensightParticlePositions
os.newline();
os.write("particle coordinates");
os.newline();
- os.write(parcels.size(), 8); // unusual width
+ os.write(parcels.size(), 8); // unusual width
os.newline();
// binary write is Ensight6 - first ids, then positions
@@ -141,7 +139,7 @@ void ensightParticlePositions
{
const vector& p = elmnt().position();
- os.write(++nParcels, 8); // unusual width
+ os.write(++nParcels, 8); // unusual width
os.write(p.x());
os.write(p.y());
os.write(p.z());
@@ -153,7 +151,7 @@ void ensightParticlePositions
template<class Type>
-void ensightLagrangianField
+void Foam::ensightLagrangianField
(
const IOobject& fieldObject,
const fileName& dataDir,
@@ -211,7 +209,7 @@ void ensightLagrangianField
//- write generalized field components
template <class Type>
-void ensightVolField
+void Foam::ensightVolField
(
const ensightParts& partsList,
const IOobject& fieldObject,
@@ -241,9 +239,5 @@ void ensightVolField
);
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // namespace Foam
-
// ************************************************************************* //
diff --git a/applications/utilities/postProcessing/graphics/fieldview9Reader/fieldview9Reader.C b/applications/utilities/postProcessing/graphics/fieldview9Reader/fieldview9Reader.C
index a658631a9f1..d4a16e83ea0 100644
--- a/applications/utilities/postProcessing/graphics/fieldview9Reader/fieldview9Reader.C
+++ b/applications/utilities/postProcessing/graphics/fieldview9Reader/fieldview9Reader.C
@@ -1195,16 +1195,15 @@ void register_data_readers()
/*
** like this for combined unstructured grids & results in a single file
*/
- reg_single_unstruct_reader (
- "Foam Reader", /* title you want for data reader */
- user_query_file_function, /* whatever you called this */
- user_read_one_grid_function /* whatever you called this */
- );
+ reg_single_unstruct_reader
+ (
+ "Foam Reader", /* title you want for data reader */
+ user_query_file_function, /* whatever you called this */
+ user_read_one_grid_function /* whatever you called this */
+ );
}
-
-
}
diff --git a/applications/utilities/postProcessing/sampling/sample/sampleDict b/applications/utilities/postProcessing/sampling/sample/sampleDict
index 9c288d7cbfa..518a75ab5a4 100644
--- a/applications/utilities/postProcessing/sampling/sample/sampleDict
+++ b/applications/utilities/postProcessing/sampling/sample/sampleDict
@@ -38,9 +38,9 @@ setFormat raw;
surfaceFormat vtk;
// interpolationScheme. choice of
-// cell : use cell-centre value only; constant over cells (default)
-// cellPoint : use cell-centre and vertex values
-// cellPointFace : use cell-centre, vertex and face values.
+// cell : use cell-centre value only; constant over cells (default)
+// cellPoint : use cell-centre and vertex values
+// cellPointFace : use cell-centre, vertex and face values.
// 1] vertex values determined from neighbouring cell-centre values
// 2] face values determined using the current face interpolation scheme
// for the field (linear, gamma, etc.)
diff --git a/applications/utilities/preProcessing/mapFields/mapLagrangian.C b/applications/utilities/preProcessing/mapFields/mapLagrangian.C
index d3f35d02a35..575c6fa3967 100644
--- a/applications/utilities/preProcessing/mapFields/mapLagrangian.C
+++ b/applications/utilities/preProcessing/mapFields/mapLagrangian.C
@@ -223,7 +223,7 @@ void mapLagrangian(const meshToMesh& meshToMeshInterp)
{
unmappedSource.erase(sourceParticleI);
addParticles.append(sourceParticleI);
- iter().cell()=targetCell;
+ iter().cell()=targetCell;
targetParcels.addParticle
(
sourceParcels.remove(&iter())
diff --git a/applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C b/applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C
index ea4f795edad..e293596ab16 100644
--- a/applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C
+++ b/applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C
@@ -25,10 +25,10 @@ License
Description
Surface coarsening using 'bunnylod':
- Polygon Reduction Demo
- By Stan Melax (c) 1998
- mailto:melax@cs.ualberta.ca
- http://www.cs.ualberta.ca/~melax
+ Polygon Reduction Demo
+ By Stan Melax (c) 1998
+ mailto:melax@cs.ualberta.ca
+ http://www.cs.ualberta.ca/~melax
\*---------------------------------------------------------------------------*/
@@ -55,7 +55,7 @@ int mapVertex(::List<int>& collapse_map, int a, int mx)
}
while (a >= mx)
{
- a = collapse_map[a];
+ a = collapse_map[a];
}
return a;
}
diff --git a/etc/bashrc b/etc/bashrc
index 308d33bf84c..3d5be555f04 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -192,7 +192,7 @@ SunOS)
export WM_MPLIB=FJMPI
;;
-*) # an unsupported operating system
+*) # an unsupported operating system
cat <<USAGE
Your "$WM_ARCH" operating system is not supported by this release
diff --git a/src/ODE/ODESolvers/RK/RK.C b/src/ODE/ODESolvers/RK/RK.C
index 7846560dd5c..e6cf6704697 100644
--- a/src/ODE/ODESolvers/RK/RK.C
+++ b/src/ODE/ODESolvers/RK/RK.C
@@ -29,10 +29,9 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-defineTypeNameAndDebug(Foam::RK, 0);
-
namespace Foam
{
+ defineTypeNameAndDebug(Foam::RK, 0);
addToRunTimeSelectionTable(ODESolver, RK, ODE);
const scalar
@@ -85,28 +84,28 @@ void Foam::RK::solve
{
forAll(yTemp_, i)
{
- yTemp_[i] = y[i] + b21*h*dydx[i];
+ yTemp_[i] = y[i] + b21*h*dydx[i];
}
ode.derivatives(x + a2*h, yTemp_, ak2_);
forAll(yTemp_, i)
{
- yTemp_[i] = y[i] + h*(b31*dydx[i] + b32*ak2_[i]);
+ yTemp_[i] = y[i] + h*(b31*dydx[i] + b32*ak2_[i]);
}
ode.derivatives(x + a3*h, yTemp_, ak3_);
forAll(yTemp_, i)
{
- yTemp_[i] = y[i] + h*(b41*dydx[i] + b42*ak2_[i] + b43*ak3_[i]);
+ yTemp_[i] = y[i] + h*(b41*dydx[i] + b42*ak2_[i] + b43*ak3_[i]);
}
ode.derivatives(x + a4*h, yTemp_, ak4_);
forAll(yTemp_, i)
{
- yTemp_[i] = y[i]
+ yTemp_[i] = y[i]
+ h*(b51*dydx[i] + b52*ak2_[i] + b53*ak3_[i] + b54*ak4_[i]);
}
@@ -114,7 +113,7 @@ void Foam::RK::solve
forAll(yTemp_, i)
{
- yTemp_[i] = y[i]
+ yTemp_[i] = y[i]
+ h*
(
b61*dydx[i] + b62*ak2_[i] + b63*ak3_[i]
@@ -126,13 +125,13 @@ void Foam::RK::solve
forAll(yout, i)
{
- yout[i] = y[i]
+ yout[i] = y[i]
+ h*(c1*dydx[i] + c3*ak3_[i] + c4*ak4_[i] + c6*ak6_[i]);
}
forAll(yerr, i)
{
- yerr[i] =
+ yerr[i] =
h*
(
dc1*dydx[i] + dc3*ak3_[i] + dc4*ak4_[i]
@@ -160,16 +159,16 @@ void Foam::RK::solve
for (;;)
{
- solve(ode, x, y, dydx, h, yTemp2_, yErr_);
+ solve(ode, x, y, dydx, h, yTemp2_, yErr_);
- maxErr = 0.0;
- for (register label i=0; i<n_; i++)
+ maxErr = 0.0;
+ for (register label i=0; i<n_; i++)
{
maxErr = max(maxErr, mag(yErr_[i]/yScale[i]));
}
- maxErr /= eps;
+ maxErr /= eps;
- if (maxErr <= 1.0)
+ if (maxErr <= 1.0)
{
break;
}
@@ -179,7 +178,7 @@ void Foam::RK::solve
h = (h >= 0.0 ? max(hTemp, 0.1*h) : min(hTemp, 0.1*h));
}
- if (h < VSMALL)
+ if (h < VSMALL)
{
FatalErrorIn("RK::solve")
<< "stepsize underflow"
diff --git a/src/ODE/ODESolvers/RK/RK.H b/src/ODE/ODESolvers/RK/RK.H
index c4a2a34982e..500e9f29988 100644
--- a/src/ODE/ODESolvers/RK/RK.H
+++ b/src/ODE/ODESolvers/RK/RK.H
@@ -26,7 +26,7 @@ Class
Foam::RK
Description
- Foam::RK
+ Runge-Kutta ODE solver
SourceFiles
RKCK.C
@@ -53,6 +53,15 @@ class RK
public ODESolver
{
// Private data
+ static const scalar safety, pGrow, pShrink, errCon;
+
+ static const scalar
+ a2, a3, a4, a5, a6,
+ b21, b31, b32, b41, b42, b43,
+ b51, b52, b53, b54, b61, b62, b63, b64, b65,
+ c1, c3, c4, c6,
+ dc1, dc3, dc4, dc5, dc6;
+
mutable scalarField yTemp_;
mutable scalarField ak2_;
@@ -64,16 +73,6 @@ class RK
mutable scalarField yErr_;
mutable scalarField yTemp2_;
- static const scalar safety, pGrow, pShrink, errCon;
-
- static const scalar
- a2, a3, a4, a5, a6,
- b21, b31, b32, b41, b42, b43,
- b51, b52, b53, b54, b61, b62, b63, b64, b65,
- c1, c3, c4, c6,
- dc1, dc3, dc4, dc5, dc6;
-
-
public:
//- Runtime type information
diff --git a/src/OSspecific/POSIX/timer.C b/src/OSspecific/POSIX/timer.C
index b61efa5ed9a..02158b8929b 100644
--- a/src/OSspecific/POSIX/timer.C
+++ b/src/OSspecific/POSIX/timer.C
@@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Description
-
\*---------------------------------------------------------------------------*/
#include <unistd.h>
@@ -44,7 +42,7 @@ unsigned int Foam::timer::oldTimeOut_ = 0;
// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
void Foam::timer::signalHandler(int)
-{
+{
if (debug)
{
Info<< "Foam::timer::signalHandler(int sig) : "
@@ -56,8 +54,6 @@ void Foam::timer::signalHandler(int)
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-
-// Construct from components
Foam::timer::timer(const unsigned int newTimeOut)
:
newTimeOut_(newTimeOut)
@@ -72,7 +68,7 @@ Foam::timer::timer(const unsigned int newTimeOut)
(
"Foam::timer::timer(const unsigned int)"
) << "timer already used."
- << abort(FatalError);
+ << abort(FatalError);
}
// Install alarm signal handler:
@@ -80,7 +76,7 @@ Foam::timer::timer(const unsigned int newTimeOut)
// - clear list of signals to mask
struct sigaction newAction;
newAction.sa_handler = timer::signalHandler;
- newAction.sa_flags = SA_NODEFER;
+ newAction.sa_flags = SA_NODEFER;
sigemptyset(&newAction.sa_mask);
if (sigaction(SIGALRM, &newAction, &oldAction_) < 0)
@@ -89,7 +85,7 @@ Foam::timer::timer(const unsigned int newTimeOut)
(
"Foam::timer::timer(const unsigned int)"
) << "sigaction(SIGALRM) error"
- << abort(FatalError);
+ << abort(FatalError);
}
oldTimeOut_ = ::alarm(newTimeOut);
@@ -131,7 +127,7 @@ Foam::timer::~timer()
"Foam::timer::~timer(const struct sigaction&"
"const struct sigaction&)"
) << "sigaction(SIGALRM) error"
- << abort(FatalError);
+ << abort(FatalError);
}
}
}
diff --git a/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.C b/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.C
index b9254397018..4f2aa65d75f 100644
--- a/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.C
+++ b/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.C
@@ -80,7 +80,7 @@ void PrimitivePatchInterpolation<Patch>::makeFaceToPointWeights() const
forAll(curFaces, facei)
{
- pw[facei] =
+ pw[facei] =
1.0/mag(faces[curFaces[facei]].centre(points) - points[pointi]);
sumw += pw[facei];
}
@@ -133,7 +133,7 @@ void PrimitivePatchInterpolation<Patch>::makeFaceToEdgeWeights() const
vector S = points[edges[edgei].start()];
vector e = edges[edgei].vec(points);
- scalar alpha =
+ scalar alpha =
-(((N - P)^(S - P))&((N - P)^e))/(((N - P)^e )&((N - P)^e));
vector E = S + alpha*e;
@@ -318,7 +318,7 @@ tmp<Field<Type> > PrimitivePatchInterpolation<Patch>::faceToEdgeInterpolate
);
Field<Type>& result = tresult();
-
+
const pointField& points = patch_.localPoints();
const faceList& faces = patch_.localFaces();
const edgeList& edges = patch_.edges();
@@ -328,7 +328,7 @@ tmp<Field<Type> > PrimitivePatchInterpolation<Patch>::faceToEdgeInterpolate
for (label edgei = 0; edgei < patch_.nInternalEdges(); edgei++)
{
- result[edgei] =
+ result[edgei] =
weights[edgei]*pf[edgeFaces[edgei][0]]
+ (1.0 - weights[edgei])*pf[edgeFaces[edgei][1]];
}
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.H
index 5f7425535cd..e09e3110a61 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.H
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/faceMapper/faceMapper.H
@@ -148,13 +148,13 @@ public:
//- Return flux flip map
virtual const labelHashSet& flipFaceFlux() const;
- //- Return number of old internalFaces
+ //- Return number of old internalFaces
virtual label nOldInternalFaces() const;
- //- Return old patch starts
+ //- Return old patch starts
virtual const labelList& oldPatchStarts() const;
- //- Return old patch sizes
+ //- Return old patch sizes
virtual const labelList& oldPatchSizes() const;
//- Are there any inserted faces
diff --git a/src/Pstream/gamma/Pstream.C b/src/Pstream/gamma/Pstream.C
index 1e4a6fa6421..986b733bc3a 100644
--- a/src/Pstream/gamma/Pstream.C
+++ b/src/Pstream/gamma/Pstream.C
@@ -282,11 +282,11 @@ bool Pstream::init(int& argc, char**& argv)
// Lock the special resize message
-// gamma_mlock
-// (
- // reinterpret_cast<char*>(PstreamGlobals::resizeMessage),
- // PstreamGlobals::resizeMessageLen*sizeof(uint64_t)
- // );
+ // gamma_mlock
+ // (
+ // reinterpret_cast<char*>(PstreamGlobals::resizeMessage),
+ // PstreamGlobals::resizeMessageLen*sizeof(uint64_t)
+ // );
// Attach current receive buffers
@@ -307,10 +307,10 @@ bool Pstream::init(int& argc, char**& argv)
gamma_my_par_pid(), //unsigned char dest_par_pid,
myProcNo_, //unsigned short dest_port,
handler, //callback
- procNo, //unsigned short semaphore,
- GO_BACK, //unsigned char buffer_kind,
+ procNo, //unsigned short semaphore,
+ GO_BACK, //unsigned char buffer_kind,
buf.begin(),
- buf.size()
+ buf.size()
);
}
}
@@ -334,7 +334,7 @@ bool Pstream::init(int& argc, char**& argv)
void Pstream::exit(int errnum)
{
-// gamma_munlockall();
+ // gamma_munlockall();
gamma_exit();
//gamma_abort();
}
@@ -342,8 +342,8 @@ void Pstream::exit(int errnum)
void Pstream::abort()
{
-Pout<< "**Pstream::abort()**" << endl;
-// gamma_munlockall();
+ Pout<< "**Pstream::abort()**" << endl;
+ // gamma_munlockall();
gamma_abort();
}
diff --git a/src/conversion/meshTables/README b/src/conversion/meshTables/README
index 56c47002412..0c81bbc10ac 100644
--- a/src/conversion/meshTables/README
+++ b/src/conversion/meshTables/README
@@ -13,7 +13,7 @@ chosen to match those used by the ccm-format.
Here is a sample dictionary entry:
-<int> // unique positive int
+<int> // unique positive int
{
Label <word>; // optional
MaterialType <word>; // optional (fluid|solid)
diff --git a/src/conversion/meshWriter/starcd/STARCDMeshWriter.C b/src/conversion/meshWriter/starcd/STARCDMeshWriter.C
index 0bb4632cce7..630dd20f430 100644
--- a/src/conversion/meshWriter/starcd/STARCDMeshWriter.C
+++ b/src/conversion/meshWriter/starcd/STARCDMeshWriter.C
@@ -394,7 +394,7 @@ void Foam::meshWriters::STARCD::writeBoundary(const fileName& prefix) const
label regionId = patchI;
if (regionId == defaultId)
{
- continue; // skip - already written
+ continue; // skip - already written
}
else if (defaultId == -1 || regionId < defaultId)
{
diff --git a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
index 26399d4c1b8..222d28e2f1a 100644
--- a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
+++ b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
@@ -26,28 +26,27 @@ License
#include "dynamicRefineFvMesh.H"
#include "addToRunTimeSelectionTable.H"
+#include "fvc.H"
#include "volFields.H"
#include "polyTopoChange.H"
#include "surfaceFields.H"
-#include "fvCFD.H"
#include "syncTools.H"
#include "pointFields.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
+ defineTypeNameAndDebug(dynamicRefineFvMesh, 0);
+ addToRunTimeSelectionTable(dynamicFvMesh, dynamicRefineFvMesh, IOobject);
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(dynamicRefineFvMesh, 0);
-
-addToRunTimeSelectionTable(dynamicFvMesh, dynamicRefineFvMesh, IOobject);
-
+} // End namespace Foam
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-label dynamicRefineFvMesh::count
+// the PackedBoolList::count method would probably be faster
+// since we are only checking for 'true' anyhow
+Foam::label Foam::dynamicRefineFvMesh::count
(
const PackedBoolList& l,
const unsigned int val
@@ -65,7 +64,7 @@ label dynamicRefineFvMesh::count
}
-void dynamicRefineFvMesh::calculateProtectedCells
+void Foam::dynamicRefineFvMesh::calculateProtectedCells
(
PackedBoolList& unrefineableCell
) const
@@ -171,7 +170,7 @@ void dynamicRefineFvMesh::calculateProtectedCells
}
-void dynamicRefineFvMesh::readDict()
+void Foam::dynamicRefineFvMesh::readDict()
{
dictionary refineDict
(
@@ -196,7 +195,8 @@ void dynamicRefineFvMesh::readDict()
// Refines cells, maps fields and recalculates (an approximate) flux
-autoPtr<mapPolyMesh> dynamicRefineFvMesh::refine
+Foam::autoPtr<Foam::mapPolyMesh>
+Foam::dynamicRefineFvMesh::refine
(
const labelList& cellsToRefine
)
@@ -408,7 +408,8 @@ autoPtr<mapPolyMesh> dynamicRefineFvMesh::refine
// Combines previously split cells, maps fields and recalculates
// (an approximate) flux
-autoPtr<mapPolyMesh> dynamicRefineFvMesh::unrefine
+Foam::autoPtr<Foam::mapPolyMesh>
+Foam::dynamicRefineFvMesh::unrefine
(
const labelList& splitPoints
)
@@ -563,7 +564,8 @@ autoPtr<mapPolyMesh> dynamicRefineFvMesh::unrefine
// Get max of connected point
-scalarField dynamicRefineFvMesh::maxPointField(const scalarField& pFld) const
+Foam::scalarField
+Foam::dynamicRefineFvMesh::maxPointField(const scalarField& pFld) const
{
scalarField vFld(nCells(), -GREAT);
@@ -581,7 +583,8 @@ scalarField dynamicRefineFvMesh::maxPointField(const scalarField& pFld) const
// Get min of connected cell
-scalarField dynamicRefineFvMesh::minCellField(const volScalarField& vFld) const
+Foam::scalarField
+Foam::dynamicRefineFvMesh::minCellField(const volScalarField& vFld) const
{
scalarField pFld(nPoints(), GREAT);
@@ -599,7 +602,8 @@ scalarField dynamicRefineFvMesh::minCellField(const volScalarField& vFld) const
// Simple (non-parallel) interpolation by averaging.
-scalarField dynamicRefineFvMesh::cellToPoint(const scalarField& vFld) const
+Foam::scalarField
+Foam::dynamicRefineFvMesh::cellToPoint(const scalarField& vFld) const
{
scalarField pFld(nPoints());
@@ -619,7 +623,8 @@ scalarField dynamicRefineFvMesh::cellToPoint(const scalarField& vFld) const
// Calculate error. Is < 0 or distance from inbetween levels
-scalarField dynamicRefineFvMesh::error
+Foam::scalarField
+Foam::dynamicRefineFvMesh::error
(
const scalarField& fld,
const scalar minLevel,
@@ -641,7 +646,7 @@ scalarField dynamicRefineFvMesh::error
}
-void dynamicRefineFvMesh::selectRefineCandidates
+void Foam::dynamicRefineFvMesh::selectRefineCandidates
(
const scalar lowerRefineLevel,
const scalar upperRefineLevel,
@@ -675,7 +680,7 @@ void dynamicRefineFvMesh::selectRefineCandidates
}
-labelList dynamicRefineFvMesh::selectRefineCells
+Foam::labelList Foam::dynamicRefineFvMesh::selectRefineCells
(
const label maxCells,
const label maxRefinement,
@@ -762,7 +767,7 @@ labelList dynamicRefineFvMesh::selectRefineCells
}
-labelList dynamicRefineFvMesh::selectUnrefinePoints
+Foam::labelList Foam::dynamicRefineFvMesh::selectUnrefinePoints
(
const scalar unrefineLevel,
const PackedBoolList& markedCell,
@@ -822,7 +827,10 @@ labelList dynamicRefineFvMesh::selectUnrefinePoints
}
-void dynamicRefineFvMesh::extendMarkedCells(PackedBoolList& markedCell) const
+void Foam::dynamicRefineFvMesh::extendMarkedCells
+(
+ PackedBoolList& markedCell
+) const
{
// Mark faces using any marked cell
boolList markedFace(nFaces(), false);
@@ -863,7 +871,7 @@ void dynamicRefineFvMesh::extendMarkedCells(PackedBoolList& markedCell) const
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-dynamicRefineFvMesh::dynamicRefineFvMesh(const IOobject& io)
+Foam::dynamicRefineFvMesh::dynamicRefineFvMesh(const IOobject& io)
:
dynamicFvMesh(io),
meshCutter_(*this),
@@ -996,13 +1004,13 @@ dynamicRefineFvMesh::dynamicRefineFvMesh(const IOobject& io)
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-dynamicRefineFvMesh::~dynamicRefineFvMesh()
+Foam::dynamicRefineFvMesh::~dynamicRefineFvMesh()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-bool dynamicRefineFvMesh::update()
+bool Foam::dynamicRefineFvMesh::update()
{
// Re-read dictionary. Choosen since usually -small so trivial amount
// of time compared to actual refinement. Also very useful to be able
@@ -1204,7 +1212,7 @@ bool dynamicRefineFvMesh::update()
}
-bool dynamicRefineFvMesh::writeObject
+bool Foam::dynamicRefineFvMesh::writeObject
(
IOstream::streamFormat fmt,
IOstream::versionNumber ver,
@@ -1215,8 +1223,10 @@ bool dynamicRefineFvMesh::writeObject
const_cast<hexRef8&>(meshCutter_).setInstance(time().timeName());
bool writeOk =
+ (
dynamicFvMesh::writeObjects(fmt, ver, cmp)
- && meshCutter_.write();
+ && meshCutter_.write()
+ );
if (dumpLevel_)
{
@@ -1249,8 +1259,4 @@ bool dynamicRefineFvMesh::writeObject
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C
index 8261941be2b..4896c0f5535 100644
--- a/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C
+++ b/src/dynamicMesh/polyMeshAdder/faceCoupleInfo.C
@@ -1,4 +1,4 @@
-/*---------------------------------------------------------------------------* \
+/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
diff --git a/src/finiteVolume/fvMatrices/solvers/MULES/MULES.C b/src/finiteVolume/fvMatrices/solvers/MULES/MULES.C
index 885615d9c82..9c055ca339a 100644
--- a/src/finiteVolume/fvMatrices/solvers/MULES/MULES.C
+++ b/src/finiteVolume/fvMatrices/solvers/MULES/MULES.C
@@ -34,8 +34,7 @@ License
#include "fvcSurfaceIntegrate.H"
#include "slicedSurfaceFields.H"
#include "syncTools.H"
-
-#include "fvCFD.H"
+#include "fvm.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C b/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
index 89e0260456a..5d1588a39bd 100644
--- a/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
+++ b/src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
@@ -34,8 +34,7 @@ License
#include "fvcSurfaceIntegrate.H"
#include "slicedSurfaceFields.H"
#include "syncTools.H"
-
-#include "fvCFD.H"
+#include "fvm.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -142,7 +141,7 @@ void Foam::MULES::implicitSolve
{
const fvMesh& mesh = psi.mesh();
- const dictionary& MULEScontrols =
+ const dictionary& MULEScontrols =
mesh.solverDict(psi.name()).subDict("MULESImplicit");
label maxIter
diff --git a/src/lagrangian/dieselSpray/injector/commonRailInjector/commonRailInjector.C b/src/lagrangian/dieselSpray/injector/commonRailInjector/commonRailInjector.C
index 6d5201111c3..9933bbb6aee 100644
--- a/src/lagrangian/dieselSpray/injector/commonRailInjector/commonRailInjector.C
+++ b/src/lagrangian/dieselSpray/injector/commonRailInjector/commonRailInjector.C
@@ -44,7 +44,6 @@ namespace Foam
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
Foam::commonRailInjector::commonRailInjector
(
const Foam::Time& t,
diff --git a/src/lagrangian/dieselSpray/injector/definedInjector/definedInjector.C b/src/lagrangian/dieselSpray/injector/definedInjector/definedInjector.C
index 76c9e4ea5df..2e9a41ebf4e 100644
--- a/src/lagrangian/dieselSpray/injector/definedInjector/definedInjector.C
+++ b/src/lagrangian/dieselSpray/injector/definedInjector/definedInjector.C
@@ -45,7 +45,6 @@ namespace Foam
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
Foam::definedInjector::definedInjector
(
const Time& t,
diff --git a/src/lagrangian/dieselSpray/injector/injector/injector.H b/src/lagrangian/dieselSpray/injector/injector/injector.H
index 2a67692471b..0e4f0cf630d 100644
--- a/src/lagrangian/dieselSpray/injector/injector/injector.H
+++ b/src/lagrangian/dieselSpray/injector/injector/injector.H
@@ -64,7 +64,7 @@ public:
// Constructors
//- Constructor from Istream
- injector(const Time& t, Istream& is);
+ injector(const Time&, Istream&);
//- Return clone
inline autoPtr<injector> clone() const;
diff --git a/src/lagrangian/dieselSpray/injector/injector/injectorI.H b/src/lagrangian/dieselSpray/injector/injector/injectorI.H
index 715093a0472..f73592bd893 100644
--- a/src/lagrangian/dieselSpray/injector/injector/injectorI.H
+++ b/src/lagrangian/dieselSpray/injector/injector/injectorI.H
@@ -24,32 +24,25 @@ License
\*---------------------------------------------------------------------------*/
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-
-//- Return clone
-inline autoPtr<injector> injector::clone() const
+
+inline Foam::autoPtr<Foam::injector>
+Foam::injector::clone() const
{
return autoPtr<injector>(new injector(*this));
}
-inline autoPtr<injectorType>& injector::properties()
+inline Foam::autoPtr<Foam::injectorType>&
+Foam::injector::properties()
{
return properties_;
}
-inline const autoPtr<injectorType>& injector::properties() const
+inline const Foam::autoPtr<Foam::injectorType>&
+Foam::injector::properties() const
{
return properties_;
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/injector/injectorType/injectorType.C b/src/lagrangian/dieselSpray/injector/injectorType/injectorType.C
index 5a6edcda83b..4a79e608c9f 100644
--- a/src/lagrangian/dieselSpray/injector/injectorType/injectorType.C
+++ b/src/lagrangian/dieselSpray/injector/injectorType/injectorType.C
@@ -37,7 +37,6 @@ namespace Foam
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
Foam::injectorType::injectorType
(
const Foam::Time&,
diff --git a/src/lagrangian/dieselSpray/injector/multiHoleInjector/multiHoleInjector.C b/src/lagrangian/dieselSpray/injector/multiHoleInjector/multiHoleInjector.C
index ea7cd833230..6d30336b60c 100644
--- a/src/lagrangian/dieselSpray/injector/multiHoleInjector/multiHoleInjector.C
+++ b/src/lagrangian/dieselSpray/injector/multiHoleInjector/multiHoleInjector.C
@@ -44,7 +44,6 @@ namespace Foam
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
Foam::multiHoleInjector::multiHoleInjector
(
const Foam::Time& t,
diff --git a/src/lagrangian/dieselSpray/injector/unitInjector/unitInjector.C b/src/lagrangian/dieselSpray/injector/unitInjector/unitInjector.C
index 1e054f2d41f..2463c7d0705 100644
--- a/src/lagrangian/dieselSpray/injector/unitInjector/unitInjector.C
+++ b/src/lagrangian/dieselSpray/injector/unitInjector/unitInjector.C
@@ -46,7 +46,6 @@ namespace Foam
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
Foam::unitInjector::unitInjector
(
const Foam::Time& t,
diff --git a/src/lagrangian/dieselSpray/parcel/boundaryTreatment.H b/src/lagrangian/dieselSpray/parcel/boundaryTreatment.H
index b8702112faf..4420773172b 100644
--- a/src/lagrangian/dieselSpray/parcel/boundaryTreatment.H
+++ b/src/lagrangian/dieselSpray/parcel/boundaryTreatment.H
@@ -23,7 +23,7 @@ else if (isA<wedgePolyPatch>(pbMesh[patch(face())]))
scalar Un = U() & nf;
if (Un > 0)
{
- scalar Un2 = U() & n();
+ scalar Un2 = U() & n();
U() -= 2.0*Un2*n();
}
}
diff --git a/src/lagrangian/dieselSpray/spray/spray.C b/src/lagrangian/dieselSpray/spray/spray.C
index 1e556d7a763..7cd595f6555 100644
--- a/src/lagrangian/dieselSpray/spray/spray.C
+++ b/src/lagrangian/dieselSpray/spray/spray.C
@@ -45,7 +45,10 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-defineTemplateTypeNameAndDebug(IOPtrList<injector>, 0);
+namespace Foam
+{
+ defineTemplateTypeNameAndDebug(IOPtrList<injector>, 0);
+}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.C b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.C
index 01525723f9b..d55440656b6 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.C
@@ -30,26 +30,24 @@ License
#include "mathematicalConstants.H"
#include "RosinRammler.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
+ defineTypeNameAndDebug(LISA, 0);
+
+ addToRunTimeSelectionTable
+ (
+ atomizationModel,
+ LISA,
+ dictionary
+ );
+}
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(LISA, 0);
-
-addToRunTimeSelectionTable
-(
- atomizationModel,
- LISA,
- dictionary
-);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
-LISA::LISA
+Foam::LISA::LISA
(
const dictionary& dict,
spray& sm
@@ -67,13 +65,13 @@ LISA::LISA
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-LISA::~LISA()
+Foam::LISA::~LISA()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-void LISA::atomizeParcel
+void Foam::LISA::atomizeParcel
(
parcel& p,
const scalar deltaT,
@@ -381,8 +379,4 @@ void LISA::atomizeParcel
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/atomizationModel/atomizationModel.C b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/atomizationModel/atomizationModel.C
index e0672494479..b4ac68591b5 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/atomizationModel/atomizationModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/atomizationModel/atomizationModel.C
@@ -27,21 +27,18 @@ License
#include "error.H"
#include "atomizationModel.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
+ defineTypeNameAndDebug(atomizationModel, 0);
+ defineRunTimeSelectionTable(atomizationModel, dictionary);
+}
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(atomizationModel, 0);
-
-defineRunTimeSelectionTable(atomizationModel, dictionary);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
-atomizationModel::atomizationModel
+Foam::atomizationModel::atomizationModel
(
const dictionary& dict,
spray& sm
@@ -55,11 +52,8 @@ atomizationModel::atomizationModel
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * //
-atomizationModel::~atomizationModel()
+Foam::atomizationModel::~atomizationModel()
{}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
// ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/blobsSheetAtomization/blobsSheetAtomization.C b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/blobsSheetAtomization/blobsSheetAtomization.C
index c98aa951317..81bef6b1e00 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/blobsSheetAtomization/blobsSheetAtomization.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/blobsSheetAtomization/blobsSheetAtomization.C
@@ -30,26 +30,25 @@ License
#include "mathematicalConstants.H"
#include "RosinRammler.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-defineTypeNameAndDebug(blobsSheetAtomization, 0);
+namespace Foam
+{
+ defineTypeNameAndDebug(blobsSheetAtomization, 0);
+
+ addToRunTimeSelectionTable
+ (
+ atomizationModel,
+ blobsSheetAtomization,
+ dictionary
+ );
+}
-addToRunTimeSelectionTable
-(
- atomizationModel,
- blobsSheetAtomization,
- dictionary
-);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
-blobsSheetAtomization::blobsSheetAtomization
+Foam::blobsSheetAtomization::blobsSheetAtomization
(
const dictionary& dict,
spray& sm
@@ -65,13 +64,13 @@ blobsSheetAtomization::blobsSheetAtomization
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-blobsSheetAtomization::~blobsSheetAtomization()
+Foam::blobsSheetAtomization::~blobsSheetAtomization()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-void blobsSheetAtomization::atomizeParcel
+void Foam::blobsSheetAtomization::atomizeParcel
(
parcel& p,
const scalar deltaT,
@@ -140,8 +139,4 @@ void blobsSheetAtomization::atomizeParcel
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/noAtomization/noAtomization.C b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/noAtomization/noAtomization.C
index 65300cb6f20..cb80e6ec748 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/noAtomization/noAtomization.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/noAtomization/noAtomization.C
@@ -30,26 +30,24 @@ License
#include "addToRunTimeSelectionTable.H"
#include "basicMultiComponentMixture.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
+ defineTypeNameAndDebug(noAtomization, 0);
+
+ addToRunTimeSelectionTable
+ (
+ atomizationModel,
+ noAtomization,
+ dictionary
+ );
+}
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(noAtomization, 0);
-
-addToRunTimeSelectionTable
-(
- atomizationModel,
- noAtomization,
- dictionary
-);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
-noAtomization::noAtomization
+Foam::noAtomization::noAtomization
(
const dictionary& dict,
spray& sm
@@ -61,13 +59,13 @@ noAtomization::noAtomization
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-noAtomization::~noAtomization()
+Foam::noAtomization::~noAtomization()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-void noAtomization::atomizeParcel
+void Foam::noAtomization::atomizeParcel
(
parcel& p,
const scalar deltaT,
@@ -79,8 +77,4 @@ void noAtomization::atomizeParcel
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/ETAB/ETAB.C b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/ETAB/ETAB.C
index db8438ca9af..aa125e5010e 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/ETAB/ETAB.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/ETAB/ETAB.C
@@ -28,26 +28,25 @@ License
#include "addToRunTimeSelectionTable.H"
#include "mathematicalConstants.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+ defineTypeNameAndDebug(ETAB, 0);
-defineTypeNameAndDebug(ETAB, 0);
+ addToRunTimeSelectionTable
+ (
+ breakupModel,
+ ETAB,
+ dictionary
+ );
+}
-addToRunTimeSelectionTable
-(
- breakupModel,
- ETAB,
- dictionary
-);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
-ETAB::ETAB
+Foam::ETAB::ETAB
(
const dictionary& dict,
spray& sm
@@ -70,13 +69,13 @@ ETAB::ETAB
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-ETAB::~ETAB()
+Foam::ETAB::~ETAB()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-void ETAB::breakupParcel
+void Foam::ETAB::breakupParcel
(
parcel& p,
const scalar deltaT,
@@ -84,7 +83,6 @@ void ETAB::breakupParcel
const liquidMixture& fuels
) const
{
-
scalar T = p.T();
scalar pc = spray_.p()[p.cell()];
scalar r = 0.5*p.d();
@@ -191,8 +189,4 @@ void ETAB::breakupParcel
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/SHF/SHF.C b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/SHF/SHF.C
index 8382251ad60..39f9a04e8e5 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/SHF/SHF.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/SHF/SHF.C
@@ -28,27 +28,24 @@ License
#include "addToRunTimeSelectionTable.H"
#include "mathematicalConstants.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(SHF, 0);
-
-addToRunTimeSelectionTable
-(
- breakupModel,
- SHF,
- dictionary
-);
+ defineTypeNameAndDebug(SHF, 0);
+
+ addToRunTimeSelectionTable
+ (
+ breakupModel,
+ SHF,
+ dictionary
+ );
+}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
-SHF::SHF
+Foam::SHF::SHF
(
const dictionary& dict,
spray& sm
@@ -92,13 +89,13 @@ SHF::SHF
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-SHF::~SHF()
+Foam::SHF::~SHF()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-void SHF::breakupParcel
+void Foam::SHF::breakupParcel
(
parcel& p,
const scalar deltaT,
@@ -265,8 +262,4 @@ void SHF::breakupParcel
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/TAB/TAB.C b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/TAB/TAB.C
index b47bcc968b8..9c71d61c677 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/TAB/TAB.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/TAB/TAB.C
@@ -28,26 +28,25 @@ License
#include "addToRunTimeSelectionTable.H"
#include "mathematicalConstants.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-defineTypeNameAndDebug(TAB, 0);
+namespace Foam
+{
+ defineTypeNameAndDebug(TAB, 0);
+
+ addToRunTimeSelectionTable
+ (
+ breakupModel,
+ TAB,
+ dictionary
+ );
+}
-addToRunTimeSelectionTable
-(
- breakupModel,
- TAB,
- dictionary
-);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
-TAB::TAB
+Foam::TAB::TAB
(
const dictionary& dict,
spray& sm
@@ -75,13 +74,13 @@ TAB::TAB
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-TAB::~TAB()
+Foam::TAB::~TAB()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-void TAB::breakupParcel
+void Foam::TAB::breakupParcel
(
parcel& p,
const scalar deltaT,
@@ -207,8 +206,4 @@ void TAB::breakupParcel
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModel.C b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModel.C
index ddf2ca7fe1f..80a63fdda45 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModel.C
@@ -27,21 +27,18 @@ License
#include "error.H"
#include "breakupModel.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
+ defineTypeNameAndDebug(breakupModel, 0);
+ defineRunTimeSelectionTable(breakupModel, dictionary);
+}
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(breakupModel, 0);
-
-defineRunTimeSelectionTable(breakupModel, dictionary);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
-breakupModel::breakupModel
+Foam::breakupModel::breakupModel
(
const dictionary& dict,
spray& sm
@@ -71,13 +68,13 @@ breakupModel::breakupModel
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * //
-breakupModel::~breakupModel()
+Foam::breakupModel::~breakupModel()
{}
// * * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * //
-void breakupModel::updateParcelProperties
+void Foam::breakupModel::updateParcelProperties
(
parcel& p,
const scalar deltaT,
@@ -142,8 +139,4 @@ void breakupModel::updateParcelProperties
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/noBreakup/noBreakup.C b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/noBreakup/noBreakup.C
index d58b0eb8170..e3b8717124a 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/noBreakup/noBreakup.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/noBreakup/noBreakup.C
@@ -31,24 +31,23 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
-{
-
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-defineTypeNameAndDebug(noBreakup, 0);
-
-addToRunTimeSelectionTable
-(
- breakupModel,
- noBreakup,
- dictionary
-);
+namespace Foam
+{
+ defineTypeNameAndDebug(noBreakup, 0);
+
+ addToRunTimeSelectionTable
+ (
+ breakupModel,
+ noBreakup,
+ dictionary
+ );
+}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
-noBreakup::noBreakup
+Foam::noBreakup::noBreakup
(
const dictionary& dict,
spray& sm
@@ -60,13 +59,13 @@ noBreakup::noBreakup
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-noBreakup::~noBreakup()
+Foam::noBreakup::~noBreakup()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-void noBreakup::breakupParcel
+void Foam::noBreakup::breakupParcel
(
parcel&,
const scalar,
@@ -77,8 +76,5 @@ void noBreakup::breakupParcel
// Do nothing
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
// ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzDiwakar/reitzDiwakar.C b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzDiwakar/reitzDiwakar.C
index b91afc3d704..5f39ced9d00 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzDiwakar/reitzDiwakar.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzDiwakar/reitzDiwakar.C
@@ -30,26 +30,23 @@ License
#include "addToRunTimeSelectionTable.H"
#include "basicMultiComponentMixture.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(reitzDiwakar, 0);
-
-addToRunTimeSelectionTable
-(
- breakupModel,
- reitzDiwakar,
- dictionary
-);
+ defineTypeNameAndDebug(reitzDiwakar, 0);
+
+ addToRunTimeSelectionTable
+ (
+ breakupModel,
+ reitzDiwakar,
+ dictionary
+ );
+}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
-reitzDiwakar::reitzDiwakar
+Foam::reitzDiwakar::reitzDiwakar
(
const dictionary& dict,
spray& sm
@@ -66,13 +63,13 @@ reitzDiwakar::reitzDiwakar
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-reitzDiwakar::~reitzDiwakar()
+Foam::reitzDiwakar::~reitzDiwakar()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-void reitzDiwakar::breakupParcel
+void Foam::reitzDiwakar::breakupParcel
(
parcel& p,
const scalar deltaT,
@@ -147,8 +144,4 @@ void reitzDiwakar::breakupParcel
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzKHRT/reitzKHRT.C b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzKHRT/reitzKHRT.C
index 6d9ab7cd816..81956e98f73 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzKHRT/reitzKHRT.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzKHRT/reitzKHRT.C
@@ -28,27 +28,24 @@ License
#include "addToRunTimeSelectionTable.H"
#include "mathematicalConstants.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
+ defineTypeNameAndDebug(reitzKHRT, 0);
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(reitzKHRT, 0);
-
-addToRunTimeSelectionTable
-(
- breakupModel,
- reitzKHRT,
- dictionary
-);
+ addToRunTimeSelectionTable
+ (
+ breakupModel,
+ reitzKHRT,
+ dictionary
+ );
+}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
-reitzKHRT::reitzKHRT
+Foam::reitzKHRT::reitzKHRT
(
const dictionary& dict,
spray& sm
@@ -68,13 +65,13 @@ reitzKHRT::reitzKHRT
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-reitzKHRT::~reitzKHRT()
+Foam::reitzKHRT::~reitzKHRT()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-void reitzKHRT::breakupParcel
+void Foam::reitzKHRT::breakupParcel
(
parcel& p,
const scalar deltaT,
@@ -228,8 +225,4 @@ void reitzKHRT::breakupParcel
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/spraySubModels/collisionModel/ORourke/ORourkeCollisionModel.C b/src/lagrangian/dieselSpray/spraySubModels/collisionModel/ORourke/ORourkeCollisionModel.C
index 24f7565ea05..1f8217a1756 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/collisionModel/ORourke/ORourkeCollisionModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/collisionModel/ORourke/ORourkeCollisionModel.C
@@ -28,27 +28,24 @@ License
#include "addToRunTimeSelectionTable.H"
#include "mathematicalConstants.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(ORourkeCollisionModel, 0);
-
-addToRunTimeSelectionTable
-(
- collisionModel,
- ORourkeCollisionModel,
- dictionary
-);
+ defineTypeNameAndDebug(ORourkeCollisionModel, 0);
+
+ addToRunTimeSelectionTable
+ (
+ collisionModel,
+ ORourkeCollisionModel,
+ dictionary
+ );
+}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
-ORourkeCollisionModel::ORourkeCollisionModel
+Foam::ORourkeCollisionModel::ORourkeCollisionModel
(
const dictionary& dict,
spray& sm,
@@ -64,13 +61,13 @@ ORourkeCollisionModel::ORourkeCollisionModel
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-ORourkeCollisionModel::~ORourkeCollisionModel()
+Foam::ORourkeCollisionModel::~ORourkeCollisionModel()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-void ORourkeCollisionModel::collideParcels(const scalar dt) const
+void Foam::ORourkeCollisionModel::collideParcels(const scalar dt) const
{
if (spray_.size() < 2)
{
@@ -127,8 +124,4 @@ void ORourkeCollisionModel::collideParcels(const scalar dt) const
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/spraySubModels/collisionModel/collisionModel/collisionModel.C b/src/lagrangian/dieselSpray/spraySubModels/collisionModel/collisionModel/collisionModel.C
index 4ce21bb9d73..8a0a61af1e9 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/collisionModel/collisionModel/collisionModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/collisionModel/collisionModel/collisionModel.C
@@ -27,21 +27,18 @@ License
#include "error.H"
#include "collisionModel.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
+ defineTypeNameAndDebug(collisionModel, 0);
+ defineRunTimeSelectionTable(collisionModel, dictionary);
+}
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(collisionModel, 0);
-
-defineRunTimeSelectionTable(collisionModel, dictionary);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
-collisionModel::collisionModel
+Foam::collisionModel::collisionModel
(
const dictionary& dict,
spray& sm,
@@ -51,18 +48,14 @@ collisionModel::collisionModel
dict_(dict),
spray_(sm),
rndGen_(rndGen)
- //coeffsDict_(dict.subDict(typeName + "Coeffs"))
+ // coeffsDict_(dict.subDict(typeName + "Coeffs"))
{}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-collisionModel::~collisionModel()
+Foam::collisionModel::~collisionModel()
{}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/spraySubModels/collisionModel/noCollision/noCollision.C b/src/lagrangian/dieselSpray/spraySubModels/collisionModel/noCollision/noCollision.C
index 8c89bf072ee..7e257ded25c 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/collisionModel/noCollision/noCollision.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/collisionModel/noCollision/noCollision.C
@@ -29,27 +29,24 @@ License
#include "noCollision.H"
#include "addToRunTimeSelectionTable.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(noCollision, 0);
-
-addToRunTimeSelectionTable
-(
- collisionModel,
- noCollision,
- dictionary
-);
+ defineTypeNameAndDebug(noCollision, 0);
+
+ addToRunTimeSelectionTable
+ (
+ collisionModel,
+ noCollision,
+ dictionary
+ );
+}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
-noCollision::noCollision
+Foam::noCollision::noCollision
(
const dictionary& dict,
spray& sm,
@@ -62,20 +59,16 @@ noCollision::noCollision
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-noCollision::~noCollision()
+Foam::noCollision::~noCollision()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-void noCollision::collideParcels(const scalar) const
+void Foam::noCollision::collideParcels(const scalar) const
{
// Do nothing
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/spraySubModels/collisionModel/trajectoryModel/trajectoryModel.C b/src/lagrangian/dieselSpray/spraySubModels/collisionModel/trajectoryModel/trajectoryModel.C
index 3d6be9b7929..377d7e0e507 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/collisionModel/trajectoryModel/trajectoryModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/collisionModel/trajectoryModel/trajectoryModel.C
@@ -28,27 +28,24 @@ License
#include "addToRunTimeSelectionTable.H"
#include "mathematicalConstants.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(trajectoryCollisionModel, 0);
-
-addToRunTimeSelectionTable
-(
- collisionModel,
- trajectoryCollisionModel,
- dictionary
-);
+ defineTypeNameAndDebug(trajectoryCollisionModel, 0);
+
+ addToRunTimeSelectionTable
+ (
+ collisionModel,
+ trajectoryCollisionModel,
+ dictionary
+ );
+}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
-trajectoryCollisionModel::trajectoryCollisionModel
+Foam::trajectoryCollisionModel::trajectoryCollisionModel
(
const dictionary& dict,
spray& sm,
@@ -66,13 +63,13 @@ trajectoryCollisionModel::trajectoryCollisionModel
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-trajectoryCollisionModel::~trajectoryCollisionModel()
+Foam::trajectoryCollisionModel::~trajectoryCollisionModel()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-void trajectoryCollisionModel::collideParcels(const scalar dt) const
+void Foam::trajectoryCollisionModel::collideParcels(const scalar dt) const
{
if (spray_.size() < 2)
{
@@ -121,8 +118,4 @@ void trajectoryCollisionModel::collideParcels(const scalar dt) const
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionLESModel/dispersionLESModel.C b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionLESModel/dispersionLESModel.C
index 1ce6bb1e72c..34bf9d1481e 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionLESModel/dispersionLESModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionLESModel/dispersionLESModel.C
@@ -26,19 +26,16 @@ License
#include "dispersionLESModel.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(dispersionLESModel, 0);
+ defineTypeNameAndDebug(dispersionLESModel, 0);
+}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
-dispersionLESModel::dispersionLESModel
+Foam::dispersionLESModel::dispersionLESModel
(
const dictionary& dict,
spray& sm
@@ -57,12 +54,8 @@ dispersionLESModel::dispersionLESModel
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-dispersionLESModel::~dispersionLESModel()
+Foam::dispersionLESModel::~dispersionLESModel()
{}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionModel/dispersionModel.C b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionModel/dispersionModel.C
index 16b7d6d458e..cfb31129ef7 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionModel/dispersionModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionModel/dispersionModel.C
@@ -28,22 +28,18 @@ License
#include "dispersionModel.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(dispersionModel, 0);
-
-defineRunTimeSelectionTable(dispersionModel, dictionary);
+ defineTypeNameAndDebug(dispersionModel, 0);
+ defineRunTimeSelectionTable(dispersionModel, dictionary);
+}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
-dispersionModel::dispersionModel
+Foam::dispersionModel::dispersionModel
(
const dictionary& dict,
spray& sm
@@ -56,12 +52,8 @@ dispersionModel::dispersionModel
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-dispersionModel::~dispersionModel()
+Foam::dispersionModel::~dispersionModel()
{}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionRASModel/dispersionRASModel.C b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionRASModel/dispersionRASModel.C
index 082989a89b7..8dc90be059a 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionRASModel/dispersionRASModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionRASModel/dispersionRASModel.C
@@ -26,19 +26,16 @@ License
#include "dispersionRASModel.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(dispersionRASModel, 0);
+ defineTypeNameAndDebug(dispersionRASModel, 0);
+}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
-dispersionRASModel::dispersionRASModel
+Foam::dispersionRASModel::dispersionRASModel
(
const dictionary& dict,
spray& sm
@@ -57,12 +54,8 @@ dispersionRASModel::dispersionRASModel
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-dispersionRASModel::~dispersionRASModel()
+Foam::dispersionRASModel::~dispersionRASModel()
{}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/gradientDispersionRAS/gradientDispersionRAS.C b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/gradientDispersionRAS/gradientDispersionRAS.C
index 1db72fe0088..4a0c0d139c4 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/gradientDispersionRAS/gradientDispersionRAS.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/gradientDispersionRAS/gradientDispersionRAS.C
@@ -29,27 +29,24 @@ License
#include "gradientDispersionRAS.H"
#include "addToRunTimeSelectionTable.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
+ defineTypeNameAndDebug(gradientDispersionRAS, 0);
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(gradientDispersionRAS, 0);
-
-addToRunTimeSelectionTable
-(
- dispersionModel,
- gradientDispersionRAS,
- dictionary
-);
+ addToRunTimeSelectionTable
+ (
+ dispersionModel,
+ gradientDispersionRAS,
+ dictionary
+ );
+}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
-gradientDispersionRAS::gradientDispersionRAS
+Foam::gradientDispersionRAS::gradientDispersionRAS
(
const dictionary& dict,
spray& sm
@@ -61,13 +58,13 @@ gradientDispersionRAS::gradientDispersionRAS
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-gradientDispersionRAS::~gradientDispersionRAS()
+Foam::gradientDispersionRAS::~gradientDispersionRAS()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-void gradientDispersionRAS::disperseParcels() const
+void Foam::gradientDispersionRAS::disperseParcels() const
{
const scalar cps = 0.16432;
@@ -90,7 +87,7 @@ void gradientDispersionRAS::disperseParcels() const
scalar Tturb = min
(
- k[celli]/epsilon[celli],
+ k[celli]/epsilon[celli],
cps*pow(k[celli], 1.5)/epsilon[celli]/(UrelMag + SMALL)
);
// parcel is perturbed by the turbulence
@@ -115,9 +112,9 @@ void gradientDispersionRAS::disperseParcels() const
x2 = 2.0*spray_.rndGen().scalar01() - 1.0;
rsq = x1*x1 + x2*x2;
}
-
+
scalar fac = sqrt(-2.0*log(rsq)/rsq);
-
+
// in 2D calculations the -grad(k) is always
// away from the axis of symmetry
// This creates a 'hole' in the spray and to
@@ -130,7 +127,7 @@ void gradientDispersionRAS::disperseParcels() const
{
fac *= mag(x1);
}
-
+
elmnt().Uturb() = sigma*fac*dir;
}
}
@@ -143,8 +140,4 @@ void gradientDispersionRAS::disperseParcels() const
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/noDispersion/noDispersion.C b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/noDispersion/noDispersion.C
index e3be5bf441e..2039b78d6d2 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/noDispersion/noDispersion.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/noDispersion/noDispersion.C
@@ -29,27 +29,24 @@ License
#include "noDispersion.H"
#include "addToRunTimeSelectionTable.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(noDispersion, 0);
-
-addToRunTimeSelectionTable
-(
- dispersionModel,
- noDispersion,
- dictionary
-);
+ defineTypeNameAndDebug(noDispersion, 0);
+
+ addToRunTimeSelectionTable
+ (
+ dispersionModel,
+ noDispersion,
+ dictionary
+ );
+}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
-noDispersion::noDispersion(const dictionary& dict, spray& sm)
+Foam::noDispersion::noDispersion(const dictionary& dict, spray& sm)
:
dispersionModel(dict, sm)
{}
@@ -57,20 +54,16 @@ noDispersion::noDispersion(const dictionary& dict, spray& sm)
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-noDispersion::~noDispersion()
+Foam::noDispersion::~noDispersion()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-void noDispersion::disperseParcels() const
+void Foam::noDispersion::disperseParcels() const
{
// Do nothing
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/stochasticDispersionRAS/stochasticDispersionRAS.C b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/stochasticDispersionRAS/stochasticDispersionRAS.C
index 5c8d8732f8b..2b9ef606371 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/stochasticDispersionRAS/stochasticDispersionRAS.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/dispersionModel/stochasticDispersionRAS/stochasticDispersionRAS.C
@@ -29,27 +29,24 @@ License
#include "stochasticDispersionRAS.H"
#include "addToRunTimeSelectionTable.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
+ defineTypeNameAndDebug(stochasticDispersionRAS, 0);
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(stochasticDispersionRAS, 0);
-
-addToRunTimeSelectionTable
-(
- dispersionModel,
- stochasticDispersionRAS,
- dictionary
-);
+ addToRunTimeSelectionTable
+ (
+ dispersionModel,
+ stochasticDispersionRAS,
+ dictionary
+ );
+}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
-stochasticDispersionRAS::stochasticDispersionRAS
+Foam::stochasticDispersionRAS::stochasticDispersionRAS
(
const dictionary& dict,
spray& sm
@@ -61,13 +58,13 @@ stochasticDispersionRAS::stochasticDispersionRAS
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-stochasticDispersionRAS::~stochasticDispersionRAS()
+Foam::stochasticDispersionRAS::~stochasticDispersionRAS()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-void stochasticDispersionRAS::disperseParcels() const
+void Foam::stochasticDispersionRAS::disperseParcels() const
{
const scalar cps = 0.16432;
@@ -91,7 +88,7 @@ void stochasticDispersionRAS::disperseParcels() const
scalar Tturb = min
(
- k[celli]/epsilon[celli],
+ k[celli]/epsilon[celli],
cps*pow(k[celli], 1.5)/epsilon[celli]/(UrelMag + SMALL)
);
@@ -103,25 +100,25 @@ void stochasticDispersionRAS::disperseParcels() const
if (elmnt().tTurb() > Tturb)
{
elmnt().tTurb() = 0.0;
-
+
scalar sigma = sqrt(2.0*k[celli]/3.0);
vector dir = 2.0*spray_.rndGen().vector01() - one;
dir /= mag(dir) + SMALL;
-
+
// numerical recipes... Ch. 7. Random Numbers...
scalar x1,x2;
scalar rsq = 10.0;
- while ((rsq > 1.0) || (rsq == 0.0))
+ while (rsq > 1.0 || rsq == 0.0)
{
x1 = 2.0*spray_.rndGen().scalar01() - 1.0;
x2 = 2.0*spray_.rndGen().scalar01() - 1.0;
rsq = x1*x1 + x2*x2;
}
-
+
scalar fac = sqrt(-2.0*log(rsq)/rsq);
-
+
fac *= mag(x1);
-
+
elmnt().Uturb() = sigma*fac*dir;
}
@@ -135,8 +132,4 @@ void stochasticDispersionRAS::disperseParcels() const
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/spraySubModels/dragModel/dragModel/dragModel.C b/src/lagrangian/dieselSpray/spraySubModels/dragModel/dragModel/dragModel.C
index 6f8308d1f83..35bc4fd75ee 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/dragModel/dragModel/dragModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/dragModel/dragModel/dragModel.C
@@ -29,21 +29,18 @@ License
#include "dragModel.H"
#include "parcel.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
+ defineTypeNameAndDebug(dragModel, 0);
+ defineRunTimeSelectionTable(dragModel, dictionary);
+}
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(dragModel, 0);
-
-defineRunTimeSelectionTable(dragModel, dictionary);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
-dragModel::dragModel(const dictionary& dict)
+Foam::dragModel::dragModel(const dictionary& dict)
:
dict_(dict)
{}
@@ -51,12 +48,8 @@ dragModel::dragModel(const dictionary& dict)
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-dragModel::~dragModel()
+Foam::dragModel::~dragModel()
{}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/spraySubModels/dragModel/dragModel/dragModel.H b/src/lagrangian/dieselSpray/spraySubModels/dragModel/dragModel/dragModel.H
index e3cecba0bae..eee7d5fdac5 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/dragModel/dragModel/dragModel.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/dragModel/dragModel/dragModel.H
@@ -34,7 +34,8 @@ Description
#define dragModel_H
#include "IOdictionary.H"
-#include "fvCFD.H"
+#include "volFields.H"
+#include "surfaceFields.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/dieselSpray/spraySubModels/dragModel/noDragModel/noDragModel.C b/src/lagrangian/dieselSpray/spraySubModels/dragModel/noDragModel/noDragModel.C
index ad5ea2510d4..32059fb0f64 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/dragModel/noDragModel/noDragModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/dragModel/noDragModel/noDragModel.C
@@ -29,26 +29,24 @@ License
#include "noDragModel.H"
#include "addToRunTimeSelectionTable.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
+ defineTypeNameAndDebug(noDragModel, 0);
+
+ addToRunTimeSelectionTable
+ (
+ dragModel,
+ noDragModel,
+ dictionary
+ );
+}
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(noDragModel, 0);
-
-addToRunTimeSelectionTable
-(
- dragModel,
- noDragModel,
- dictionary
-);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
-noDragModel::noDragModel(const dictionary& dict)
+Foam::noDragModel::noDragModel(const dictionary& dict)
:
dragModel(dict)
{}
@@ -56,13 +54,13 @@ noDragModel::noDragModel(const dictionary& dict)
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-noDragModel::~noDragModel()
+Foam::noDragModel::~noDragModel()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-scalar noDragModel::Cd
+Foam::scalar Foam::noDragModel::Cd
(
const scalar,
const scalar
@@ -72,7 +70,7 @@ scalar noDragModel::Cd
}
-scalar noDragModel::relaxationTime
+Foam::scalar Foam::noDragModel::relaxationTime
(
const vector&,
const scalar,
@@ -86,8 +84,4 @@ scalar noDragModel::relaxationTime
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/spraySubModels/dragModel/standardDragModel/standardDragModel.C b/src/lagrangian/dieselSpray/spraySubModels/dragModel/standardDragModel/standardDragModel.C
index 597e7eaea10..09fca3c7028 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/dragModel/standardDragModel/standardDragModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/dragModel/standardDragModel/standardDragModel.C
@@ -29,26 +29,24 @@ License
#include "standardDragModel.H"
#include "addToRunTimeSelectionTable.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
+ defineTypeNameAndDebug(standardDragModel, 0);
+
+ addToRunTimeSelectionTable
+ (
+ dragModel,
+ standardDragModel,
+ dictionary
+ );
+}
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(standardDragModel, 0);
-
-addToRunTimeSelectionTable
-(
- dragModel,
- standardDragModel,
- dictionary
-);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
-standardDragModel::standardDragModel(const dictionary& dict)
+Foam::standardDragModel::standardDragModel(const dictionary& dict)
:
dragModel(dict),
dragDict_(dict.subDict(typeName + "Coeffs")),
@@ -62,13 +60,13 @@ standardDragModel::standardDragModel(const dictionary& dict)
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-standardDragModel::~standardDragModel()
+Foam::standardDragModel::~standardDragModel()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-scalar standardDragModel::Cd
+Foam::scalar Foam::standardDragModel::Cd
(
const scalar Re,
const scalar dev
@@ -88,7 +86,7 @@ scalar standardDragModel::Cd
}
-scalar standardDragModel::relaxationTime
+Foam::scalar Foam::standardDragModel::relaxationTime
(
const vector& URel,
const scalar diameter,
@@ -119,8 +117,4 @@ scalar standardDragModel::relaxationTime
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/RutlandFlashBoil/RutlandFlashBoil.C b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/RutlandFlashBoil/RutlandFlashBoil.C
index afb24110d8d..30082e80894 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/RutlandFlashBoil/RutlandFlashBoil.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/RutlandFlashBoil/RutlandFlashBoil.C
@@ -30,27 +30,24 @@ License
#include "addToRunTimeSelectionTable.H"
#include "mathematicalConstants.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(RutlandFlashBoil, 0);
-
-addToRunTimeSelectionTable
-(
- evaporationModel,
- RutlandFlashBoil,
- dictionary
-);
+ defineTypeNameAndDebug(RutlandFlashBoil, 0);
+
+ addToRunTimeSelectionTable
+ (
+ evaporationModel,
+ RutlandFlashBoil,
+ dictionary
+ );
+}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from dictionary
-RutlandFlashBoil::RutlandFlashBoil( const dictionary& dict)
+Foam::RutlandFlashBoil::RutlandFlashBoil( const dictionary& dict)
:
evaporationModel(dict),
evapDict_(dict.subDict(typeName + "Coeffs")),
@@ -80,20 +77,20 @@ RutlandFlashBoil::RutlandFlashBoil( const dictionary& dict)
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-RutlandFlashBoil::~RutlandFlashBoil()
+Foam::RutlandFlashBoil::~RutlandFlashBoil()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-bool RutlandFlashBoil::evaporation() const
+bool Foam::RutlandFlashBoil::evaporation() const
{
return true;
}
// Correlation for the Sherwood Number
-scalar RutlandFlashBoil::Sh
+Foam::scalar Foam::RutlandFlashBoil::Sh
(
const scalar ReynoldsNumber,
const scalar SchmidtNumber
@@ -107,7 +104,7 @@ scalar RutlandFlashBoil::Sh
}
-scalar RutlandFlashBoil::relaxationTime
+Foam::scalar Foam::RutlandFlashBoil::relaxationTime
(
const scalar diameter,
const scalar liquidDensity,
@@ -181,7 +178,7 @@ scalar RutlandFlashBoil::relaxationTime
}
-scalar RutlandFlashBoil::boilingTime
+Foam::scalar Foam::RutlandFlashBoil::boilingTime
(
const scalar liquidDensity,
const scalar cpFuel,
@@ -351,14 +348,4 @@ scalar RutlandFlashBoil::boilingTime
}
-inline label RutlandFlashBoil::nEvapIter() const
-{
- return nEvapIter_;
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/RutlandFlashBoil/RutlandFlashBoil.H b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/RutlandFlashBoil/RutlandFlashBoil.H
index c207ea0d25b..887298a4fb5 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/RutlandFlashBoil/RutlandFlashBoil.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/RutlandFlashBoil/RutlandFlashBoil.H
@@ -135,7 +135,11 @@ public:
const scalar kLiquid
) const;
- inline label nEvapIter() const;
+ inline label nEvapIter() const
+ {
+ return nEvapIter_;
+ }
+
};
diff --git a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/evaporationModel/evaporationModel.C b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/evaporationModel/evaporationModel.C
index 96d1d6dd885..a7e322a3a36 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/evaporationModel/evaporationModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/evaporationModel/evaporationModel.C
@@ -24,36 +24,29 @@ License
\*---------------------------------------------------------------------------*/
-#include "error.H"
-
#include "evaporationModel.H"
-#include "fvCFD.H"
+#include "runTimeSelectionTables.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
-
-defineTypeNameAndDebug(evaporationModel, 0);
-
-defineRunTimeSelectionTable(evaporationModel, dictionary);
+ defineTypeNameAndDebug(evaporationModel, 0);
+ defineRunTimeSelectionTable(evaporationModel, dictionary);
+}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from dictionary
-evaporationModel::evaporationModel(const dictionary& dict)
+Foam::evaporationModel::evaporationModel(const dictionary& dict)
:
dict_(dict)
{}
+
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-evaporationModel::~evaporationModel()
+Foam::evaporationModel::~evaporationModel()
{}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/evaporationModel/evaporationModel.H b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/evaporationModel/evaporationModel.H
index 94d31d74aa1..c5ac818c45c 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/evaporationModel/evaporationModel.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/evaporationModel/evaporationModel.H
@@ -60,9 +60,9 @@ public:
//- Runtime type information
TypeName("evaporationModel");
- //- Evaluate the gaseous properties Tand Y (implicit/explicit)
- //word gasPropertyEvaluation_;
- //label nEvapIter_;
+ //- Evaluate the gaseous properties T and Y (implicit/explicit)
+ // word gasPropertyEvaluation_;
+ // label nEvapIter_;
// Declare runtime constructor selection table
@@ -82,7 +82,7 @@ public:
// Constructors
//- Construct from components
- evaporationModel(const dictionary& dict);
+ evaporationModel(const dictionary&);
//- Destructor
@@ -91,7 +91,7 @@ public:
// Selector
- static autoPtr<evaporationModel> New(const dictionary& dict);
+ static autoPtr<evaporationModel> New(const dictionary&);
// Member Functions
diff --git a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/evaporationModel/newEvaporationModel.C b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/evaporationModel/newEvaporationModel.C
index 2fa4aefce9d..55e4a541781 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/evaporationModel/newEvaporationModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/evaporationModel/newEvaporationModel.C
@@ -29,29 +29,23 @@ License
#include "evaporationModel.H"
#include "noEvaporation.H"
#include "standardEvaporationModel.H"
-#include "fvCFD.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-namespace Foam
+Foam::autoPtr<Foam::evaporationModel>
+Foam::evaporationModel::New(const dictionary& dict)
{
+ word modelType(dict.lookup("evaporationModel"));
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-autoPtr<evaporationModel> evaporationModel::New(const dictionary& dict)
-{
- word evaporationModelType(dict.lookup("evaporationModel"));
-
- Info<< "Selecting evaporationModel "
- << evaporationModelType << endl;
+ Info<< "Selecting evaporationModel " << modelType << endl;
dictionaryConstructorTable::iterator cstrIter =
- dictionaryConstructorTablePtr_->find(evaporationModelType);
+ dictionaryConstructorTablePtr_->find(modelType);
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
FatalErrorIn("evaporationModel::New(const dictionary&)")
- << "Unknown evaporationModelType type " << evaporationModelType
+ << "Unknown evaporationModelType type " << modelType
<< ", constructor not in hash table" << nl << nl
<< " Valid evaporationModel types are: " << nl
<< dictionaryConstructorTablePtr_->sortedToc()
@@ -62,8 +56,4 @@ autoPtr<evaporationModel> evaporationModel::New(const dictionary& dict)
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/noEvaporation/noEvaporation.C b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/noEvaporation/noEvaporation.C
index b92e1824e1a..4def5707659 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/noEvaporation/noEvaporation.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/noEvaporation/noEvaporation.C
@@ -29,26 +29,24 @@ License
#include "noEvaporation.H"
#include "addToRunTimeSelectionTable.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
+ defineTypeNameAndDebug(noEvaporation, 0);
+
+ addToRunTimeSelectionTable
+ (
+ evaporationModel,
+ noEvaporation,
+ dictionary
+ );
+}
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(noEvaporation, 0);
-
-addToRunTimeSelectionTable
-(
- evaporationModel,
- noEvaporation,
- dictionary
-);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from dictionary
-noEvaporation::noEvaporation( const dictionary& dict)
+Foam::noEvaporation::noEvaporation( const dictionary& dict)
:
evaporationModel(dict)
{}
@@ -56,19 +54,19 @@ noEvaporation::noEvaporation( const dictionary& dict)
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-noEvaporation::~noEvaporation()
+Foam::noEvaporation::~noEvaporation()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-bool noEvaporation::evaporation() const
+bool Foam::noEvaporation::evaporation() const
{
return false;
}
-scalar noEvaporation::Sh
+Foam::scalar Foam::noEvaporation::Sh
(
const scalar,
const scalar
@@ -78,7 +76,7 @@ scalar noEvaporation::Sh
}
-scalar noEvaporation::relaxationTime
+Foam::scalar Foam::noEvaporation::relaxationTime
(
const scalar,
const scalar,
@@ -97,7 +95,7 @@ scalar noEvaporation::relaxationTime
}
-scalar noEvaporation::boilingTime
+Foam::scalar Foam::noEvaporation::boilingTime
(
const scalar,
const scalar,
@@ -121,14 +119,4 @@ scalar noEvaporation::boilingTime
}
-inline label noEvaporation::nEvapIter() const
-{
- return 0;
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/noEvaporation/noEvaporation.H b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/noEvaporation/noEvaporation.H
index 6aaf8038db1..d61aa7ce9fb 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/noEvaporation/noEvaporation.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/noEvaporation/noEvaporation.H
@@ -111,7 +111,11 @@ public:
const scalar kLiq
) const;
- inline label nEvapIter() const;
+ inline label nEvapIter() const
+ {
+ return 0;
+ }
+
};
diff --git a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/saturateEvaporationModel/saturateEvaporationModel.C b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/saturateEvaporationModel/saturateEvaporationModel.C
index ac6e8af4e0b..221ff5b883d 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/saturateEvaporationModel/saturateEvaporationModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/saturateEvaporationModel/saturateEvaporationModel.C
@@ -29,27 +29,24 @@ License
#include "saturateEvaporationModel.H"
#include "addToRunTimeSelectionTable.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(saturateEvaporationModel, 0);
-
-addToRunTimeSelectionTable
-(
- evaporationModel,
- saturateEvaporationModel,
- dictionary
-);
+ defineTypeNameAndDebug(saturateEvaporationModel, 0);
+
+ addToRunTimeSelectionTable
+ (
+ evaporationModel,
+ saturateEvaporationModel,
+ dictionary
+ );
+}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from dictionary
-saturateEvaporationModel::saturateEvaporationModel
+Foam::saturateEvaporationModel::saturateEvaporationModel
(
const dictionary& dict
)
@@ -60,20 +57,20 @@ saturateEvaporationModel::saturateEvaporationModel
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-saturateEvaporationModel::~saturateEvaporationModel()
+Foam::saturateEvaporationModel::~saturateEvaporationModel()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-bool saturateEvaporationModel::evaporation() const
+bool Foam::saturateEvaporationModel::evaporation() const
{
return true;
}
// Correlation for the Sherwood Number
-scalar saturateEvaporationModel::Sh
+Foam::scalar Foam::saturateEvaporationModel::Sh
(
const scalar ReynoldsNumber,
const scalar SchmidtNumber
@@ -83,7 +80,7 @@ scalar saturateEvaporationModel::Sh
}
-scalar saturateEvaporationModel::relaxationTime
+Foam::scalar Foam::saturateEvaporationModel::relaxationTime
(
const scalar diameter,
const scalar liquidDensity,
@@ -102,7 +99,7 @@ scalar saturateEvaporationModel::relaxationTime
}
-scalar saturateEvaporationModel::boilingTime
+Foam::scalar Foam::saturateEvaporationModel::boilingTime
(
const scalar liquidDensity,
const scalar cpFuel,
@@ -142,14 +139,4 @@ scalar saturateEvaporationModel::boilingTime
}
-inline label saturateEvaporationModel::nEvapIter() const
-{
- return 1;
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/saturateEvaporationModel/saturateEvaporationModel.H b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/saturateEvaporationModel/saturateEvaporationModel.H
index 8a9bf1e3755..9c4430c6919 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/saturateEvaporationModel/saturateEvaporationModel.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/saturateEvaporationModel/saturateEvaporationModel.H
@@ -123,7 +123,12 @@ public:
const scalar
) const;
- inline label nEvapIter() const;
+ inline label nEvapIter() const
+ {
+ return 1;
+ }
+
+
};
diff --git a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/standardEvaporationModel/standardEvaporationModel.C b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/standardEvaporationModel/standardEvaporationModel.C
index de169440c0a..a8d3f61f3da 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/standardEvaporationModel/standardEvaporationModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/standardEvaporationModel/standardEvaporationModel.C
@@ -29,27 +29,24 @@ License
#include "standardEvaporationModel.H"
#include "addToRunTimeSelectionTable.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(standardEvaporationModel, 0);
-
-addToRunTimeSelectionTable
-(
- evaporationModel,
- standardEvaporationModel,
- dictionary
-);
+ defineTypeNameAndDebug(standardEvaporationModel, 0);
+
+ addToRunTimeSelectionTable
+ (
+ evaporationModel,
+ standardEvaporationModel,
+ dictionary
+ );
+}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from dictionary
-standardEvaporationModel::standardEvaporationModel
+Foam::standardEvaporationModel::standardEvaporationModel
(
const dictionary& dict
)
@@ -82,20 +79,20 @@ standardEvaporationModel::standardEvaporationModel
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-standardEvaporationModel::~standardEvaporationModel()
+Foam::standardEvaporationModel::~standardEvaporationModel()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-bool standardEvaporationModel::evaporation() const
+bool Foam::standardEvaporationModel::evaporation() const
{
return true;
}
// Correlation for the Sherwood Number
-scalar standardEvaporationModel::Sh
+Foam::scalar Foam::standardEvaporationModel::Sh
(
const scalar ReynoldsNumber,
const scalar SchmidtNumber
@@ -109,7 +106,7 @@ scalar standardEvaporationModel::Sh
}
-scalar standardEvaporationModel::relaxationTime
+Foam::scalar Foam::standardEvaporationModel::relaxationTime
(
const scalar diameter,
const scalar liquidDensity,
@@ -169,7 +166,7 @@ scalar standardEvaporationModel::relaxationTime
}
-scalar standardEvaporationModel::boilingTime
+Foam::scalar Foam::standardEvaporationModel::boilingTime
(
const scalar liquidDensity,
const scalar cpFuel,
@@ -207,14 +204,4 @@ scalar standardEvaporationModel::boilingTime
}
-inline label standardEvaporationModel::nEvapIter() const
-{
- return nEvapIter_;
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/standardEvaporationModel/standardEvaporationModel.H b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/standardEvaporationModel/standardEvaporationModel.H
index 4083a7336b3..51528e6c90e 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/standardEvaporationModel/standardEvaporationModel.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/standardEvaporationModel/standardEvaporationModel.H
@@ -126,7 +126,11 @@ public:
const scalar
) const;
- inline label nEvapIter() const;
+ inline label nEvapIter() const
+ {
+ return nEvapIter_;
+ }
+
};
diff --git a/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/RanzMarshall/RanzMarshall.C b/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/RanzMarshall/RanzMarshall.C
index 5b69f9183ef..03403f4ef78 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/RanzMarshall/RanzMarshall.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/RanzMarshall/RanzMarshall.C
@@ -29,26 +29,24 @@ License
#include "RanzMarshall.H"
#include "addToRunTimeSelectionTable.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
+ defineTypeNameAndDebug(RanzMarshall, 0);
+
+ addToRunTimeSelectionTable
+ (
+ heatTransferModel,
+ RanzMarshall,
+ dictionary
+ );
+}
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(RanzMarshall, 0);
-
-addToRunTimeSelectionTable
-(
- heatTransferModel,
- RanzMarshall,
- dictionary
-);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
-RanzMarshall::RanzMarshall(const dictionary& dict)
+Foam::RanzMarshall::RanzMarshall(const dictionary& dict)
:
heatTransferModel(dict),
heatDict_(dict.subDict(typeName + "Coeffs")),
@@ -60,19 +58,19 @@ RanzMarshall::RanzMarshall(const dictionary& dict)
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-RanzMarshall::~RanzMarshall()
+Foam::RanzMarshall::~RanzMarshall()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-bool RanzMarshall::heatTransfer() const
+bool Foam::RanzMarshall::heatTransfer() const
{
return true;
}
-scalar RanzMarshall::Nu
+Foam::scalar Foam::RanzMarshall::Nu
(
const scalar ReynoldsNumber,
const scalar PrandtlNumber
@@ -86,7 +84,7 @@ scalar RanzMarshall::Nu
}
-scalar RanzMarshall::relaxationTime
+Foam::scalar Foam::RanzMarshall::relaxationTime
(
const scalar liquidDensity,
const scalar diameter,
@@ -108,7 +106,7 @@ scalar RanzMarshall::relaxationTime
}
-scalar RanzMarshall::fCorrection(const scalar z) const
+Foam::scalar Foam::RanzMarshall::fCorrection(const scalar z) const
{
scalar correct;
if (z > 0.01)
@@ -132,8 +130,4 @@ scalar RanzMarshall::fCorrection(const scalar z) const
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/heatTransferModel/heatTransferModel.C b/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/heatTransferModel/heatTransferModel.C
index 0bc9c4604f2..a49adab680e 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/heatTransferModel/heatTransferModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/heatTransferModel/heatTransferModel.C
@@ -26,32 +26,24 @@ License
#include "heatTransferModel.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(heatTransferModel, 0);
-
-defineRunTimeSelectionTable(heatTransferModel, dictionary);
+ defineTypeNameAndDebug(heatTransferModel, 0);
+ defineRunTimeSelectionTable(heatTransferModel, dictionary);
+}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from dictionary
-heatTransferModel::heatTransferModel(const dictionary& dict)
+Foam::heatTransferModel::heatTransferModel(const dictionary& dict)
:
dict_(dict)
{}
-heatTransferModel::~heatTransferModel()
+Foam::heatTransferModel::~heatTransferModel()
{}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/noHeatTransfer/noHeatTransfer.C b/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/noHeatTransfer/noHeatTransfer.C
index 6779a70445a..a2e22d0537d 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/noHeatTransfer/noHeatTransfer.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/noHeatTransfer/noHeatTransfer.C
@@ -27,27 +27,24 @@ License
#include "noHeatTransfer.H"
#include "addToRunTimeSelectionTable.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(noHeatTransfer, 0);
-
-addToRunTimeSelectionTable
-(
- heatTransferModel,
- noHeatTransfer,
- dictionary
-);
+ defineTypeNameAndDebug(noHeatTransfer, 0);
+
+ addToRunTimeSelectionTable
+ (
+ heatTransferModel,
+ noHeatTransfer,
+ dictionary
+ );
+}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
-noHeatTransfer::noHeatTransfer(const dictionary& dict)
+Foam::noHeatTransfer::noHeatTransfer(const dictionary& dict)
:
heatTransferModel(dict)
{}
@@ -55,25 +52,25 @@ noHeatTransfer::noHeatTransfer(const dictionary& dict)
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-noHeatTransfer::~noHeatTransfer()
+Foam::noHeatTransfer::~noHeatTransfer()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-bool noHeatTransfer::heatTransfer() const
+bool Foam::noHeatTransfer::heatTransfer() const
{
return false;
}
-scalar noHeatTransfer::Nu(const scalar, const scalar) const
+Foam::scalar Foam::noHeatTransfer::Nu(const scalar, const scalar) const
{
return 0.0;
}
-scalar noHeatTransfer::relaxationTime
+Foam::scalar Foam::noHeatTransfer::relaxationTime
(
const scalar,
const scalar,
@@ -87,14 +84,10 @@ scalar noHeatTransfer::relaxationTime
}
-scalar noHeatTransfer::fCorrection(const scalar) const
+Foam::scalar Foam::noHeatTransfer::fCorrection(const scalar) const
{
return 1.0;
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.C b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.C
index 5a48bc9fca5..661a2ea7b24 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.C
@@ -28,27 +28,24 @@ License
#include "addToRunTimeSelectionTable.H"
#include "mathematicalConstants.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
+ defineTypeNameAndDebug(ChomiakInjector, 0);
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(ChomiakInjector, 0);
-
-addToRunTimeSelectionTable
-(
- injectorModel,
- ChomiakInjector,
- dictionary
-);
+ addToRunTimeSelectionTable
+ (
+ injectorModel,
+ ChomiakInjector,
+ dictionary
+ );
+}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
-ChomiakInjector::ChomiakInjector
+Foam::ChomiakInjector::ChomiakInjector
(
const dictionary& dict,
spray& sm
@@ -88,13 +85,13 @@ ChomiakInjector::ChomiakInjector
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-ChomiakInjector::~ChomiakInjector()
+Foam::ChomiakInjector::~ChomiakInjector()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-scalar ChomiakInjector::d0
+Foam::scalar Foam::ChomiakInjector::d0
(
const label,
const scalar
@@ -104,7 +101,7 @@ scalar ChomiakInjector::d0
}
-vector ChomiakInjector::direction
+Foam::vector Foam::ChomiakInjector::direction
(
const label n,
const label hole,
@@ -162,7 +159,7 @@ vector ChomiakInjector::direction
}
-scalar ChomiakInjector::velocity
+Foam::scalar Foam::ChomiakInjector::velocity
(
const label i,
const scalar time
@@ -184,7 +181,7 @@ scalar ChomiakInjector::velocity
}
-scalar ChomiakInjector::averageVelocity(const label i) const
+Foam::scalar Foam::ChomiakInjector::averageVelocity(const label i) const
{
const injectorType& it = sm_.injectors()[i].properties();
scalar dt = it.teoi() - it.tsoi();
@@ -192,8 +189,4 @@ scalar ChomiakInjector::averageVelocity(const label i) const
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/blobsSwirl/blobsSwirlInjector.C b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/blobsSwirl/blobsSwirlInjector.C
index 7c996a0cf9c..268ecd45e2c 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/blobsSwirl/blobsSwirlInjector.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/blobsSwirl/blobsSwirlInjector.C
@@ -28,27 +28,24 @@ License
#include "addToRunTimeSelectionTable.H"
#include "unitConversion.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(blobsSwirlInjector, 0);
-
-addToRunTimeSelectionTable
-(
- injectorModel,
- blobsSwirlInjector,
- dictionary
-);
+ defineTypeNameAndDebug(blobsSwirlInjector, 0);
+
+ addToRunTimeSelectionTable
+ (
+ injectorModel,
+ blobsSwirlInjector,
+ dictionary
+ );
+}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
-blobsSwirlInjector::blobsSwirlInjector
+Foam::blobsSwirlInjector::blobsSwirlInjector
(
const dictionary& dict,
spray& sm
@@ -94,13 +91,13 @@ blobsSwirlInjector::blobsSwirlInjector
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-blobsSwirlInjector::~blobsSwirlInjector()
+Foam::blobsSwirlInjector::~blobsSwirlInjector()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-scalar blobsSwirlInjector::d0
+Foam::scalar Foam::blobsSwirlInjector::d0
(
const label n,
const scalar t
@@ -132,7 +129,7 @@ scalar blobsSwirlInjector::d0
}
-vector blobsSwirlInjector::direction
+Foam::vector Foam::blobsSwirlInjector::direction
(
const label n,
const label hole,
@@ -182,7 +179,7 @@ vector blobsSwirlInjector::direction
}
-scalar blobsSwirlInjector::velocity
+Foam::scalar Foam::blobsSwirlInjector::velocity
(
const label i,
const scalar time
@@ -192,7 +189,7 @@ scalar blobsSwirlInjector::velocity
}
-scalar blobsSwirlInjector::averageVelocity(const label i) const
+Foam::scalar Foam::blobsSwirlInjector::averageVelocity(const label i) const
{
const injectorType& it = sm_.injectors()[i].properties();
@@ -210,13 +207,13 @@ scalar blobsSwirlInjector::averageVelocity(const label i) const
}
-scalar blobsSwirlInjector::kv(const label inj) const
+Foam::scalar Foam::blobsSwirlInjector::kv(const label inj) const
{
return cD_[inj]/cos(angle_) * sqrt((1.0 - x_)/(1.0 + x_));
}
-void blobsSwirlInjector::calculateHX
+void Foam::blobsSwirlInjector::calculateHX
(
const label inj,
const scalar massFlow,
@@ -277,7 +274,7 @@ void blobsSwirlInjector::calculateHX
}
-scalar blobsSwirlInjector::deltaPressureInj
+Foam::scalar Foam::blobsSwirlInjector::deltaPressureInj
(
const scalar time,
const label inj
@@ -289,7 +286,7 @@ scalar blobsSwirlInjector::deltaPressureInj
}
-scalar blobsSwirlInjector::averagePressure(const label inj) const
+Foam::scalar Foam::blobsSwirlInjector::averagePressure(const label inj) const
{
const injectorType& it = sm_.injectors()[inj].properties();
@@ -298,8 +295,4 @@ scalar blobsSwirlInjector::averagePressure(const label inj) const
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/constant/constInjector.C b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/constant/constInjector.C
index bc58618be6b..47c19f096a1 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/constant/constInjector.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/constant/constInjector.C
@@ -28,27 +28,24 @@ License
#include "addToRunTimeSelectionTable.H"
#include "mathematicalConstants.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(constInjector, 0);
-
-addToRunTimeSelectionTable
-(
- injectorModel,
- constInjector,
- dictionary
-);
+ defineTypeNameAndDebug(constInjector, 0);
+
+ addToRunTimeSelectionTable
+ (
+ injectorModel,
+ constInjector,
+ dictionary
+ );
+}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
-constInjector::constInjector
+Foam::constInjector::constInjector
(
const dictionary& dict,
spray& sm
@@ -93,13 +90,13 @@ constInjector::constInjector
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-constInjector::~constInjector()
+Foam::constInjector::~constInjector()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-scalar constInjector::d0
+Foam::scalar Foam::constInjector::d0
(
const label n,
const scalar
@@ -109,7 +106,7 @@ scalar constInjector::d0
}
-vector constInjector::direction
+Foam::vector Foam::constInjector::direction
(
const label n,
const label hole,
@@ -125,12 +122,12 @@ vector constInjector::direction
= maximum sin(sprayAngle/2)
beta = angle in the normal plane
- o / (beta)
- |\ /
- | \ /)
- | \ o-----------> (x-axis)
- | \
- v (alpha)
+ o / (beta)
+ |\ /
+ | \ /)
+ | \ o-----------> (x-axis)
+ | \
+ v (alpha)
*/
scalar angle = rndGen_.scalar01()*sprayAngle_[n]*constant::mathematical::pi/360.0;
@@ -176,7 +173,7 @@ vector constInjector::direction
}
-scalar constInjector::velocity
+Foam::scalar Foam::constInjector::velocity
(
const label i,
const scalar time
@@ -198,7 +195,7 @@ scalar constInjector::velocity
}
-scalar constInjector::averageVelocity(const label i) const
+Foam::scalar Foam::constInjector::averageVelocity(const label i) const
{
const injectorType& it = sm_.injectors()[i].properties();
scalar dt = it.teoi() - it.tsoi();
@@ -207,8 +204,4 @@ scalar constInjector::averageVelocity(const label i) const
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.C b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.C
index bc5add5df31..883dc9c4319 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.C
@@ -28,27 +28,24 @@ License
#include "addToRunTimeSelectionTable.H"
#include "mathematicalConstants.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
+ defineTypeNameAndDebug(definedHollowConeInjector, 0);
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(definedHollowConeInjector, 0);
-
-addToRunTimeSelectionTable
-(
- injectorModel,
- definedHollowConeInjector,
- dictionary
-);
+ addToRunTimeSelectionTable
+ (
+ injectorModel,
+ definedHollowConeInjector,
+ dictionary
+ );
+}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
-definedHollowConeInjector::definedHollowConeInjector
+Foam::definedHollowConeInjector::definedHollowConeInjector
(
const dictionary& dict,
spray& sm
@@ -128,13 +125,13 @@ definedHollowConeInjector::definedHollowConeInjector
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-definedHollowConeInjector::~definedHollowConeInjector()
+Foam::definedHollowConeInjector::~definedHollowConeInjector()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-scalar definedHollowConeInjector::d0
+Foam::scalar Foam::definedHollowConeInjector::d0
(
const label n,
const scalar t
@@ -146,7 +143,7 @@ scalar definedHollowConeInjector::d0
}
-vector definedHollowConeInjector::direction
+Foam::vector Foam::definedHollowConeInjector::direction
(
const label n,
const label hole,
@@ -204,7 +201,7 @@ vector definedHollowConeInjector::direction
}
-scalar definedHollowConeInjector::velocity
+Foam::scalar Foam::definedHollowConeInjector::velocity
(
const label i,
const scalar time
@@ -226,7 +223,8 @@ scalar definedHollowConeInjector::velocity
}
-scalar definedHollowConeInjector::averageVelocity(const label i) const
+Foam::scalar
+Foam::definedHollowConeInjector::averageVelocity(const label i) const
{
const injectorType& it = sm_.injectors()[i].properties();
scalar dt = it.teoi() - it.tsoi();
@@ -234,8 +232,4 @@ scalar definedHollowConeInjector::averageVelocity(const label i) const
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedPressureSwirl/definedPressureSwirl.C b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedPressureSwirl/definedPressureSwirl.C
index 0308dcb1327..9dcd5baeb6c 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedPressureSwirl/definedPressureSwirl.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedPressureSwirl/definedPressureSwirl.C
@@ -28,27 +28,24 @@ License
#include "addToRunTimeSelectionTable.H"
#include "mathematicalConstants.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
+ defineTypeNameAndDebug(definedPressureSwirlInjector, 0);
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(definedPressureSwirlInjector, 0);
-
-addToRunTimeSelectionTable
-(
- injectorModel,
- definedPressureSwirlInjector,
- dictionary
-);
+ addToRunTimeSelectionTable
+ (
+ injectorModel,
+ definedPressureSwirlInjector,
+ dictionary
+ );
+}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
-definedPressureSwirlInjector::definedPressureSwirlInjector
+Foam::definedPressureSwirlInjector::definedPressureSwirlInjector
(
const dictionary& dict,
spray& sm
@@ -80,13 +77,13 @@ definedPressureSwirlInjector::definedPressureSwirlInjector
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-definedPressureSwirlInjector::~definedPressureSwirlInjector()
+Foam::definedPressureSwirlInjector::~definedPressureSwirlInjector()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-scalar definedPressureSwirlInjector::d0
+Foam::scalar Foam::definedPressureSwirlInjector::d0
(
const label n,
const scalar t
@@ -206,7 +203,7 @@ scalar definedPressureSwirlInjector::d0
}
-vector definedPressureSwirlInjector::direction
+Foam::vector Foam::definedPressureSwirlInjector::direction
(
const label n,
const label hole,
@@ -255,7 +252,7 @@ vector definedPressureSwirlInjector::direction
}
-scalar definedPressureSwirlInjector::velocity
+Foam::scalar Foam::definedPressureSwirlInjector::velocity
(
const label i,
const scalar time
@@ -265,7 +262,7 @@ scalar definedPressureSwirlInjector::velocity
}
-scalar definedPressureSwirlInjector::averageVelocity(const label i) const
+Foam::scalar Foam::definedPressureSwirlInjector::averageVelocity(const label i) const
{
const injectorType& it = sm_.injectors()[i].properties();
@@ -284,7 +281,7 @@ scalar definedPressureSwirlInjector::averageVelocity(const label i) const
}
-scalar definedPressureSwirlInjector::kv
+Foam::scalar Foam::definedPressureSwirlInjector::kv
(
const label inj,
const scalar massFlow,
@@ -316,7 +313,7 @@ scalar definedPressureSwirlInjector::kv
}
-scalar definedPressureSwirlInjector::deltaPressureInj
+Foam::scalar Foam::definedPressureSwirlInjector::deltaPressureInj
(
const scalar time,
const label inj
@@ -328,7 +325,8 @@ scalar definedPressureSwirlInjector::deltaPressureInj
}
-scalar definedPressureSwirlInjector::averagePressure(const label inj) const
+Foam::scalar
+Foam::definedPressureSwirlInjector::averagePressure(const label inj) const
{
const injectorType& it = sm_.injectors()[inj].properties();
@@ -337,8 +335,4 @@ scalar definedPressureSwirlInjector::averagePressure(const label inj) const
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.C b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.C
index 3d77b3aed39..40508fda7ee 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.C
@@ -28,27 +28,24 @@ License
#include "addToRunTimeSelectionTable.H"
#include "mathematicalConstants.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
+ defineTypeNameAndDebug(hollowConeInjector, 0);
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(hollowConeInjector, 0);
-
-addToRunTimeSelectionTable
-(
- injectorModel,
- hollowConeInjector,
- dictionary
-);
+ addToRunTimeSelectionTable
+ (
+ injectorModel,
+ hollowConeInjector,
+ dictionary
+ );
+}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
-hollowConeInjector::hollowConeInjector
+Foam::hollowConeInjector::hollowConeInjector
(
const dictionary& dict,
spray& sm
@@ -104,13 +101,13 @@ hollowConeInjector::hollowConeInjector
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-hollowConeInjector::~hollowConeInjector()
+Foam::hollowConeInjector::~hollowConeInjector()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-scalar hollowConeInjector::d0
+Foam::scalar Foam::hollowConeInjector::d0
(
const label,
const scalar
@@ -120,7 +117,7 @@ scalar hollowConeInjector::d0
}
-vector hollowConeInjector::direction
+Foam::vector Foam::hollowConeInjector::direction
(
const label n,
const label hole,
@@ -171,7 +168,7 @@ vector hollowConeInjector::direction
}
-scalar hollowConeInjector::velocity
+Foam::scalar Foam::hollowConeInjector::velocity
(
const label i,
const scalar time
@@ -193,7 +190,7 @@ scalar hollowConeInjector::velocity
}
-scalar hollowConeInjector::averageVelocity(const label i) const
+Foam::scalar Foam::hollowConeInjector::averageVelocity(const label i) const
{
const injectorType& it = sm_.injectors()[i].properties();
scalar dt = it.teoi() - it.tsoi();
@@ -201,8 +198,4 @@ scalar hollowConeInjector::averageVelocity(const label i) const
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/injectorModel/injectorModel.C b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/injectorModel/injectorModel.C
index 0e428b3066b..069da4c0339 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/injectorModel/injectorModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/injectorModel/injectorModel.C
@@ -29,21 +29,18 @@ License
#include "injectorModel.H"
#include "volFields.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
+ defineTypeNameAndDebug(injectorModel, 0);
+ defineRunTimeSelectionTable(injectorModel, dictionary);
+}
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(injectorModel, 0);
-
-defineRunTimeSelectionTable(injectorModel, dictionary);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
-injectorModel::injectorModel
+Foam::injectorModel::injectorModel
(
const dictionary& dict,
spray& sm
@@ -58,12 +55,8 @@ injectorModel::injectorModel
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-injectorModel::~injectorModel()
+Foam::injectorModel::~injectorModel()
{}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/pressureSwirl/pressureSwirlInjector.C b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/pressureSwirl/pressureSwirlInjector.C
index 04f5807fe55..229a2c18b54 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/pressureSwirl/pressureSwirlInjector.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/pressureSwirl/pressureSwirlInjector.C
@@ -28,27 +28,24 @@ License
#include "addToRunTimeSelectionTable.H"
#include "mathematicalConstants.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
+ defineTypeNameAndDebug(pressureSwirlInjector, 0);
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(pressureSwirlInjector, 0);
-
-addToRunTimeSelectionTable
-(
- injectorModel,
- pressureSwirlInjector,
- dictionary
-);
+ addToRunTimeSelectionTable
+ (
+ injectorModel,
+ pressureSwirlInjector,
+ dictionary
+ );
+}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
-pressureSwirlInjector::pressureSwirlInjector
+Foam::pressureSwirlInjector::pressureSwirlInjector
(
const dictionary& dict,
spray& sm
@@ -90,13 +87,13 @@ pressureSwirlInjector::pressureSwirlInjector
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-pressureSwirlInjector::~pressureSwirlInjector()
+Foam::pressureSwirlInjector::~pressureSwirlInjector()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-scalar pressureSwirlInjector::d0
+Foam::scalar Foam::pressureSwirlInjector::d0
(
const label n,
const scalar t
@@ -128,7 +125,7 @@ scalar pressureSwirlInjector::d0
}
-vector pressureSwirlInjector::direction
+Foam::vector Foam::pressureSwirlInjector::direction
(
const label n,
const label hole,
@@ -177,7 +174,7 @@ vector pressureSwirlInjector::direction
}
-scalar pressureSwirlInjector::velocity
+Foam::scalar Foam::pressureSwirlInjector::velocity
(
const label i,
const scalar time
@@ -187,7 +184,7 @@ scalar pressureSwirlInjector::velocity
}
-scalar pressureSwirlInjector::averageVelocity(const label i) const
+Foam::scalar Foam::pressureSwirlInjector::averageVelocity(const label i) const
{
const injectorType& it = sm_.injectors()[i].properties();
@@ -206,7 +203,7 @@ scalar pressureSwirlInjector::averageVelocity(const label i) const
}
-scalar pressureSwirlInjector::kv
+Foam::scalar Foam::pressureSwirlInjector::kv
(
const label inj,
const scalar massFlow,
@@ -237,7 +234,7 @@ scalar pressureSwirlInjector::kv
}
-scalar pressureSwirlInjector::deltaPressureInj
+Foam::scalar Foam::pressureSwirlInjector::deltaPressureInj
(
const scalar time,
const label inj
@@ -249,7 +246,7 @@ scalar pressureSwirlInjector::deltaPressureInj
}
-scalar pressureSwirlInjector::averagePressure(const label inj) const
+Foam::scalar Foam::pressureSwirlInjector::averagePressure(const label inj) const
{
const injectorType& it = sm_.injectors()[inj].properties();
@@ -259,8 +256,4 @@ scalar pressureSwirlInjector::averagePressure(const label inj) const
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/spraySubModels/wallModel/reflectParcel/reflectParcel.C b/src/lagrangian/dieselSpray/spraySubModels/wallModel/reflectParcel/reflectParcel.C
index 9d631553e57..cd9f8a5d934 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/wallModel/reflectParcel/reflectParcel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/wallModel/reflectParcel/reflectParcel.C
@@ -28,27 +28,24 @@ License
#include "addToRunTimeSelectionTable.H"
#include "wallPolyPatch.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(reflectParcel, 0);
-
-addToRunTimeSelectionTable
-(
- wallModel,
- reflectParcel,
- dictionary
-);
+ defineTypeNameAndDebug(reflectParcel, 0);
+
+ addToRunTimeSelectionTable
+ (
+ wallModel,
+ reflectParcel,
+ dictionary
+ );
+}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
-reflectParcel::reflectParcel
+Foam::reflectParcel::reflectParcel
(
const dictionary& dict,
const volVectorField& U,
@@ -64,14 +61,14 @@ reflectParcel::reflectParcel
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-reflectParcel::~reflectParcel()
+Foam::reflectParcel::~reflectParcel()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
// Return 'keepParcel'
-bool reflectParcel::wallTreatment
+bool Foam::reflectParcel::wallTreatment
(
parcel& p,
const label globalFacei
@@ -156,7 +153,7 @@ bool reflectParcel::wallTreatment
// translation
vector Ur = p.U() - Ub;
scalar Urn = Ur & Sf;
- /*
+ /*
if (mag(Ub-v) > SMALL)
{
Info<< "reflectParcel:: v = " << v
@@ -167,7 +164,7 @@ bool reflectParcel::wallTreatment
<< ", name = " << mesh_.boundaryMesh()[patchi].name()
<< endl;
}
- */
+ */
if (Urn > 0.0)
{
p.U() -= (1.0 + elasticity_)*Urn*Sf;
@@ -187,8 +184,4 @@ bool reflectParcel::wallTreatment
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/spraySubModels/wallModel/removeParcel/removeParcel.C b/src/lagrangian/dieselSpray/spraySubModels/wallModel/removeParcel/removeParcel.C
index fb89e4f1c9d..b0bd8ec1779 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/wallModel/removeParcel/removeParcel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/wallModel/removeParcel/removeParcel.C
@@ -27,29 +27,24 @@ License
#include "removeParcel.H"
#include "addToRunTimeSelectionTable.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(removeParcel, 0);
-
-addToRunTimeSelectionTable
-(
- wallModel,
- removeParcel,
- dictionary
-);
-
-// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
+ defineTypeNameAndDebug(removeParcel, 0);
+
+ addToRunTimeSelectionTable
+ (
+ wallModel,
+ removeParcel,
+ dictionary
+ );
+}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
-removeParcel::removeParcel
+Foam::removeParcel::removeParcel
(
const dictionary& dict,
const volVectorField& U,
@@ -62,13 +57,13 @@ removeParcel::removeParcel
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-removeParcel::~removeParcel()
+Foam::removeParcel::~removeParcel()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-bool removeParcel::wallTreatment
+bool Foam::removeParcel::wallTreatment
(
parcel&,
const label facei
@@ -78,8 +73,4 @@ bool removeParcel::wallTreatment
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/spraySubModels/wallModel/wallModel/wallModel.C b/src/lagrangian/dieselSpray/spraySubModels/wallModel/wallModel/wallModel.C
index 0fbe08c755a..1d77684178a 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/wallModel/wallModel/wallModel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/wallModel/wallModel/wallModel.C
@@ -26,21 +26,18 @@ License
#include "wallModel.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(wallModel, 0);
-
-defineRunTimeSelectionTable(wallModel, dictionary);
+ defineTypeNameAndDebug(wallModel, 0);
+ defineRunTimeSelectionTable(wallModel, dictionary);
+}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-wallModel::wallModel
+Foam::wallModel::wallModel
(
const dictionary& dict,
const volVectorField& U,
@@ -55,12 +52,8 @@ wallModel::wallModel
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-wallModel::~wallModel()
+Foam::wallModel::~wallModel()
{}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
// ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/spraySubModels/wallModel/wallModel/wallModel.H b/src/lagrangian/dieselSpray/spraySubModels/wallModel/wallModel/wallModel.H
index 75bf1b30221..a609e80853b 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/wallModel/wallModel/wallModel.H
+++ b/src/lagrangian/dieselSpray/spraySubModels/wallModel/wallModel/wallModel.H
@@ -40,10 +40,12 @@ SourceFiles
#include "spray.H"
#include "IOdictionary.H"
-#include "fvCFD.H"
#include "autoPtr.H"
#include "runTimeSelectionTables.H"
+#include "volFields.H"
+#include "surfaceFields.H"
+
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
@@ -91,9 +93,9 @@ public:
//- Construct from components
wallModel
(
- const dictionary& dict,
+ const dictionary&,
const volVectorField& U,
- spray& sm
+ spray&
);
@@ -105,7 +107,7 @@ public:
static autoPtr<wallModel> New
(
- const dictionary& dict,
+ const dictionary&,
const volVectorField& U,
spray& sm
);
@@ -116,7 +118,7 @@ public:
//- Return true if parcel is to be kept, false if it is to be removed
virtual bool wallTreatment
(
- parcel& parcel,
+ parcel&,
const label facei
) const = 0;
};
diff --git a/src/lagrangian/molecularDynamics/molecule/Make/options b/src/lagrangian/molecularDynamics/molecule/Make/options
index 620e87e138d..9354036e6f4 100644
--- a/src/lagrangian/molecularDynamics/molecule/Make/options
+++ b/src/lagrangian/molecularDynamics/molecule/Make/options
@@ -8,5 +8,5 @@ EXE_LIBS = \
-lfiniteVolume \
-llagrangian \
-lpotential \
- -lmolecularMeasurements
+ -lmolecularMeasurements
diff --git a/src/meshTools/octree/treeBoundBox.H b/src/meshTools/octree/treeBoundBox.H
index a0fa8a1f51a..287bc63a6f7 100644
--- a/src/meshTools/octree/treeBoundBox.H
+++ b/src/meshTools/octree/treeBoundBox.H
@@ -254,7 +254,7 @@ public:
// second the octant with boundary nearest to the point etc.
inline void searchOrder
(
- const point& pt,
+ const point& pt,
FixedList<direction, 8>& octantOrder
) const;
diff --git a/src/meshTools/octree/treeBoundBoxI.H b/src/meshTools/octree/treeBoundBoxI.H
index 32dc1612cde..d8d7b7a1144 100644
--- a/src/meshTools/octree/treeBoundBoxI.H
+++ b/src/meshTools/octree/treeBoundBoxI.H
@@ -242,7 +242,7 @@ inline void Foam::treeBoundBox::searchOrder
if (dist.z() < 0)
{
octant |= treeBoundBox::FRONTHALF;
- dist.z() *= -1;
+ dist.z() *= -1;
}
direction min = 0;
@@ -252,44 +252,44 @@ inline void Foam::treeBoundBox::searchOrder
if (dist.x() < dist.y())
{
if (dist.y() < dist.z())
- {
- min = treeBoundBox::RIGHTHALF;
- mid = treeBoundBox::TOPHALF;
- max = treeBoundBox::FRONTHALF;
- }
- else if (dist.z() < dist.x())
- {
- min = treeBoundBox::FRONTHALF;
+ {
+ min = treeBoundBox::RIGHTHALF;
+ mid = treeBoundBox::TOPHALF;
+ max = treeBoundBox::FRONTHALF;
+ }
+ else if (dist.z() < dist.x())
+ {
+ min = treeBoundBox::FRONTHALF;
mid = treeBoundBox::RIGHTHALF;
- max = treeBoundBox::TOPHALF;
- }
- else
- {
- min = treeBoundBox::RIGHTHALF;
- mid = treeBoundBox::FRONTHALF;
- max = treeBoundBox::TOPHALF;
- }
+ max = treeBoundBox::TOPHALF;
+ }
+ else
+ {
+ min = treeBoundBox::RIGHTHALF;
+ mid = treeBoundBox::FRONTHALF;
+ max = treeBoundBox::TOPHALF;
+ }
}
else
{
if (dist.z() < dist.y())
- {
- min = treeBoundBox::FRONTHALF;
- mid = treeBoundBox::TOPHALF;
- max = treeBoundBox::RIGHTHALF;
- }
- else if (dist.x() < dist.z())
- {
- min = treeBoundBox::TOPHALF;
- mid = treeBoundBox::RIGHTHALF;
- max = treeBoundBox::FRONTHALF;
- }
- else
- {
- min = treeBoundBox::TOPHALF;
- mid = treeBoundBox::FRONTHALF;
- max = treeBoundBox::RIGHTHALF;
- }
+ {
+ min = treeBoundBox::FRONTHALF;
+ mid = treeBoundBox::TOPHALF;
+ max = treeBoundBox::RIGHTHALF;
+ }
+ else if (dist.x() < dist.z())
+ {
+ min = treeBoundBox::TOPHALF;
+ mid = treeBoundBox::RIGHTHALF;
+ max = treeBoundBox::FRONTHALF;
+ }
+ else
+ {
+ min = treeBoundBox::TOPHALF;
+ mid = treeBoundBox::FRONTHALF;
+ max = treeBoundBox::RIGHTHALF;
+ }
}
// Primary subOctant
diff --git a/src/thermophysicalModels/radiation/radiationModel/fvDOM/interpolationLookUpTable/interpolationLookUpTable.C b/src/thermophysicalModels/radiation/radiationModel/fvDOM/interpolationLookUpTable/interpolationLookUpTable.C
index b9af5e65b6c..ce4b43ffaef 100644
--- a/src/thermophysicalModels/radiation/radiationModel/fvDOM/interpolationLookUpTable/interpolationLookUpTable.C
+++ b/src/thermophysicalModels/radiation/radiationModel/fvDOM/interpolationLookUpTable/interpolationLookUpTable.C
@@ -101,14 +101,7 @@ bool Foam::interpolationLookUpTable<Type>::checkRange
const label interfield
) const
{
- if (lookUpValue >= min_[interfield] && lookUpValue <= max_[interfield])
- {
- return true;
- }
- else
- {
- return false;
- }
+ return lookUpValue >= min_[interfield] && lookUpValue <= max_[interfield];
}
diff --git a/src/thermophysicalModels/radiation/radiationModel/fvDOM/interpolationLookUpTable/interpolationLookUpTable.H b/src/thermophysicalModels/radiation/radiationModel/fvDOM/interpolationLookUpTable/interpolationLookUpTable.H
index 7768fb48ca2..743d60e0209 100644
--- a/src/thermophysicalModels/radiation/radiationModel/fvDOM/interpolationLookUpTable/interpolationLookUpTable.H
+++ b/src/thermophysicalModels/radiation/radiationModel/fvDOM/interpolationLookUpTable/interpolationLookUpTable.H
@@ -46,13 +46,15 @@ SourceFiles
#include "scalarField.H"
#include "HashTable.H"
#include "IOdictionary.H"
-#include "fvCFD.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
+// Forward declaration of classes
+class fvMesh;
+
/*---------------------------------------------------------------------------*\
Class interpolationLookUpTable Declaration
\*---------------------------------------------------------------------------*/
@@ -103,7 +105,7 @@ private:
// Private Member Functions
//- Read the table of data from file
- void readTable(const word& instance, const fvMesh& mesh);
+ void readTable(const word& instance, const fvMesh&);
//- Dimension table from dictionaries input and output
void dimensionTable();
@@ -144,16 +146,16 @@ public:
//- Construct given the name of the file containing the table of data
interpolationLookUpTable
(
- const fileName& fn,
+ const fileName&,
const word& instance,
- const fvMesh& mesh
+ const fvMesh&
);
//- Construct from dictionary
- interpolationLookUpTable(const dictionary& dict);
+ interpolationLookUpTable(const dictionary&);
//- Construct copy
- interpolationLookUpTable(const interpolationLookUpTable& interpTable);
+ interpolationLookUpTable(const interpolationLookUpTable&);
// Member Functions
@@ -167,10 +169,10 @@ public:
//- Write Look Up Table to filename.
void write
(
- Ostream& os,
- const fileName& fn,
+ Ostream&,
+ const fileName&,
const word& instance,
- const fvMesh& mesh
+ const fvMesh&
) const;
@@ -211,17 +213,13 @@ public:
};
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#include "interpolationLookUpTableI.H"
-
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+#include "interpolationLookUpTableI.H"
#ifdef NoRepository
# include "interpolationLookUpTable.C"
--
GitLab