functionObjects: Renamed dictionary entry 'functionObjectLibs' -> 'libs'

This changes simplifies the specification of functionObjects in controlDict and is consistent with the 'libs' option in controlDict to load special solver libraries. Support for the old 'functionObjectLibs' name is supported for backward compatibility.
2016-05-16 22:09:01 +01:00
parent 4ba3463052
commit 18725ed3ac
128 changed files with 191 additions and 166 deletions
--- 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;
--- 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;
--- 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
        (
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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
--- 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;
--- 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;

--- 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);
--- 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;
--- 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
--- 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;
--- 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
        (
--- 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);
--- 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;
--- 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;
--- 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));
    }
--- 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
--- 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;
--- 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);
--- 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);
--- 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;
--- 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");
    }
--- 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
--- 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
--- 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
        (
--- 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;
--- 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
--- 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)
--- 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;
--- 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);
    }
--- 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;

--- 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
        (
--- 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";
--- 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";
--- 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;
--- 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
        (
--- 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)
--- 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);