diff --git a/src/postProcessing/functionObjects/jobControl/Make/files b/src/postProcessing/functionObjects/jobControl/Make/files
index c86cc727f689b657f05d9f02987279385353246e..043b5dc029e71be1225a553fe230a4c083e8afe8 100644
--- a/src/postProcessing/functionObjects/jobControl/Make/files
+++ b/src/postProcessing/functionObjects/jobControl/Make/files
@@ -1,4 +1,4 @@
-abortCalculation/abortCalculation.C
-abortCalculation/abortCalculationFunctionObject.C
+abort/abort.C
+abort/abortFunctionObject.C
LIB = $(FOAM_LIBBIN)/libjobControl
diff --git a/src/postProcessing/functionObjects/jobControl/abortCalculation/IOabortCalculation.H b/src/postProcessing/functionObjects/jobControl/abort/IOabort.H
similarity index 81%
rename from src/postProcessing/functionObjects/jobControl/abortCalculation/IOabortCalculation.H
rename to src/postProcessing/functionObjects/jobControl/abort/IOabort.H
index 0edecbaac1d7af76bdde9ad281f997be601b328a..c4aadbfd87bf7a581d11c91afce03f549a7c754e 100644
--- a/src/postProcessing/functionObjects/jobControl/abortCalculation/IOabortCalculation.H
+++ b/src/postProcessing/functionObjects/jobControl/abort/IOabort.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
@@ -22,24 +22,24 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Typedef
- Foam::IOabortCalculation
+ Foam::IOabort
Description
- Instance of the generic IOOutputFilter for abortCalculation.
+ Instance of the generic IOOutputFilter for abort.
\*---------------------------------------------------------------------------*/
-#ifndef IOabortCalculation_H
-#define IOabortCalculation_H
+#ifndef IOabort_H
+#define IOabort_H
-#include "abortCalculation.H"
+#include "abort.H"
#include "IOOutputFilter.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
- typedef IOOutputFilter<abortCalculation> IOabortCalculation;
+ typedef IOOutputFilter<abort> IOabort;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculation.C b/src/postProcessing/functionObjects/jobControl/abort/abort.C
similarity index 84%
rename from src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculation.C
rename to src/postProcessing/functionObjects/jobControl/abort/abort.C
index 8706db08595ab0d5009ac9cd1b141ff44a22ead9..d68fe939b3d12f3e90b17476cdc421d0ae8e425e 100644
--- a/src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculation.C
+++ b/src/postProcessing/functionObjects/jobControl/abort/abort.C
@@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/
-#include "abortCalculation.H"
+#include "abort.H"
#include "dictionary.H"
#include "error.H"
#include "Time.H"
@@ -36,14 +36,14 @@ namespace Foam
{
namespace functionObjects
{
- defineTypeNameAndDebug(abortCalculation, 0);
+ defineTypeNameAndDebug(abort, 0);
}
}
template<>
const char* Foam::NamedEnum
<
- Foam::functionObjects::abortCalculation::actionType,
+ Foam::functionObjects::abort::actionType,
3
>::names[] =
{
@@ -54,14 +54,14 @@ const char* Foam::NamedEnum
const Foam::NamedEnum
<
- Foam::functionObjects::abortCalculation::actionType,
+ Foam::functionObjects::abort::actionType,
3
-> Foam::functionObjects::abortCalculation::actionTypeNames_;
+> Foam::functionObjects::abort::actionTypeNames_;
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-void Foam::functionObjects::abortCalculation::removeFile() const
+void Foam::functionObjects::abort::removeFile() const
{
bool hasAbort = isFile(abortFile_);
reduce(hasAbort, orOp<bool>());
@@ -76,7 +76,7 @@ void Foam::functionObjects::abortCalculation::removeFile() const
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-Foam::functionObjects::abortCalculation::abortCalculation
+Foam::functionObjects::abort::abort
(
const word& name,
const objectRegistry& obr,
@@ -97,7 +97,7 @@ Foam::functionObjects::abortCalculation::abortCalculation
}
-bool Foam::functionObjects::abortCalculation::viable
+bool Foam::functionObjects::abort::viable
(
const word& name,
const objectRegistry& obr,
@@ -112,13 +112,13 @@ bool Foam::functionObjects::abortCalculation::viable
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-Foam::functionObjects::abortCalculation::~abortCalculation()
+Foam::functionObjects::abort::~abort()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-void Foam::functionObjects::abortCalculation::read(const dictionary& dict)
+void Foam::functionObjects::abort::read(const dictionary& dict)
{
if (dict.found("action"))
{
@@ -136,7 +136,7 @@ void Foam::functionObjects::abortCalculation::read(const dictionary& dict)
}
-void Foam::functionObjects::abortCalculation::execute()
+void Foam::functionObjects::abort::execute()
{
bool hasAbort = isFile(abortFile_);
reduce(hasAbort, orOp<bool>());
@@ -185,17 +185,17 @@ void Foam::functionObjects::abortCalculation::execute()
}
-void Foam::functionObjects::abortCalculation::end()
+void Foam::functionObjects::abort::end()
{
removeFile();
}
-void Foam::functionObjects::abortCalculation::timeSet()
+void Foam::functionObjects::abort::timeSet()
{}
-void Foam::functionObjects::abortCalculation::write()
+void Foam::functionObjects::abort::write()
{}
diff --git a/src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculation.H b/src/postProcessing/functionObjects/jobControl/abort/abort.H
similarity index 92%
rename from src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculation.H
rename to src/postProcessing/functionObjects/jobControl/abort/abort.H
index 21c0650080ded7fb162bcb09590380e1f84a0ec0..29dc9c22c937c5a83dc09fb62ebebce2d8a29802 100644
--- a/src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculation.H
+++ b/src/postProcessing/functionObjects/jobControl/abort/abort.H
@@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
- Foam::functionObjects::abortCalculation
+ Foam::functionObjects::abort
Group
grpJobControlFunctionObjects
@@ -37,13 +37,13 @@ Description
- nextWrite
SourceFiles
- abortCalculation.C
- IOabortCalculation.H
+ abort.C
+ IOabort.H
\*---------------------------------------------------------------------------*/
-#ifndef abortCalculation_H
-#define abortCalculation_H
+#ifndef abort_H
+#define abort_H
#include "NamedEnum.H"
@@ -62,10 +62,10 @@ namespace functionObjects
{
/*---------------------------------------------------------------------------*\
- Class abortCalculation Declaration
+ Class abort Declaration
\*---------------------------------------------------------------------------*/
-class abortCalculation
+class abort
{
public:
@@ -104,10 +104,10 @@ private:
void removeFile() const;
//- Disallow default bitwise copy construct
- abortCalculation(const abortCalculation&);
+ abort(const abort&);
//- Disallow default bitwise assignment
- void operator=(const abortCalculation&);
+ void operator=(const abort&);
public:
@@ -119,7 +119,7 @@ public:
// Constructors
//- Construct for given objectRegistry and dictionary.
- abortCalculation
+ abort
(
const word& name,
const objectRegistry&,
@@ -139,7 +139,7 @@ public:
//- Destructor
- virtual ~abortCalculation();
+ virtual ~abort();
// Member Functions
diff --git a/src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculationFunctionObject.C b/src/postProcessing/functionObjects/jobControl/abort/abortFunctionObject.C
similarity index 85%
rename from src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculationFunctionObject.C
rename to src/postProcessing/functionObjects/jobControl/abort/abortFunctionObject.C
index 19664d4ae638963561d04f2457fa74f2f05050d1..0e7cb8fe3552322934fe30d9428c96010f4386b4 100644
--- a/src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculationFunctionObject.C
+++ b/src/postProcessing/functionObjects/jobControl/abort/abortFunctionObject.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
@@ -23,18 +23,18 @@ License
\*---------------------------------------------------------------------------*/
-#include "abortCalculationFunctionObject.H"
+#include "abortFunctionObject.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
- defineNamedTemplateTypeNameAndDebug(abortCalculationFunctionObject, 0);
+ defineNamedTemplateTypeNameAndDebug(abortFunctionObject, 0);
addToRunTimeSelectionTable
(
functionObject,
- abortCalculationFunctionObject,
+ abortFunctionObject,
dictionary
);
}
diff --git a/src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculationFunctionObject.H b/src/postProcessing/functionObjects/jobControl/abort/abortFunctionObject.H
similarity index 80%
rename from src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculationFunctionObject.H
rename to src/postProcessing/functionObjects/jobControl/abort/abortFunctionObject.H
index 97150ced98d50470e4cb13172eab38654533cc49..cd53ca0851b5fbee18457cf49b355c8aef086506 100644
--- a/src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculationFunctionObject.H
+++ b/src/postProcessing/functionObjects/jobControl/abort/abortFunctionObject.H
@@ -22,29 +22,29 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Typedef
- Foam::abortCalculationFunctionObject
+ Foam::abortFunctionObject
Description
- FunctionObject wrapper around abortCalculation to allow it to be created via
+ FunctionObject wrapper around abort to allow it to be created via
the functions entry within controlDict.
SourceFiles
- abortCalculationFunctionObject.C
+ abortFunctionObject.C
\*---------------------------------------------------------------------------*/
-#ifndef abortCalculationFunctionObject_H
-#define abortCalculationFunctionObject_H
+#ifndef abortFunctionObject_H
+#define abortFunctionObject_H
-#include "abortCalculation.H"
+#include "abort.H"
#include "OutputFilterFunctionObject.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
- typedef OutputFilterFunctionObject<functionObjects::abortCalculation>
- abortCalculationFunctionObject;
+ typedef OutputFilterFunctionObject<functionObjects::abort>
+ abortFunctionObject;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //