From e8cfd92f9ddb78ecfde1a9d5296a593a31af7545 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Fri, 9 Apr 2010 17:55:37 +0200
Subject: [PATCH] ENH: move residualControl and abortCalculation into common
jobControl lib
---
src/postProcessing/functionObjects/Allwmake | 2 +-
src/postProcessing/functionObjects/jobControl/Make/files | 7 +++++++
.../{residualControl => jobControl}/Make/options | 0
.../abortCalculation/IOabortCalculation.H | 0
.../abortCalculation/abortCalculation.C | 0
.../abortCalculation/abortCalculation.H | 0
.../abortCalculation/abortCalculationFunctionObject.C | 0
.../abortCalculation/abortCalculationFunctionObject.H | 0
.../{ => jobControl}/residualControl/IOresidualControl.H | 0
.../{ => jobControl}/residualControl/controlDict | 2 +-
.../{ => jobControl}/residualControl/residualControl.C | 0
.../{ => jobControl}/residualControl/residualControl.H | 0
.../residualControl/residualControlFunctionObject.C | 0
.../residualControl/residualControlFunctionObject.H | 0
.../functionObjects/residualControl/Make/files | 4 ----
src/postProcessing/functionObjects/utilities/Make/files | 3 ---
.../incompressible/simpleFoam/pitzDaily/system/controlDict | 2 +-
17 files changed, 10 insertions(+), 10 deletions(-)
create mode 100644 src/postProcessing/functionObjects/jobControl/Make/files
rename src/postProcessing/functionObjects/{residualControl => jobControl}/Make/options (100%)
rename src/postProcessing/functionObjects/{utilities => jobControl}/abortCalculation/IOabortCalculation.H (100%)
rename src/postProcessing/functionObjects/{utilities => jobControl}/abortCalculation/abortCalculation.C (100%)
rename src/postProcessing/functionObjects/{utilities => jobControl}/abortCalculation/abortCalculation.H (100%)
rename src/postProcessing/functionObjects/{utilities => jobControl}/abortCalculation/abortCalculationFunctionObject.C (100%)
rename src/postProcessing/functionObjects/{utilities => jobControl}/abortCalculation/abortCalculationFunctionObject.H (100%)
rename src/postProcessing/functionObjects/{ => jobControl}/residualControl/IOresidualControl.H (100%)
rename src/postProcessing/functionObjects/{ => jobControl}/residualControl/controlDict (96%)
rename src/postProcessing/functionObjects/{ => jobControl}/residualControl/residualControl.C (100%)
rename src/postProcessing/functionObjects/{ => jobControl}/residualControl/residualControl.H (100%)
rename src/postProcessing/functionObjects/{ => jobControl}/residualControl/residualControlFunctionObject.C (100%)
rename src/postProcessing/functionObjects/{ => jobControl}/residualControl/residualControlFunctionObject.H (100%)
delete mode 100644 src/postProcessing/functionObjects/residualControl/Make/files
diff --git a/src/postProcessing/functionObjects/Allwmake b/src/postProcessing/functionObjects/Allwmake
index 980a308557a..d8cbe09eb9e 100755
--- a/src/postProcessing/functionObjects/Allwmake
+++ b/src/postProcessing/functionObjects/Allwmake
@@ -6,7 +6,7 @@ wmake libso field
wmake libso forces
wmake libso IO
wmake libso utilities
-wmake libso residualControl
+wmake libso jobControl
wmake libso systemCall
# ----------------------------------------------------------------- end-of-file
diff --git a/src/postProcessing/functionObjects/jobControl/Make/files b/src/postProcessing/functionObjects/jobControl/Make/files
new file mode 100644
index 00000000000..03a93b6bf16
--- /dev/null
+++ b/src/postProcessing/functionObjects/jobControl/Make/files
@@ -0,0 +1,7 @@
+abortCalculation/abortCalculation.C
+abortCalculation/abortCalculationFunctionObject.C
+
+residualControl/residualControl.C
+residualControl/residualControlFunctionObject.C
+
+LIB = $(FOAM_LIBBIN)/libjobControl
diff --git a/src/postProcessing/functionObjects/residualControl/Make/options b/src/postProcessing/functionObjects/jobControl/Make/options
similarity index 100%
rename from src/postProcessing/functionObjects/residualControl/Make/options
rename to src/postProcessing/functionObjects/jobControl/Make/options
diff --git a/src/postProcessing/functionObjects/utilities/abortCalculation/IOabortCalculation.H b/src/postProcessing/functionObjects/jobControl/abortCalculation/IOabortCalculation.H
similarity index 100%
rename from src/postProcessing/functionObjects/utilities/abortCalculation/IOabortCalculation.H
rename to src/postProcessing/functionObjects/jobControl/abortCalculation/IOabortCalculation.H
diff --git a/src/postProcessing/functionObjects/utilities/abortCalculation/abortCalculation.C b/src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculation.C
similarity index 100%
rename from src/postProcessing/functionObjects/utilities/abortCalculation/abortCalculation.C
rename to src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculation.C
diff --git a/src/postProcessing/functionObjects/utilities/abortCalculation/abortCalculation.H b/src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculation.H
similarity index 100%
rename from src/postProcessing/functionObjects/utilities/abortCalculation/abortCalculation.H
rename to src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculation.H
diff --git a/src/postProcessing/functionObjects/utilities/abortCalculation/abortCalculationFunctionObject.C b/src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculationFunctionObject.C
similarity index 100%
rename from src/postProcessing/functionObjects/utilities/abortCalculation/abortCalculationFunctionObject.C
rename to src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculationFunctionObject.C
diff --git a/src/postProcessing/functionObjects/utilities/abortCalculation/abortCalculationFunctionObject.H b/src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculationFunctionObject.H
similarity index 100%
rename from src/postProcessing/functionObjects/utilities/abortCalculation/abortCalculationFunctionObject.H
rename to src/postProcessing/functionObjects/jobControl/abortCalculation/abortCalculationFunctionObject.H
diff --git a/src/postProcessing/functionObjects/residualControl/IOresidualControl.H b/src/postProcessing/functionObjects/jobControl/residualControl/IOresidualControl.H
similarity index 100%
rename from src/postProcessing/functionObjects/residualControl/IOresidualControl.H
rename to src/postProcessing/functionObjects/jobControl/residualControl/IOresidualControl.H
diff --git a/src/postProcessing/functionObjects/residualControl/controlDict b/src/postProcessing/functionObjects/jobControl/residualControl/controlDict
similarity index 96%
rename from src/postProcessing/functionObjects/residualControl/controlDict
rename to src/postProcessing/functionObjects/jobControl/residualControl/controlDict
index 46b53abce57..aae3ee4d5e1 100644
--- a/src/postProcessing/functionObjects/residualControl/controlDict
+++ b/src/postProcessing/functionObjects/jobControl/residualControl/controlDict
@@ -50,7 +50,7 @@ functions
convergenceChecks
{
type residualControl;
- functionObjectLibs ( "libresidualControl.so" );
+ functionObjectLibs ( "libjobControl.so" );
outputControl timeStep;
outputInterval 1;
diff --git a/src/postProcessing/functionObjects/residualControl/residualControl.C b/src/postProcessing/functionObjects/jobControl/residualControl/residualControl.C
similarity index 100%
rename from src/postProcessing/functionObjects/residualControl/residualControl.C
rename to src/postProcessing/functionObjects/jobControl/residualControl/residualControl.C
diff --git a/src/postProcessing/functionObjects/residualControl/residualControl.H b/src/postProcessing/functionObjects/jobControl/residualControl/residualControl.H
similarity index 100%
rename from src/postProcessing/functionObjects/residualControl/residualControl.H
rename to src/postProcessing/functionObjects/jobControl/residualControl/residualControl.H
diff --git a/src/postProcessing/functionObjects/residualControl/residualControlFunctionObject.C b/src/postProcessing/functionObjects/jobControl/residualControl/residualControlFunctionObject.C
similarity index 100%
rename from src/postProcessing/functionObjects/residualControl/residualControlFunctionObject.C
rename to src/postProcessing/functionObjects/jobControl/residualControl/residualControlFunctionObject.C
diff --git a/src/postProcessing/functionObjects/residualControl/residualControlFunctionObject.H b/src/postProcessing/functionObjects/jobControl/residualControl/residualControlFunctionObject.H
similarity index 100%
rename from src/postProcessing/functionObjects/residualControl/residualControlFunctionObject.H
rename to src/postProcessing/functionObjects/jobControl/residualControl/residualControlFunctionObject.H
diff --git a/src/postProcessing/functionObjects/residualControl/Make/files b/src/postProcessing/functionObjects/residualControl/Make/files
deleted file mode 100644
index c3bc44fe412..00000000000
--- a/src/postProcessing/functionObjects/residualControl/Make/files
+++ /dev/null
@@ -1,4 +0,0 @@
-residualControl.C
-residualControlFunctionObject.C
-
-LIB = $(FOAM_LIBBIN)/libresidualControl
diff --git a/src/postProcessing/functionObjects/utilities/Make/files b/src/postProcessing/functionObjects/utilities/Make/files
index 1812a0b448a..a93fad2edad 100644
--- a/src/postProcessing/functionObjects/utilities/Make/files
+++ b/src/postProcessing/functionObjects/utilities/Make/files
@@ -1,6 +1,3 @@
-abortCalculation/abortCalculation.C
-abortCalculation/abortCalculationFunctionObject.C
-
staticPressure/staticPressure.C
staticPressure/staticPressureFunctionObject.C
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict b/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict
index 754eb512a15..7f1626172b8 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict
@@ -50,7 +50,7 @@ functions
convergenceChecks
{
type residualControl;
- functionObjectLibs ( "libresidualControl.so" );
+ functionObjectLibs ( "libjobControl.so" );
outputControl timeStep;
outputInterval 1;
--
GitLab