functionObjects: Simplified organization and naming

src/postProcessing/functionObjects/Allwmake

@@ -6,13 +6,9 @@ targetType=libso
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
-wmake $targetType cloud
 wmake $targetType field
 wmake $targetType forces
-wmake $targetType fvTools
+wmake $targetType lagrangian
-wmake $targetType IO
-wmake $targetType jobControl
-wmake $targetType systemCall
 wmake $targetType utilities
 
 #------------------------------------------------------------------------------

src/postProcessing/functionObjects/IO/IOFunctionObjectsDoc.H

@@ -1,30 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it under
-    the terms of the GNU General Public License as published by the Free
-    Software Foundation, either version 3 of the License, or (at your option)
-    any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT ANY
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-    FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-    details.
-
-    You should have received a copy of the GNU General Public License along with
-    OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\defgroup grpIOFunctionObjects Input/output function objects
-@{
-    \ingroup grpFunctionObjects
-    This group contains input/output-based function objects
-@}
-
-\*---------------------------------------------------------------------------*/

src/postProcessing/functionObjects/IO/Make/files

@@ -1,13 +0,0 @@
-partialWrite/partialWrite.C
-partialWrite/partialWriteFunctionObject.C
-
-removeRegisteredObject/removeRegisteredObject.C
-removeRegisteredObject/removeRegisteredObjectFunctionObject.C
-
-writeDictionary/writeDictionary.C
-writeDictionary/writeDictionaryFunctionObject.C
-
-writeRegisteredObject/writeRegisteredObject.C
-writeRegisteredObject/writeRegisteredObjectFunctionObject.C
-
-LIB = $(FOAM_LIBBIN)/libIOFunctionObjects

src/postProcessing/functionObjects/IO/Make/options

@@ -1,7 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude
-
-LIB_LIBS = \
-    -lfiniteVolume \
-    -lmeshTools

src/postProcessing/functionObjects/field/Make/files

@@ -49,4 +49,13 @@ regionSizeDistribution/regionSizeDistributionFunctionObject.C
 histogram/histogram.C
 histogram/histogramFunctionObject.C
 
+div/div.C
+div/divFunctionObject.C
+
+grad/grad.C
+grad/gradFunctionObject.C
+
+mag/mag.C
+mag/magFunctionObject.C
+
 LIB = $(FOAM_LIBBIN)/libfieldFunctionObjects

src/postProcessing/functionObjects/field/div/IOdiv.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
@@ -22,24 +22,24 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Typedef
-    Foam::IOcalcMag
+    Foam::IOdiv
 
 Description
-    Instance of the generic IOOutputFilter for calcMag.
+    Instance of the generic IOOutputFilter for div.
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef IOcalcMag_H
+#ifndef IOdiv_H
-#define IOcalcMag_H
+#define IOdiv_H
 
-#include "calcMag.H"
+#include "div.H"
 #include "IOOutputFilter.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    typedef IOOutputFilter<calcMag> IOcalcMag;
+    typedef IOOutputFilter<div> IOdiv;
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/postProcessing/functionObjects/field/div/div.C

@@ -23,10 +23,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "calcFvcDiv.H"
+#include "div.H"
 #include "volFields.H"
 #include "dictionary.H"
