Renamed Cloud.H to prevent name clash between foam/ and lagrangian/

2015-06-29 18:34:30 +01:00 · 2015-06-29 18:34:30 +01:00 · 9b7817be6d
commit 9b7817be6d
parent 23bad8f060
33 changed files with 38 additions and 38 deletions
--- a/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.H
+++ b/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.H
@ -36,7 +36,7 @@ SourceFiles
 #ifndef lagrangianFieldDecomposer_H
 #define lagrangianFieldDecomposer_H

-#include "Cloud.H"
+#include "CloudTemplate.H"
 #include "indexedParticle.H"
 #include "passiveParticle.H"

--- a/applications/utilities/parallelProcessing/reconstructPar/reconstructLagrangianPositions.C
+++ b/applications/utilities/parallelProcessing/reconstructPar/reconstructLagrangianPositions.C
@ -25,7 +25,7 @@ License

 #include "reconstructLagrangian.H"
 #include "labelIOList.H"
-#include "Cloud.H"
+#include "CloudTemplate.H"
 #include "passiveParticle.H"

 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
--- a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructLagrangianPositions.C
+++ b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructLagrangianPositions.C
@ -25,7 +25,7 @@ License

 #include "reconstructLagrangian.H"
 #include "labelIOList.H"
-#include "Cloud.H"
+#include "CloudTemplate.H"
 #include "passiveParticle.H"

 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCloudField.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCloudField.H
@ -34,7 +34,7 @@ SourceFiles
 #ifndef ensightCloudField_H
 #define ensightCloudField_H

-#include "Cloud.H"
+#include "CloudTemplate.H"
 #include "IOobject.H"

 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightParticlePositions.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightParticlePositions.C
@ -26,7 +26,7 @@ License
 #include "ensightParticlePositions.H"
 #include "fvMesh.H"
 #include "passiveParticle.H"
-#include "Cloud.H"
+#include "CloudTemplate.H"
 #include "OFstream.H"
 #include "IOmanip.H"
 #include "itoa.H"
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputFunctions.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputFunctions.H
@ -33,7 +33,7 @@ SourceFiles
 #define ensightOutputFunctions_H

 #include "ensightFile.H"
-#include "Cloud.H"
+#include "CloudTemplate.H"
 #include "polyMesh.H"
 #include "IOobject.H"

--- a/applications/utilities/postProcessing/dataConversion/foamToFieldview9/foamToFieldview9.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToFieldview9/foamToFieldview9.C
@ -40,7 +40,7 @@ Description
 #include "wallFvPatch.H"
 #include "symmetryFvPatch.H"

-#include "Cloud.H"
+#include "CloudTemplate.H"
 #include "passiveParticle.H"

 #include "IOobjectList.H"
--- a/applications/utilities/postProcessing/dataConversion/foamToGMV/foamToGMV.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToGMV/foamToGMV.C
@ -34,7 +34,7 @@ Description
 #include "instantList.H"
 #include "IOobjectList.H"
 #include "itoa.H"
-#include "Cloud.H"
+#include "CloudTemplate.H"
 #include "passiveParticle.H"

 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
@ -116,7 +116,7 @@ Note
 #include "symmTensorIOField.H"
 #include "tensorIOField.H"
 #include "faceZoneMesh.H"
-#include "Cloud.H"
+#include "CloudTemplate.H"
 #include "passiveParticle.H"

 #include "faCFD.H"
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/lagrangianWriter.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/lagrangianWriter.C
@ -25,7 +25,7 @@ License

 #include "lagrangianWriter.H"
 #include "writeFuns.H"
-#include "Cloud.H"
+#include "CloudTemplate.H"
 #include "passiveParticle.H"

 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/lagrangianWriter.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/lagrangianWriter.H
@ -38,7 +38,7 @@ SourceFiles

 #include "globalPointPatch.H"
 #include "OFstream.H"
-#include "Cloud.H"
+#include "CloudTemplate.H"
 #include "volFields.H"
 #include "pointFields.H"
 #include "vtkMesh.H"
--- a/applications/utilities/postProcessing/graphics/ensightFoamReader/libuserd.C
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/libuserd.C
@ -40,7 +40,7 @@ Description

 #include "fvCFD.H"
 #include "IOobjectList.H"
-#include "Cloud.H"
+#include "CloudTemplate.H"
 #include "passiveParticle.H"
 #include "fvMesh.H"
 #include "cellModeller.H"
