ENH: execFlowFunctionObjects: added -region option. Added -noFlow option.

applications/utilities/postProcessing/foamCalc/foamCalcApp.C

@@ -43,6 +43,7 @@ Description
 int main(int argc, char *argv[])
 {
     Foam::timeSelector::addOptions();
+#   include "addRegionOption.H"
     Foam::argList::addBoolOption
     (
         "noWrite",
@@ -74,7 +75,7 @@ int main(int argc, char *argv[])
 #   include "setRootCase.H"
 #   include "createTime.H"
     Foam::instantList timeDirs = Foam::timeSelector::select0(runTime, args);
-#   include "createMesh.H"
+#   include "createNamedMesh.H"
 
     utility().tryPreCalc(args, runTime, mesh);
 

applications/utilities/postProcessing/miscellaneous/execFlowFunctionObjects/execFlowFunctionObjects.C

@@ -37,6 +37,11 @@ Description
 
 #include "calc.H"
 
+#include "volFields.H"
+#include "surfaceFields.H"
+#include "pointFields.H"
+#include "ReadFields.H"
+
 #include "incompressible/singlePhaseTransportModel/singlePhaseTransportModel.H"
 
 #include "incompressible/RAS/RASModel/RASModel.H"
@@ -84,6 +89,70 @@ namespace Foam
 
 void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
 {
+    if (args.optionFound("noFlow"))
+    {
+        Info<< "    Operating in no-flow mode; no models will be loaded."
+            << " All vol, surface and point fields will be loaded." << endl;
+
+        // Read objects in time directory
+        IOobjectList objects(mesh, runTime.timeName());
+
+        // Read vol fields.
+
+        PtrList<volScalarField> vsFlds;
+        ReadFields(mesh, objects, vsFlds);
+
+        PtrList<volVectorField> vvFlds;
+        ReadFields(mesh, objects, vvFlds);
+
+        PtrList<volSphericalTensorField> vstFlds;
+        ReadFields(mesh, objects, vstFlds);
+
+        PtrList<volSymmTensorField> vsymtFlds;
+        ReadFields(mesh, objects, vsymtFlds);
+
+        PtrList<volTensorField> vtFlds;
+        ReadFields(mesh, objects, vtFlds);
+
+        // Read surface fields.
+
+        PtrList<surfaceScalarField> ssFlds;
+        ReadFields(mesh, objects, ssFlds);
+
+        PtrList<surfaceVectorField> svFlds;
+        ReadFields(mesh, objects, svFlds);
+
+        PtrList<surfaceSphericalTensorField> sstFlds;
+        ReadFields(mesh, objects, sstFlds);
+
+        PtrList<surfaceSymmTensorField> ssymtFlds;
+        ReadFields(mesh, objects, ssymtFlds);
+
+        PtrList<surfaceTensorField> stFlds;
+        ReadFields(mesh, objects, stFlds);
+
+        // Read point fields.
+        const pointMesh& pMesh = pointMesh::New(mesh);
+
+        PtrList<pointScalarField> psFlds;
+        ReadFields(pMesh, objects, psFlds);
+
+        PtrList<pointVectorField> pvFlds;
+        ReadFields(pMesh, objects, pvFlds);
+
+        PtrList<pointSphericalTensorField> pstFlds;
+        ReadFields(pMesh, objects, pstFlds);
+
+        PtrList<pointSymmTensorField> psymtFlds;
+        ReadFields(pMesh, objects, psymtFlds);
+
+        PtrList<pointTensorField> ptFlds;
+        ReadFields(pMesh, objects, ptFlds);
+
+        execFlowFunctionObjects(args, runTime);
+    }
+    else
+    {
         Info<< "    Reading phi" << endl;
         surfaceScalarField phi
         (
@@ -282,6 +351,7 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
                 << "Incorrect dimensions of phi: " << phi.dimensions()
                 << nl << exit(FatalError);
         }
+    }
 }
 
 

src/postProcessing/postCalc/postCalc.C

@@ -57,11 +57,17 @@ namespace Foam
 int main(int argc, char *argv[])
 {
     Foam::timeSelector::addOptions();
+#   include "addRegionOption.H"
     Foam::argList::addBoolOption
     (
         "noWrite",
         "suppress writing results"
     );
+    Foam::argList::addBoolOption
+    (
+        "noFlow",
+        "suppress creating flow models (execFlowFunctionObjects only)"
+    );
     Foam::argList::addOption
     (
         "dict",
@@ -72,7 +78,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     Foam::instantList timeDirs = Foam::timeSelector::select0(runTime, args);
-    #include "createMesh.H"
+    #include "createNamedMesh.H"
 
     forAll(timeDirs, timeI)
     {