-#include "calcFvcDiv.H"
+#include "div.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -34,14 +34,14 @@ namespace Foam
 {
 namespace functionObjects
 {
-    defineTypeNameAndDebug(calcFvcDiv, 0);
+    defineTypeNameAndDebug(div, 0);
 }
 }
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-Foam::volScalarField& Foam::functionObjects::calcFvcDiv::divField
+Foam::volScalarField& Foam::functionObjects::div::divField
 (
     const word& divName,
     const dimensionSet& dims
@@ -79,7 +79,7 @@ Foam::volScalarField& Foam::functionObjects::calcFvcDiv::divField
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::functionObjects::calcFvcDiv::calcFvcDiv
+Foam::functionObjects::div::div
 (
     const word& name,
     const objectRegistry& obr,
@@ -96,7 +96,7 @@ Foam::functionObjects::calcFvcDiv::calcFvcDiv
 }
 
 
-bool Foam::functionObjects::calcFvcDiv::viable
+bool Foam::functionObjects::div::viable
 (
     const word& name,
     const objectRegistry& obr,
@@ -111,13 +111,13 @@ bool Foam::functionObjects::calcFvcDiv::viable
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::functionObjects::calcFvcDiv::~calcFvcDiv()
+Foam::functionObjects::div::~div()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::functionObjects::calcFvcDiv::read(const dictionary& dict)
+void Foam::functionObjects::div::read(const dictionary& dict)
 {
     dict.lookup("fieldName") >> fieldName_;
     dict.lookup("resultName") >> resultName_;
@@ -129,7 +129,7 @@ void Foam::functionObjects::calcFvcDiv::read(const dictionary& dict)
 }
 
 
-void Foam::functionObjects::calcFvcDiv::execute()
+void Foam::functionObjects::div::execute()
 {
     bool processed = false;
 
@@ -144,17 +144,17 @@ void Foam::functionObjects::calcFvcDiv::execute()
 }
 
 
-void Foam::functionObjects::calcFvcDiv::end()
+void Foam::functionObjects::div::end()
 {
     execute();
 }
 
 
-void Foam::functionObjects::calcFvcDiv::timeSet()
+void Foam::functionObjects::div::timeSet()
 {}
 
 
-void Foam::functionObjects::calcFvcDiv::write()
+void Foam::functionObjects::div::write()
 {
     if (obr_.foundObject<regIOobject>(resultName_))
     {

src/postProcessing/functionObjects/field/div/div.H

@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::functionObjects::calcFvcDiv
+    Foam::functionObjects::div
 
 Group
     grpFVFunctionObjects
@@ -33,13 +33,13 @@ Description
     volume scalar field.
 
 SourceFiles
-    calcFvcDiv.C
+    div.C
-    IOcalcFvcDiv.H
+    IOdiv.H
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef calcFvcDiv_H
+#ifndef functionObjects_div_H
-#define calcFvcDiv_H
+#define functionObjects_div_H
 
 #include "volFieldsFwd.H"
 #include "surfaceFieldsFwd.H"
@@ -63,14 +63,14 @@ namespace functionObjects
 {
 
 /*---------------------------------------------------------------------------*\
-                         Class calcFvcDiv Declaration
+                         Class div Declaration
 \*---------------------------------------------------------------------------*/
 
-class calcFvcDiv
+class div
 {
     // Private data
 
-        //- Name of this calcFvcDiv object
+        //- Name of this div object
         word name_;
 
         //- Reference to the database
@@ -102,23 +102,23 @@ class calcFvcDiv
         );
 
         //- Disallow default bitwise copy construct
-        calcFvcDiv(const calcFvcDiv&);
+        div(const div&);
 
         //- Disallow default bitwise assignment
-        void operator=(const calcFvcDiv&);
+        void operator=(const div&);
 
 
 public:
 
     //- Runtime type information
-    TypeName("calcFvcDiv");
+    TypeName("div");
 
 
     // Constructors
 
         //- Construct for given objectRegistry and dictionary.
         //  Allow the possibility to load fields from files
-        calcFvcDiv
+        div
         (
             const word& name,
             const objectRegistry&,
@@ -138,18 +138,18 @@ public:
 
 
     //- Destructor
-    virtual ~calcFvcDiv();
+    virtual ~div();
 
 
     // Member Functions
 
-        //- Return name of the set of calcFvcDiv
+        //- Return name of the set of div
         virtual const word& name() const
         {
             return name_;
         }
 
-        //- Read the calcFvcDiv data
+        //- Read the div data
         virtual void read(const dictionary&);
 
         //- Execute, currently does nothing
@@ -161,7 +161,7 @@ public:
         //- Called when time was set at the end of the Time::operator++
         virtual void timeSet();
 
-        //- Calculate the calcFvcDiv and write
+        //- Calculate the div and write
         virtual void write();
 
         //- Update for changes of mesh
@@ -182,7 +182,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-    #include "calcFvcDivTemplates.C"
+    #include "divTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/postProcessing/functionObjects/field/div/divFunctionObject.C

@@ -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
@@ -23,18 +23,18 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "calcMagFunctionObject.H"
+#include "divFunctionObject.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    defineNamedTemplateTypeNameAndDebug(calcMagFunctionObject, 0);
+    defineNamedTemplateTypeNameAndDebug(divFunctionObject, 0);
 
     addToRunTimeSelectionTable
     (
         functionObject,
-        calcMagFunctionObject,
+        divFunctionObject,
         dictionary
     );
 }

src/postProcessing/functionObjects/field/div/divFunctionObject.H

@@ -22,29 +22,29 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Typedef
-    Foam::calcFvcDivFunctionObject
+    Foam::divFunctionObject
 
 Description
-    FunctionObject wrapper around calcFvcDiv to allow it to be created
+    FunctionObject wrapper around div to allow it to be created
     via the functions entry within controlDict.
 
 SourceFiles
-    calcFvcDivFunctionObject.C
+    divFunctionObject.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef calcFvcDivFunctionObject_H
+#ifndef divFunctionObject_H
-#define calcFvcDivFunctionObject_H
+#define divFunctionObject_H
 
-#include "calcFvcDiv.H"
+#include "div.H"
 #include "OutputFilterFunctionObject.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    typedef OutputFilterFunctionObject<functionObjects::calcFvcDiv>
+    typedef OutputFilterFunctionObject<functionObjects::div>
-        calcFvcDivFunctionObject;
+        divFunctionObject;
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/postProcessing/functionObjects/field/div/divTemplates.C

@@ -29,7 +29,7 @@ License
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class FieldType>
-void Foam::functionObjects::calcFvcDiv::calcDiv
+void Foam::functionObjects::div::calcDiv
 (
     const word& fieldName,
     const word& resultName,

src/postProcessing/functionObjects/field/doc/fieldFunctionObjectsDoc.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

src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H

@@ -119,8 +119,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef fieldAverage_H
+#ifndef functionObjects_fieldAverage_H
-#define fieldAverage_H
+#define functionObjects_fieldAverage_H
 
 #include "volFieldsFwd.H"
 #include "Switch.H"

src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H

@@ -74,8 +74,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef fieldCoordinateSystemTransform_H
+#ifndef functionObjects_fieldCoordinateSystemTransform_H
-#define fieldCoordinateSystemTransform_H
+#define functionObjects_fieldCoordinateSystemTransform_H
 
 #include "OFstream.H"
 #include "volFields.H"

src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.H

@@ -75,8 +75,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef fieldMinMax_H
+#ifndef functionObjects_fieldMinMax_H
-#define fieldMinMax_H
+#define functionObjects_fieldMinMax_H
 
 #include "functionObjectFiles.H"
 #include "Switch.H"

src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.H

@@ -102,8 +102,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef cellSource_H
+#ifndef functionObjects_cellSource_H
-#define cellSource_H
+#define functionObjects_cellSource_H
 
 #include "NamedEnum.H"
 #include "fieldValue.H"

src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.H

@@ -136,8 +136,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef faceSource_H
+#ifndef functionObjects_faceSource_H
-#define faceSource_H
+#define functionObjects_faceSource_H
 
 #include "NamedEnum.H"
 #include "fieldValue.H"

src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValue.H

@@ -35,8 +35,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef fieldValue_H
+#ifndef functionObjects_fieldValue_H
-#define fieldValue_H
+#define functionObjects_fieldValue_H
 
 #include "functionObjectFiles.H"
 #include "Switch.H"

src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.H

@@ -73,8 +73,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef fieldValueDelta_H
+#ifndef functionObjects_fieldValueDelta_H
-#define fieldValueDelta_H
+#define functionObjects_fieldValueDelta_H
 
 #include "functionObjectFiles.H"
 #include "fieldValue.H"

src/postProcessing/functionObjects/field/grad/IOgrad.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
@@ -22,24 +22,24 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Typedef
-    Foam::IOcalcFvcDiv
+    Foam::IOgrad
 
 Description
-    Instance of the generic IOOutputFilter for calcFvcDiv.
+    Instance of the generic IOOutputFilter for grad.
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef IOcalcFvcDiv_H
+#ifndef IOgrad_H
-#define IOcalcFvcDiv_H
+#define IOgrad_H
 
-#include "calcFvcDiv.H"
+#include "grad.H"
 #include "IOOutputFilter.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    typedef IOOutputFilter<calcFvcDiv> IOcalcFvcDiv;
+    typedef IOOutputFilter<grad> IOgrad;
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/postProcessing/functionObjects/field/grad/grad.C

@@ -23,10 +23,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "calcFvcGrad.H"
+#include "grad.H"
 #include "volFields.H"
 #include "dictionary.H"
-#include "calcFvcGrad.H"
+#include "grad.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -34,14 +34,14 @@ namespace Foam
 {
 namespace functionObjects
 {
-    defineTypeNameAndDebug(calcFvcGrad, 0);
+    defineTypeNameAndDebug(grad, 0);
 }
 }
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::functionObjects::calcFvcGrad::calcFvcGrad
+Foam::functionObjects::grad::grad
 (
     const word& name,
     const objectRegistry& obr,
@@ -58,7 +58,7 @@ Foam::functionObjects::calcFvcGrad::calcFvcGrad
 }
 
 
-bool Foam::functionObjects::calcFvcGrad::viable
+bool Foam::functionObjects::grad::viable
 (
     const word& name,
     const objectRegistry& obr,
@@ -73,13 +73,13 @@ bool Foam::functionObjects::calcFvcGrad::viable
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::functionObjects::calcFvcGrad::~calcFvcGrad()
+Foam::functionObjects::grad::~grad()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::functionObjects::calcFvcGrad::read(const dictionary& dict)
+void Foam::functionObjects::grad::read(const dictionary& dict)
 {
     dict.lookup("fieldName") >> fieldName_;
     dict.lookup("resultName") >> resultName_;
@@ -91,7 +91,7 @@ void Foam::functionObjects::calcFvcGrad::read(const dictionary& dict)
 }
 
 
-void Foam::functionObjects::calcFvcGrad::execute()
+void Foam::functionObjects::grad::execute()
 {
     bool processed = false;
 
@@ -106,17 +106,17 @@ void Foam::functionObjects::calcFvcGrad::execute()
 }
 
 
-void Foam::functionObjects::calcFvcGrad::end()
+void Foam::functionObjects::grad::end()
 {
     execute();
 }
 
 
-void Foam::functionObjects::calcFvcGrad::timeSet()
+void Foam::functionObjects::grad::timeSet()
 {}
 
 
-void Foam::functionObjects::calcFvcGrad::write()
+void Foam::functionObjects::grad::write()
 {
     if (obr_.foundObject<regIOobject>(resultName_))
     {

src/postProcessing/functionObjects/field/grad/grad.H

@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::functionObjects::calcFvcGrad
+    Foam::functionObjects::grad
 
 Group
     grpFVFunctionObjects
@@ -33,13 +33,13 @@ Description
     volume vector or tensor field.
 
 SourceFiles
-    calcFvcGrad.C
+    grad.C
-    IOcalcFvcGrad.H
+    IOgrad.H
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef calcFvcGrad_H
+#ifndef functionObjects_grad_H
-#define calcFvcGrad_H
+#define functionObjects_grad_H
 
 #include "volFieldsFwd.H"
 #include "surfaceFieldsFwd.H"
@@ -63,14 +63,14 @@ namespace functionObjects
 {
 
 /*---------------------------------------------------------------------------*\
-                         Class calcFvcGrad Declaration
+                         Class grad Declaration
 \*---------------------------------------------------------------------------*/
 
-class calcFvcGrad
+class grad
 {
     // Private data
 
-        //- Name of this calcFvcGrad object
+        //- Name of this grad object
         word name_;
 
         //- Reference to the database
@@ -105,23 +105,23 @@ class calcFvcGrad
         );
 
         //- Disallow default bitwise copy construct
-        calcFvcGrad(const calcFvcGrad&);
+        grad(const grad&);
 
         //- Disallow default bitwise assignment
-        void operator=(const calcFvcGrad&);
+        void operator=(const grad&);
 
 
 public:
 
     //- Runtime type information
-    TypeName("calcFvcGrad");
+    TypeName("grad");
 
 
     // Constructors
 
         //- Construct for given objectRegistry and dictionary.
         //  Allow the possibility to load fields from files
-        calcFvcGrad
+        grad
         (
             const word& name,
             const objectRegistry&,
@@ -141,18 +141,18 @@ public:
 
 
     //- Destructor
-    virtual ~calcFvcGrad();
+    virtual ~grad();
 
 
     // Member Functions
 
-        //- Return name of the set of calcFvcGrad
+        //- Return name of the set of grad
         virtual const word& name() const
         {
             return name_;
         }
 
-        //- Read the calcFvcGrad data
+        //- Read the grad data
         virtual void read(const dictionary&);
 
         //- Execute, currently does nothing
@@ -164,7 +164,7 @@ public:
         //- Called when time was set at the end of the Time::operator++
         virtual void timeSet();
 
-        //- Calculate the calcFvcGrad and write
+        //- Calculate the grad and write
         virtual void write();
 
         //- Update for changes of mesh
@@ -185,7 +185,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-    #include "calcFvcGradTemplates.C"
+    #include "gradTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/postProcessing/functionObjects/field/grad/gradFunctionObject.C

@@ -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
@@ -23,18 +23,18 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "calcFvcDivFunctionObject.H"
+#include "gradFunctionObject.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    defineNamedTemplateTypeNameAndDebug(calcFvcDivFunctionObject, 0);
+    defineNamedTemplateTypeNameAndDebug(gradFunctionObject, 0);
 
     addToRunTimeSelectionTable
     (
         functionObject,
-        calcFvcDivFunctionObject,
+        gradFunctionObject,
         dictionary
     );
 }

src/postProcessing/functionObjects/field/grad/gradFunctionObject.H

@@ -22,29 +22,29 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Typedef
-    Foam::calcMagFunctionObject
+    Foam::gradFunctionObject
 
 Description
-    FunctionObject wrapper around calcMag to allow it to be created
+    FunctionObject wrapper around grad to allow it to be created
     via the functions entry within controlDict.
 
 SourceFiles
-    calcMagFunctionObject.C
+    gradFunctionObject.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef calcMagFunctionObject_H
+#ifndef gradFunctionObject_H
-#define calcMagFunctionObject_H
+#define gradFunctionObject_H
 
-#include "calcMag.H"
+#include "grad.H"
 #include "OutputFilterFunctionObject.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    typedef OutputFilterFunctionObject<functionObjects::calcMag>
+    typedef OutputFilterFunctionObject<functionObjects::grad>
-        calcMagFunctionObject;
+        gradFunctionObject;
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/postProcessing/functionObjects/field/grad/gradTemplates.C

@@ -35,7 +35,7 @@ Foam::GeometricField
     Foam::fvPatchField,
     Foam::volMesh
 >&
-Foam::functionObjects::calcFvcGrad::gradField
+Foam::functionObjects::grad::gradField
 (
     const word& gradName,
     const dimensionSet& dims
@@ -82,7 +82,7 @@ Foam::functionObjects::calcFvcGrad::gradField
 
 
 template<class Type>
-void Foam::functionObjects::calcFvcGrad::calcGrad
+void Foam::functionObjects::grad::calcGrad
 (
     const word& fieldName,
     const word& resultName,

src/postProcessing/functionObjects/field/mag/IOmag.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
@@ -22,24 +22,24 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Typedef
-    Foam::IOcalcFvcGrad
+    Foam::IOmag
 
 Description
-    Instance of the generic IOOutputFilter for calcFvcGrad.
+    Instance of the generic IOOutputFilter for mag.
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef IOcalcFvcGrad_H
+#ifndef IOmag_H
-#define IOcalcFvcGrad_H
+#define IOmag_H
 
-#include "calcFvcGrad.H"
+#include "mag.H"
 #include "IOOutputFilter.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    typedef IOOutputFilter<calcFvcGrad> IOcalcFvcGrad;
+    typedef IOOutputFilter<mag> IOmag;
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/postProcessing/functionObjects/field/mag/mag.C

@@ -23,10 +23,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "calcMag.H"
+#include "mag.H"
 #include "volFields.H"
 #include "dictionary.H"
-#include "calcMag.H"
+#include "mag.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -34,14 +34,14 @@ namespace Foam
 {
 namespace functionObjects
 {
-    defineTypeNameAndDebug(calcMag, 0);
+    defineTypeNameAndDebug(mag, 0);
 }
 }
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::functionObjects::calcMag::calcMag
+Foam::functionObjects::mag::mag
 (
     const word& name,
     const objectRegistry& obr,
@@ -58,7 +58,7 @@ Foam::functionObjects::calcMag::calcMag
 }
 
 
-bool Foam::functionObjects::calcMag::viable
+bool Foam::functionObjects::mag::viable
 (
     const word& name,
     const objectRegistry& obr,
@@ -73,13 +73,13 @@ bool Foam::functionObjects::calcMag::viable
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::functionObjects::calcMag::~calcMag()
+Foam::functionObjects::mag::~mag()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::functionObjects::calcMag::read(const dictionary& dict)
+void Foam::functionObjects::mag::read(const dictionary& dict)
 {
     dict.lookup("fieldName") >> fieldName_;
     dict.lookup("resultName") >> resultName_;
@@ -91,7 +91,7 @@ void Foam::functionObjects::calcMag::read(const dictionary& dict)
 }
 
 
-void Foam::functionObjects::calcMag::execute()
+void Foam::functionObjects::mag::execute()
 {
     bool processed = false;
 
@@ -109,17 +109,17 @@ void Foam::functionObjects::calcMag::execute()
 }
 
 
-void Foam::functionObjects::calcMag::end()
+void Foam::functionObjects::mag::end()
 {
     execute();
 }
 
 
-void Foam::functionObjects::calcMag::timeSet()
+void Foam::functionObjects::mag::timeSet()
 {}
 
 
-void Foam::functionObjects::calcMag::write()
+void Foam::functionObjects::mag::write()
 {
     if (obr_.foundObject<regIOobject>(resultName_))
     {

src/postProcessing/functionObjects/field/mag/mag.H

@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::functionObjects::calcMag
+    Foam::functionObjects::mag
 
 Group
     grpFVFunctionObjects
@@ -33,13 +33,13 @@ Description
     volume or surface scalar field.
 
 SourceFiles
-    calcMag.C
+    mag.C
-    IOcalcMag.H
+    IOmag.H
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef calcMag_H
+#ifndef functionObjects_mag_H
-#define calcMag_H
+#define functionObjects_mag_H
 
 #include "volFieldsFwd.H"
 #include "surfaceFieldsFwd.H"
@@ -63,14 +63,14 @@ namespace functionObjects
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class calcMag Declaration
+                           Class mag Declaration
 \*---------------------------------------------------------------------------*/
 
-class calcMag
+class mag
 {
     // Private data
 
-        //- Name of this calcMag object
+        //- Name of this mag object
         word name_;
 
         //- Reference to the database
@@ -99,23 +99,23 @@ class calcMag
         );
 
         //- Disallow default bitwise copy construct
-        calcMag(const calcMag&);
+        mag(const mag&);
 
         //- Disallow default bitwise assignment
-        void operator=(const calcMag&);
+        void operator=(const mag&);
 
 
 public:
 
     //- Runtime type information
-    TypeName("calcMag");
+    TypeName("mag");
 
 
     // Constructors
 
         //- Construct for given objectRegistry and dictionary.
         //  Allow the possibility to load fields from files
-        calcMag
+        mag
         (
             const word& name,
             const objectRegistry&,
@@ -135,18 +135,18 @@ public:
 
 
     //- Destructor
-    virtual ~calcMag();
+    virtual ~mag();
 
 
     // Member Functions
 
-        //- Return name of the set of calcMag
+        //- Return name of the set of mag
         virtual const word& name() const
         {
             return name_;
         }
 
-        //- Read the calcMag data
+        //- Read the mag data
         virtual void read(const dictionary&);
 
         //- Execute, currently does nothing
@@ -158,7 +158,7 @@ public:
         //- Called when time was set at the end of the Time::operator++
         virtual void timeSet();
 
-        //- Calculate the calcMag and write
+        //- Calculate the mag and write
         virtual void write();
 
         //- Update for changes of mesh
@@ -179,7 +179,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-    #include "calcMagTemplates.C"
+    #include "magTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/postProcessing/functionObjects/field/mag/magFunctionObject.C

@@ -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
@@ -23,18 +23,18 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "calcFvcGradFunctionObject.H"
+#include "magFunctionObject.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    defineNamedTemplateTypeNameAndDebug(calcFvcGradFunctionObject, 0);
+    defineNamedTemplateTypeNameAndDebug(magFunctionObject, 0);
 
     addToRunTimeSelectionTable
     (
         functionObject,
-        calcFvcGradFunctionObject,
+        magFunctionObject,
         dictionary
     );
 }

src/postProcessing/functionObjects/field/mag/magFunctionObject.H

@@ -22,29 +22,29 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Typedef
-    Foam::calcFvcGradFunctionObject
+    Foam::magFunctionObject
 
 Description
-    FunctionObject wrapper around calcFvcGrad to allow it to be created
+    FunctionObject wrapper around mag to allow it to be created
     via the functions entry within controlDict.
 
 SourceFiles
-    calcFvcGradFunctionObject.C
+    magFunctionObject.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef calcFvcGradFunctionObject_H
+#ifndef magFunctionObject_H
-#define calcFvcGradFunctionObject_H
+#define magFunctionObject_H
 
-#include "calcFvcGrad.H"
+#include "mag.H"
 #include "OutputFilterFunctionObject.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    typedef OutputFilterFunctionObject<functionObjects::calcFvcGrad>
+    typedef OutputFilterFunctionObject<functionObjects::mag>
-        calcFvcGradFunctionObject;
+        magFunctionObject;
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/postProcessing/functionObjects/field/mag/magTemplates.C

@@ -29,7 +29,7 @@ License
 #include "surfaceFields.H"
 
 template<class FieldType>
-FieldType& Foam::functionObjects::calcMag::magField
+FieldType& Foam::functionObjects::mag::magField
 (
     const word& magName,
     const dimensionSet& dims
@@ -68,7 +68,7 @@ FieldType& Foam::functionObjects::calcMag::magField
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-void Foam::functionObjects::calcMag::calc
+void Foam::functionObjects::mag::calc
 (
     const word& fieldName,
     const word& resultName,
@@ -87,7 +87,7 @@ void Foam::functionObjects::calcMag::calc
         volScalarField& field =
             magField<volScalarField>(resultName_, vf.dimensions());
 
-        field = mag(vf);
+        field = Foam::mag(vf);
 
         processed = true;
     }
@@ -98,7 +98,7 @@ void Foam::functionObjects::calcMag::calc
         surfaceScalarField& field =
             magField<surfaceScalarField>(resultName_, sf.dimensions());
 
-        field = mag(sf);
+        field = Foam::mag(sf);
 
         processed = true;
     }

src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.H

@@ -70,8 +70,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef nearWallFields_H
+#ifndef functionObjects_nearWallFields_H
-#define nearWallFields_H
+#define functionObjects_nearWallFields_H
 
 #include "OFstream.H"
 #include "volFields.H"

src/postProcessing/functionObjects/field/processorField/processorField.H

@@ -57,8 +57,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef processorField_H
+#ifndef functionObjects_processorField_H
-#define processorField_H
+#define functionObjects_processorField_H
 
 #include "OFstream.H"
 #include "pointFieldFwd.H"

src/postProcessing/functionObjects/field/readFields/readFields.H

@@ -63,8 +63,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef readFields_H
+#ifndef functionObjects_readFields_H
-#define readFields_H
+#define functionObjects_readFields_H
 
 #include "OFstream.H"
 #include "pointFieldFwd.H"

src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H

@@ -103,8 +103,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef regionSizeDistribution_H
+#ifndef functionObjects_regionSizeDistribution_H
-#define regionSizeDistribution_H
+#define functionObjects_regionSizeDistribution_H
 
 #include "functionObjectFiles.H"
 #include "pointFieldFwd.H"

src/postProcessing/functionObjects/field/streamLine/streamLine.H

@@ -100,8 +100,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef streamLine_H
+#ifndef functionObjects_streamLine_H
-#define streamLine_H
+#define functionObjects_streamLine_H
 
 #include "volFieldsFwd.H"
 #include "pointFieldFwd.H"

src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.H

@@ -67,8 +67,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef surfaceInterpolateFields_H
+#ifndef functionObjects_surfaceInterpolateFields_H
-#define surfaceInterpolateFields_H
+#define functionObjects_surfaceInterpolateFields_H
 
 #include "OFstream.H"
 #include "surfaceFields.H"

src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H

@@ -100,8 +100,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef wallBoundedStreamLine_H
+#ifndef functionObjects_wallBoundedStreamLine_H
-#define wallBoundedStreamLine_H
+#define functionObjects_wallBoundedStreamLine_H
 
 #include "volFieldsFwd.H"
 #include "pointFieldFwd.H"

src/postProcessing/functionObjects/forces/Make/files

@@ -1,3 +1,9 @@
+pressureTools/pressureTools.C
+pressureTools/pressureToolsFunctionObject.C
+
+wallShearStress/wallShearStress.C
+wallShearStress/wallShearStressFunctionObject.C
+
 forces/forces.C
 forces/forcesFunctionObject.C
 

src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.H

@@ -90,8 +90,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef forceCoeffs_H
+#ifndef functionObjects_forceCoeffs_H
-#define forceCoeffs_H
+#define functionObjects_forceCoeffs_H
 
 #include "forces.H"
 

src/postProcessing/functionObjects/forces/forces/forces.H

@@ -110,8 +110,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef forces_H
+#ifndef functionObjects_forces_H
-#define forces_H
+#define functionObjects_forces_H
 
 #include "functionObjectFiles.H"
 #include "coordinateSystem.H"

src/postProcessing/functionObjects/forces/pressureTools/pressureTools.H

@@ -106,8 +106,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef pressureTools_H
+#ifndef functionObjects_pressureTools_H
-#define pressureTools_H
+#define functionObjects_pressureTools_H
 
 #include "volFieldsFwd.H"
 #include "dimensionedScalar.H"

src/postProcessing/functionObjects/forces/pressureTools/pressureToolsFunctionObject.C

@@ -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

src/postProcessing/functionObjects/forces/wallShearStress/wallShearStress.H

@@ -70,8 +70,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef wallShearStress_H
+#ifndef functionObjects_wallShearStress_H
-#define wallShearStress_H
+#define functionObjects_wallShearStress_H
 
 #include "functionObjectFiles.H"
 #include "volFieldsFwd.H"

src/postProcessing/functionObjects/forces/wallShearStress/wallShearStressFunctionObject.C

@@ -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

src/postProcessing/functionObjects/fvTools/Make/files

@@ -1,10 +0,0 @@
-calcFvcDiv/calcFvcDiv.C
-calcFvcDiv/calcFvcDivFunctionObject.C
-
-calcFvcGrad/calcFvcGrad.C
-calcFvcGrad/calcFvcGradFunctionObject.C
-
-calcMag/calcMag.C
-calcMag/calcMagFunctionObject.C
-
-LIB = $(FOAM_LIBBIN)/libFVFunctionObjects

src/postProcessing/functionObjects/fvTools/Make/options

@@ -1,5 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude
-
-LIB_LIBS = \
-    -lfiniteVolume

src/postProcessing/functionObjects/fvTools/doc/fvToolsFunctionObjectsDoc.H

@@ -1,30 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2013 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it under
-    the terms of the GNU General Public License as published by the Free
-    Software Foundation, either version 3 of the License, or (at your option)
-    any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT ANY
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-    FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-    details.
-
-    You should have received a copy of the GNU General Public License along with
-    OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\defgroup grpFVFunctionObjects Finite volume tools function objects
-@{
-    \ingroup grpFunctionObjects
-    This group contains finite-volume tools-based function objects
-@}
-
-\*---------------------------------------------------------------------------*/

src/postProcessing/functionObjects/jobControl/Make/files

@@ -1,4 +0,0 @@
-abort/abort.C
-abort/abortFunctionObject.C
-
-LIB = $(FOAM_LIBBIN)/libjobControl

src/postProcessing/functionObjects/jobControl/jobControlFunctionObjectsDoc.H

@@ -1,30 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it under
-    the terms of the GNU General Public License as published by the Free
-    Software Foundation, either version 3 of the License, or (at your option)
-    any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT ANY
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-    FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-    details.
-
-    You should have received a copy of the GNU General Public License along with
-    OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\defgroup grpJobControlFunctionObjects Job control function objects
-@{
-    \ingroup grpFunctionObjects
-    This group contains job control-based function objects
-@}
-
-\*---------------------------------------------------------------------------*/

src/postProcessing/functionObjects/lagrangian/Make/files

@@ -1,4 +1,4 @@
 cloudInfo/cloudInfo.C
 cloudInfo/cloudInfoFunctionObject.C
 
-LIB = $(FOAM_LIBBIN)/libcloudFunctionObjects
+LIB = $(FOAM_LIBBIN)/liblagrangianFunctionObjects

src/postProcessing/functionObjects/lagrangian/cloudInfo/IOcloudInfo.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

src/postProcessing/functionObjects/lagrangian/cloudInfo/cloudInfo.H

@@ -69,8 +69,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef cloudInfo_H
+#ifndef functionObjects_cloudInfo_H
-#define cloudInfo_H
+#define functionObjects_cloudInfo_H
 
 #include "functionObjectFiles.H"
 #include "PtrList.H"

src/postProcessing/functionObjects/lagrangian/cloudInfo/cloudInfoFunctionObject.C

@@ -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

src/postProcessing/functionObjects/lagrangian/lagrangianFunctionObjectsDoc.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
@@ -21,13 +21,13 @@ License
     You should have received a copy of the GNU General Public License along with
     OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-\defgroup grpCloudFunctionObjects Cloud function objects
+\defgroup grpLagrangianFunctionObjects Lagrangian function objects
 @{
     \ingroup grpFunctionObjects
-    This group contains cloud-based function objects.
+    This group contains lagrangian-based function objects.
 
     Function objects in this group are packaged into the
-    libcloudFunctionObjects.so library.
+    liblagrangianFunctionObjects.so library.
 @}
 
 \*---------------------------------------------------------------------------*/

src/postProcessing/functionObjects/utilities/CourantNo/CourantNo.H

@@ -38,8 +38,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef CourantNo_H
+#ifndef functionObjects_CourantNo_H
-#define CourantNo_H
+#define functionObjects_CourantNo_H
 
 #include "volFields.H"
 

src/postProcessing/functionObjects/utilities/Lambda2/Lambda2.H

@@ -38,8 +38,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef Lambda2_H
+#ifndef functionObjects_Lambda2_H
-#define Lambda2_H
+#define functionObjects_Lambda2_H
 
 #include "volFieldsFwd.H"
 #include "surfaceFieldsFwd.H"

src/postProcessing/functionObjects/utilities/Make/files

@@ -18,9 +18,6 @@ blendingFactor/blendingFactorFunctionObject.C
 dsmcFields/dsmcFields.C
 dsmcFields/dsmcFieldsFunctionObject.C
 
-pressureTools/pressureTools.C
-pressureTools/pressureToolsFunctionObject.C
-
 residuals/residuals.C
 residuals/residualsFunctionObject.C
 
@@ -36,12 +33,26 @@ turbulenceFields/turbulenceFieldsFunctionObject.C
 vorticity/vorticity.C
 vorticity/vorticityFunctionObject.C
 
-wallShearStress/wallShearStress.C
-wallShearStress/wallShearStressFunctionObject.C
-
 yPlus/yPlus.C
 yPlus/yPlusFunctionObject.C
 
 setTimeStep/setTimeStepFunctionObject.C
 
+systemCall/systemCall.C
+systemCall/systemCallFunctionObject.C
+
+abort/abort.C
+
+partialWrite/partialWrite.C
+partialWrite/partialWriteFunctionObject.C
+
+removeRegisteredObject/removeRegisteredObject.C
+removeRegisteredObject/removeRegisteredObjectFunctionObject.C
+
+writeDictionary/writeDictionary.C
+writeDictionary/writeDictionaryFunctionObject.C
+
+writeRegisteredObject/writeRegisteredObject.C
+writeRegisteredObject/writeRegisteredObjectFunctionObject.C
+
 LIB = $(FOAM_LIBBIN)/libutilityFunctionObjects

src/postProcessing/functionObjects/utilities/Make/options

@@ -21,8 +21,6 @@ LIB_LIBS = \
     -lcompressibleTransportModels \
     -lfluidThermophysicalModels \
     -lspecie \
-    -llagrangian \
-    -lDSMC \
     -lfiniteVolume \
     -lmeshTools \
     -lsampling

src/postProcessing/functionObjects/utilities/Peclet/Peclet.H

@@ -37,8 +37,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef Peclet_H
+#ifndef functionObjects_Peclet_H
-#define Peclet_H
+#define functionObjects_Peclet_H
 
 #include "volFieldsFwd.H"
 #include "surfaceFieldsFwd.H"

src/postProcessing/functionObjects/utilities/Q/Q.H

@@ -41,8 +41,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef Q_H
+#ifndef functionObjects_Q_H
-#define Q_H
+#define functionObjects_Q_H
 
 #include "volFieldsFwd.H"
 #include "surfaceFieldsFwd.H"

src/postProcessing/functionObjects/utilities/abort/abort.H

@@ -42,8 +42,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef abort_H
+#ifndef functionObjects_abort_H
-#define abort_H
+#define functionObjects_abort_H
 
 #include "NamedEnum.H"
 

src/postProcessing/functionObjects/utilities/blendingFactor/blendingFactor.H

@@ -39,8 +39,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef blendingFactor_H
+#ifndef functionObjects_blendingFactor_H
-#define blendingFactor_H
+#define functionObjects_blendingFactor_H
 
 #include "volFieldsFwd.H"
 #include "surfaceFieldsFwd.H"

src/postProcessing/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -74,8 +74,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef codedFunctionObject_H
+#ifndef functionObjects_codedFunctionObject_H
-#define codedFunctionObject_H
+#define functionObjects_codedFunctionObject_H
 
 #include "functionObject.H"
 #include "codedBase.H"

src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.H

@@ -41,8 +41,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef dsmcFields_H
+#ifndef functionObjects_dsmcFields_H
-#define dsmcFields_H
+#define functionObjects_dsmcFields_H
 
 #include "typeInfo.H"
 #include "autoPtr.H"

src/postProcessing/functionObjects/utilities/partialWrite/IOpartialWrite.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/postProcessing/functionObjects/utilities/partialWrite/partialWrite.H

@@ -62,8 +62,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef partialWrite_H
+#ifndef functionObjects_partialWrite_H
-#define partialWrite_H
+#define functionObjects_partialWrite_H
 
 #include "HashSet.H"
 #include "runTimeSelectionTables.H"

src/postProcessing/functionObjects/utilities/partialWrite/partialWriteFunctionObject.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/postProcessing/functionObjects/utilities/removeRegisteredObject/IOremoveRegisteredObject.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

src/postProcessing/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.H

@@ -58,8 +58,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef removeRegisteredObject_H
+#ifndef functionObjects_removeRegisteredObject_H
-#define removeRegisteredObject_H
+#define functionObjects_removeRegisteredObject_H
 
 #include "wordList.H"
 #include "runTimeSelectionTables.H"

src/postProcessing/functionObjects/utilities/removeRegisteredObject/removeRegisteredObjectFunctionObject.C

@@ -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

src/postProcessing/functionObjects/utilities/residuals/residuals.H

@@ -59,8 +59,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef residuals_H
+#ifndef functionObjects_residuals_H
-#define residuals_H
+#define functionObjects_residuals_H
 
 #include "functionObjectFiles.H"
 #include "primitiveFieldsFwd.H"

src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.H

@@ -45,8 +45,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef scalarTransport_H
+#ifndef functionObjects_scalarTransport_H
-#define scalarTransport_H
+#define functionObjects_scalarTransport_H
 
 #include "volFields.H"
 #include "surfaceFieldsFwd.H"

src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.C

@@ -29,6 +29,8 @@ License
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
+{
+namespace functionObjects
 {
     defineTypeNameAndDebug(setTimeStepFunctionObject, 0);
 
@@ -39,11 +41,12 @@ namespace Foam
         dictionary
     );
 }
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::setTimeStepFunctionObject::setTimeStepFunctionObject
+Foam::functionObjects::setTimeStepFunctionObject::setTimeStepFunctionObject
 (
     const word& name,
     const Time& runTime,
@@ -60,43 +63,46 @@ Foam::setTimeStepFunctionObject::setTimeStepFunctionObject
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::setTimeStepFunctionObject::on()
+void Foam::functionObjects::setTimeStepFunctionObject::on()
 {
     enabled_ = true;
 }
 
 
-void Foam::setTimeStepFunctionObject::off()
+void Foam::functionObjects::setTimeStepFunctionObject::off()
 {
     enabled_ = false;
 }
 
 
-bool Foam::setTimeStepFunctionObject::start()
+bool Foam::functionObjects::setTimeStepFunctionObject::start()
 {
     return true;
 }
 
 
-bool Foam::setTimeStepFunctionObject::execute(const bool forceWrite)
+bool Foam::functionObjects::setTimeStepFunctionObject::execute
+(
+    const bool forceWrite
+)
 {
     return true;
 }
 
 
-bool Foam::setTimeStepFunctionObject::end()
+bool Foam::functionObjects::setTimeStepFunctionObject::end()
 {
     return true;
 }
 
 
-bool Foam::setTimeStepFunctionObject::timeSet()
+bool Foam::functionObjects::setTimeStepFunctionObject::timeSet()
 {
     return true;
 }
 
 
-bool Foam::setTimeStepFunctionObject::adjustTimeStep()
+bool Foam::functionObjects::setTimeStepFunctionObject::adjustTimeStep()
 {
     if (enabled())
     {
@@ -114,7 +120,10 @@ bool Foam::setTimeStepFunctionObject::adjustTimeStep()
 }
 
 
-bool Foam::setTimeStepFunctionObject::read(const dictionary& dict)
+bool Foam::functionObjects::setTimeStepFunctionObject::read
+(
+    const dictionary& dict
+)
 {
     enabled_ = dict.lookupOrDefault("enabled", true);
 
@@ -141,11 +150,17 @@ bool Foam::setTimeStepFunctionObject::read(const dictionary& dict)
 }
 
 
-void Foam::setTimeStepFunctionObject::updateMesh(const mapPolyMesh& mpm)
+void Foam::functionObjects::setTimeStepFunctionObject::updateMesh
+(
+    const mapPolyMesh& mpm
+)
 {}
 
 
-void Foam::setTimeStepFunctionObject::movePoints(const polyMesh& mesh)
+void Foam::functionObjects::setTimeStepFunctionObject::movePoints
+(
+    const polyMesh& mesh
+)
 {}
 
 

src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.H

@@ -39,8 +39,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef setTimeStepFunctionObject_H
+#ifndef functionObjects_setTimeStepFunctionObject_H
-#define setTimeStepFunctionObject_H
+#define functionObjects_setTimeStepFunctionObject_H
 
 #include "functionObject.H"
 #include "dictionary.H"
@@ -50,6 +50,8 @@ SourceFiles
 
 namespace Foam
 {
+namespace functionObjects
+{
 
 /*---------------------------------------------------------------------------*\
                     Class setTimeStepFunctionObject Declaration
@@ -150,6 +152,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace functionObjects
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/postProcessing/functionObjects/utilities/systemCall/IOsystemCall.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License