diff --git a/src/postProcessing/functionObjects/Allwmake b/src/postProcessing/functionObjects/Allwmake index 980a308557a4498f50ff19b7721f07f2a7787ab9..d8cbe09eb9ef47957d37281e867d764d5d035e10 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 0000000000000000000000000000000000000000..03a93b6bf162a19feadef94fd6f4666b12860a1a --- /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 46b53abce5796e51a5209e4ba4bab3971e3119a1..aae3ee4d5e17b6efd73bce0e4e7187ea5a387e4b 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 c3bc44fe41247be7af01c274dd93ee76656c2db3..0000000000000000000000000000000000000000 --- 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 1812a0b448a534162e144935be7751103339c772..a93fad2edadcb9a9b6f011ed423abff1d8ccb9e6 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 754eb512a15b806bcfbe5314921bd2395e5e8b71..7f1626172b8e484badb25a8c38d99afaafcf46fb 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;