diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeVTK/controlDict b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeVTK/controlDict index 344ae189f9..b269605472 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeVTK/controlDict +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeVTK/controlDict @@ -55,7 +55,7 @@ functions type writeVTK; // Where to load it from - functionObjectLibs ("libfoamToVTK.so"); + libs ("libfoamToVTK.so"); // When to write: // timeStep (with optional writeInterval) diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeVTK/writeVTK.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeVTK/writeVTK.H index b8c1968f81..3dca57387d 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeVTK/writeVTK.H +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/writeVTK/writeVTK.H @@ -40,7 +40,7 @@ Description writeVTK1 { type writeVTK; - functionObjectLibs ("libIOFunctionObjects.so"); + libs ("libIOFunctionObjects.so"); ... objectNames (obj1 obj2); } diff --git a/etc/caseDicts/postProcessing/faceSource/faceSource.cfg b/etc/caseDicts/postProcessing/faceSource/faceSource.cfg index 2d540dae09..31b1ab25cc 100644 --- a/etc/caseDicts/postProcessing/faceSource/faceSource.cfg +++ b/etc/caseDicts/postProcessing/faceSource/faceSource.cfg @@ -15,7 +15,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // type faceSource; -functionObjectLibs ("libfieldFunctionObjects.so"); +libs ("libfieldFunctionObjects.so"); enabled true; writeControl timeStep; diff --git a/etc/caseDicts/postProcessing/fields/Lambda2.cfg b/etc/caseDicts/postProcessing/fields/Lambda2.cfg index d61c0d4f1f..cb4a63de6f 100644 --- a/etc/caseDicts/postProcessing/fields/Lambda2.cfg +++ b/etc/caseDicts/postProcessing/fields/Lambda2.cfg @@ -15,7 +15,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // type Lambda2; -functionObjectLibs ("libutilityFunctionObjects.so"); +libs ("libutilityFunctionObjects.so"); enabled true; writeControl writeTime; diff --git a/etc/caseDicts/postProcessing/fields/Q.cfg b/etc/caseDicts/postProcessing/fields/Q.cfg index a9bf4b235f..d486d85ae4 100644 --- a/etc/caseDicts/postProcessing/fields/Q.cfg +++ b/etc/caseDicts/postProcessing/fields/Q.cfg @@ -15,7 +15,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // type Q; -functionObjectLibs ("libutilityFunctionObjects.so"); +libs ("libutilityFunctionObjects.so"); enabled true; writeControl writeTime; diff --git a/etc/caseDicts/postProcessing/forces/forces.cfg b/etc/caseDicts/postProcessing/forces/forces.cfg index 9d78c1d2cb..97b9cd833a 100644 --- a/etc/caseDicts/postProcessing/forces/forces.cfg +++ b/etc/caseDicts/postProcessing/forces/forces.cfg @@ -15,7 +15,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // type forces; -functionObjectLibs ( "libforces.so" ); +libs ( "libforces.so" ); enabled true; writeControl timeStep; diff --git a/etc/caseDicts/postProcessing/graphs/graph.cfg b/etc/caseDicts/postProcessing/graphs/graph.cfg index f11826cb26..2959089784 100644 --- a/etc/caseDicts/postProcessing/graphs/graph.cfg +++ b/etc/caseDicts/postProcessing/graphs/graph.cfg @@ -15,7 +15,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // type sets; -functionObjectLibs ("libsampling.so"); +libs ("libsampling.so"); enabled true; writeControl writeTime; diff --git a/etc/caseDicts/postProcessing/minMax/cellMinMax.cfg b/etc/caseDicts/postProcessing/minMax/cellMinMax.cfg index d7de7029c6..5374dc7dcd 100644 --- a/etc/caseDicts/postProcessing/minMax/cellMinMax.cfg +++ b/etc/caseDicts/postProcessing/minMax/cellMinMax.cfg @@ -15,7 +15,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // type cellSource; -functionObjectLibs ("libfieldFunctionObjects.so"); +libs ("libfieldFunctionObjects.so"); enabled true; writeControl timeStep; diff --git a/etc/caseDicts/postProcessing/minMax/faceMinMax.cfg b/etc/caseDicts/postProcessing/minMax/faceMinMax.cfg index 4f6d9f36b2..2405304444 100644 --- a/etc/caseDicts/postProcessing/minMax/faceMinMax.cfg +++ b/etc/caseDicts/postProcessing/minMax/faceMinMax.cfg @@ -15,7 +15,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // type faceSource; -functionObjectLibs ("libfieldFunctionObjects.so"); +libs ("libfieldFunctionObjects.so"); enabled true; writeControl timeStep; diff --git a/etc/caseDicts/postProcessing/minMax/fieldMinMax.cfg b/etc/caseDicts/postProcessing/minMax/fieldMinMax.cfg index 93c1a82eae..b77e7f66e2 100644 --- a/etc/caseDicts/postProcessing/minMax/fieldMinMax.cfg +++ b/etc/caseDicts/postProcessing/minMax/fieldMinMax.cfg @@ -15,7 +15,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // type fieldMinMax; -functionObjectLibs ("libfieldFunctionObjects.so"); +libs ("libfieldFunctionObjects.so"); enabled true; writeControl timeStep; diff --git a/etc/caseDicts/postProcessing/numerical/residuals.cfg b/etc/caseDicts/postProcessing/numerical/residuals.cfg index a775830cf5..9ed37bca8e 100644 --- a/etc/caseDicts/postProcessing/numerical/residuals.cfg +++ b/etc/caseDicts/postProcessing/numerical/residuals.cfg @@ -15,7 +15,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // type residuals; -functionObjectLibs ("libutilityFunctionObjects.so"); +libs ("libutilityFunctionObjects.so"); enabled true; writeControl timeStep; diff --git a/etc/caseDicts/postProcessing/pressure/pressureDifference.cfg b/etc/caseDicts/postProcessing/pressure/pressureDifference.cfg index b1f5dfb82c..f93107379d 100644 --- a/etc/caseDicts/postProcessing/pressure/pressureDifference.cfg +++ b/etc/caseDicts/postProcessing/pressure/pressureDifference.cfg @@ -15,7 +15,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // type fieldValueDelta; -functionObjectLibs ("libfieldFunctionObjects.so"); +libs ("libfieldFunctionObjects.so"); operation subtract; diff --git a/etc/caseDicts/postProcessing/pressure/pressureTools.cfg b/etc/caseDicts/postProcessing/pressure/pressureTools.cfg index b548b156fd..47a1f60ad1 100644 --- a/etc/caseDicts/postProcessing/pressure/pressureTools.cfg +++ b/etc/caseDicts/postProcessing/pressure/pressureTools.cfg @@ -15,7 +15,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // type pressureTools; -functionObjectLibs ("libutilityFunctionObjects.so"); +libs ("libutilityFunctionObjects.so"); enabled true; writeControl writeTime; diff --git a/etc/caseDicts/postProcessing/probes/cloud.cfg b/etc/caseDicts/postProcessing/probes/cloud.cfg index b474fc9e2a..6ce08876f2 100644 --- a/etc/caseDicts/postProcessing/probes/cloud.cfg +++ b/etc/caseDicts/postProcessing/probes/cloud.cfg @@ -15,7 +15,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // type sets; -functionObjectLibs ("libsampling.so"); +libs ("libsampling.so"); enabled true; writeControl writeTime; diff --git a/etc/caseDicts/postProcessing/probes/probes.cfg b/etc/caseDicts/postProcessing/probes/probes.cfg index 5a9b63aaa9..a3eb75d98a 100644 --- a/etc/caseDicts/postProcessing/probes/probes.cfg +++ b/etc/caseDicts/postProcessing/probes/probes.cfg @@ -15,7 +15,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // type probes; -functionObjectLibs ("libsampling.so"); +libs ("libsampling.so"); enabled true; writeControl timeStep; diff --git a/etc/caseDicts/postProcessing/scalarTransport/scalarTransport.cfg b/etc/caseDicts/postProcessing/scalarTransport/scalarTransport.cfg index eaeea4073d..7f21398303 100644 --- a/etc/caseDicts/postProcessing/scalarTransport/scalarTransport.cfg +++ b/etc/caseDicts/postProcessing/scalarTransport/scalarTransport.cfg @@ -15,7 +15,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // type scalarTransport; -functionObjectLibs ("libutilityFunctionObjects.so"); +libs ("libutilityFunctionObjects.so"); enabled true; writeControl timeStep; diff --git a/etc/caseDicts/postProcessing/visualization/streamlines.cfg b/etc/caseDicts/postProcessing/visualization/streamlines.cfg index dd810f96df..e02e8f01e2 100644 --- a/etc/caseDicts/postProcessing/visualization/streamlines.cfg +++ b/etc/caseDicts/postProcessing/visualization/streamlines.cfg @@ -15,7 +15,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // type streamLine; -functionObjectLibs ( "libfieldFunctionObjects.so" ); +libs ( "libfieldFunctionObjects.so" ); writeControl writeTime; diff --git a/etc/caseDicts/postProcessing/visualization/surfaces.cfg b/etc/caseDicts/postProcessing/visualization/surfaces.cfg index 203f753e4d..919d7b4f98 100644 --- a/etc/caseDicts/postProcessing/visualization/surfaces.cfg +++ b/etc/caseDicts/postProcessing/visualization/surfaces.cfg @@ -15,7 +15,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // type surfaces; -functionObjectLibs ("libsampling.so"); +libs ("libsampling.so"); enabled true; writeControl writeTime; diff --git a/etc/codeTemplates/functionObject/FUNCTIONOBJECT.H b/etc/codeTemplates/functionObject/FUNCTIONOBJECT.H index 6dbf37d3fb..dac326842b 100644 --- a/etc/codeTemplates/functionObject/FUNCTIONOBJECT.H +++ b/etc/codeTemplates/functionObject/FUNCTIONOBJECT.H @@ -34,7 +34,7 @@ Description FUNCTIONOBJECT1 { type FUNCTIONOBJECT; - functionObjectLibs ("libFUNCTIONOBJECTFunctionObject.so"); + libs ("libFUNCTIONOBJECTFunctionObject.so"); ... wordData someWord; scalarData 1.0; diff --git a/etc/templates/axisymmetricJet/system/graph b/etc/templates/axisymmetricJet/system/graph index a419b446d9..72b4d2b3cf 100644 --- a/etc/templates/axisymmetricJet/system/graph +++ b/etc/templates/axisymmetricJet/system/graph @@ -17,7 +17,7 @@ FoamFile graph { type sets; - functionObjectLibs ("libsampling.so"); + libs ("libsampling.so"); writeControl writeTime; interpolationScheme cellPointFace; diff --git a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C index 791a8139b0..72c5ac5a2e 100644 --- a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C +++ b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C @@ -61,12 +61,24 @@ Foam::autoPtr Foam::functionObject::New Info<< "Selecting function " << functionType << endl; } - const_cast(t).libs().open - ( - dict, - "functionObjectLibs", - dictionaryConstructorTablePtr_ - ); + if (dict.found("functionObjectLibs")) + { + const_cast(t).libs().open + ( + dict, + "functionObjectLibs", + dictionaryConstructorTablePtr_ + ); + } + else + { + const_cast(t).libs().open + ( + dict, + "libs", + dictionaryConstructorTablePtr_ + ); + } if (!dictionaryConstructorTablePtr_) { diff --git a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H index e730c2a6f5..0b3abaf18d 100644 --- a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H +++ b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H @@ -46,7 +46,7 @@ Description myFunctionObject // Name of functionObject entry { type functionObjectType; - functionObjectLibs ("libMyFunctionObjectlib.so"); + libs ("libMyFunctionObjectlib.so"); region defaultRegion; enabled yes; timeStart 0; @@ -62,7 +62,7 @@ Description \table Property | Description | Required | Default value type | Type of function object | yes | - functionObjectLibs | Libraries containing implementation | yes | + libs | Libraries containing implementation | yes | region | Name of region for multi-region cases | no | enabled | On/off switch | no | yes timeStart| Start time | no | diff --git a/src/OpenFOAM/db/functionObjects/writeFiles/writeFiles.C b/src/OpenFOAM/db/functionObjects/writeFiles/writeFiles.C index c907c2f9b4..4b4bf0d9f9 100644 --- a/src/OpenFOAM/db/functionObjects/writeFiles/writeFiles.C +++ b/src/OpenFOAM/db/functionObjects/writeFiles/writeFiles.C @@ -64,12 +64,6 @@ void Foam::functionObjects::writeFiles::createFiles() } -void Foam::functionObjects::writeFiles::write() -{ - createFiles(); -} - - void Foam::functionObjects::writeFiles::resetNames(const wordList& names) { names_.clear(); @@ -200,4 +194,12 @@ Foam::OFstream& Foam::functionObjects::writeFiles::file(const label i) } +bool Foam::functionObjects::writeFiles::write(const bool postProcess) +{ + createFiles(); + + return true; +} + + // ************************************************************************* // diff --git a/src/OpenFOAM/db/functionObjects/writeFiles/writeFiles.H b/src/OpenFOAM/db/functionObjects/writeFiles/writeFiles.H index 8d9831e0a0..8801c3ee44 100644 --- a/src/OpenFOAM/db/functionObjects/writeFiles/writeFiles.H +++ b/src/OpenFOAM/db/functionObjects/writeFiles/writeFiles.H @@ -74,9 +74,6 @@ protected: //- Create the output file virtual void createFiles(); - //- Write function - virtual void write(); - //- Reset the list of names from a wordList virtual void resetNames(const wordList& names); @@ -130,6 +127,9 @@ public: //- Return file 'i' OFstream& file(const label i); + + //- Write function + virtual bool write(const bool postProcess = false); }; diff --git a/src/postProcessing/functionObjects/field/fieldAverage/controlDict b/src/postProcessing/functionObjects/field/fieldAverage/controlDict index d8b20ad200..d2c47ec3ac 100644 --- a/src/postProcessing/functionObjects/field/fieldAverage/controlDict +++ b/src/postProcessing/functionObjects/field/fieldAverage/controlDict @@ -52,7 +52,7 @@ functions type fieldAverage; // Where to load it from (if not already in solver) - functionObjectLibs ("libfieldFunctionObjects.so"); + libs ("libfieldFunctionObjects.so"); // Function object enabled flag enabled true; diff --git a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage.H b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage.H index a4bda83f3a..d89247a80c 100644 --- a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage.H +++ b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage.H @@ -67,7 +67,7 @@ Description fieldAverage1 { type fieldAverage; - functionObjectLibs ("libfieldFunctionObjects.so"); + libs ("libfieldFunctionObjects.so"); ... restartOnRestart false; restartOnOutput false; diff --git a/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H b/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H index 23334db14f..7987f13827 100644 --- a/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H +++ b/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransform.H @@ -37,7 +37,7 @@ Description fieldCoordinateSystemTransform1 { type fieldCoordinateSystemTransform; - functionObjectLibs ("libfieldFunctionObjects.so"); + libs ("libfieldFunctionObjects.so"); ... fields ( diff --git a/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/postProcessingDict b/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/postProcessingDict index 93081e26d1..4c680267c0 100644 --- a/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/postProcessingDict +++ b/src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/postProcessingDict @@ -22,7 +22,7 @@ functions type fieldCoordinateSystemTransform; // Where to load it from (if not already in solver) - functionObjectLibs ("libfieldFunctionObjects.so"); + libs ("libfieldFunctionObjects.so"); // Function object enabled flag enabled true; diff --git a/src/postProcessing/functionObjects/field/fieldMinMax/controlDict b/src/postProcessing/functionObjects/field/fieldMinMax/controlDict index 397b57cf0f..e31f656b8b 100644 --- a/src/postProcessing/functionObjects/field/fieldMinMax/controlDict +++ b/src/postProcessing/functionObjects/field/fieldMinMax/controlDict @@ -52,7 +52,7 @@ functions type fieldMinMax; // Where to load it from (if not already in solver) - functionObjectLibs ("libfieldFunctionObjects.so"); + libs ("libfieldFunctionObjects.so"); // Function object enabled flag enabled true; diff --git a/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.H b/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.H index 45942bf2b3..94ba2f0552 100644 --- a/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.H +++ b/src/postProcessing/functionObjects/field/fieldMinMax/fieldMinMax.H @@ -39,7 +39,7 @@ Description fieldMinMax1 { type fieldMinMax; - functionObjectLibs ("libfieldFunctionObjects.so"); + libs ("libfieldFunctionObjects.so"); ... write yes; log yes; diff --git a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.H b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.H index db529bd172..5644582aaa 100644 --- a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.H +++ b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.H @@ -39,7 +39,7 @@ Description cellSource1 { type cellSource; - functionObjectLibs ("libfieldFunctionObjects.so"); + libs ("libfieldFunctionObjects.so"); ... log true; valueOutput true; diff --git a/src/postProcessing/functionObjects/field/fieldValues/controlDict b/src/postProcessing/functionObjects/field/fieldValues/controlDict index dd80dd785b..5cc3468961 100644 --- a/src/postProcessing/functionObjects/field/fieldValues/controlDict +++ b/src/postProcessing/functionObjects/field/fieldValues/controlDict @@ -49,7 +49,7 @@ functions faceObj1 { type faceSource; - functionObjectLibs ("libfieldFunctionObjects.so"); + libs ("libfieldFunctionObjects.so"); enabled true; writeControl writeTime; @@ -91,7 +91,7 @@ functions faceObj2 { type faceSource; - functionObjectLibs ("libfieldFunctionObjects.so"); + libs ("libfieldFunctionObjects.so"); enabled true; writeControl writeTime; log true; @@ -109,7 +109,7 @@ functions cellObj1 { type cellSource; - functionObjectLibs ("libfieldFunctionObjects.so"); + libs ("libfieldFunctionObjects.so"); enabled true; writeControl writeTime; log true; diff --git a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.H b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.H index 0d775f01ed..7a9a6d6393 100644 --- a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.H +++ b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.H @@ -42,7 +42,7 @@ Description faceSource1 { type faceSource; - functionObjectLibs ("libfieldFunctionObjects.so"); + libs ("libfieldFunctionObjects.so"); ... log yes; valueOutput true; diff --git a/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.H b/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.H index f164c8f9ef..50d4a41e0a 100644 --- a/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.H +++ b/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDelta.H @@ -36,7 +36,7 @@ Description fieldValueDelta1 { type fieldValueDelta; - functionObjectLibs ("libfieldFunctionObjects.so"); + libs ("libfieldFunctionObjects.so"); operation subtract; fieldValue1 diff --git a/src/postProcessing/functionObjects/field/histogram/histogram.H b/src/postProcessing/functionObjects/field/histogram/histogram.H index 48f8f24325..831df5edda 100644 --- a/src/postProcessing/functionObjects/field/histogram/histogram.H +++ b/src/postProcessing/functionObjects/field/histogram/histogram.H @@ -36,7 +36,7 @@ Description { type histogram; - functionObjectLibs ("libfieldFunctionObjects.so"); + libs ("libfieldFunctionObjects.so"); field p; nBins 100; diff --git a/src/postProcessing/functionObjects/field/nearWallFields/controlDict b/src/postProcessing/functionObjects/field/nearWallFields/controlDict index f1d7d283cc..9d40cdcf9f 100644 --- a/src/postProcessing/functionObjects/field/nearWallFields/controlDict +++ b/src/postProcessing/functionObjects/field/nearWallFields/controlDict @@ -49,7 +49,7 @@ functions near { // Where to load it from - functionObjectLibs ("libfieldFunctionObjects.so"); + libs ("libfieldFunctionObjects.so"); type nearWallFields; diff --git a/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.H b/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.H index f0bdda2cc8..93026a3761 100644 --- a/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.H +++ b/src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.H @@ -43,7 +43,7 @@ Description nearWallFields1 { type nearWallFields; - functionObjectLibs ("libfieldFunctionObjects.so"); + libs ("libfieldFunctionObjects.so"); ... fields ((p pNear)(U UNear)); patches (movingWall); diff --git a/src/postProcessing/functionObjects/field/processorField/postProcessingDict b/src/postProcessing/functionObjects/field/processorField/postProcessingDict index 79463a0058..0df126095f 100644 --- a/src/postProcessing/functionObjects/field/processorField/postProcessingDict +++ b/src/postProcessing/functionObjects/field/processorField/postProcessingDict @@ -22,7 +22,7 @@ functions type processorField; // Where to load it from (if not already in solver) - functionObjectLibs ("libfieldFunctionObjects.so"); + libs ("libfieldFunctionObjects.so"); // Function object enabled flag enabled true; diff --git a/src/postProcessing/functionObjects/field/processorField/processorField.H b/src/postProcessing/functionObjects/field/processorField/processorField.H index c3334bedd9..fe0124cf76 100644 --- a/src/postProcessing/functionObjects/field/processorField/processorField.H +++ b/src/postProcessing/functionObjects/field/processorField/processorField.H @@ -36,7 +36,7 @@ Description processorField1 { type processorField; - functionObjectLibs ("libfieldFunctionObjects.so"); + libs ("libfieldFunctionObjects.so"); ... } \endverbatim diff --git a/src/postProcessing/functionObjects/field/readFields/postProcessingDict b/src/postProcessing/functionObjects/field/readFields/postProcessingDict index 8c86608121..3ed3fe8e98 100644 --- a/src/postProcessing/functionObjects/field/readFields/postProcessingDict +++ b/src/postProcessing/functionObjects/field/readFields/postProcessingDict @@ -19,7 +19,7 @@ functions readFields1 { type readFields; - functionObjectLibs ("libfieldFunctionObjects.so"); + libs ("libfieldFunctionObjects.so"); enabled true; writeControl timeStep; writeInterval 1; @@ -33,7 +33,7 @@ functions faceObj2 { type faceSource; - functionObjectLibs ("libfieldFunctionObjects.so"); + libs ("libfieldFunctionObjects.so"); enabled true; writeControl timeStep; writeInterval 1; diff --git a/src/postProcessing/functionObjects/field/readFields/readFields.H b/src/postProcessing/functionObjects/field/readFields/readFields.H index 0f314eb0b3..092b536ae1 100644 --- a/src/postProcessing/functionObjects/field/readFields/readFields.H +++ b/src/postProcessing/functionObjects/field/readFields/readFields.H @@ -36,7 +36,7 @@ Description readFields1 { type readFields; - functionObjectLibs ("libfieldFunctionObjects.so"); + libs ("libfieldFunctionObjects.so"); ... fields ( diff --git a/src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H b/src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H index 039db7e35b..65ccfab63c 100644 --- a/src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H +++ b/src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H @@ -59,7 +59,7 @@ Description regionSizeDistribution1 { type regionSizeDistribution; - functionObjectLibs ("libfieldFunctionObjects.so"); + libs ("libfieldFunctionObjects.so"); ... field alpha; patches (inlet); diff --git a/src/postProcessing/functionObjects/field/streamLine/controlDict b/src/postProcessing/functionObjects/field/streamLine/controlDict index 97ce6665c4..32d84034db 100644 --- a/src/postProcessing/functionObjects/field/streamLine/controlDict +++ b/src/postProcessing/functionObjects/field/streamLine/controlDict @@ -51,7 +51,7 @@ functions type streamLine; // Where to load it from (if not already in solver) - functionObjectLibs ("libfieldFunctionObjects.so"); + libs ("libfieldFunctionObjects.so"); // Output every writeControl writeTime; diff --git a/src/postProcessing/functionObjects/field/streamLine/streamLine.H b/src/postProcessing/functionObjects/field/streamLine/streamLine.H index 5a577e666d..08a18c96a6 100644 --- a/src/postProcessing/functionObjects/field/streamLine/streamLine.H +++ b/src/postProcessing/functionObjects/field/streamLine/streamLine.H @@ -37,7 +37,7 @@ Description streamLine1 { type streamLine; - functionObjectLibs ("libfieldFunctionObjects.so"); + libs ("libfieldFunctionObjects.so"); ... setFormat vtk; UName U; diff --git a/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.H b/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.H index eef1c591f8..463c274756 100644 --- a/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.H +++ b/src/postProcessing/functionObjects/field/surfaceInterpolateFields/surfaceInterpolateFields.H @@ -43,7 +43,7 @@ Description surfaceInterpolateFields1 { type surfaceInterpolateFields; - functionObjectLibs ("libfieldFunctionObjects.so"); + libs ("libfieldFunctionObjects.so"); ... fields ((p pNear)(U UNear)); } diff --git a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/controlDict b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/controlDict index fbba54842d..087a6f6c2f 100644 --- a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/controlDict +++ b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/controlDict @@ -49,7 +49,7 @@ functions readFields { // Where to load it from (if not already in solver) - functionObjectLibs ("libfieldFunctionObjects.so"); + libs ("libfieldFunctionObjects.so"); type readFields; fields (p U k); @@ -58,7 +58,7 @@ functions near { // Where to load it from - functionObjectLibs ("libfieldFunctionObjects.so"); + libs ("libfieldFunctionObjects.so"); type nearWallFields; @@ -82,7 +82,7 @@ functions streamLines { // Where to load it from (if not already in solver) - functionObjectLibs ("libfieldFunctionObjects.so"); + libs ("libfieldFunctionObjects.so"); type wallBoundedStreamLine; // Output every diff --git a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H index 0a76cb120d..c610cc1d68 100644 --- a/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H +++ b/src/postProcessing/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H @@ -37,7 +37,7 @@ Description wallBoundedStreamLine1 { type wallBoundedStreamLine; - functionObjectLibs ("libfieldFunctionObjects.so"); + libs ("libfieldFunctionObjects.so"); ... setFormat vtk; UName UNear; diff --git a/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.H b/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.H index 1470d5784c..dc4552eab1 100644 --- a/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.H +++ b/src/postProcessing/functionObjects/forces/forceCoeffs/forceCoeffs.H @@ -37,7 +37,7 @@ Description forceCoeffs1 { type forceCoeffs; - functionObjectLibs ("libforces.so"); + libs ("libforces.so"); ... log yes; patches (walls); diff --git a/src/postProcessing/functionObjects/forces/forces/forces.H b/src/postProcessing/functionObjects/forces/forces/forces.H index b8270eba3c..d3d994df12 100644 --- a/src/postProcessing/functionObjects/forces/forces/forces.H +++ b/src/postProcessing/functionObjects/forces/forces/forces.H @@ -40,7 +40,7 @@ Description forces1 { type forces; - functionObjectLibs ("libforces.so"); + libs ("libforces.so"); ... log yes; patches (walls); diff --git a/src/postProcessing/functionObjects/forces/pressureTools/pressureTools.H b/src/postProcessing/functionObjects/forces/pressureTools/pressureTools.H index f957966c87..a14a88dffc 100644 --- a/src/postProcessing/functionObjects/forces/pressureTools/pressureTools.H +++ b/src/postProcessing/functionObjects/forces/pressureTools/pressureTools.H @@ -81,7 +81,7 @@ Description pressureTools1 { type pressureTools; - functionObjectLibs ("libutilityFunctionObjects.so"); + libs ("libutilityFunctionObjects.so"); ... calcTotal no; calcCoeff yes; diff --git a/src/postProcessing/functionObjects/forces/wallShearStress/wallShearStress.H b/src/postProcessing/functionObjects/forces/wallShearStress/wallShearStress.H index 8c2ffef6e1..128885970c 100644 --- a/src/postProcessing/functionObjects/forces/wallShearStress/wallShearStress.H +++ b/src/postProcessing/functionObjects/forces/wallShearStress/wallShearStress.H @@ -51,7 +51,7 @@ Description wallShearStress1 { type wallShearStress; - functionObjectLibs ("libutilityFunctionObjects.so"); + libs ("libutilityFunctionObjects.so"); ... patches (".*Wall"); } diff --git a/src/postProcessing/functionObjects/lagrangian/Make/files b/src/postProcessing/functionObjects/lagrangian/Make/files index 1301f29b44..368d9dffe6 100644 --- a/src/postProcessing/functionObjects/lagrangian/Make/files +++ b/src/postProcessing/functionObjects/lagrangian/Make/files @@ -1,3 +1,4 @@ cloudInfo/cloudInfo.C +icoUncoupledKinematicCloud/icoUncoupledKinematicCloud.C LIB = $(FOAM_LIBBIN)/liblagrangianFunctionObjects diff --git a/src/postProcessing/functionObjects/lagrangian/Make/options b/src/postProcessing/functionObjects/lagrangian/Make/options index 7699961acc..f99c39cb4b 100644 --- a/src/postProcessing/functionObjects/lagrangian/Make/options +++ b/src/postProcessing/functionObjects/lagrangian/Make/options @@ -1,9 +1,19 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/transportModels \ + -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ + -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ - -I$(LIB_SRC)/lagrangian/intermediate/lnInclude + -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ + -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ + -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude LIB_LIBS = \ -lfiniteVolume \ + -lincompressibleTransportModels \ + -lmeshTools \ -llagrangian \ - -llagrangianIntermediate + -llagrangianIntermediate \ + -llagrangianTurbulence \ + -lregionModels \ + -lsurfaceFilmModels diff --git a/src/postProcessing/functionObjects/lagrangian/cloudInfo/cloudInfo.H b/src/postProcessing/functionObjects/lagrangian/cloudInfo/cloudInfo.H index dfd5171275..3cd45ac7bb 100644 --- a/src/postProcessing/functionObjects/lagrangian/cloudInfo/cloudInfo.H +++ b/src/postProcessing/functionObjects/lagrangian/cloudInfo/cloudInfo.H @@ -38,7 +38,7 @@ Description cloudInfo1 { type cloudInfo; - functionObjectLibs ("libcloudFunctionObjects.so"); + libs ("libcloudFunctionObjects.so"); ... clouds ( diff --git a/src/postProcessing/functionObjects/lagrangian/cloudInfo/postProcessingDict b/src/postProcessing/functionObjects/lagrangian/cloudInfo/postProcessingDict index 74fd3b9d37..ca8a3ba09c 100644 --- a/src/postProcessing/functionObjects/lagrangian/cloudInfo/postProcessingDict +++ b/src/postProcessing/functionObjects/lagrangian/cloudInfo/postProcessingDict @@ -19,7 +19,7 @@ functions cloudInfo1 { type cloudInfo; - functionObjectLibs ("libcloudFunctionObjects.so"); + libs ("libcloudFunctionObjects.so"); enabled true; writeControl timeStep; writeInterval 1; diff --git a/src/postProcessing/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H b/src/postProcessing/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H index 4628283137..a2197b23e0 100644 --- a/src/postProcessing/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H +++ b/src/postProcessing/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H @@ -48,7 +48,7 @@ Description \verbatim difference { - functionObjectLibs ("libutilityFunctionObjects.so"); + libs ("libutilityFunctionObjects.so"); type coded; // Name of on-the-fly generated functionObject diff --git a/src/postProcessing/functionObjects/utilities/partialWrite/controlDict b/src/postProcessing/functionObjects/utilities/partialWrite/controlDict index 4ddf310200..a9f4ec7486 100644 --- a/src/postProcessing/functionObjects/utilities/partialWrite/controlDict +++ b/src/postProcessing/functionObjects/utilities/partialWrite/controlDict @@ -58,7 +58,7 @@ functions type partialWrite; // Where to load it from - functionObjectLibs ("libIOFunctionObjects.so"); + libs ("libIOFunctionObjects.so"); // Optional mesh region to operate on. Only one partialWrite per // region allowed. @@ -91,7 +91,7 @@ functions type writeRegisteredObject; // Where to load it from - functionObjectLibs ("libIOFunctionObjects.so"); + libs ("libIOFunctionObjects.so"); // When to write: // timeStep (with optional writeInterval) diff --git a/src/postProcessing/functionObjects/utilities/partialWrite/partialWrite.H b/src/postProcessing/functionObjects/utilities/partialWrite/partialWrite.H index d312a78bab..798522746a 100644 --- a/src/postProcessing/functionObjects/utilities/partialWrite/partialWrite.H +++ b/src/postProcessing/functionObjects/utilities/partialWrite/partialWrite.H @@ -37,7 +37,7 @@ Description partialWrite1 { type partialWrite; - functionObjectLibs ("libIOFunctionObjects.so"); + libs ("libIOFunctionObjects.so"); ... objectNames (p U T); writeInterval 100; diff --git a/src/postProcessing/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.H b/src/postProcessing/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.H index 7120edf8a7..1cf76d8eb4 100644 --- a/src/postProcessing/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.H +++ b/src/postProcessing/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.H @@ -35,7 +35,7 @@ Description removeRegisteredObject1 { type removeRegisteredObject; - functionObjectLibs ("libIOFunctionObjects.so"); + libs ("libIOFunctionObjects.so"); ... objectNames (obj1 obj2); } diff --git a/src/postProcessing/functionObjects/utilities/systemCall/controlDict b/src/postProcessing/functionObjects/utilities/systemCall/controlDict index abed2d748f..41287f0c4a 100644 --- a/src/postProcessing/functionObjects/utilities/systemCall/controlDict +++ b/src/postProcessing/functionObjects/utilities/systemCall/controlDict @@ -49,7 +49,7 @@ functions systemCall1 { type systemCall; - functionObjectLibs ("libsystemCall.so"); + libs ("libsystemCall.so"); enabled true; writeControl writeTime; diff --git a/src/postProcessing/functionObjects/utilities/systemCall/systemCall.H b/src/postProcessing/functionObjects/utilities/systemCall/systemCall.H index a1dd56046b..4104a6e415 100644 --- a/src/postProcessing/functionObjects/utilities/systemCall/systemCall.H +++ b/src/postProcessing/functionObjects/utilities/systemCall/systemCall.H @@ -40,7 +40,7 @@ Description systemCall1 { type systemCall; - functionObjectLibs ("libsystemCall.so"); + libs ("libsystemCall.so"); ... executeCalls ( diff --git a/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/controlDict b/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/controlDict index cb2d146666..5a38c46c94 100644 --- a/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/controlDict +++ b/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/controlDict @@ -49,7 +49,7 @@ functions fileUpdate1 { type timeActivatedFileUpdate; - functionObjectLibs ("libutilityFunctionObjects.so"); + libs ("libutilityFunctionObjects.so"); writeControl timeStep; writeInterval 1; fileToUpdate "$FOAM_CASE/system/fvSolution"; diff --git a/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H b/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H index e72fb38b7d..79f55ecdd3 100644 --- a/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H +++ b/src/postProcessing/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H @@ -37,7 +37,7 @@ Description fileUpdate1 { type timeActivatedFileUpdate; - functionObjectLibs ("libutilityFunctionObjects.so"); + libs ("libutilityFunctionObjects.so"); writeControl timeStep; writeInterval 1; fileToUpdate "$FOAM_CASE/system/fvSolution"; diff --git a/src/postProcessing/functionObjects/utilities/turbulenceFields/postProcessingDict b/src/postProcessing/functionObjects/utilities/turbulenceFields/postProcessingDict index aa00da824a..dc0cd6d37d 100644 --- a/src/postProcessing/functionObjects/utilities/turbulenceFields/postProcessingDict +++ b/src/postProcessing/functionObjects/utilities/turbulenceFields/postProcessingDict @@ -19,7 +19,7 @@ functions turbulenceFields1 { type turbulenceFields; - functionObjectLibs ("libutilityFunctionObjects.so"); + libs ("libutilityFunctionObjects.so"); enabled true; writeControl timeStep; writeInterval 1; diff --git a/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.H b/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.H index bd480dfdfb..13eaac0a90 100644 --- a/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.H +++ b/src/postProcessing/functionObjects/utilities/turbulenceFields/turbulenceFields.H @@ -43,7 +43,7 @@ Description turbulenceFields1 { type turbulenceFields; - functionObjectLibs ("libutilityFunctionObjects.so"); + libs ("libutilityFunctionObjects.so"); ... fields ( diff --git a/src/postProcessing/functionObjects/utilities/writeRegisteredObject/controlDict b/src/postProcessing/functionObjects/utilities/writeRegisteredObject/controlDict index 0267dd2ee7..4f3b184e83 100644 --- a/src/postProcessing/functionObjects/utilities/writeRegisteredObject/controlDict +++ b/src/postProcessing/functionObjects/utilities/writeRegisteredObject/controlDict @@ -58,7 +58,7 @@ functions type partialWrite; // Where to load it from - functionObjectLibs ("libIOFunctionObjects.so"); + libs ("libIOFunctionObjects.so"); // Optional mesh region to operate on. Only one partialWrite per // region allowed. @@ -91,7 +91,7 @@ functions type writeRegisteredObject; // Where to load it from - functionObjectLibs ("libIOFunctionObjects.so"); + libs ("libIOFunctionObjects.so"); // When to write: // timeStep (with optional writeInterval) diff --git a/src/postProcessing/functionObjects/utilities/writeRegisteredObject/writeRegisteredObject.H b/src/postProcessing/functionObjects/utilities/writeRegisteredObject/writeRegisteredObject.H index a9979dfa01..11a56f8d50 100644 --- a/src/postProcessing/functionObjects/utilities/writeRegisteredObject/writeRegisteredObject.H +++ b/src/postProcessing/functionObjects/utilities/writeRegisteredObject/writeRegisteredObject.H @@ -44,7 +44,7 @@ Description writeRegisteredObject1 { type writeRegisteredObject; - functionObjectLibs ("libIOFunctionObjects.so"); + libs ("libIOFunctionObjects.so"); exclusiveWriting true; ... objectNames (obj1 obj2); diff --git a/tutorials/basic/potentialFoam/cylinder/system/controlDict b/tutorials/basic/potentialFoam/cylinder/system/controlDict index a303ac75f6..c326838ddb 100644 --- a/tutorials/basic/potentialFoam/cylinder/system/controlDict +++ b/tutorials/basic/potentialFoam/cylinder/system/controlDict @@ -50,7 +50,7 @@ functions difference { // Load the library containing the 'coded' functionObject - functionObjectLibs ("libutilityFunctionObjects.so"); + libs ("libutilityFunctionObjects.so"); type coded; diff --git a/tutorials/combustion/engineFoam/kivaTest/system/controlDict b/tutorials/combustion/engineFoam/kivaTest/system/controlDict index 644dd62afe..485cc686bd 100644 --- a/tutorials/combustion/engineFoam/kivaTest/system/controlDict +++ b/tutorials/combustion/engineFoam/kivaTest/system/controlDict @@ -56,7 +56,7 @@ functions timeStep { type coded; - functionObjectLibs ("libutilityFunctionObjects.so"); + libs ("libutilityFunctionObjects.so"); redirectType setDeltaT; code diff --git a/tutorials/compressible/rhoCentralDyMFoam/movingCone/system/cuttingPlane b/tutorials/compressible/rhoCentralDyMFoam/movingCone/system/cuttingPlane index 0ef1f22a5d..a1cfdee93e 100644 --- a/tutorials/compressible/rhoCentralDyMFoam/movingCone/system/cuttingPlane +++ b/tutorials/compressible/rhoCentralDyMFoam/movingCone/system/cuttingPlane @@ -9,7 +9,7 @@ cuttingPlane { type surfaces; - functionObjectLibs ("libsampling.so"); + libs ("libsampling.so"); writeControl writeTime; diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/system/controlDict b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/system/controlDict index 6c543652ae..c4cfb33a94 100644 --- a/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/system/controlDict +++ b/tutorials/compressible/rhoPimpleFoam/laminar/helmholtzResonance/system/controlDict @@ -53,7 +53,7 @@ functions { probes { - functionObjectLibs ( "libsampling.so" ); + libs ( "libsampling.so" ); type probes; name probes; writeControl timeStep; diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/controlDict b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/controlDict index 6abdc3053e..af81fb869a 100644 --- a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/controlDict +++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/controlDict @@ -54,7 +54,7 @@ functions fieldAverage1 { type fieldAverage; - functionObjectLibs ( "libfieldFunctionObjects.so" ); + libs ( "libfieldFunctionObjects.so" ); enabled true; writeControl writeTime; diff --git a/tutorials/compressible/sonicDyMFoam/movingCone/system/cuttingPlane b/tutorials/compressible/sonicDyMFoam/movingCone/system/cuttingPlane index 0ef1f22a5d..a1cfdee93e 100644 --- a/tutorials/compressible/sonicDyMFoam/movingCone/system/cuttingPlane +++ b/tutorials/compressible/sonicDyMFoam/movingCone/system/cuttingPlane @@ -9,7 +9,7 @@ cuttingPlane { type surfaces; - functionObjectLibs ("libsampling.so"); + libs ("libsampling.so"); writeControl writeTime; diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict index aa126e906b..6c20d90831 100644 --- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict +++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict @@ -50,7 +50,7 @@ functions forces { type forceCoeffs; - functionObjectLibs ( "libforces.so" ); + libs ( "libforces.so" ); writeControl timeStep; writeInterval 1; diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict index d435604913..75c6aedf9c 100644 --- a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict +++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/system/controlDict @@ -52,7 +52,7 @@ functions fieldAverage1 { type fieldAverage; - functionObjectLibs ( "libfieldFunctionObjects.so" ); + libs ( "libfieldFunctionObjects.so" ); writeControl writeTime; fields @@ -116,7 +116,7 @@ functions dsmcFields1 { type dsmcFields; - functionObjectLibs ( "libutilityFunctionObjects.so" ); + libs ( "libutilityFunctionObjects.so" ); enabled true; writeControl writeTime; } diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict index 704666f029..c1a97cd71f 100644 --- a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict +++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/system/controlDict @@ -52,7 +52,7 @@ functions fieldAverage1 { type fieldAverage; - functionObjectLibs ( "libfieldFunctionObjects.so" ); + libs ( "libfieldFunctionObjects.so" ); writeControl writeTime; restartOnOutput off; @@ -117,7 +117,7 @@ functions dsmcFields1 { type dsmcFields; - functionObjectLibs ( "libutilityFunctionObjects.so" ); + libs ( "libutilityFunctionObjects.so" ); enabled true; writeControl writeTime; } diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict index 450664dc79..eb5e78206a 100644 --- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict +++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/system/controlDict @@ -52,7 +52,7 @@ functions fieldAverage1 { type fieldAverage; - functionObjectLibs ( "libfieldFunctionObjects.so" ); + libs ( "libfieldFunctionObjects.so" ); writeControl writeTime; fields @@ -116,7 +116,7 @@ functions dsmcFields1 { type dsmcFields; - functionObjectLibs ( "libutilityFunctionObjects.so" ); + libs ( "libutilityFunctionObjects.so" ); enabled true; writeControl writeTime; } diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict index 9131af9669..f89ed2f016 100644 --- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict +++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/system/controlDict @@ -52,7 +52,7 @@ functions fieldAverage1 { type fieldAverage; - functionObjectLibs ( "libfieldFunctionObjects.so" ); + libs ( "libfieldFunctionObjects.so" ); writeControl writeTime; fields @@ -117,7 +117,7 @@ functions dsmcFields1 { type dsmcFields; - functionObjectLibs ( "libutilityFunctionObjects.so" ); + libs ( "libutilityFunctionObjects.so" ); enabled true; writeControl writeTime; } @@ -126,7 +126,7 @@ functions { type forces; enabled true; - functionObjectLibs ( "libforces.so" ); + libs ( "libforces.so" ); writeControl writeTime; patches ( obstacle ); directForceDensity true; diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/cuttingPlane b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/cuttingPlane index 0ef1f22a5d..a1cfdee93e 100644 --- a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/cuttingPlane +++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/cuttingPlane @@ -9,7 +9,7 @@ cuttingPlane { type surfaces; - functionObjectLibs ("libsampling.so"); + libs ("libsampling.so"); writeControl writeTime; diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/Q b/tutorials/incompressible/pimpleDyMFoam/propeller/system/Q index 325a3bff1d..a6f431788c 100644 --- a/tutorials/incompressible/pimpleDyMFoam/propeller/system/Q +++ b/tutorials/incompressible/pimpleDyMFoam/propeller/system/Q @@ -10,7 +10,7 @@ Q { // Where to load it from - functionObjectLibs ("libutilityFunctionObjects.so"); + libs ("libutilityFunctionObjects.so"); type Q; diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/forces b/tutorials/incompressible/pimpleDyMFoam/propeller/system/forces index e6e94fb65d..0bc9c2f89c 100644 --- a/tutorials/incompressible/pimpleDyMFoam/propeller/system/forces +++ b/tutorials/incompressible/pimpleDyMFoam/propeller/system/forces @@ -10,7 +10,7 @@ forces { type forces; - functionObjectLibs ( "libforces.so" ); + libs ( "libforces.so" ); writeControl timeStep; timeInterval 1; diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaces b/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaces index 528b363f63..5d6e587987 100644 --- a/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaces +++ b/tutorials/incompressible/pimpleDyMFoam/propeller/system/surfaces @@ -9,7 +9,7 @@ surfaces { type surfaces; - functionObjectLibs ("libsampling.so"); + libs ("libsampling.so"); writeControl writeTime; surfaceFormat vtk; diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/controlDict b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/controlDict index 3fc415deaa..8eb77896dc 100644 --- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/controlDict +++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/controlDict @@ -50,7 +50,7 @@ functions forces { type forces; - functionObjectLibs ( "libforces.so" ); + libs ( "libforces.so" ); writeControl timeStep; writeInterval 10; patches (wing); diff --git a/tutorials/incompressible/pimpleFoam/TJunction/system/controlDict b/tutorials/incompressible/pimpleFoam/TJunction/system/controlDict index 03793cbc50..0151f88dca 100644 --- a/tutorials/incompressible/pimpleFoam/TJunction/system/controlDict +++ b/tutorials/incompressible/pimpleFoam/TJunction/system/controlDict @@ -54,7 +54,7 @@ functions probes { // Where to load it from - functionObjectLibs ( "libsampling.so" ); + libs ( "libsampling.so" ); type probes; diff --git a/tutorials/incompressible/pimpleFoam/TJunctionFan/system/controlDict b/tutorials/incompressible/pimpleFoam/TJunctionFan/system/controlDict index 4a43a60f28..1fdcaebb0b 100644 --- a/tutorials/incompressible/pimpleFoam/TJunctionFan/system/controlDict +++ b/tutorials/incompressible/pimpleFoam/TJunctionFan/system/controlDict @@ -54,7 +54,7 @@ functions probes { // Where to load it from - functionObjectLibs ( "libsampling.so" ); + libs ( "libsampling.so" ); type probes; diff --git a/tutorials/incompressible/pimpleFoam/channel395/system/controlDict b/tutorials/incompressible/pimpleFoam/channel395/system/controlDict index d4070fbb9d..5e66d134ce 100644 --- a/tutorials/incompressible/pimpleFoam/channel395/system/controlDict +++ b/tutorials/incompressible/pimpleFoam/channel395/system/controlDict @@ -50,7 +50,7 @@ functions fieldAverage1 { type fieldAverage; - functionObjectLibs ( "libfieldFunctionObjects.so" ); + libs ( "libfieldFunctionObjects.so" ); enabled true; writeControl writeTime; diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/controlDict b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/controlDict index 95a1ad13c2..141f5df839 100644 --- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/controlDict +++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/controlDict @@ -73,7 +73,7 @@ functions cuttingPlane { type surfaces; - functionObjectLibs ( "libsampling.so" ); + libs ( "libsampling.so" ); writeControl writeTime; surfaceFormat vtk; fields ( p U ); @@ -96,7 +96,7 @@ functions forces { type forceCoeffs; - functionObjectLibs ( "libforces.so" ); + libs ( "libforces.so" ); writeControl timeStep; writeInterval 1; patches ( "motorBike.*" ); diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/cuttingPlane b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/cuttingPlane index befc1336c3..558bf223ce 100644 --- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/cuttingPlane +++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/cuttingPlane @@ -9,7 +9,7 @@ cuttingPlane { type surfaces; - functionObjectLibs ("libsampling.so"); + libs ("libsampling.so"); writeControl writeTime; surfaceFormat vtk; diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/forceCoeffs b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/forceCoeffs index 0befb9f69d..473439d6de 100644 --- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/forceCoeffs +++ b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/forceCoeffs @@ -9,7 +9,7 @@ forces { type forceCoeffs; - functionObjectLibs ( "libforces.so" ); + libs ( "libforces.so" ); writeControl timeStep; writeInterval 1; diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict index 855473e58c..d935938c76 100644 --- a/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict +++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/system/controlDict @@ -50,7 +50,7 @@ functions probes { type probes; - functionObjectLibs ("libsampling.so"); + libs ("libsampling.so"); enabled true; writeControl timeStep; writeInterval 1; @@ -76,7 +76,7 @@ functions fieldAverage1 { type fieldAverage; - functionObjectLibs ("libfieldFunctionObjects.so"); + libs ("libfieldFunctionObjects.so"); enabled true; writeControl writeTime; @@ -105,7 +105,7 @@ functions type surfaces; // Where to load it from (if not already in solver) - functionObjectLibs ("libsampling.so"); + libs ("libsampling.so"); enabled true; writeControl writeTime; diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/controlDict b/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/controlDict index 855473e58c..d935938c76 100644 --- a/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/controlDict +++ b/tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/controlDict @@ -50,7 +50,7 @@ functions probes { type probes; - functionObjectLibs ("libsampling.so"); + libs ("libsampling.so"); enabled true; writeControl timeStep; writeInterval 1; @@ -76,7 +76,7 @@ functions fieldAverage1 { type fieldAverage; - functionObjectLibs ("libfieldFunctionObjects.so"); + libs ("libfieldFunctionObjects.so"); enabled true; writeControl writeTime; @@ -105,7 +105,7 @@ functions type surfaces; // Where to load it from (if not already in solver) - functionObjectLibs ("libsampling.so"); + libs ("libsampling.so"); enabled true; writeControl writeTime; diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/cuttingPlane b/tutorials/incompressible/simpleFoam/motorBike/system/cuttingPlane index befc1336c3..558bf223ce 100644 --- a/tutorials/incompressible/simpleFoam/motorBike/system/cuttingPlane +++ b/tutorials/incompressible/simpleFoam/motorBike/system/cuttingPlane @@ -9,7 +9,7 @@ cuttingPlane { type surfaces; - functionObjectLibs ("libsampling.so"); + libs ("libsampling.so"); writeControl writeTime; surfaceFormat vtk; diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/forceCoeffs b/tutorials/incompressible/simpleFoam/motorBike/system/forceCoeffs index efa27c0eb6..9c44bca6cf 100644 --- a/tutorials/incompressible/simpleFoam/motorBike/system/forceCoeffs +++ b/tutorials/incompressible/simpleFoam/motorBike/system/forceCoeffs @@ -10,7 +10,7 @@ forceCoeffs1 { type forceCoeffs; - functionObjectLibs ( "libforces.so" ); + libs ( "libforces.so" ); writeControl timeStep; timeInterval 1; diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/streamLines b/tutorials/incompressible/simpleFoam/motorBike/system/streamLines index 1a7184fb86..0e563b4837 100644 --- a/tutorials/incompressible/simpleFoam/motorBike/system/streamLines +++ b/tutorials/incompressible/simpleFoam/motorBike/system/streamLines @@ -9,7 +9,7 @@ streamLines { // Where to load it from - functionObjectLibs ("libfieldFunctionObjects.so"); + libs ("libfieldFunctionObjects.so"); type streamLine; diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines b/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines index 4d13d7d402..052538b5f3 100644 --- a/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines +++ b/tutorials/incompressible/simpleFoam/motorBike/system/wallBoundedStreamLines @@ -10,7 +10,7 @@ near { // Where to load it from - functionObjectLibs ("libfieldFunctionObjects.so"); + libs ("libfieldFunctionObjects.so"); type nearWallFields; @@ -39,7 +39,7 @@ near wallBoundedStreamLines { // Where to load it from (if not already in solver) - functionObjectLibs ("libfieldFunctionObjects.so"); + libs ("libfieldFunctionObjects.so"); type wallBoundedStreamLine; // Output every diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict b/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict index 71d42db917..1edf86c9cb 100644 --- a/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict +++ b/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict @@ -52,7 +52,7 @@ functions type streamLine; // Where to load it from (if not already in solver) - functionObjectLibs ("libfieldFunctionObjects.so"); + libs ("libfieldFunctionObjects.so"); // Output every writeControl writeTime; diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict index d8032efee5..4c60def219 100644 --- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict +++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict @@ -52,7 +52,7 @@ functions type streamLine; // Where to load it from (if not already in solver) - functionObjectLibs ("libfieldFunctionObjects.so"); + libs ("libfieldFunctionObjects.so"); // Output every writeControl writeTime; diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/controlDict index 357bbc962e..6121a89143 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/controlDict +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/controlDict @@ -56,7 +56,7 @@ functions faceSource1 { type faceSource; - functionObjectLibs ("libfieldFunctionObjects.so"); + libs ("libfieldFunctionObjects.so"); enabled yes; writeControl writeTime; log yes; diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/controlDict index c0b5659ff1..6b2dc4faae 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/controlDict +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/controlDict @@ -51,7 +51,7 @@ functions faceSource1 { type faceSource; - functionObjectLibs ("libfieldFunctionObjects.so"); + libs ("libfieldFunctionObjects.so"); enabled yes; writeControl writeTime; log yes; diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/controlDict b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/controlDict index b547bcf0c3..85cbcd795d 100644 --- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/controlDict +++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/controlDict @@ -51,7 +51,7 @@ functions faceSource1 { type faceSource; - functionObjectLibs ("libfieldFunctionObjects.so"); + libs ("libfieldFunctionObjects.so"); enabled yes; writeControl writeTime; log yes; diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict b/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict index ee6b8267ff..c5ef129b1a 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict @@ -54,7 +54,7 @@ functions fieldAverage1 { type fieldAverage; - functionObjectLibs ( "libfieldFunctionObjects.so" ); + libs ( "libfieldFunctionObjects.so" ); enabled false; writeControl writeTime; fields diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict index f495ec0e7f..8bd22cef0b 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict @@ -54,7 +54,7 @@ functions fieldAverage1 { type fieldAverage; - functionObjectLibs ( "libfieldFunctionObjects.so" ); + libs ( "libfieldFunctionObjects.so" ); enabled false; writeControl writeTime; fields diff --git a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/controlDict b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/controlDict index 6ebd8cd2fe..9c73195f26 100644 --- a/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/controlDict +++ b/tutorials/multiphase/compressibleInterDyMFoam/ras/sloshingTank2D/system/controlDict @@ -57,7 +57,7 @@ functions probes { type probes; - functionObjectLibs ("libsampling.so"); + libs ("libsampling.so"); writeControl writeTime; probeLocations ( @@ -74,7 +74,7 @@ functions wallPressure { type surfaces; - functionObjectLibs ("libsampling.so"); + libs ("libsampling.so"); writeControl writeTime; surfaceFormat raw; fields diff --git a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/controlDict index 0425ebae64..6d75bbfc4f 100644 --- a/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/controlDict +++ b/tutorials/multiphase/interDyMFoam/ras/DTCHull/system/controlDict @@ -56,7 +56,7 @@ functions forces { type forces; - functionObjectLibs ( "libforces.so" ); + libs ( "libforces.so" ); patches (hull); rhoInf 998.8; rhoName rho; diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict index 8dcc4a5034..dc1ec8c127 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict @@ -57,7 +57,7 @@ functions probes { type probes; - functionObjectLibs ("libsampling.so"); + libs ("libsampling.so"); writeControl writeTime; probeLocations ( @@ -74,7 +74,7 @@ functions wallPressure { type surfaces; - functionObjectLibs ("libsampling.so"); + libs ("libsampling.so"); writeControl writeTime; surfaceFormat raw; fields diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict index d7f803717c..4f211ef384 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/controlDict @@ -56,7 +56,7 @@ functions probes { type probes; - functionObjectLibs ("libsampling.so"); + libs ("libsampling.so"); writeControl writeTime; probeLocations ( @@ -73,7 +73,7 @@ functions wallPressure { type surfaces; - functionObjectLibs ("libsampling.so"); + libs ("libsampling.so"); writeControl writeTime; surfaceFormat raw; fields diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict index 288c68a66a..6e66cae3d4 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/controlDict @@ -56,7 +56,7 @@ functions probes { type probes; - functionObjectLibs ("libsampling.so"); + libs ("libsampling.so"); writeControl timeStep; writeInterval 1; probeLocations diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/controlDict index 3c851f42e0..5a8587772a 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/controlDict +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/controlDict @@ -56,7 +56,7 @@ functions probes { type probes; - functionObjectLibs ("libsampling.so"); + libs ("libsampling.so"); writeControl timeStep; writeInterval 1; probeLocations diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/controlDict index 3c851f42e0..5a8587772a 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/controlDict +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/controlDict @@ -56,7 +56,7 @@ functions probes { type probes; - functionObjectLibs ("libsampling.so"); + libs ("libsampling.so"); writeControl timeStep; writeInterval 1; probeLocations diff --git a/tutorials/multiphase/interFoam/ras/DTCHull/system/controlDict b/tutorials/multiphase/interFoam/ras/DTCHull/system/controlDict index 1ecee4b6bb..d29b79647b 100644 --- a/tutorials/multiphase/interFoam/ras/DTCHull/system/controlDict +++ b/tutorials/multiphase/interFoam/ras/DTCHull/system/controlDict @@ -50,7 +50,7 @@ functions forces { type forces; - functionObjectLibs ( "libforces.so" ); + libs ( "libforces.so" ); patches (hull); rhoInf 998.8; rhoName rho; diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/system/controlDict b/tutorials/multiphase/interFoam/ras/waterChannel/system/controlDict index 865bb59d99..e9292a96af 100644 --- a/tutorials/multiphase/interFoam/ras/waterChannel/system/controlDict +++ b/tutorials/multiphase/interFoam/ras/waterChannel/system/controlDict @@ -56,7 +56,7 @@ functions inletFlux { type faceSource; - functionObjectLibs ("libfieldFunctionObjects.so"); + libs ("libfieldFunctionObjects.so"); writeControl timeStep; log true; // Output field values as well diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/controlDict b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/controlDict index ef183ae9f8..8336493c6a 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/controlDict +++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/controlDict @@ -56,7 +56,7 @@ functions fieldAverage1 { type fieldAverage; - functionObjectLibs ( "libfieldFunctionObjects.so" ); + libs ( "libfieldFunctionObjects.so" ); writeControl writeTime; fields ( diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/controlDict b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/controlDict index a7682133ac..b497ec4143 100644 --- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/controlDict +++ b/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/controlDict @@ -56,7 +56,7 @@ functions forces { type forces; - functionObjectLibs ("libforces.so"); + libs ("libforces.so"); writeControl writeTime; patches (floatingObject); pName p; @@ -70,7 +70,7 @@ functions poolHeight { type faceSource; - functionObjectLibs ("libfieldFunctionObjects.so"); + libs ("libfieldFunctionObjects.so"); enabled yes; writeControl timeStep; writeInterval 1; diff --git a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/controlDict b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/controlDict index f14f836958..712edfa6c1 100644 --- a/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/controlDict +++ b/tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/system/controlDict @@ -56,7 +56,7 @@ functions forces { type forces; - functionObjectLibs ("libforces.so"); + libs ("libforces.so"); writeControl writeTime; patches (floatingObject); pName p; @@ -70,7 +70,7 @@ functions poolHeight { type faceSource; - functionObjectLibs ("libfieldFunctionObjects.so"); + libs ("libfieldFunctionObjects.so"); enabled yes; writeControl timeStep; writeInterval 1; diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/controlDict b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/controlDict index cea35079ef..4952298b15 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/controlDict +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/laminar/bubbleColumn/system/controlDict @@ -56,7 +56,7 @@ functions0 fieldAverage1 { type fieldAverage; - functionObjectLibs ( "libfieldFunctionObjects.so" ); + libs ( "libfieldFunctionObjects.so" ); writeControl writeTime; fields ( diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/controlDict index 1a0a73e343..bda032fbbb 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/controlDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/LES/bubbleColumn/system/controlDict @@ -56,7 +56,7 @@ functions fieldAverage1 { type fieldAverage; - functionObjectLibs ( "libfieldFunctionObjects.so" ); + libs ( "libfieldFunctionObjects.so" ); writeControl writeTime; fields ( diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict index 1a0a73e343..bda032fbbb 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict @@ -56,7 +56,7 @@ functions fieldAverage1 { type fieldAverage; - functionObjectLibs ( "libfieldFunctionObjects.so" ); + libs ( "libfieldFunctionObjects.so" ); writeControl writeTime; fields ( diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict index 8f109eb589..0171ad9a96 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict @@ -56,7 +56,7 @@ functions fieldAverage1 { type fieldAverage; - functionObjectLibs ( "libfieldFunctionObjects.so" ); + libs ( "libfieldFunctionObjects.so" ); writeControl writeTime; fields ( diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict index 1a0a73e343..bda032fbbb 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict @@ -56,7 +56,7 @@ functions fieldAverage1 { type fieldAverage; - functionObjectLibs ( "libfieldFunctionObjects.so" ); + libs ( "libfieldFunctionObjects.so" ); writeControl writeTime; fields ( diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/continuityFunctions b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/continuityFunctions index 2f8d9ff108..bb04d87da1 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/continuityFunctions +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnEvaporating/system/continuityFunctions @@ -9,7 +9,7 @@ inletMassFlowRate { type faceSource; - functionObjectLibs ("libfieldFunctionObjects.so"); + libs ("libfieldFunctionObjects.so"); fields ( @@ -32,7 +32,7 @@ inletMassFlowRate outletMassFlowRate { type faceSource; - functionObjectLibs ("libfieldFunctionObjects.so"); + libs ("libfieldFunctionObjects.so"); fields ( @@ -55,7 +55,7 @@ outletMassFlowRate totalMass { type coded; - functionObjectLibs ("libutilityFunctionObjects.so"); + libs ("libutilityFunctionObjects.so"); redirectType error; code diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict index 1a0a73e343..bda032fbbb 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict @@ -56,7 +56,7 @@ functions fieldAverage1 { type fieldAverage; - functionObjectLibs ( "libfieldFunctionObjects.so" ); + libs ( "libfieldFunctionObjects.so" ); writeControl writeTime; fields ( diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict index 6b261193bd..bd01b0bd4f 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict @@ -56,7 +56,7 @@ functions fieldAverage1 { type fieldAverage; - functionObjectLibs ( "libfieldFunctionObjects.so" ); + libs ( "libfieldFunctionObjects.so" ); writeControl writeTime; fields ( diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/controlDict index 1f7f969de7..732ef99879 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/controlDict +++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/system/controlDict @@ -56,7 +56,7 @@ functions fieldAverage1 { type fieldAverage; - functionObjectLibs ( "libfieldFunctionObjects.so" ); + libs ( "libfieldFunctionObjects.so" ); writeControl writeTime; fields ( diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict index 1f7f969de7..732ef99879 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/system/controlDict @@ -56,7 +56,7 @@ functions fieldAverage1 { type fieldAverage; - functionObjectLibs ( "libfieldFunctionObjects.so" ); + libs ( "libfieldFunctionObjects.so" ); writeControl writeTime; fields ( diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict index e987039e57..9ccb4f9d35 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict +++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/system/controlDict @@ -56,7 +56,7 @@ functions fieldAverage1 { type fieldAverage; - functionObjectLibs ( "libfieldFunctionObjects.so" ); + libs ( "libfieldFunctionObjects.so" ); writeControl writeTime; fields ( diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict index 1f7f969de7..732ef99879 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict @@ -56,7 +56,7 @@ functions fieldAverage1 { type fieldAverage; - functionObjectLibs ( "libfieldFunctionObjects.so" ); + libs ( "libfieldFunctionObjects.so" ); writeControl writeTime; fields ( diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict index 1f7f969de7..732ef99879 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict @@ -56,7 +56,7 @@ functions fieldAverage1 { type fieldAverage; - functionObjectLibs ( "libfieldFunctionObjects.so" ); + libs ( "libfieldFunctionObjects.so" ); writeControl writeTime; fields ( diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict index 4d2ae22021..565b7fedf8 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict @@ -56,7 +56,7 @@ functions fieldAverage1 { type fieldAverage; - functionObjectLibs ( "libfieldFunctionObjects.so" ); + libs ( "libfieldFunctionObjects.so" ); writeControl writeTime; fields (