--- a/applications/utilities/postProcessing/graphics/newEnsightFoamReader/libuserd.C
+++ b/applications/utilities/postProcessing/graphics/newEnsightFoamReader/libuserd.C
@ -41,7 +41,7 @@ Description

 #include "fvCFD.H"
 #include "IOobjectList.H"
-#include "Cloud.H"
+#include "CloudTemplate.H"
 #include "passiveParticle.H"
 #include "fvMesh.H"
 #include "cellModeller.H"
--- a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C
+++ b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C
@ -31,7 +31,7 @@ Description
 \*---------------------------------------------------------------------------*/

 #include "argList.H"
-#include "Cloud.H"
+#include "CloudTemplate.H"
 #include "IOdictionary.H"
 #include "fvMesh.H"
 #include "foamTime.H"
--- a/applications/utilities/preProcessing/mapFields/mapLagrangian.C
+++ b/applications/utilities/preProcessing/mapFields/mapLagrangian.C
@ -24,7 +24,7 @@ License
 \*---------------------------------------------------------------------------*/

 #include "MapLagrangianFields.H"
-#include "Cloud.H"
+#include "CloudTemplate.H"
 #include "passiveParticle.H"
 #include "meshSearch.H"

--- a/src/lagrangian/basic/CloudTemplate/CloudTemplate.C
+++ b/src/lagrangian/basic/CloudTemplate/CloudTemplate.C
@ -23,7 +23,7 @@ License

 \*---------------------------------------------------------------------------*/

-#include "Cloud.H"
+#include "CloudTemplate.H"
 #include "processorPolyPatch.H"
 #include "globalMeshData.H"
 #include "PstreamCombineReduceOps.H"
@ -360,6 +360,6 @@ void Foam::Cloud<ParticleType>::writePositions() const

 // * * * * * * * * * * * * * * * *  IOStream operators * * * * * * * * * * * //

-#include "CloudIO.C"
+#include "CloudTemplateIO.C"

 // ************************************************************************* //
--- a/src/lagrangian/basic/CloudTemplate/CloudTemplate.H
+++ b/src/lagrangian/basic/CloudTemplate/CloudTemplate.H
@ -27,13 +27,13 @@ Class
 Description

 SourceFiles
-    Cloud.C
-    CloudIO.C
+    CloudTemplate.C
+    CloudTemplateIO.C

 \*---------------------------------------------------------------------------*/

-#ifndef Cloud_H
-#define Cloud_H
+#ifndef CloudTemplate_H
+#define CloudTemplate_H

 #include "cloud.H"
 #include "IDLList.H"
@ -308,7 +308,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

 #ifdef NoRepository
-#   include "Cloud.C"
+#   include "CloudTemplate.C"
 #endif

 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
--- a/src/lagrangian/basic/CloudTemplate/CloudTemplateIO.C
+++ b/src/lagrangian/basic/CloudTemplate/CloudTemplateIO.C
@ -23,7 +23,7 @@ License

 \*---------------------------------------------------------------------------*/

-#include "Cloud.H"
+#include "CloudTemplate.H"
 #include "Particle.H"
 #include "foamTime.H"
 #include "IOPosition.H"
--- a/src/lagrangian/basic/Particle/Particle.C
+++ b/src/lagrangian/basic/Particle/Particle.C
@ -24,7 +24,7 @@ License
 \*---------------------------------------------------------------------------*/

 #include "Particle.H"
-#include "Cloud.H"
+#include "CloudTemplate.H"
 #include "wedgePolyPatch.H"
 #include "symmetryPolyPatch.H"
 #include "cyclicPolyPatch.H"
--- a/src/lagrangian/basic/indexedParticle/indexedParticleCloud.H
+++ b/src/lagrangian/basic/indexedParticle/indexedParticleCloud.H
@ -35,7 +35,7 @@ SourceFiles
 #ifndef indexedParticleCloud_H
 #define indexedParticleCloud_H

-#include "Cloud.H"
+#include "CloudTemplate.H"
 #include "indexedParticle.H"

 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
--- a/src/lagrangian/basic/passiveParticle/passiveParticleCloud.H
+++ b/src/lagrangian/basic/passiveParticle/passiveParticleCloud.H
@ -35,7 +35,7 @@ SourceFiles
 #ifndef passiveParticleCloud_H
 #define passiveParticleCloud_H

