src/postProcessing/functionObjects: Moving the functionObjects into the "functionObjects" namespace

src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfo.C

@@ -30,14 +30,17 @@ License
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
+{
+namespace functionObjects
 {
     defineTypeNameAndDebug(cloudInfo, 0);
 }
+}
 
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
-void Foam::cloudInfo::writeFileHeader(const label i)
+void Foam::functionObjects::cloudInfo::writeFileHeader(const label i)
 {
     writeHeader(file(), "Cloud information");
     writeCommented(file(), "Time");
@@ -49,7 +52,7 @@ void Foam::cloudInfo::writeFileHeader(const label i)
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::cloudInfo::cloudInfo
+Foam::functionObjects::cloudInfo::cloudInfo
 (
     const word& name,
     const objectRegistry& obr,
@@ -66,15 +69,31 @@ Foam::cloudInfo::cloudInfo
 }
 
 
+Foam::autoPtr<Foam::functionObjects::cloudInfo>
+Foam::functionObjects::cloudInfo::New
+(
+    const word& name,
+    const objectRegistry& obr,
+    const dictionary& dict,
+    const bool loadFromFiles
+)
+{
+    return autoPtr<cloudInfo>
+    (
+        new cloudInfo(name, obr, dict, loadFromFiles)
+    );
+}
+
+
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::cloudInfo::~cloudInfo()
+Foam::functionObjects::cloudInfo::~cloudInfo()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::cloudInfo::read(const dictionary& dict)
+void Foam::functionObjects::cloudInfo::read(const dictionary& dict)
 {
     if (active_)
     {
@@ -98,19 +117,19 @@ void Foam::cloudInfo::read(const dictionary& dict)
 }
 
 
-void Foam::cloudInfo::execute()
+void Foam::functionObjects::cloudInfo::execute()
 {}
 
 
-void Foam::cloudInfo::end()
+void Foam::functionObjects::cloudInfo::end()
 {}
 
 
-void Foam::cloudInfo::timeSet()
+void Foam::functionObjects::cloudInfo::timeSet()
 {}
 
 
-void Foam::cloudInfo::write()
+void Foam::functionObjects::cloudInfo::write()
 {
     if (active_)
     {

src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfo.H

@@ -88,6 +88,9 @@ class objectRegistry;
 class dictionary;
 class mapPolyMesh;
 
+namespace functionObjects
+{
+
 /*---------------------------------------------------------------------------*\
                          Class cloudInfo Declaration
 \*---------------------------------------------------------------------------*/
@@ -145,6 +148,16 @@ public:
             const bool loadFromFiles = false
         );
 
+        //- Construct on free-store and return pointer if successful
+        //  otherwise return a null-pointer
+        static autoPtr<cloudInfo> New
+        (
+            const word& name,
+            const objectRegistry&,
+            const dictionary&,
+            const bool loadFromFiles = false
+        );
+
 
     //- Destructor
     virtual ~cloudInfo();
@@ -185,6 +198,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace functionObjects
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfoFunctionObject.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,7 +43,7 @@ SourceFiles
 
 namespace Foam
 {
-    typedef OutputFilterFunctionObject<cloudInfo>
+    typedef OutputFilterFunctionObject<functionObjects::cloudInfo>
         cloudInfoFunctionObject;
 }