functionObjects: Simplified organization and naming

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

@@ -0,0 +1,49 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012-2016 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/>.
+
+Typedef
+    Foam::IOdiv
+
+Description
+    Instance of the generic IOOutputFilter for div.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef IOdiv_H
+#define IOdiv_H
+
+#include "div.H"
+#include "IOOutputFilter.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    typedef IOOutputFilter<div> IOdiv;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

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

@@ -0,0 +1,172 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2013-2016 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "div.H"
+#include "volFields.H"
+#include "dictionary.H"
+#include "div.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace functionObjects
+{
+    defineTypeNameAndDebug(div, 0);
+}
+}
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+Foam::volScalarField& Foam::functionObjects::div::divField
+(
+    const word& divName,
+    const dimensionSet& dims
+)
+{
+    const fvMesh& mesh = refCast<const fvMesh>(obr_);
+
+    if (!mesh.foundObject<volScalarField>(divName))
+    {
+        volScalarField* divFieldPtr
+        (
+            new volScalarField
+            (
+                IOobject
+                (
+                    divName,
+                    mesh.time().timeName(),
+                    mesh,
+                    IOobject::NO_READ,
+                    IOobject::NO_WRITE
+                ),
+                mesh,
+                dimensionedScalar("zero", dims/dimLength, 0.0)
+            )
+        );
+
+        mesh.objectRegistry::store(divFieldPtr);
+    }
+
+    const volScalarField& field = mesh.lookupObject<volScalarField>(divName);
+
+    return const_cast<volScalarField&>(field);
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::functionObjects::div::div
+(
+    const word& name,
+    const objectRegistry& obr,
+    const dictionary& dict,
+    const bool loadFromFiles
+)
+:
+    name_(name),
+    obr_(obr),
+    fieldName_("undefined-fieldName"),
+    resultName_("undefined-resultName")
+{
+    read(dict);
+}
+
+
+bool Foam::functionObjects::div::viable
+(
+    const word& name,
+    const objectRegistry& obr,
+    const dictionary& dict,
+    const bool loadFromFiles
+)
+{
+    // Construction is viable if the available mesh is an fvMesh
+    return isA<fvMesh>(obr);
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::functionObjects::div::~div()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::functionObjects::div::read(const dictionary& dict)
+{
+    dict.lookup("fieldName") >> fieldName_;
+    dict.lookup("resultName") >> resultName_;
+
+    if (resultName_ == "none")
+    {
+        resultName_ = "fvc::div(" + fieldName_ + ")";
+    }
+}
+
+
+void Foam::functionObjects::div::execute()
+{
+    bool processed = false;
+
+    calcDiv<surfaceScalarField>(fieldName_, resultName_, processed);
+    calcDiv<volVectorField>(fieldName_, resultName_, processed);
+
+    if (!processed)
+    {
+        WarningInFunction
+            << "Unprocessed field " << fieldName_ << endl;
+    }
+}
+
+
+void Foam::functionObjects::div::end()
+{
+    execute();
+}
+
+
+void Foam::functionObjects::div::timeSet()
+{}
+
+
+void Foam::functionObjects::div::write()
+{
+    if (obr_.foundObject<regIOobject>(resultName_))
+    {
+        const regIOobject& field =
+            obr_.lookupObject<regIOobject>(resultName_);
+
+        Info<< type() << " " << name_ << " output:" << nl
+            << "    writing field " << field.name() << nl << endl;
+
+        field.write();
+    }
+}
+
+
+// ************************************************************************* //

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

@@ -0,0 +1,192 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012-2016 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/>.
+
+Class
+    Foam::functionObjects::div
+
+Group
+    grpFVFunctionObjects
+
+Description
+    This function object calculates the divergence of a field.  The operation is
+    limited to surfaceScalarFields and volumeVector fields, and the output is a
+    volume scalar field.
+
+SourceFiles
+    div.C
+    IOdiv.H
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef functionObjects_div_H
+#define functionObjects_div_H
+
+#include "volFieldsFwd.H"
+#include "surfaceFieldsFwd.H"
+#include "pointFieldFwd.H"
+#include "OFstream.H"
+#include "Switch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+class objectRegistry;
+class dictionary;
+class polyMesh;
+class mapPolyMesh;
+class dimensionSet;
+
+namespace functionObjects
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class div Declaration
+\*---------------------------------------------------------------------------*/
+
+class div
+{
+    // Private data
+
+        //- Name of this div object
+        word name_;
+
+        //- Reference to the database
+        const objectRegistry& obr_;
+
+        //- Name of field to process
+        word fieldName_;
+
+        //- Name of result field
+        word resultName_;
+
+
+    // Private Member Functions
+
+        //- Helper function to create/store/return the divergence field
+        volScalarField& divField
+        (
+            const word& gradName,
+            const dimensionSet& dims
+        );
+
+        //- Helper function to calculate the divergence of different field types
+        template<class FieldType>
+        void calcDiv
+        (
+            const word& fieldName,
+            const word& resultName,
+            bool& processed
+        );
+
+        //- Disallow default bitwise copy construct
+        div(const div&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const div&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("div");
+
+
+    // Constructors
+
+        //- Construct for given objectRegistry and dictionary.
+        //  Allow the possibility to load fields from files
+        div
+        (
+            const word& name,
+            const objectRegistry&,
+            const dictionary&,
+            const bool loadFromFiles = false
+        );
+
+        //- Return true if the construction of this functionObject is viable
+        //  i.e. the prerequisites for construction are available
+        static bool viable
+        (
+            const word& name,
+            const objectRegistry&,
+            const dictionary&,
+            const bool loadFromFiles = false
+        );
+
+
+    //- Destructor
+    virtual ~div();
+
+
+    // Member Functions
+
+        //- Return name of the set of div
+        virtual const word& name() const
+        {
+            return name_;
+        }
+
+        //- Read the div data
+        virtual void read(const dictionary&);
+
+        //- Execute, currently does nothing
+        virtual void execute();
+
+        //- Execute at the final time-loop, currently does nothing
+        virtual void end();
+
+        //- Called when time was set at the end of the Time::operator++
+        virtual void timeSet();
+
+        //- Calculate the div and write
+        virtual void write();
+
+        //- Update for changes of mesh
+        virtual void updateMesh(const mapPolyMesh&)
+        {}
+
+        //- Update for changes of mesh
+        virtual void movePoints(const polyMesh&)
+        {}
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace functionObjects
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "divTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

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

@@ -0,0 +1,42 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012-2016 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "divFunctionObject.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineNamedTemplateTypeNameAndDebug(divFunctionObject, 0);
+
+    addToRunTimeSelectionTable
+    (
+        functionObject,
+        divFunctionObject,
+        dictionary
+    );
+}
+
+// ************************************************************************* //

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

@@ -0,0 +1,54 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012-2016 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/>.
+
+Typedef
+    Foam::divFunctionObject
+
+Description
+    FunctionObject wrapper around div to allow it to be created
+    via the functions entry within controlDict.
+
+SourceFiles
+    divFunctionObject.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef divFunctionObject_H
+#define divFunctionObject_H
+
+#include "div.H"
+#include "OutputFilterFunctionObject.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    typedef OutputFilterFunctionObject<functionObjects::div>
+        divFunctionObject;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

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

@@ -0,0 +1,54 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012-2016 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "fvMesh.H"
+#include "fvcDiv.H"
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class FieldType>
+void Foam::functionObjects::div::calcDiv
+(
+    const word& fieldName,
+    const word& resultName,
+    bool& processed
+)
+{
+    const fvMesh& mesh = refCast<const fvMesh>(obr_);
+
+    if (mesh.foundObject<FieldType>(fieldName))
+    {
+        const FieldType& vf = mesh.lookupObject<FieldType>(fieldName);
+
+        volScalarField& field = divField(resultName, vf.dimensions());
+
+        field = fvc::div(vf);
+
+        processed = true;
+    }
+}
+
+
+// ************************************************************************* //

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
-#define fieldAverage_H
+#ifndef functionObjects_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
-#define fieldCoordinateSystemTransform_H
+#ifndef functionObjects_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
-#define fieldMinMax_H
+#ifndef functionObjects_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
-#define cellSource_H
+#ifndef functionObjects_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
-#define faceSource_H
+#ifndef functionObjects_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
-#define fieldValue_H
+#ifndef functionObjects_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
-#define fieldValueDelta_H
+#ifndef functionObjects_fieldValueDelta_H
+#define functionObjects_fieldValueDelta_H
 
 #include "functionObjectFiles.H"
 #include "fieldValue.H"

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

@@ -0,0 +1,49 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012-2016 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/>.
+
+Typedef
+    Foam::IOgrad
+
+Description
+    Instance of the generic IOOutputFilter for grad.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef IOgrad_H
+#define IOgrad_H
+
+#include "grad.H"
+#include "IOOutputFilter.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    typedef IOOutputFilter<grad> IOgrad;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

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

@@ -0,0 +1,134 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2013-2016 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "grad.H"
+#include "volFields.H"
+#include "dictionary.H"
+#include "grad.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace functionObjects
+{
+    defineTypeNameAndDebug(grad, 0);
+}
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::functionObjects::grad::grad
+(
+    const word& name,
+    const objectRegistry& obr,
+    const dictionary& dict,
+    const bool loadFromFiles
+)
+:
+    name_(name),
+    obr_(obr),
+    fieldName_("undefined-fieldName"),
+    resultName_("undefined-resultName")
+{
+    read(dict);
+}
+
+
+bool Foam::functionObjects::grad::viable
+(
+    const word& name,
+    const objectRegistry& obr,
+    const dictionary& dict,
+    const bool loadFromFiles
+)
+{
+    // Construction is viable if the available mesh is an fvMesh
+    return isA<fvMesh>(obr);
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::functionObjects::grad::~grad()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::functionObjects::grad::read(const dictionary& dict)
+{
+    dict.lookup("fieldName") >> fieldName_;
+    dict.lookup("resultName") >> resultName_;
+
+    if (resultName_ == "none")
+    {
+        resultName_ = "fvc::grad(" + fieldName_ + ")";
+    }
+}
+
+
+void Foam::functionObjects::grad::execute()
+{
+    bool processed = false;
+
+    calcGrad<scalar>(fieldName_, resultName_, processed);
+    calcGrad<vector>(fieldName_, resultName_, processed);
+
+    if (!processed)
+    {
+        WarningInFunction
+            << "Unprocessed field " << fieldName_ << endl;
+    }
+}
+
+
+void Foam::functionObjects::grad::end()
+{
+    execute();
+}
+
+
+void Foam::functionObjects::grad::timeSet()
+{}
+
+
+void Foam::functionObjects::grad::write()
+{
+    if (obr_.foundObject<regIOobject>(resultName_))
+    {
+        const regIOobject& field =
+            obr_.lookupObject<regIOobject>(resultName_);
+
+        Info<< type() << " " << name_ << " output:" << nl
+            << "    writing field " << field.name() << nl << endl;
+
+        field.write();
+    }
+}
+
+
+// ************************************************************************* //

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

@@ -0,0 +1,195 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012-2016 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/>.
+
+Class
+    Foam::functionObjects::grad
+
+Group
+    grpFVFunctionObjects
+
+Description
+    This function object calculates the gradient of a field.  The operation is
+    limited to scalar and vector volume or surface fields, and the output is a
+    volume vector or tensor field.
+
+SourceFiles
+    grad.C
+    IOgrad.H
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef functionObjects_grad_H
+#define functionObjects_grad_H
+
+#include "volFieldsFwd.H"
+#include "surfaceFieldsFwd.H"
+#include "pointFieldFwd.H"
+#include "OFstream.H"
+#include "Switch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+class objectRegistry;
+class dictionary;
+class polyMesh;
+class mapPolyMesh;
+class dimensionSet;
+
+namespace functionObjects
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class grad Declaration
+\*---------------------------------------------------------------------------*/
+
+class grad
+{
+    // Private data
+
+        //- Name of this grad object
+        word name_;
+
+        //- Reference to the database
+        const objectRegistry& obr_;
+
+        //- Name of field to process
+        word fieldName_;
+
+        //- Name of result field
+        word resultName_;
+
+
+    // Private Member Functions
+
+        //- Helper function to create/store/return the gradient field
+        template<class Type>
+        GeometricField
+        <
+            typename outerProduct<vector, Type>::type,
+            fvPatchField,
+            volMesh
+        >&
+        gradField(const word& gradName, const dimensionSet& dims);
+
+        //- Helper function to calculate the gradient of different field types
+        template<class Type>
+        void calcGrad
+        (
+            const word& fieldName,
+            const word& resultName,
+            bool& processed
+        );
+
+        //- Disallow default bitwise copy construct
+        grad(const grad&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const grad&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("grad");
+
+
+    // Constructors
+
+        //- Construct for given objectRegistry and dictionary.
+        //  Allow the possibility to load fields from files
+        grad
+        (
+            const word& name,
+            const objectRegistry&,
+            const dictionary&,
+            const bool loadFromFiles = false
+        );
+
+        //- Return true if the construction of this functionObject is viable
+        //  i.e. the prerequisites for construction are available
+        static bool viable
+        (
+            const word& name,
+            const objectRegistry&,
+            const dictionary&,
+            const bool loadFromFiles = false
+        );
+
+
+    //- Destructor
+    virtual ~grad();
+
+
+    // Member Functions
+
+        //- Return name of the set of grad
+        virtual const word& name() const
+        {
+            return name_;
+        }
+
+        //- Read the grad data
+        virtual void read(const dictionary&);
+
+        //- Execute, currently does nothing
+        virtual void execute();
+
+        //- Execute at the final time-loop, currently does nothing
+        virtual void end();
+
+        //- Called when time was set at the end of the Time::operator++
+        virtual void timeSet();
+
+        //- Calculate the grad and write
+        virtual void write();
+
+        //- Update for changes of mesh
+        virtual void updateMesh(const mapPolyMesh&)
+        {}
+
+        //- Update for changes of mesh
+        virtual void movePoints(const polyMesh&)
+        {}
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace functionObjects
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "gradTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

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

@@ -0,0 +1,42 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012-2016 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "gradFunctionObject.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineNamedTemplateTypeNameAndDebug(gradFunctionObject, 0);
+
+    addToRunTimeSelectionTable
+    (
+        functionObject,
+        gradFunctionObject,
+        dictionary
+    );
+}
+
+// ************************************************************************* //

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

@@ -0,0 +1,54 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012-2016 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/>.
+
+Typedef
+    Foam::gradFunctionObject
+
+Description
+    FunctionObject wrapper around grad to allow it to be created
+    via the functions entry within controlDict.
+
+SourceFiles
+    gradFunctionObject.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef gradFunctionObject_H
+#define gradFunctionObject_H
+
+#include "grad.H"
+#include "OutputFilterFunctionObject.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    typedef OutputFilterFunctionObject<functionObjects::grad>
+        gradFunctionObject;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

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

@@ -0,0 +1,126 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012-2016 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "fvMesh.H"
+#include "fvcGrad.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class Type>
+Foam::GeometricField
+<
+    typename Foam::outerProduct<Foam::vector, Type>::type,
+    Foam::fvPatchField,
+    Foam::volMesh
+>&
+Foam::functionObjects::grad::gradField
+(
+    const word& gradName,
+    const dimensionSet& dims
+)
+{
+    Info<< "gradField" << endl;
+
+    typedef typename outerProduct<vector, Type>::type gradType;
+    typedef GeometricField<gradType, fvPatchField, volMesh> vfGradType;
+
+    const fvMesh& mesh = refCast<const fvMesh>(obr_);
+
+    if (!mesh.foundObject<vfGradType>(gradName))
+    {
+        vfGradType* gradFieldPtr
+        (
+            new vfGradType
+            (
+                IOobject
+                (
+                    gradName,
+                    mesh.time().timeName(),
+                    mesh,
+                    IOobject::NO_READ,
+                    IOobject::NO_WRITE
+                ),
+                mesh,
+                dimensioned<gradType>
+                (
+                    "zero",
+                    dims/dimLength,
+                    Zero
+                )
+            )
+        );
+
+        mesh.objectRegistry::store(gradFieldPtr);
+    }
+
+    const vfGradType& field = mesh.lookupObject<vfGradType>(gradName);
+
+    return const_cast<vfGradType&>(field);
+}
+
+
+template<class Type>
+void Foam::functionObjects::grad::calcGrad
+(
+    const word& fieldName,
+    const word& resultName,
+    bool& processed
+)
+{
+    typedef GeometricField<Type, fvPatchField, volMesh> vfType;
+    typedef GeometricField<Type, fvsPatchField, surfaceMesh> sfType;
+
+    typedef typename outerProduct<vector, Type>::type gradType;
+    typedef GeometricField<gradType, fvPatchField, volMesh> vfGradType;
+
+    const fvMesh& mesh = refCast<const fvMesh>(obr_);
+
+
+    if (mesh.foundObject<vfType>(fieldName))
+    {
+        const vfType& vf = mesh.lookupObject<vfType>(fieldName);
+
+        vfGradType& field = gradField<Type>(resultName, vf.dimensions());
+
+        // De-reference the tmp to avoid a clash with the cached grad field
+        field = fvc::grad(vf)();
+
+        processed = true;
+    }
+    else if (mesh.foundObject<sfType>(fieldName))
+    {
+        const sfType& sf = mesh.lookupObject<sfType>(fieldName);
+
+        vfGradType& field = gradField<Type>(resultName, sf.dimensions());
+
+        // De-reference the tmp to avoid a clash with the cached grad field
+        field = fvc::grad(sf)();
+
+        processed = true;
+    }
+}
+
+
+// ************************************************************************* //

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

@@ -0,0 +1,49 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012-2016 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/>.
+
+Typedef
+    Foam::IOmag
+
+Description
+    Instance of the generic IOOutputFilter for mag.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef IOmag_H
+#define IOmag_H
+
+#include "mag.H"
+#include "IOOutputFilter.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    typedef IOOutputFilter<mag> IOmag;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

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

@@ -0,0 +1,137 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2013-2016 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "mag.H"
+#include "volFields.H"
+#include "dictionary.H"
+#include "mag.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace functionObjects
+{
+    defineTypeNameAndDebug(mag, 0);
+}
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::functionObjects::mag::mag
+(
+    const word& name,
+    const objectRegistry& obr,
+    const dictionary& dict,
+    const bool loadFromFiles
+)
+:
+    name_(name),
+    obr_(obr),
+    fieldName_("undefined-fieldName"),
+    resultName_("undefined-resultName")
+{
+    read(dict);
+}
+
+
+bool Foam::functionObjects::mag::viable
+(
+    const word& name,
+    const objectRegistry& obr,
+    const dictionary& dict,
+    const bool loadFromFiles
+)
+{
+    // Construction is viable if the available mesh is an fvMesh
+    return isA<fvMesh>(obr);
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::functionObjects::mag::~mag()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::functionObjects::mag::read(const dictionary& dict)
+{
+    dict.lookup("fieldName") >> fieldName_;
+    dict.lookup("resultName") >> resultName_;
+
+    if (resultName_ == "none")
+    {
+        resultName_ = "mag(" + fieldName_ + ")";
+    }
+}
+
+
+void Foam::functionObjects::mag::execute()
+{
+    bool processed = false;
+
+    calc<scalar>(fieldName_, resultName_, processed);
+    calc<vector>(fieldName_, resultName_, processed);
+    calc<sphericalTensor>(fieldName_, resultName_, processed);
+    calc<symmTensor>(fieldName_, resultName_, processed);
+    calc<tensor>(fieldName_, resultName_, processed);
+
+    if (!processed)
+    {
+        WarningInFunction
+            << "Unprocessed field " << fieldName_ << endl;
+    }
+}
+
+
+void Foam::functionObjects::mag::end()
+{
+    execute();
+}
+
+
+void Foam::functionObjects::mag::timeSet()
+{}
+
+
+void Foam::functionObjects::mag::write()
+{
+    if (obr_.foundObject<regIOobject>(resultName_))
+    {
+        const regIOobject& field =
+            obr_.lookupObject<regIOobject>(resultName_);
+
+        Info<< type() << " " << name_ << " output:" << nl
+            << "    writing field " << field.name() << nl << endl;
+
+        field.write();
+    }
+}
+
+
+// ************************************************************************* //

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

@@ -0,0 +1,189 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012-2016 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/>.
+
+Class
+    Foam::functionObjects::mag
+
+Group
+    grpFVFunctionObjects
+
+Description
+    This function object calculates the magnitude of a field.  The operation
+    can be applied to any volume or surface fieldsm and the output is a
+    volume or surface scalar field.
+
+SourceFiles
+    mag.C
+    IOmag.H
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef functionObjects_mag_H
+#define functionObjects_mag_H
+
+#include "volFieldsFwd.H"
+#include "surfaceFieldsFwd.H"
+#include "pointFieldFwd.H"
+#include "OFstream.H"
+#include "Switch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+class objectRegistry;
+class dictionary;
+class polyMesh;
+class mapPolyMesh;
+class dimensionSet;
+
+namespace functionObjects
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class mag Declaration
+\*---------------------------------------------------------------------------*/
+
+class mag
+{
+    // Private data
+
+        //- Name of this mag object
+        word name_;
+
+        //- Reference to the database
+        const objectRegistry& obr_;
+
+        //- Name of field to process
+        word fieldName_;
+
+        //- Name of result field
+        word resultName_;
+
+
+    // Private Member Functions
+
+        //- Helper function to create/store/return the mag field
+        template<class FieldType>
+        FieldType& magField(const word& magName, const dimensionSet& dims);
+
+        //- Helper function to calculate the magnitude of different field types
+        template<class Type>
+        void calc
+        (
+            const word& fieldName,
+            const word& resultName,
+            bool& processed
+        );
+
+        //- Disallow default bitwise copy construct
+        mag(const mag&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const mag&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("mag");
+
+
+    // Constructors
+
+        //- Construct for given objectRegistry and dictionary.
+        //  Allow the possibility to load fields from files
+        mag
+        (
+            const word& name,
+            const objectRegistry&,
+            const dictionary&,
+            const bool loadFromFiles = false
+        );
+
+        //- Return true if the construction of this functionObject is viable
+        //  i.e. the prerequisites for construction are available
+        static bool viable
+        (
+            const word& name,
+            const objectRegistry&,
+            const dictionary&,
+            const bool loadFromFiles = false
+        );
+
+
+    //- Destructor
+    virtual ~mag();
+
+
+    // Member Functions
+
+        //- Return name of the set of mag
+        virtual const word& name() const
+        {
+            return name_;
+        }
+
+        //- Read the mag data
+        virtual void read(const dictionary&);
+
+        //- Execute, currently does nothing
+        virtual void execute();
+
+        //- Execute at the final time-loop, currently does nothing
+        virtual void end();
+
+        //- Called when time was set at the end of the Time::operator++
+        virtual void timeSet();
+
+        //- Calculate the mag and write
+        virtual void write();
+
+        //- Update for changes of mesh
+        virtual void updateMesh(const mapPolyMesh&)
+        {}
+
+        //- Update for changes of mesh
+        virtual void movePoints(const polyMesh&)
+        {}
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace functionObjects
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "magTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

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

@@ -0,0 +1,42 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012-2016 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "magFunctionObject.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineNamedTemplateTypeNameAndDebug(magFunctionObject, 0);
+
+    addToRunTimeSelectionTable
+    (
+        functionObject,
+        magFunctionObject,
+        dictionary
+    );
+}
+
+// ************************************************************************* //

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

@@ -0,0 +1,54 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012-2016 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/>.
+
+Typedef
+    Foam::magFunctionObject
+
+Description
+    FunctionObject wrapper around mag to allow it to be created
+    via the functions entry within controlDict.
+
+SourceFiles
+    magFunctionObject.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef magFunctionObject_H
+#define magFunctionObject_H
+
+#include "mag.H"
+#include "OutputFilterFunctionObject.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    typedef OutputFilterFunctionObject<functionObjects::mag>
+        magFunctionObject;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

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

@@ -0,0 +1,108 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012-2016 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/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "fvMesh.H"
+#include "Time.H"
+#include "volFields.H"
+#include "surfaceFields.H"
+
+template<class FieldType>
+FieldType& Foam::functionObjects::mag::magField
+(
+    const word& magName,
+    const dimensionSet& dims
+)
+{
+    const fvMesh& mesh = refCast<const fvMesh>(obr_);
+
+    if (!mesh.foundObject<FieldType>(magName))
+    {
+        FieldType* magFieldPtr
+        (
+            new FieldType
+            (
+                IOobject
+                (
+                    magName,
+                    mesh.time().timeName(),
+                    mesh,
+                    IOobject::NO_READ,
+                    IOobject::NO_WRITE
+                ),
+                mesh,
+                dimensionedScalar("zero", dims, 0.0)
+            )
+        );
+
+        mesh.objectRegistry::store(magFieldPtr);
+    }
+
+    const FieldType& f = mesh.lookupObject<FieldType>(magName);
+
+    return const_cast<FieldType&>(f);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::functionObjects::mag::calc
+(
+    const word& fieldName,
+    const word& resultName,
+    bool& processed
+)
+{
+    typedef GeometricField<Type, fvPatchField, volMesh> vfType;
+    typedef GeometricField<Type, fvsPatchField, surfaceMesh> sfType;
+
+    const fvMesh& mesh = refCast<const fvMesh>(obr_);
+
+    if (mesh.foundObject<vfType>(fieldName))
+    {
+        const vfType& vf = mesh.lookupObject<vfType>(fieldName);
+
+        volScalarField& field =
+            magField<volScalarField>(resultName_, vf.dimensions());
+
+        field = Foam::mag(vf);
+
+        processed = true;
+    }
+    else if (mesh.foundObject<sfType>(fieldName))
+    {
+        const sfType& sf = mesh.lookupObject<sfType>(fieldName);
+
+        surfaceScalarField& field =
+            magField<surfaceScalarField>(resultName_, sf.dimensions());
+
+        field = Foam::mag(sf);
+
+        processed = true;
+    }
+}
+
+
+// ************************************************************************* //

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

@@ -70,8 +70,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef nearWallFields_H
-#define nearWallFields_H
+#ifndef functionObjects_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
-#define processorField_H
+#ifndef functionObjects_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
-#define readFields_H
+#ifndef functionObjects_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
-#define regionSizeDistribution_H
+#ifndef functionObjects_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
-#define streamLine_H
+#ifndef functionObjects_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
-#define surfaceInterpolateFields_H
+#ifndef functionObjects_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
-#define wallBoundedStreamLine_H
+#ifndef functionObjects_wallBoundedStreamLine_H
+#define functionObjects_wallBoundedStreamLine_H
 
 #include "volFieldsFwd.H"
 #include "pointFieldFwd.H"