From c8171fb1e6c6afc894cf4e80e928b25452361f0f Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 3 May 2016 23:37:28 +0100
Subject: [PATCH] functionObjects: Simplified organization and naming
---
src/postProcessing/functionObjects/Allwmake | 6 +-
.../functionObjects/IO/IOFunctionObjectsDoc.H | 30 -----
.../functionObjects/IO/Make/files | 13 --
.../functionObjects/IO/Make/options | 7 -
.../functionObjects/field/Make/files | 9 ++
.../calcMag/IOcalcMag.H => field/div/IOdiv.H} | 14 +-
.../calcFvcDiv.C => field/div/div.C} | 24 ++--
.../calcFvcDiv.H => field/div/div.H} | 34 ++---
.../div/divFunctionObject.C} | 8 +-
.../div/divFunctionObject.H} | 16 +--
.../div/divTemplates.C} | 2 +-
.../field/{ => doc}/fieldFunctionObjectsDoc.H | 2 +-
.../fieldAverage/fieldAverage/fieldAverage.H | 4 +-
.../fieldCoordinateSystemTransform.H | 4 +-
.../field/fieldMinMax/fieldMinMax.H | 4 +-
.../field/fieldValues/cellSource/cellSource.H | 4 +-
.../field/fieldValues/faceSource/faceSource.H | 4 +-
.../field/fieldValues/fieldValue/fieldValue.H | 4 +-
.../fieldValueDelta/fieldValueDelta.H | 4 +-
.../IOcalcFvcDiv.H => field/grad/IOgrad.H} | 14 +-
.../calcFvcGrad.C => field/grad/grad.C} | 22 ++--
.../calcFvcGrad.H => field/grad/grad.H} | 34 ++---
.../grad/gradFunctionObject.C} | 8 +-
.../grad/gradFunctionObject.H} | 16 +--
.../grad/gradTemplates.C} | 4 +-
.../IOcalcFvcGrad.H => field/mag/IOmag.H} | 14 +-
.../calcMag/calcMag.C => field/mag/mag.C} | 22 ++--
.../calcMag/calcMag.H => field/mag/mag.H} | 34 ++---
.../mag/magFunctionObject.C} | 8 +-
.../mag/magFunctionObject.H} | 16 +--
.../mag/magTemplates.C} | 8 +-
.../field/nearWallFields/nearWallFields.H | 4 +-
.../field/processorField/processorField.H | 4 +-
.../field/readFields/readFields.H | 4 +-
.../regionSizeDistribution.H | 4 +-
.../field/streamLine/streamLine.H | 4 +-
.../surfaceInterpolateFields.H | 4 +-
.../wallBoundedStreamLine.H | 4 +-
.../functionObjects/forces/Make/files | 6 +
.../forces/forceCoeffs/forceCoeffs.H | 4 +-
.../functionObjects/forces/forces/forces.H | 4 +-
.../pressureTools/IOpressureTools.H | 0
.../pressureTools/pressureTools.C | 0
.../pressureTools/pressureTools.H | 4 +-
.../pressureToolsFunctionObject.C | 2 +-
.../pressureToolsFunctionObject.H | 0
.../wallShearStress/IOwallShearStress.H | 0
.../wallShearStress/wallShearStress.C | 0
.../wallShearStress/wallShearStress.H | 4 +-
.../wallShearStressFunctionObject.C | 2 +-
.../wallShearStressFunctionObject.H | 0
.../functionObjects/fvTools/Make/files | 10 --
.../functionObjects/fvTools/Make/options | 5 -
.../fvTools/doc/fvToolsFunctionObjectsDoc.H | 30 -----
.../functionObjects/jobControl/Make/files | 4 -
.../jobControl/jobControlFunctionObjectsDoc.H | 30 -----
.../{cloud => lagrangian}/Make/files | 2 +-
.../{cloud => lagrangian}/Make/options | 0
.../cloudInfo/IOcloudInfo.H | 2 +-
.../cloudInfo/cloudInfo.C | 0
.../cloudInfo/cloudInfo.H | 4 +-
.../cloudInfo/cloudInfoFunctionObject.C | 2 +-
.../cloudInfo/cloudInfoFunctionObject.H | 0
.../cloudInfo/postProcessingDict | 0
.../lagrangianFunctionObjectsDoc.H} | 8 +-
.../functionObjects/systemCall/Make/options | 0
.../utilities/CourantNo/CourantNo.H | 4 +-
.../utilities/Lambda2/Lambda2.H | 4 +-
.../functionObjects/utilities/Make/files | 23 +++-
.../functionObjects/utilities/Make/options | 2 -
.../functionObjects/utilities/Peclet/Peclet.H | 4 +-
.../functionObjects/utilities/Q/Q.H | 4 +-
.../{jobControl => utilities}/abort/IOabort.H | 0
.../{jobControl => utilities}/abort/abort.C | 0
.../{jobControl => utilities}/abort/abort.H | 4 +-
.../abort/abortFunctionObject.C | 0
.../abort/abortFunctionObject.H | 0
.../utilities/blendingFactor/blendingFactor.H | 4 +-
.../codedFunctionObject/codedFunctionObject.H | 6 +-
.../utilities/dsmcFields/dsmcFields.H | 4 +-
.../partialWrite/IOpartialWrite.H | 2 +-
.../partialWrite}/controlDict | 0
.../partialWrite/partialWrite.C | 0
.../partialWrite/partialWrite.H | 4 +-
.../partialWrite/partialWriteFunctionObject.C | 2 +-
.../partialWrite/partialWriteFunctionObject.H | 0
.../partialWrite/partialWriteTemplates.C | 0
.../IOremoveRegisteredObject.H | 2 +-
.../removeRegisteredObject.C | 0
.../removeRegisteredObject.H | 4 +-
.../removeRegisteredObjectFunctionObject.C | 2 +-
.../removeRegisteredObjectFunctionObject.H | 0
.../utilities/residuals/residuals.H | 4 +-
.../scalarTransport/scalarTransport.H | 4 +-
.../setTimeStep/setTimeStepFunctionObject.C | 37 ++++--
.../setTimeStep/setTimeStepFunctionObject.H | 7 +-
.../{ => utilities}/systemCall/IOsystemCall.H | 2 +-
.../{ => utilities}/systemCall/Make/files | 0
.../systemCall}/Make/options | 0
.../{ => utilities}/systemCall/controlDict | 0
.../{ => utilities}/systemCall/systemCall.C | 0
.../{ => utilities}/systemCall/systemCall.H | 4 +-
.../systemCall/systemCallFunctionObject.C | 2 +-
.../systemCall/systemCallFunctionObject.H | 0
.../timeActivatedFileUpdate.H | 4 +-
.../turbulenceFields/turbulenceFields.H | 4 +-
.../utilities/vorticity/vorticity.H | 4 +-
.../writeDictionary/IOwriteDictionary.H | 2 +-
.../writeDictionary/writeDictionary.C | 0
.../writeDictionary/writeDictionary.H | 4 +-
.../writeDictionaryFunctionObject.C | 2 +-
.../writeDictionaryFunctionObject.H | 0
.../IOwriteRegisteredObject.H | 2 +-
.../writeRegisteredObject/controlDict | 122 ++++++++++++++++++
.../writeRegisteredObject.C | 0
.../writeRegisteredObject.H | 4 +-
.../writeRegisteredObjectFunctionObject.C | 2 +-
.../writeRegisteredObjectFunctionObject.H | 0
.../functionObjects/utilities/yPlus/yPlus.H | 4 +-
119 files changed, 432 insertions(+), 401 deletions(-)
delete mode 100644 src/postProcessing/functionObjects/IO/IOFunctionObjectsDoc.H
delete mode 100644 src/postProcessing/functionObjects/IO/Make/files
delete mode 100644 src/postProcessing/functionObjects/IO/Make/options
rename src/postProcessing/functionObjects/{fvTools/calcMag/IOcalcMag.H => field/div/IOdiv.H} (84%)
rename src/postProcessing/functionObjects/{fvTools/calcFvcDiv/calcFvcDiv.C => field/div/div.C} (87%)
rename src/postProcessing/functionObjects/{fvTools/calcFvcDiv/calcFvcDiv.H => field/div/div.H} (89%)
rename src/postProcessing/functionObjects/{fvTools/calcMag/calcMagFunctionObject.C => field/div/divFunctionObject.C} (87%)
rename src/postProcessing/functionObjects/{fvTools/calcFvcDiv/calcFvcDivFunctionObject.H => field/div/divFunctionObject.H} (82%)
rename src/postProcessing/functionObjects/{fvTools/calcFvcDiv/calcFvcDivTemplates.C => field/div/divTemplates.C} (97%)
rename src/postProcessing/functionObjects/field/{ => doc}/fieldFunctionObjectsDoc.H (94%)
rename src/postProcessing/functionObjects/{fvTools/calcFvcDiv/IOcalcFvcDiv.H => field/grad/IOgrad.H} (83%)
rename src/postProcessing/functionObjects/{fvTools/calcFvcGrad/calcFvcGrad.C => field/grad/grad.C} (85%)
rename src/postProcessing/functionObjects/{fvTools/calcFvcGrad/calcFvcGrad.H => field/grad/grad.H} (89%)
rename src/postProcessing/functionObjects/{fvTools/calcFvcDiv/calcFvcDivFunctionObject.C => field/grad/gradFunctionObject.C} (86%)
rename src/postProcessing/functionObjects/{fvTools/calcMag/calcMagFunctionObject.H => field/grad/gradFunctionObject.H} (83%)
rename src/postProcessing/functionObjects/{fvTools/calcFvcGrad/calcFvcGradTemplates.C => field/grad/gradTemplates.C} (97%)
rename src/postProcessing/functionObjects/{fvTools/calcFvcGrad/IOcalcFvcGrad.H => field/mag/IOmag.H} (83%)
rename src/postProcessing/functionObjects/{fvTools/calcMag/calcMag.C => field/mag/mag.C} (87%)
rename src/postProcessing/functionObjects/{fvTools/calcMag/calcMag.H => field/mag/mag.H} (90%)
rename src/postProcessing/functionObjects/{fvTools/calcFvcGrad/calcFvcGradFunctionObject.C => field/mag/magFunctionObject.C} (86%)
rename src/postProcessing/functionObjects/{fvTools/calcFvcGrad/calcFvcGradFunctionObject.H => field/mag/magFunctionObject.H} (81%)
rename src/postProcessing/functionObjects/{fvTools/calcMag/calcMagTemplates.C => field/mag/magTemplates.C} (95%)
rename src/postProcessing/functionObjects/{utilities => forces}/pressureTools/IOpressureTools.H (100%)
rename src/postProcessing/functionObjects/{utilities => forces}/pressureTools/pressureTools.C (100%)
rename src/postProcessing/functionObjects/{utilities => forces}/pressureTools/pressureTools.H (99%)
rename src/postProcessing/functionObjects/{utilities => forces}/pressureTools/pressureToolsFunctionObject.C (95%)
rename src/postProcessing/functionObjects/{utilities => forces}/pressureTools/pressureToolsFunctionObject.H (100%)
rename src/postProcessing/functionObjects/{utilities => forces}/wallShearStress/IOwallShearStress.H (100%)
rename src/postProcessing/functionObjects/{utilities => forces}/wallShearStress/wallShearStress.C (100%)
rename src/postProcessing/functionObjects/{utilities => forces}/wallShearStress/wallShearStress.H (98%)
rename src/postProcessing/functionObjects/{utilities => forces}/wallShearStress/wallShearStressFunctionObject.C (95%)
rename src/postProcessing/functionObjects/{utilities => forces}/wallShearStress/wallShearStressFunctionObject.H (100%)
delete mode 100644 src/postProcessing/functionObjects/fvTools/Make/files
delete mode 100644 src/postProcessing/functionObjects/fvTools/Make/options
delete mode 100644 src/postProcessing/functionObjects/fvTools/doc/fvToolsFunctionObjectsDoc.H
delete mode 100644 src/postProcessing/functionObjects/jobControl/Make/files
delete mode 100644 src/postProcessing/functionObjects/jobControl/jobControlFunctionObjectsDoc.H
rename src/postProcessing/functionObjects/{cloud => lagrangian}/Make/files (54%)
rename src/postProcessing/functionObjects/{cloud => lagrangian}/Make/options (100%)
rename src/postProcessing/functionObjects/{cloud => lagrangian}/cloudInfo/IOcloudInfo.H (95%)
rename src/postProcessing/functionObjects/{cloud => lagrangian}/cloudInfo/cloudInfo.C (100%)
rename src/postProcessing/functionObjects/{cloud => lagrangian}/cloudInfo/cloudInfo.H (98%)
rename src/postProcessing/functionObjects/{cloud => lagrangian}/cloudInfo/cloudInfoFunctionObject.C (95%)
rename src/postProcessing/functionObjects/{cloud => lagrangian}/cloudInfo/cloudInfoFunctionObject.H (100%)
rename src/postProcessing/functionObjects/{cloud => lagrangian}/cloudInfo/postProcessingDict (100%)
rename src/postProcessing/functionObjects/{cloud/cloudFunctionObjectsDoc.H => lagrangian/lagrangianFunctionObjectsDoc.H} (82%)
delete mode 100644 src/postProcessing/functionObjects/systemCall/Make/options
rename src/postProcessing/functionObjects/{jobControl => utilities}/abort/IOabort.H (100%)
rename src/postProcessing/functionObjects/{jobControl => utilities}/abort/abort.C (100%)
rename src/postProcessing/functionObjects/{jobControl => utilities}/abort/abort.H (98%)
rename src/postProcessing/functionObjects/{jobControl => utilities}/abort/abortFunctionObject.C (100%)
rename src/postProcessing/functionObjects/{jobControl => utilities}/abort/abortFunctionObject.H (100%)
rename src/postProcessing/functionObjects/{IO => utilities}/partialWrite/IOpartialWrite.H (95%)
rename src/postProcessing/functionObjects/{IO => utilities/partialWrite}/controlDict (100%)
rename src/postProcessing/functionObjects/{IO => utilities}/partialWrite/partialWrite.C (100%)
rename src/postProcessing/functionObjects/{IO => utilities}/partialWrite/partialWrite.H (98%)
rename src/postProcessing/functionObjects/{IO => utilities}/partialWrite/partialWriteFunctionObject.C (95%)
rename src/postProcessing/functionObjects/{IO => utilities}/partialWrite/partialWriteFunctionObject.H (100%)
rename src/postProcessing/functionObjects/{IO => utilities}/partialWrite/partialWriteTemplates.C (100%)
rename src/postProcessing/functionObjects/{IO => utilities}/removeRegisteredObject/IOremoveRegisteredObject.H (95%)
rename src/postProcessing/functionObjects/{IO => utilities}/removeRegisteredObject/removeRegisteredObject.C (100%)
rename src/postProcessing/functionObjects/{IO => utilities}/removeRegisteredObject/removeRegisteredObject.H (98%)
rename src/postProcessing/functionObjects/{IO => utilities}/removeRegisteredObject/removeRegisteredObjectFunctionObject.C (95%)
rename src/postProcessing/functionObjects/{IO => utilities}/removeRegisteredObject/removeRegisteredObjectFunctionObject.H (100%)
rename src/postProcessing/functionObjects/{ => utilities}/systemCall/IOsystemCall.H (95%)
rename src/postProcessing/functionObjects/{ => utilities}/systemCall/Make/files (100%)
rename src/postProcessing/functionObjects/{jobControl => utilities/systemCall}/Make/options (100%)
rename src/postProcessing/functionObjects/{ => utilities}/systemCall/controlDict (100%)
rename src/postProcessing/functionObjects/{ => utilities}/systemCall/systemCall.C (100%)
rename src/postProcessing/functionObjects/{ => utilities}/systemCall/systemCall.H (98%)
rename src/postProcessing/functionObjects/{ => utilities}/systemCall/systemCallFunctionObject.C (95%)
rename src/postProcessing/functionObjects/{ => utilities}/systemCall/systemCallFunctionObject.H (100%)
rename src/postProcessing/functionObjects/{IO => utilities}/writeDictionary/IOwriteDictionary.H (95%)
rename src/postProcessing/functionObjects/{IO => utilities}/writeDictionary/writeDictionary.C (100%)
rename src/postProcessing/functionObjects/{IO => utilities}/writeDictionary/writeDictionary.H (98%)
rename src/postProcessing/functionObjects/{IO => utilities}/writeDictionary/writeDictionaryFunctionObject.C (95%)
rename src/postProcessing/functionObjects/{IO => utilities}/writeDictionary/writeDictionaryFunctionObject.H (100%)
rename src/postProcessing/functionObjects/{IO => utilities}/writeRegisteredObject/IOwriteRegisteredObject.H (95%)
create mode 100644 src/postProcessing/functionObjects/utilities/writeRegisteredObject/controlDict
rename src/postProcessing/functionObjects/{IO => utilities}/writeRegisteredObject/writeRegisteredObject.C (100%)
rename src/postProcessing/functionObjects/{IO => utilities}/writeRegisteredObject/writeRegisteredObject.H (98%)
rename src/postProcessing/functionObjects/{IO => utilities}/writeRegisteredObject/writeRegisteredObjectFunctionObject.C (95%)
rename src/postProcessing/functionObjects/{IO => utilities}/writeRegisteredObject/writeRegisteredObjectFunctionObject.H (100%)
diff --git a/src/postProcessing/functionObjects/Allwmake b/src/postProcessing/functionObjects/Allwmake
index 2110ced873..9eaf5762e8 100755
--- a/src/postProcessing/functionObjects/Allwmake
+++ b/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 IO
-wmake $targetType jobControl
-wmake $targetType systemCall
+wmake $targetType lagrangian
wmake $targetType utilities
#------------------------------------------------------------------------------
diff --git a/src/postProcessing/functionObjects/IO/IOFunctionObjectsDoc.H b/src/postProcessing/functionObjects/IO/IOFunctionObjectsDoc.H
deleted file mode 100644
index 9071ce5b5e..0000000000
--- a/src/postProcessing/functionObjects/IO/IOFunctionObjectsDoc.H
+++ /dev/null
@@ -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
-@}
-
-\*---------------------------------------------------------------------------*/
diff --git a/src/postProcessing/functionObjects/IO/Make/files b/src/postProcessing/functionObjects/IO/Make/files
deleted file mode 100644
index 95065c4b3f..0000000000
--- a/src/postProcessing/functionObjects/IO/Make/files
+++ /dev/null
@@ -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
diff --git a/src/postProcessing/functionObjects/IO/Make/options b/src/postProcessing/functionObjects/IO/Make/options
deleted file mode 100644
index a3ae8da833..0000000000
--- a/src/postProcessing/functionObjects/IO/Make/options
+++ /dev/null
@@ -1,7 +0,0 @@
-EXE_INC = \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
-
-LIB_LIBS = \
- -lfiniteVolume \
- -lmeshTools
diff --git a/src/postProcessing/functionObjects/field/Make/files b/src/postProcessing/functionObjects/field/Make/files
index 24a3e5b599..0aa4a5184d 100644
--- a/src/postProcessing/functionObjects/field/Make/files
+++ b/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
diff --git a/src/postProcessing/functionObjects/fvTools/calcMag/IOcalcMag.H b/src/postProcessing/functionObjects/field/div/IOdiv.H
similarity index 84%
rename from src/postProcessing/functionObjects/fvTools/calcMag/IOcalcMag.H
rename to src/postProcessing/functionObjects/field/div/IOdiv.H
index 3f0a584d14..10ca5a8670 100644
--- a/src/postProcessing/functionObjects/fvTools/calcMag/IOcalcMag.H
+++ b/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
-#define IOcalcMag_H
+#ifndef IOdiv_H
+#define IOdiv_H
-#include "calcMag.H"
+#include "div.H"
#include "IOOutputFilter.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
- typedef IOOutputFilter<calcMag> IOcalcMag;
+ typedef IOOutputFilter<div> IOdiv;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDiv.C b/src/postProcessing/functionObjects/field/div/div.C
similarity index 87%
rename from src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDiv.C
rename to src/postProcessing/functionObjects/field/div/div.C
index 9cb0229d4d..cf5405659a 100644
--- a/src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDiv.C
+++ b/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_))
{
diff --git a/src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDiv.H b/src/postProcessing/functionObjects/field/div/div.H
similarity index 89%
rename from src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDiv.H
rename to src/postProcessing/functionObjects/field/div/div.H
index bc96f8ffb0..8fe81600fe 100644
--- a/src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDiv.H
+++ b/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
- IOcalcFvcDiv.H
+ div.C
+ IOdiv.H
\*---------------------------------------------------------------------------*/
-#ifndef calcFvcDiv_H
-#define calcFvcDiv_H
+#ifndef functionObjects_div_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
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/fvTools/calcMag/calcMagFunctionObject.C b/src/postProcessing/functionObjects/field/div/divFunctionObject.C
similarity index 87%
rename from src/postProcessing/functionObjects/fvTools/calcMag/calcMagFunctionObject.C
rename to src/postProcessing/functionObjects/field/div/divFunctionObject.C
index 61aded1e61..33c4d507a1 100644
--- a/src/postProcessing/functionObjects/fvTools/calcMag/calcMagFunctionObject.C
+++ b/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
);
}
diff --git a/src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDivFunctionObject.H b/src/postProcessing/functionObjects/field/div/divFunctionObject.H
similarity index 82%
rename from src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDivFunctionObject.H
rename to src/postProcessing/functionObjects/field/div/divFunctionObject.H
index 5446371ec0..4ca010f847 100644
--- a/src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDivFunctionObject.H
+++ b/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
-#define calcFvcDivFunctionObject_H
+#ifndef divFunctionObject_H
+#define divFunctionObject_H
-#include "calcFvcDiv.H"
+#include "div.H"
#include "OutputFilterFunctionObject.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
- typedef OutputFilterFunctionObject<functionObjects::calcFvcDiv>
- calcFvcDivFunctionObject;
+ typedef OutputFilterFunctionObject<functionObjects::div>
+ divFunctionObject;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDivTemplates.C b/src/postProcessing/functionObjects/field/div/divTemplates.C
similarity index 97%
rename from src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDivTemplates.C
rename to src/postProcessing/functionObjects/field/div/divTemplates.C
index 6659dccbfb..8cae12aa60 100644
--- a/src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDivTemplates.C
+++ b/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,
diff --git a/src/postProcessing/functionObjects/field/fieldFunctionObjectsDoc.H b/src/postProcessing/functionObjects/field/doc/fieldFunctionObjectsDoc.H
similarity index 94%
rename from src/postProcessing/functionObjects/field/fieldFunctionObjectsDoc.H
rename to src/postProcessing/functionObjects/field/doc/fieldFunctionObjectsDoc.H
index 6c934be48e..4de0a4a077 100644
--- a/src/postProcessing/functionObjects/field/fieldFunctionObjectsDoc.H
+++ b/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
diff --git a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H
index 34e03e462c..2fbbe0e2ea 100644
--- a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.H
+++ b/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"
diff --git a/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H b/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H
index ceea83e7ee..fa6488068f 100644
--- a/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H
+++ b/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"
diff --git a/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.H b/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.H
index b28e9433d8..1583c73544 100644
--- a/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.H
+++ b/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"
diff --git a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.H b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.H
index 7de7069c7d..15bf465e62 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.H
+++ b/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"
diff --git a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.H b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.H
index ec72bd868f..ec7c6a96d7 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.H
+++ b/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"
diff --git a/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValue.H b/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValue.H
index 5446f003f7..399a2574e7 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/fieldValue/fieldValue.H
+++ b/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"
diff --git a/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.H b/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.H
index cd68f47746..abaf609c7f 100644
--- a/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.H
+++ b/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"
diff --git a/src/postProcessing/functionObjects/fvTools/calcFvcDiv/IOcalcFvcDiv.H b/src/postProcessing/functionObjects/field/grad/IOgrad.H
similarity index 83%
rename from src/postProcessing/functionObjects/fvTools/calcFvcDiv/IOcalcFvcDiv.H
rename to src/postProcessing/functionObjects/field/grad/IOgrad.H
index 245aae6e2b..2af56a0357 100644
--- a/src/postProcessing/functionObjects/fvTools/calcFvcDiv/IOcalcFvcDiv.H
+++ b/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
-#define IOcalcFvcDiv_H
+#ifndef IOgrad_H
+#define IOgrad_H
-#include "calcFvcDiv.H"
+#include "grad.H"
#include "IOOutputFilter.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
- typedef IOOutputFilter<calcFvcDiv> IOcalcFvcDiv;
+ typedef IOOutputFilter<grad> IOgrad;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGrad.C b/src/postProcessing/functionObjects/field/grad/grad.C
similarity index 85%
rename from src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGrad.C
rename to src/postProcessing/functionObjects/field/grad/grad.C
index 31b17b9e0a..d304ee53f4 100644
--- a/src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGrad.C
+++ b/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_))
{
diff --git a/src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGrad.H b/src/postProcessing/functionObjects/field/grad/grad.H
similarity index 89%
rename from src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGrad.H
rename to src/postProcessing/functionObjects/field/grad/grad.H
index f1b67ae08b..d017c57f48 100644
--- a/src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGrad.H
+++ b/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
- IOcalcFvcGrad.H
+ grad.C
+ IOgrad.H
\*---------------------------------------------------------------------------*/
-#ifndef calcFvcGrad_H
-#define calcFvcGrad_H
+#ifndef functionObjects_grad_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
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDivFunctionObject.C b/src/postProcessing/functionObjects/field/grad/gradFunctionObject.C
similarity index 86%
rename from src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDivFunctionObject.C
rename to src/postProcessing/functionObjects/field/grad/gradFunctionObject.C
index 32f990ec09..9a04d49133 100644
--- a/src/postProcessing/functionObjects/fvTools/calcFvcDiv/calcFvcDivFunctionObject.C
+++ b/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
);
}
diff --git a/src/postProcessing/functionObjects/fvTools/calcMag/calcMagFunctionObject.H b/src/postProcessing/functionObjects/field/grad/gradFunctionObject.H
similarity index 83%
rename from src/postProcessing/functionObjects/fvTools/calcMag/calcMagFunctionObject.H
rename to src/postProcessing/functionObjects/field/grad/gradFunctionObject.H
index b83e6817a5..776051bebc 100644
--- a/src/postProcessing/functionObjects/fvTools/calcMag/calcMagFunctionObject.H
+++ b/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
-#define calcMagFunctionObject_H
+#ifndef gradFunctionObject_H
+#define gradFunctionObject_H
-#include "calcMag.H"
+#include "grad.H"
#include "OutputFilterFunctionObject.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
- typedef OutputFilterFunctionObject<functionObjects::calcMag>
- calcMagFunctionObject;
+ typedef OutputFilterFunctionObject<functionObjects::grad>
+ gradFunctionObject;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGradTemplates.C b/src/postProcessing/functionObjects/field/grad/gradTemplates.C
similarity index 97%
rename from src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGradTemplates.C
rename to src/postProcessing/functionObjects/field/grad/gradTemplates.C
index 3f20974adf..c54c0a490c 100644
--- a/src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGradTemplates.C
+++ b/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,
diff --git a/src/postProcessing/functionObjects/fvTools/calcFvcGrad/IOcalcFvcGrad.H b/src/postProcessing/functionObjects/field/mag/IOmag.H
similarity index 83%
rename from src/postProcessing/functionObjects/fvTools/calcFvcGrad/IOcalcFvcGrad.H
rename to src/postProcessing/functionObjects/field/mag/IOmag.H
index 2e97ac6459..33ba658f8a 100644
--- a/src/postProcessing/functionObjects/fvTools/calcFvcGrad/IOcalcFvcGrad.H
+++ b/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
-#define IOcalcFvcGrad_H
+#ifndef IOmag_H
+#define IOmag_H
-#include "calcFvcGrad.H"
+#include "mag.H"
#include "IOOutputFilter.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
- typedef IOOutputFilter<calcFvcGrad> IOcalcFvcGrad;
+ typedef IOOutputFilter<mag> IOmag;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/fvTools/calcMag/calcMag.C b/src/postProcessing/functionObjects/field/mag/mag.C
similarity index 87%
rename from src/postProcessing/functionObjects/fvTools/calcMag/calcMag.C
rename to src/postProcessing/functionObjects/field/mag/mag.C
index 73e0b8b286..fa0fa725e1 100644
--- a/src/postProcessing/functionObjects/fvTools/calcMag/calcMag.C
+++ b/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_))
{
diff --git a/src/postProcessing/functionObjects/fvTools/calcMag/calcMag.H b/src/postProcessing/functionObjects/field/mag/mag.H
similarity index 90%
rename from src/postProcessing/functionObjects/fvTools/calcMag/calcMag.H
rename to src/postProcessing/functionObjects/field/mag/mag.H
index d8cb5ca3d5..13de0cc074 100644
--- a/src/postProcessing/functionObjects/fvTools/calcMag/calcMag.H
+++ b/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
- IOcalcMag.H
+ mag.C
+ IOmag.H
\*---------------------------------------------------------------------------*/
-#ifndef calcMag_H
-#define calcMag_H
+#ifndef functionObjects_mag_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
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGradFunctionObject.C b/src/postProcessing/functionObjects/field/mag/magFunctionObject.C
similarity index 86%
rename from src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGradFunctionObject.C
rename to src/postProcessing/functionObjects/field/mag/magFunctionObject.C
index 3e2d1e6698..b615fb8975 100644
--- a/src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGradFunctionObject.C
+++ b/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
);
}
diff --git a/src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGradFunctionObject.H b/src/postProcessing/functionObjects/field/mag/magFunctionObject.H
similarity index 81%
rename from src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGradFunctionObject.H
rename to src/postProcessing/functionObjects/field/mag/magFunctionObject.H
index a36516740d..f518dd5130 100644
--- a/src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGradFunctionObject.H
+++ b/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
-#define calcFvcGradFunctionObject_H
+#ifndef magFunctionObject_H
+#define magFunctionObject_H
-#include "calcFvcGrad.H"
+#include "mag.H"
#include "OutputFilterFunctionObject.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
- typedef OutputFilterFunctionObject<functionObjects::calcFvcGrad>
- calcFvcGradFunctionObject;
+ typedef OutputFilterFunctionObject<functionObjects::mag>
+ magFunctionObject;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/fvTools/calcMag/calcMagTemplates.C b/src/postProcessing/functionObjects/field/mag/magTemplates.C
similarity index 95%
rename from src/postProcessing/functionObjects/fvTools/calcMag/calcMagTemplates.C
rename to src/postProcessing/functionObjects/field/mag/magTemplates.C
index 8b942e95a6..1a2e107b73 100644
--- a/src/postProcessing/functionObjects/fvTools/calcMag/calcMagTemplates.C
+++ b/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;
}
diff --git a/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.H b/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.H
index a063ebf15b..f3edeaa705 100644
--- a/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.H
+++ b/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"
diff --git a/src/postProcessing/functionObjects/field/processorField/processorField.H b/src/postProcessing/functionObjects/field/processorField/processorField.H
index aeec8f8117..8b1a714167 100644
--- a/src/postProcessing/functionObjects/field/processorField/processorField.H
+++ b/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"
diff --git a/src/postProcessing/functionObjects/field/readFields/readFields.H b/src/postProcessing/functionObjects/field/readFields/readFields.H
index c4500f4f4a..d0669ebe33 100644
--- a/src/postProcessing/functionObjects/field/readFields/readFields.H
+++ b/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"
diff --git a/src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H b/src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H
index 108c17ad8b..0a686dacaf 100644
--- a/src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H
+++ b/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"
diff --git a/src/postProcessing/functionObjects/field/streamLine/streamLine.H b/src/postProcessing/functionObjects/field/streamLine/streamLine.H
index c0f280544d..ede9683faf 100644
--- a/src/postProcessing/functionObjects/field/streamLine/streamLine.H
+++ b/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"
diff --git a/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.H b/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.H
index aed3e2aaa0..831a564352 100644
--- a/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.H
+++ b/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"
diff --git a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H
index 84c566be83..b8e2697178 100644
--- a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H
+++ b/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"
diff --git a/src/postProcessing/functionObjects/forces/Make/files b/src/postProcessing/functionObjects/forces/Make/files
index 8b91d90922..f1384ada7c 100644
--- a/src/postProcessing/functionObjects/forces/Make/files
+++ b/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
diff --git a/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.H b/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.H
index cca8e312e1..40ad36728b 100644
--- a/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.H
+++ b/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.H
@@ -90,8 +90,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
-#ifndef forceCoeffs_H
-#define forceCoeffs_H
+#ifndef functionObjects_forceCoeffs_H
+#define functionObjects_forceCoeffs_H
#include "forces.H"
diff --git a/src/postProcessing/functionObjects/forces/forces/forces.H b/src/postProcessing/functionObjects/forces/forces/forces.H
index e6a85853c7..c71881806a 100644
--- a/src/postProcessing/functionObjects/forces/forces/forces.H
+++ b/src/postProcessing/functionObjects/forces/forces/forces.H
@@ -110,8 +110,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
-#ifndef forces_H
-#define forces_H
+#ifndef functionObjects_forces_H
+#define functionObjects_forces_H
#include "functionObjectFiles.H"
#include "coordinateSystem.H"
diff --git a/src/postProcessing/functionObjects/utilities/pressureTools/IOpressureTools.H b/src/postProcessing/functionObjects/forces/pressureTools/IOpressureTools.H
similarity index 100%
rename from src/postProcessing/functionObjects/utilities/pressureTools/IOpressureTools.H
rename to src/postProcessing/functionObjects/forces/pressureTools/IOpressureTools.H
diff --git a/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.C b/src/postProcessing/functionObjects/forces/pressureTools/pressureTools.C
similarity index 100%
rename from src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.C
rename to src/postProcessing/functionObjects/forces/pressureTools/pressureTools.C
diff --git a/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.H b/src/postProcessing/functionObjects/forces/pressureTools/pressureTools.H
similarity index 99%
rename from src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.H
rename to src/postProcessing/functionObjects/forces/pressureTools/pressureTools.H
index d06fb776ab..67a04f8466 100644
--- a/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.H
+++ b/src/postProcessing/functionObjects/forces/pressureTools/pressureTools.H
@@ -106,8 +106,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
-#ifndef pressureTools_H
-#define pressureTools_H
+#ifndef functionObjects_pressureTools_H
+#define functionObjects_pressureTools_H
#include "volFieldsFwd.H"
#include "dimensionedScalar.H"
diff --git a/src/postProcessing/functionObjects/utilities/pressureTools/pressureToolsFunctionObject.C b/src/postProcessing/functionObjects/forces/pressureTools/pressureToolsFunctionObject.C
similarity index 95%
rename from src/postProcessing/functionObjects/utilities/pressureTools/pressureToolsFunctionObject.C
rename to src/postProcessing/functionObjects/forces/pressureTools/pressureToolsFunctionObject.C
index a512c193c8..e4dedce24a 100644
--- a/src/postProcessing/functionObjects/utilities/pressureTools/pressureToolsFunctionObject.C
+++ b/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
diff --git a/src/postProcessing/functionObjects/utilities/pressureTools/pressureToolsFunctionObject.H b/src/postProcessing/functionObjects/forces/pressureTools/pressureToolsFunctionObject.H
similarity index 100%
rename from src/postProcessing/functionObjects/utilities/pressureTools/pressureToolsFunctionObject.H
rename to src/postProcessing/functionObjects/forces/pressureTools/pressureToolsFunctionObject.H
diff --git a/src/postProcessing/functionObjects/utilities/wallShearStress/IOwallShearStress.H b/src/postProcessing/functionObjects/forces/wallShearStress/IOwallShearStress.H
similarity index 100%
rename from src/postProcessing/functionObjects/utilities/wallShearStress/IOwallShearStress.H
rename to src/postProcessing/functionObjects/forces/wallShearStress/IOwallShearStress.H
diff --git a/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.C b/src/postProcessing/functionObjects/forces/wallShearStress/wallShearStress.C
similarity index 100%
rename from src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.C
rename to src/postProcessing/functionObjects/forces/wallShearStress/wallShearStress.C
diff --git a/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.H b/src/postProcessing/functionObjects/forces/wallShearStress/wallShearStress.H
similarity index 98%
rename from src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.H
rename to src/postProcessing/functionObjects/forces/wallShearStress/wallShearStress.H
index 519851b4a4..cd00e72466 100644
--- a/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStress.H
+++ b/src/postProcessing/functionObjects/forces/wallShearStress/wallShearStress.H
@@ -70,8 +70,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
-#ifndef wallShearStress_H
-#define wallShearStress_H
+#ifndef functionObjects_wallShearStress_H
+#define functionObjects_wallShearStress_H
#include "functionObjectFiles.H"
#include "volFieldsFwd.H"
diff --git a/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStressFunctionObject.C b/src/postProcessing/functionObjects/forces/wallShearStress/wallShearStressFunctionObject.C
similarity index 95%
rename from src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStressFunctionObject.C
rename to src/postProcessing/functionObjects/forces/wallShearStress/wallShearStressFunctionObject.C
index 871e6b0373..a8a05500e1 100644
--- a/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStressFunctionObject.C
+++ b/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
diff --git a/src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStressFunctionObject.H b/src/postProcessing/functionObjects/forces/wallShearStress/wallShearStressFunctionObject.H
similarity index 100%
rename from src/postProcessing/functionObjects/utilities/wallShearStress/wallShearStressFunctionObject.H
rename to src/postProcessing/functionObjects/forces/wallShearStress/wallShearStressFunctionObject.H
diff --git a/src/postProcessing/functionObjects/fvTools/Make/files b/src/postProcessing/functionObjects/fvTools/Make/files
deleted file mode 100644
index f5940e8ce3..0000000000
--- a/src/postProcessing/functionObjects/fvTools/Make/files
+++ /dev/null
@@ -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
diff --git a/src/postProcessing/functionObjects/fvTools/Make/options b/src/postProcessing/functionObjects/fvTools/Make/options
deleted file mode 100644
index 71b7873964..0000000000
--- a/src/postProcessing/functionObjects/fvTools/Make/options
+++ /dev/null
@@ -1,5 +0,0 @@
-EXE_INC = \
- -I$(LIB_SRC)/finiteVolume/lnInclude
-
-LIB_LIBS = \
- -lfiniteVolume
diff --git a/src/postProcessing/functionObjects/fvTools/doc/fvToolsFunctionObjectsDoc.H b/src/postProcessing/functionObjects/fvTools/doc/fvToolsFunctionObjectsDoc.H
deleted file mode 100644
index 8d403604a5..0000000000
--- a/src/postProcessing/functionObjects/fvTools/doc/fvToolsFunctionObjectsDoc.H
+++ /dev/null
@@ -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
-@}
-
-\*---------------------------------------------------------------------------*/
diff --git a/src/postProcessing/functionObjects/jobControl/Make/files b/src/postProcessing/functionObjects/jobControl/Make/files
deleted file mode 100644
index 043b5dc029..0000000000
--- a/src/postProcessing/functionObjects/jobControl/Make/files
+++ /dev/null
@@ -1,4 +0,0 @@
-abort/abort.C
-abort/abortFunctionObject.C
-
-LIB = $(FOAM_LIBBIN)/libjobControl
diff --git a/src/postProcessing/functionObjects/jobControl/jobControlFunctionObjectsDoc.H b/src/postProcessing/functionObjects/jobControl/jobControlFunctionObjectsDoc.H
deleted file mode 100644
index 34a586b207..0000000000
--- a/src/postProcessing/functionObjects/jobControl/jobControlFunctionObjectsDoc.H
+++ /dev/null
@@ -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
-@}
-
-\*---------------------------------------------------------------------------*/
diff --git a/src/postProcessing/functionObjects/cloud/Make/files b/src/postProcessing/functionObjects/lagrangian/Make/files
similarity index 54%
rename from src/postProcessing/functionObjects/cloud/Make/files
rename to src/postProcessing/functionObjects/lagrangian/Make/files
index e8515a0937..3445d2f628 100644
--- a/src/postProcessing/functionObjects/cloud/Make/files
+++ b/src/postProcessing/functionObjects/lagrangian/Make/files
@@ -1,4 +1,4 @@
cloudInfo/cloudInfo.C
cloudInfo/cloudInfoFunctionObject.C
-LIB = $(FOAM_LIBBIN)/libcloudFunctionObjects
+LIB = $(FOAM_LIBBIN)/liblagrangianFunctionObjects
diff --git a/src/postProcessing/functionObjects/cloud/Make/options b/src/postProcessing/functionObjects/lagrangian/Make/options
similarity index 100%
rename from src/postProcessing/functionObjects/cloud/Make/options
rename to src/postProcessing/functionObjects/lagrangian/Make/options
diff --git a/src/postProcessing/functionObjects/cloud/cloudInfo/IOcloudInfo.H b/src/postProcessing/functionObjects/lagrangian/cloudInfo/IOcloudInfo.H
similarity index 95%
rename from src/postProcessing/functionObjects/cloud/cloudInfo/IOcloudInfo.H
rename to src/postProcessing/functionObjects/lagrangian/cloudInfo/IOcloudInfo.H
index 6e0eda072a..4d1740ad79 100644
--- a/src/postProcessing/functionObjects/cloud/cloudInfo/IOcloudInfo.H
+++ b/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
diff --git a/src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfo.C b/src/postProcessing/functionObjects/lagrangian/cloudInfo/cloudInfo.C
similarity index 100%
rename from src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfo.C
rename to src/postProcessing/functionObjects/lagrangian/cloudInfo/cloudInfo.C
diff --git a/src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfo.H b/src/postProcessing/functionObjects/lagrangian/cloudInfo/cloudInfo.H
similarity index 98%
rename from src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfo.H
rename to src/postProcessing/functionObjects/lagrangian/cloudInfo/cloudInfo.H
index 895dd4a2a8..54c119cb2b 100644
--- a/src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfo.H
+++ b/src/postProcessing/functionObjects/lagrangian/cloudInfo/cloudInfo.H
@@ -69,8 +69,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
-#ifndef cloudInfo_H
-#define cloudInfo_H
+#ifndef functionObjects_cloudInfo_H
+#define functionObjects_cloudInfo_H
#include "functionObjectFiles.H"
#include "PtrList.H"
diff --git a/src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfoFunctionObject.C b/src/postProcessing/functionObjects/lagrangian/cloudInfo/cloudInfoFunctionObject.C
similarity index 95%
rename from src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfoFunctionObject.C
rename to src/postProcessing/functionObjects/lagrangian/cloudInfo/cloudInfoFunctionObject.C
index 8197da4ec8..4ac835ec9d 100644
--- a/src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfoFunctionObject.C
+++ b/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
diff --git a/src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfoFunctionObject.H b/src/postProcessing/functionObjects/lagrangian/cloudInfo/cloudInfoFunctionObject.H
similarity index 100%
rename from src/postProcessing/functionObjects/cloud/cloudInfo/cloudInfoFunctionObject.H
rename to src/postProcessing/functionObjects/lagrangian/cloudInfo/cloudInfoFunctionObject.H
diff --git a/src/postProcessing/functionObjects/cloud/cloudInfo/postProcessingDict b/src/postProcessing/functionObjects/lagrangian/cloudInfo/postProcessingDict
similarity index 100%
rename from src/postProcessing/functionObjects/cloud/cloudInfo/postProcessingDict
rename to src/postProcessing/functionObjects/lagrangian/cloudInfo/postProcessingDict
diff --git a/src/postProcessing/functionObjects/cloud/cloudFunctionObjectsDoc.H b/src/postProcessing/functionObjects/lagrangian/lagrangianFunctionObjectsDoc.H
similarity index 82%
rename from src/postProcessing/functionObjects/cloud/cloudFunctionObjectsDoc.H
rename to src/postProcessing/functionObjects/lagrangian/lagrangianFunctionObjectsDoc.H
index 2ac4b66db4..5917389657 100644
--- a/src/postProcessing/functionObjects/cloud/cloudFunctionObjectsDoc.H
+++ b/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.
@}
\*---------------------------------------------------------------------------*/
diff --git a/src/postProcessing/functionObjects/systemCall/Make/options b/src/postProcessing/functionObjects/systemCall/Make/options
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/postProcessing/functionObjects/utilities/CourantNo/CourantNo.H b/src/postProcessing/functionObjects/utilities/CourantNo/CourantNo.H
index a0796ea7a0..4f5bd2cc18 100644
--- a/src/postProcessing/functionObjects/utilities/CourantNo/CourantNo.H
+++ b/src/postProcessing/functionObjects/utilities/CourantNo/CourantNo.H
@@ -38,8 +38,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
-#ifndef CourantNo_H
-#define CourantNo_H
+#ifndef functionObjects_CourantNo_H
+#define functionObjects_CourantNo_H
#include "volFields.H"
diff --git a/src/postProcessing/functionObjects/utilities/Lambda2/Lambda2.H b/src/postProcessing/functionObjects/utilities/Lambda2/Lambda2.H
index a394b9b5a8..42a8108953 100644
--- a/src/postProcessing/functionObjects/utilities/Lambda2/Lambda2.H
+++ b/src/postProcessing/functionObjects/utilities/Lambda2/Lambda2.H
@@ -38,8 +38,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
-#ifndef Lambda2_H
-#define Lambda2_H
+#ifndef functionObjects_Lambda2_H
+#define functionObjects_Lambda2_H
#include "volFieldsFwd.H"
#include "surfaceFieldsFwd.H"
diff --git a/src/postProcessing/functionObjects/utilities/Make/files b/src/postProcessing/functionObjects/utilities/Make/files
index 4c38b4ba67..b9601ff78e 100644
--- a/src/postProcessing/functionObjects/utilities/Make/files
+++ b/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
diff --git a/src/postProcessing/functionObjects/utilities/Make/options b/src/postProcessing/functionObjects/utilities/Make/options
index ad4e27c196..6ff1c14f34 100644
--- a/src/postProcessing/functionObjects/utilities/Make/options
+++ b/src/postProcessing/functionObjects/utilities/Make/options
@@ -21,8 +21,6 @@ LIB_LIBS = \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lspecie \
- -llagrangian \
- -lDSMC \
-lfiniteVolume \
-lmeshTools \
-lsampling
diff --git a/src/postProcessing/functionObjects/utilities/Peclet/Peclet.H b/src/postProcessing/functionObjects/utilities/Peclet/Peclet.H
index dba87188ab..a47e2236ab 100644
--- a/src/postProcessing/functionObjects/utilities/Peclet/Peclet.H
+++ b/src/postProcessing/functionObjects/utilities/Peclet/Peclet.H
@@ -37,8 +37,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
-#ifndef Peclet_H
-#define Peclet_H
+#ifndef functionObjects_Peclet_H
+#define functionObjects_Peclet_H
#include "volFieldsFwd.H"
#include "surfaceFieldsFwd.H"
diff --git a/src/postProcessing/functionObjects/utilities/Q/Q.H b/src/postProcessing/functionObjects/utilities/Q/Q.H
index 56e00833c3..63ae36d776 100644
--- a/src/postProcessing/functionObjects/utilities/Q/Q.H
+++ b/src/postProcessing/functionObjects/utilities/Q/Q.H
@@ -41,8 +41,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
-#ifndef Q_H
-#define Q_H
+#ifndef functionObjects_Q_H
+#define functionObjects_Q_H
#include "volFieldsFwd.H"
#include "surfaceFieldsFwd.H"
diff --git a/src/postProcessing/functionObjects/jobControl/abort/IOabort.H b/src/postProcessing/functionObjects/utilities/abort/IOabort.H
similarity index 100%
rename from src/postProcessing/functionObjects/jobControl/abort/IOabort.H
rename to src/postProcessing/functionObjects/utilities/abort/IOabort.H
diff --git a/src/postProcessing/functionObjects/jobControl/abort/abort.C b/src/postProcessing/functionObjects/utilities/abort/abort.C
similarity index 100%
rename from src/postProcessing/functionObjects/jobControl/abort/abort.C
rename to src/postProcessing/functionObjects/utilities/abort/abort.C
diff --git a/src/postProcessing/functionObjects/jobControl/abort/abort.H b/src/postProcessing/functionObjects/utilities/abort/abort.H
similarity index 98%
rename from src/postProcessing/functionObjects/jobControl/abort/abort.H
rename to src/postProcessing/functionObjects/utilities/abort/abort.H
index 29dc9c22c9..4224d980bb 100644
--- a/src/postProcessing/functionObjects/jobControl/abort/abort.H
+++ b/src/postProcessing/functionObjects/utilities/abort/abort.H
@@ -42,8 +42,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
-#ifndef abort_H
-#define abort_H
+#ifndef functionObjects_abort_H
+#define functionObjects_abort_H
#include "NamedEnum.H"
diff --git a/src/postProcessing/functionObjects/jobControl/abort/abortFunctionObject.C b/src/postProcessing/functionObjects/utilities/abort/abortFunctionObject.C
similarity index 100%
rename from src/postProcessing/functionObjects/jobControl/abort/abortFunctionObject.C
rename to src/postProcessing/functionObjects/utilities/abort/abortFunctionObject.C
diff --git a/src/postProcessing/functionObjects/jobControl/abort/abortFunctionObject.H b/src/postProcessing/functionObjects/utilities/abort/abortFunctionObject.H
similarity index 100%
rename from src/postProcessing/functionObjects/jobControl/abort/abortFunctionObject.H
rename to src/postProcessing/functionObjects/utilities/abort/abortFunctionObject.H
diff --git a/src/postProcessing/functionObjects/utilities/blendingFactor/blendingFactor.H b/src/postProcessing/functionObjects/utilities/blendingFactor/blendingFactor.H
index 8e739442cc..72e355159b 100644
--- a/src/postProcessing/functionObjects/utilities/blendingFactor/blendingFactor.H
+++ b/src/postProcessing/functionObjects/utilities/blendingFactor/blendingFactor.H
@@ -39,8 +39,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
-#ifndef blendingFactor_H
-#define blendingFactor_H
+#ifndef functionObjects_blendingFactor_H
+#define functionObjects_blendingFactor_H
#include "volFieldsFwd.H"
#include "surfaceFieldsFwd.H"
diff --git a/src/postProcessing/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H b/src/postProcessing/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H
index ae07bb0340..bd3bf8107b 100644
--- a/src/postProcessing/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H
+++ b/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
-#define codedFunctionObject_H
+#ifndef functionObjects_codedFunctionObject_H
+#define functionObjects_codedFunctionObject_H
#include "functionObject.H"
#include "codedBase.H"
diff --git a/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.H b/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.H
index e702a01abd..040b02c8b7 100644
--- a/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.H
+++ b/src/postProcessing/functionObjects/utilities/dsmcFields/dsmcFields.H
@@ -41,8 +41,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
-#ifndef dsmcFields_H
-#define dsmcFields_H
+#ifndef functionObjects_dsmcFields_H
+#define functionObjects_dsmcFields_H
#include "typeInfo.H"
#include "autoPtr.H"
diff --git a/src/postProcessing/functionObjects/IO/partialWrite/IOpartialWrite.H b/src/postProcessing/functionObjects/utilities/partialWrite/IOpartialWrite.H
similarity index 95%
rename from src/postProcessing/functionObjects/IO/partialWrite/IOpartialWrite.H
rename to src/postProcessing/functionObjects/utilities/partialWrite/IOpartialWrite.H
index a9d40914cb..a3e8842e47 100644
--- a/src/postProcessing/functionObjects/IO/partialWrite/IOpartialWrite.H
+++ b/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
diff --git a/src/postProcessing/functionObjects/IO/controlDict b/src/postProcessing/functionObjects/utilities/partialWrite/controlDict
similarity index 100%
rename from src/postProcessing/functionObjects/IO/controlDict
rename to src/postProcessing/functionObjects/utilities/partialWrite/controlDict
diff --git a/src/postProcessing/functionObjects/IO/partialWrite/partialWrite.C b/src/postProcessing/functionObjects/utilities/partialWrite/partialWrite.C
similarity index 100%
rename from src/postProcessing/functionObjects/IO/partialWrite/partialWrite.C
rename to src/postProcessing/functionObjects/utilities/partialWrite/partialWrite.C
diff --git a/src/postProcessing/functionObjects/IO/partialWrite/partialWrite.H b/src/postProcessing/functionObjects/utilities/partialWrite/partialWrite.H
similarity index 98%
rename from src/postProcessing/functionObjects/IO/partialWrite/partialWrite.H
rename to src/postProcessing/functionObjects/utilities/partialWrite/partialWrite.H
index 76a18f5fbc..e5ba6ff936 100644
--- a/src/postProcessing/functionObjects/IO/partialWrite/partialWrite.H
+++ b/src/postProcessing/functionObjects/utilities/partialWrite/partialWrite.H
@@ -62,8 +62,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
-#ifndef partialWrite_H
-#define partialWrite_H
+#ifndef functionObjects_partialWrite_H
+#define functionObjects_partialWrite_H
#include "HashSet.H"
#include "runTimeSelectionTables.H"
diff --git a/src/postProcessing/functionObjects/IO/partialWrite/partialWriteFunctionObject.C b/src/postProcessing/functionObjects/utilities/partialWrite/partialWriteFunctionObject.C
similarity index 95%
rename from src/postProcessing/functionObjects/IO/partialWrite/partialWriteFunctionObject.C
rename to src/postProcessing/functionObjects/utilities/partialWrite/partialWriteFunctionObject.C
index 89166fbbf3..9938388787 100644
--- a/src/postProcessing/functionObjects/IO/partialWrite/partialWriteFunctionObject.C
+++ b/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
diff --git a/src/postProcessing/functionObjects/IO/partialWrite/partialWriteFunctionObject.H b/src/postProcessing/functionObjects/utilities/partialWrite/partialWriteFunctionObject.H
similarity index 100%
rename from src/postProcessing/functionObjects/IO/partialWrite/partialWriteFunctionObject.H
rename to src/postProcessing/functionObjects/utilities/partialWrite/partialWriteFunctionObject.H
diff --git a/src/postProcessing/functionObjects/IO/partialWrite/partialWriteTemplates.C b/src/postProcessing/functionObjects/utilities/partialWrite/partialWriteTemplates.C
similarity index 100%
rename from src/postProcessing/functionObjects/IO/partialWrite/partialWriteTemplates.C
rename to src/postProcessing/functionObjects/utilities/partialWrite/partialWriteTemplates.C
diff --git a/src/postProcessing/functionObjects/IO/removeRegisteredObject/IOremoveRegisteredObject.H b/src/postProcessing/functionObjects/utilities/removeRegisteredObject/IOremoveRegisteredObject.H
similarity index 95%
rename from src/postProcessing/functionObjects/IO/removeRegisteredObject/IOremoveRegisteredObject.H
rename to src/postProcessing/functionObjects/utilities/removeRegisteredObject/IOremoveRegisteredObject.H
index d786378ed2..66444807ab 100644
--- a/src/postProcessing/functionObjects/IO/removeRegisteredObject/IOremoveRegisteredObject.H
+++ b/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
diff --git a/src/postProcessing/functionObjects/IO/removeRegisteredObject/removeRegisteredObject.C b/src/postProcessing/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.C
similarity index 100%
rename from src/postProcessing/functionObjects/IO/removeRegisteredObject/removeRegisteredObject.C
rename to src/postProcessing/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.C
diff --git a/src/postProcessing/functionObjects/IO/removeRegisteredObject/removeRegisteredObject.H b/src/postProcessing/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.H
similarity index 98%
rename from src/postProcessing/functionObjects/IO/removeRegisteredObject/removeRegisteredObject.H
rename to src/postProcessing/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.H
index 5bbb16d923..b8a7da75bb 100644
--- a/src/postProcessing/functionObjects/IO/removeRegisteredObject/removeRegisteredObject.H
+++ b/src/postProcessing/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.H
@@ -58,8 +58,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
-#ifndef removeRegisteredObject_H
-#define removeRegisteredObject_H
+#ifndef functionObjects_removeRegisteredObject_H
+#define functionObjects_removeRegisteredObject_H
#include "wordList.H"
#include "runTimeSelectionTables.H"
diff --git a/src/postProcessing/functionObjects/IO/removeRegisteredObject/removeRegisteredObjectFunctionObject.C b/src/postProcessing/functionObjects/utilities/removeRegisteredObject/removeRegisteredObjectFunctionObject.C
similarity index 95%
rename from src/postProcessing/functionObjects/IO/removeRegisteredObject/removeRegisteredObjectFunctionObject.C
rename to src/postProcessing/functionObjects/utilities/removeRegisteredObject/removeRegisteredObjectFunctionObject.C
index 652e60e87d..698b25d7c5 100644
--- a/src/postProcessing/functionObjects/IO/removeRegisteredObject/removeRegisteredObjectFunctionObject.C
+++ b/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
diff --git a/src/postProcessing/functionObjects/IO/removeRegisteredObject/removeRegisteredObjectFunctionObject.H b/src/postProcessing/functionObjects/utilities/removeRegisteredObject/removeRegisteredObjectFunctionObject.H
similarity index 100%
rename from src/postProcessing/functionObjects/IO/removeRegisteredObject/removeRegisteredObjectFunctionObject.H
rename to src/postProcessing/functionObjects/utilities/removeRegisteredObject/removeRegisteredObjectFunctionObject.H
diff --git a/src/postProcessing/functionObjects/utilities/residuals/residuals.H b/src/postProcessing/functionObjects/utilities/residuals/residuals.H
index 01a44e0c3e..f3ee3c5c4c 100644
--- a/src/postProcessing/functionObjects/utilities/residuals/residuals.H
+++ b/src/postProcessing/functionObjects/utilities/residuals/residuals.H
@@ -59,8 +59,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
-#ifndef residuals_H
-#define residuals_H
+#ifndef functionObjects_residuals_H
+#define functionObjects_residuals_H
#include "functionObjectFiles.H"
#include "primitiveFieldsFwd.H"
diff --git a/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.H b/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.H
index 21724bfb3d..a1434b01c2 100644
--- a/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.H
+++ b/src/postProcessing/functionObjects/utilities/scalarTransport/scalarTransport.H
@@ -45,8 +45,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
-#ifndef scalarTransport_H
-#define scalarTransport_H
+#ifndef functionObjects_scalarTransport_H
+#define functionObjects_scalarTransport_H
#include "volFields.H"
#include "surfaceFieldsFwd.H"
diff --git a/src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.C b/src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.C
index 36cef82385..6ea307928d 100644
--- a/src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.C
+++ b/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
+)
{}
diff --git a/src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.H b/src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.H
index 1749d3d4a7..55a0a06d4b 100644
--- a/src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.H
+++ b/src/postProcessing/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.H
@@ -39,8 +39,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
-#ifndef setTimeStepFunctionObject_H
-#define setTimeStepFunctionObject_H
+#ifndef functionObjects_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
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/systemCall/IOsystemCall.H b/src/postProcessing/functionObjects/utilities/systemCall/IOsystemCall.H
similarity index 95%
rename from src/postProcessing/functionObjects/systemCall/IOsystemCall.H
rename to src/postProcessing/functionObjects/utilities/systemCall/IOsystemCall.H
index cb823adbd9..ef39f2ace8 100644
--- a/src/postProcessing/functionObjects/systemCall/IOsystemCall.H
+++ b/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
diff --git a/src/postProcessing/functionObjects/systemCall/Make/files b/src/postProcessing/functionObjects/utilities/systemCall/Make/files
similarity index 100%
rename from src/postProcessing/functionObjects/systemCall/Make/files
rename to src/postProcessing/functionObjects/utilities/systemCall/Make/files
diff --git a/src/postProcessing/functionObjects/jobControl/Make/options b/src/postProcessing/functionObjects/utilities/systemCall/Make/options
similarity index 100%
rename from src/postProcessing/functionObjects/jobControl/Make/options
rename to src/postProcessing/functionObjects/utilities/systemCall/Make/options
diff --git a/src/postProcessing/functionObjects/systemCall/controlDict b/src/postProcessing/functionObjects/utilities/systemCall/controlDict
similarity index 100%
rename from src/postProcessing/functionObjects/systemCall/controlDict
rename to src/postProcessing/functionObjects/utilities/systemCall/controlDict
diff --git a/src/postProcessing/functionObjects/systemCall/systemCall.C b/src/postProcessing/functionObjects/utilities/systemCall/systemCall.C
similarity index 100%
rename from src/postProcessing/functionObjects/systemCall/systemCall.C
rename to src/postProcessing/functionObjects/utilities/systemCall/systemCall.C
diff --git a/src/postProcessing/functionObjects/systemCall/systemCall.H b/src/postProcessing/functionObjects/utilities/systemCall/systemCall.H
similarity index 98%
rename from src/postProcessing/functionObjects/systemCall/systemCall.H
rename to src/postProcessing/functionObjects/utilities/systemCall/systemCall.H
index 38ec3deff4..3219fe22d8 100644
--- a/src/postProcessing/functionObjects/systemCall/systemCall.H
+++ b/src/postProcessing/functionObjects/utilities/systemCall/systemCall.H
@@ -84,8 +84,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
-#ifndef systemCall_H
-#define systemCall_H
+#ifndef functionObjects_systemCall_H
+#define functionObjects_systemCall_H
#include "stringList.H"
diff --git a/src/postProcessing/functionObjects/systemCall/systemCallFunctionObject.C b/src/postProcessing/functionObjects/utilities/systemCall/systemCallFunctionObject.C
similarity index 95%
rename from src/postProcessing/functionObjects/systemCall/systemCallFunctionObject.C
rename to src/postProcessing/functionObjects/utilities/systemCall/systemCallFunctionObject.C
index f9855ecb0d..0dfd7b6b06 100644
--- a/src/postProcessing/functionObjects/systemCall/systemCallFunctionObject.C
+++ b/src/postProcessing/functionObjects/utilities/systemCall/systemCallFunctionObject.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
diff --git a/src/postProcessing/functionObjects/systemCall/systemCallFunctionObject.H b/src/postProcessing/functionObjects/utilities/systemCall/systemCallFunctionObject.H
similarity index 100%
rename from src/postProcessing/functionObjects/systemCall/systemCallFunctionObject.H
rename to src/postProcessing/functionObjects/utilities/systemCall/systemCallFunctionObject.H
diff --git a/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H b/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H
index 40d6ae37b4..9a34d4a9c9 100644
--- a/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H
+++ b/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H
@@ -57,8 +57,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
-#ifndef timeActivatedFileUpdate_H
-#define timeActivatedFileUpdate_H
+#ifndef functionObjects_timeActivatedFileUpdate_H
+#define functionObjects_timeActivatedFileUpdate_H
#include "Tuple2.H"
diff --git a/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.H b/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.H
index c31eaceca4..f3d98cfa12 100644
--- a/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.H
+++ b/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.H
@@ -84,8 +84,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
-#ifndef turbulenceFields_H
-#define turbulenceFields_H
+#ifndef functionObjects_turbulenceFields_H
+#define functionObjects_turbulenceFields_H
#include "HashSet.H"
#include "IOobject.H"
diff --git a/src/postProcessing/functionObjects/utilities/vorticity/vorticity.H b/src/postProcessing/functionObjects/utilities/vorticity/vorticity.H
index dd6a7dff07..0b4094f12d 100644
--- a/src/postProcessing/functionObjects/utilities/vorticity/vorticity.H
+++ b/src/postProcessing/functionObjects/utilities/vorticity/vorticity.H
@@ -36,8 +36,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
-#ifndef vorticity_H
-#define vorticity_H
+#ifndef functionObjects_vorticity_H
+#define functionObjects_vorticity_H
#include "volFieldsFwd.H"
diff --git a/src/postProcessing/functionObjects/IO/writeDictionary/IOwriteDictionary.H b/src/postProcessing/functionObjects/utilities/writeDictionary/IOwriteDictionary.H
similarity index 95%
rename from src/postProcessing/functionObjects/IO/writeDictionary/IOwriteDictionary.H
rename to src/postProcessing/functionObjects/utilities/writeDictionary/IOwriteDictionary.H
index 87718cd6dc..d7fbe3b914 100644
--- a/src/postProcessing/functionObjects/IO/writeDictionary/IOwriteDictionary.H
+++ b/src/postProcessing/functionObjects/utilities/writeDictionary/IOwriteDictionary.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
diff --git a/src/postProcessing/functionObjects/IO/writeDictionary/writeDictionary.C b/src/postProcessing/functionObjects/utilities/writeDictionary/writeDictionary.C
similarity index 100%
rename from src/postProcessing/functionObjects/IO/writeDictionary/writeDictionary.C
rename to src/postProcessing/functionObjects/utilities/writeDictionary/writeDictionary.C
diff --git a/src/postProcessing/functionObjects/IO/writeDictionary/writeDictionary.H b/src/postProcessing/functionObjects/utilities/writeDictionary/writeDictionary.H
similarity index 98%
rename from src/postProcessing/functionObjects/IO/writeDictionary/writeDictionary.H
rename to src/postProcessing/functionObjects/utilities/writeDictionary/writeDictionary.H
index 3f822fa89a..42e381832d 100644
--- a/src/postProcessing/functionObjects/IO/writeDictionary/writeDictionary.H
+++ b/src/postProcessing/functionObjects/utilities/writeDictionary/writeDictionary.H
@@ -36,8 +36,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
-#ifndef writeDictionary_H
-#define writeDictionary_H
+#ifndef functionObjects_writeDictionary_H
+#define functionObjects_writeDictionary_H
#include "wordList.H"
#include "runTimeSelectionTables.H"
diff --git a/src/postProcessing/functionObjects/IO/writeDictionary/writeDictionaryFunctionObject.C b/src/postProcessing/functionObjects/utilities/writeDictionary/writeDictionaryFunctionObject.C
similarity index 95%
rename from src/postProcessing/functionObjects/IO/writeDictionary/writeDictionaryFunctionObject.C
rename to src/postProcessing/functionObjects/utilities/writeDictionary/writeDictionaryFunctionObject.C
index 712e7d9b39..f16f5921b1 100644
--- a/src/postProcessing/functionObjects/IO/writeDictionary/writeDictionaryFunctionObject.C
+++ b/src/postProcessing/functionObjects/utilities/writeDictionary/writeDictionaryFunctionObject.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
diff --git a/src/postProcessing/functionObjects/IO/writeDictionary/writeDictionaryFunctionObject.H b/src/postProcessing/functionObjects/utilities/writeDictionary/writeDictionaryFunctionObject.H
similarity index 100%
rename from src/postProcessing/functionObjects/IO/writeDictionary/writeDictionaryFunctionObject.H
rename to src/postProcessing/functionObjects/utilities/writeDictionary/writeDictionaryFunctionObject.H
diff --git a/src/postProcessing/functionObjects/IO/writeRegisteredObject/IOwriteRegisteredObject.H b/src/postProcessing/functionObjects/utilities/writeRegisteredObject/IOwriteRegisteredObject.H
similarity index 95%
rename from src/postProcessing/functionObjects/IO/writeRegisteredObject/IOwriteRegisteredObject.H
rename to src/postProcessing/functionObjects/utilities/writeRegisteredObject/IOwriteRegisteredObject.H
index d574165482..727cae7ab3 100644
--- a/src/postProcessing/functionObjects/IO/writeRegisteredObject/IOwriteRegisteredObject.H
+++ b/src/postProcessing/functionObjects/utilities/writeRegisteredObject/IOwriteRegisteredObject.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
diff --git a/src/postProcessing/functionObjects/utilities/writeRegisteredObject/controlDict b/src/postProcessing/functionObjects/utilities/writeRegisteredObject/controlDict
new file mode 100644
index 0000000000..a9e0fb2fe3
--- /dev/null
+++ b/src/postProcessing/functionObjects/utilities/writeRegisteredObject/controlDict
@@ -0,0 +1,122 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// So we get a decent warning if we have multiple functionObject entries
+// with the same name.
+#inputMode error;
+
+application icoFoam;
+
+startFrom startTime;
+
+startTime 0;
+
+stopAt endTime;
+
+endTime 0.5;
+
+deltaT 0.005;
+
+writeControl timeStep;
+
+writeInterval 20;
+
+purgeWrite 0;
+
+writeFormat ascii;
+
+writePrecision 6;
+
+writeCompression uncompressed;
+
+timeFormat general;
+
+timePrecision 6;
+
+runTimeModifiable yes;
+
+functions
+{
+ partialWrite
+ {
+ // Write some registered objects more often than others.
+ // Above writeControl determines most frequent dump.
+
+ type partialWrite;
+
+ // Where to load it from
+ functionObjectLibs ("libIOFunctionObjects.so");
+
+ // Optional mesh region to operate on. Only one partialWrite per
+ // region allowed.
+ region wallFilmRegion;
+
+ // Execute upon options:
+ // timeStep
+ // outputTime
+ // adjustableTime
+ // runTime
+ // clockTime
+ // cpuTime
+ outputControl outputTime;
+
+ // Objects (fields or lagrangian fields in any of the clouds)
+ // to write every outputTime
+ objectNames (p positions nParticle);
+
+ // Write as normal every writeInterval'th outputTime.
+ outputInterval 1; // (timeStep, outputTime)
+
+ // Interval of time (sec) to write down(
+ writeInterval 10.5 //(adjustableTime, runTime, clockTime, cpuTime)
+ }
+
+ dumpObjects
+ {
+ // Forcibly write registered objects
+
+ type writeRegisteredObject;
+
+ // Where to load it from
+ functionObjectLibs ("libIOFunctionObjects.so");
+
+ // When to write:
+ // timeStep (with optional outputInterval)
+ // outputTime (with optional outputInterval)
+ // adjustableTime
+ // runTime
+ // clockTime
+ // cpuTime
+ outputControl outputTime;
+
+ // Write every writeInterval (only valid for timeStemp, outputTime)
+ outputInterval 1;
+
+ // Interval of time (valid for adjustableTime, runTime, clockTime,
+ // cpuTime)
+ writeInterval 10.5;
+
+ // Objects to write
+ objectNames ();
+
+
+ // Is the object written by this function Object alone
+ // (default is false)
+ //exclusiveWriting true;
+ }
+}
+
+// ************************************************************************* //
diff --git a/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.C b/src/postProcessing/functionObjects/utilities/writeRegisteredObject/writeRegisteredObject.C
similarity index 100%
rename from src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.C
rename to src/postProcessing/functionObjects/utilities/writeRegisteredObject/writeRegisteredObject.C
diff --git a/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.H b/src/postProcessing/functionObjects/utilities/writeRegisteredObject/writeRegisteredObject.H
similarity index 98%
rename from src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.H
rename to src/postProcessing/functionObjects/utilities/writeRegisteredObject/writeRegisteredObject.H
index 8fb674a883..efae29d045 100644
--- a/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObject.H
+++ b/src/postProcessing/functionObjects/utilities/writeRegisteredObject/writeRegisteredObject.H
@@ -72,8 +72,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
-#ifndef writeRegisteredObject_H
-#define writeRegisteredObject_H
+#ifndef functionObjects_writeRegisteredObject_H
+#define functionObjects_writeRegisteredObject_H
#include "wordReList.H"
#include "runTimeSelectionTables.H"
diff --git a/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObjectFunctionObject.C b/src/postProcessing/functionObjects/utilities/writeRegisteredObject/writeRegisteredObjectFunctionObject.C
similarity index 95%
rename from src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObjectFunctionObject.C
rename to src/postProcessing/functionObjects/utilities/writeRegisteredObject/writeRegisteredObjectFunctionObject.C
index 80e9280f0b..1eebe9cefa 100644
--- a/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObjectFunctionObject.C
+++ b/src/postProcessing/functionObjects/utilities/writeRegisteredObject/writeRegisteredObjectFunctionObject.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
diff --git a/src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObjectFunctionObject.H b/src/postProcessing/functionObjects/utilities/writeRegisteredObject/writeRegisteredObjectFunctionObject.H
similarity index 100%
rename from src/postProcessing/functionObjects/IO/writeRegisteredObject/writeRegisteredObjectFunctionObject.H
rename to src/postProcessing/functionObjects/utilities/writeRegisteredObject/writeRegisteredObjectFunctionObject.H
diff --git a/src/postProcessing/functionObjects/utilities/yPlus/yPlus.H b/src/postProcessing/functionObjects/utilities/yPlus/yPlus.H
index 7b026d9771..cde61ec39b 100644
--- a/src/postProcessing/functionObjects/utilities/yPlus/yPlus.H
+++ b/src/postProcessing/functionObjects/utilities/yPlus/yPlus.H
@@ -37,8 +37,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
-#ifndef yPlus_H
-#define yPlus_H
+#ifndef functionObjects_yPlus_H
+#define functionObjects_yPlus_H
#include "functionObjectFiles.H"
#include "volFieldsFwd.H"
--
GitLab