-#include "Cloud.H"
+#include "CloudTemplate.H"
 #include "passiveParticle.H"

 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
--- a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloudTemplate.H
+++ b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloudTemplate.H
@ -36,7 +36,7 @@ SourceFiles
 #ifndef DsmcCloudTemplate_H
 #define DsmcCloudTemplate_H

-#include "Cloud.H"
+#include "CloudTemplate.H"
 #include "DsmcBaseCloud.H"
 #include "IOdictionary.H"
 #include "autoPtr.H"
--- a/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcelTemplateIO.C
+++ b/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcelTemplateIO.C
@ -26,7 +26,7 @@ License
 #include "DsmcParcelTemplate.H"
 #include "IOstreams.H"
 #include "IOField.H"
-#include "Cloud.H"
+#include "CloudTemplate.H"

 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //

--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudTemplate.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudTemplate.H
@ -42,7 +42,7 @@ SourceFiles
 #ifndef KinematicCloudTemplate_H
 #define KinematicCloudTemplate_H

-#include "Cloud.H"
+#include "CloudTemplate.H"
 #include "kinematicCloud.H"
 #include "IOdictionary.H"
 #include "autoPtr.H"
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
@ -26,7 +26,7 @@ License
 #include "KinematicParcel.H"
 #include "IOstreams.H"
 #include "IOField.H"
-#include "Cloud.H"
+#include "CloudTemplate.H"

 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //

--- a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.H
+++ b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.H
@ -36,7 +36,7 @@ SourceFiles
 #ifndef moleculeCloud_H
 #define moleculeCloud_H

-#include "Cloud.H"
+#include "CloudTemplate.H"
 #include "molecule.H"
 #include "IOdictionary.H"
 #include "potential.H"
--- a/src/lagrangian/solidParticle/solidParticleCloud.H
+++ b/src/lagrangian/solidParticle/solidParticleCloud.H
@ -37,7 +37,7 @@ SourceFiles
 #ifndef solidParticleCloud_H
 #define solidParticleCloud_H

-#include "Cloud.H"
+#include "CloudTemplate.H"
 #include "solidParticle.H"
 #include "IOdictionary.H"

--- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C
+++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinementRefine.C
@ -35,7 +35,7 @@ License
 #include "directTopoChange.H"
 #include "mapDistributePolyMesh.H"
 #include "featureEdgeMesh.H"
-#include "Cloud.H"
+#include "CloudTemplate.H"

 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //

--- a/src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticleCloud.C
+++ b/src/mesh/autoMesh/autoHexMesh/trackedParticle/trackedParticleCloud.C
@ -24,7 +24,7 @@ License
 \*---------------------------------------------------------------------------*/

 #include "trackedParticle.H"
-#include "Cloud.H"
+#include "CloudTemplate.H"

 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

--- a/src/meshTools/meshSearch/meshSearch.H
+++ b/src/meshTools/meshSearch/meshSearch.H
@ -37,7 +37,7 @@ SourceFiles
 #define meshSearch_H

 #include "pointIndexHit.H"
-#include "Cloud.H"
+#include "CloudTemplate.H"
 #include "passiveParticle.H"

 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
--- a/src/sampling/sampledSet/curve/curveSet.C
+++ b/src/sampling/sampledSet/curve/curveSet.C
@ -28,7 +28,7 @@ License
 #include "DynamicList.H"
 #include "polyMesh.H"

-#include "Cloud.H"
+#include "CloudTemplate.H"
 #include "passiveParticle.H"
 #include "IDLList.H"

--- a/src/sampling/sampledSet/face/faceOnlySet.C
+++ b/src/sampling/sampledSet/face/faceOnlySet.C
@ -28,7 +28,7 @@ License
 #include "DynamicList.H"
 #include "polyMesh.H"

-#include "Cloud.H"
+#include "CloudTemplate.H"
 #include "passiveParticle.H"
 #include "IDLList.H"

--- a/src/sampling/sampledSet/uniform/uniformSet.C
+++ b/src/sampling/sampledSet/uniform/uniformSet.C
@ -28,7 +28,7 @@ License
 #include "DynamicList.H"
 #include "polyMesh.H"

-#include "Cloud.H"
+#include "CloudTemplate.H"
 #include "passiveParticle.H"
 #include "IDLList.H"