From 98b90398f136d8a3131a00fcc8ab7397ea34825e Mon Sep 17 00:00:00 2001
From: Will Bainbridge <http://cfd.direct>
Date: Fri, 9 Jul 2021 12:41:06 +0100
Subject: [PATCH] tutorials: Updated for new preconfigurations

---
 .../isothermalGrowth/system/controlDict       | 30 ++++++++--
 .../isothermalGrowth/system/singleGraph       | 39 ------------
 .../isothermalGrowth/validation/createGraphs  |  2 +-
 .../laminar/blockedChannel/system/controlDict |  2 +-
 .../blockedChannel/system/scalarTransport     | 21 -------
 .../BernardCells/system/controlDict           |  2 +-
 .../BernardCells/system/streamlines           | 28 ---------
 .../coolingCylinder2D/system/controlDict      | 18 +++++-
 .../reverseBurner/system/Qdot                 | 17 ------
 .../reverseBurner/system/controlDict          |  2 +-
 .../flowWithOpenBoundary/system/controlDict   |  2 +-
 .../system/scalarTransport                    | 23 --------
 .../RAS/pitzDaily/system/controlDict          |  2 +-
 .../laminar/blockedChannel/system/controlDict |  2 +-
 .../blockedChannel/system/scalarTransport     | 21 -------
 .../laminar/pitzDailyPulse/system/controlDict |  2 +-
 .../planarContraction/system/controlDict      |  4 +-
 .../laminar/planarContraction/system/graphs   | 59 -------------------
 .../planarPoiseuille/system/controlDict       |  4 +-
 .../laminar/planarPoiseuille/system/probes    | 21 -------
 .../planarPoiseuille/system/singleGraph       | 45 --------------
 .../validation/WatersKing/createFields.H      |  5 +-
 .../pisoFoam/LES/pitzDaily/system/controlDict | 26 +++-----
 .../simpleFoam/T3A/system/controlDict         | 22 ++++++-
 .../simpleFoam/T3A/system/kGraph              | 30 ----------
 .../T3A/system/wallShearStressGraph           | 30 ----------
 .../simpleFoam/drivaerFastback/system/car     | 30 ----------
 .../drivaerFastback/system/controlDict.orig   | 31 +++++++++-
 .../system/forceCoeffsIncompressible          | 33 ++++++-----
 .../simpleFoam/drivaerFastback/system/slices  | 46 ---------------
 .../drivaerFastback/system/streamlines        | 28 ---------
 .../simpleFoam/pitzDaily/system/controlDict   | 10 +++-
 .../simpleFoam/pitzDaily/system/streamlines   | 28 ---------
 .../simpleFoam/roomResidenceTime/Allrun       |  6 +-
 .../simpleFoam/roomResidenceTime/system/age   | 31 ----------
 .../roomResidenceTime/system/controlDict      |  2 +-
 .../roomResidenceTime/system/flowRatePatch    | 19 ------
 .../roomResidenceTime/system/probes1          |  9 +--
 .../roomResidenceTime/system/probes2          |  9 +--
 .../roomResidenceTime/validation/Allrun       |  2 +-
 .../RAS/Grossetete/system/controlDict         |  9 ++-
 .../RAS/Grossetete/system/singleGraph         | 34 -----------
 .../RAS/Grossetete/validation/createGraphs    |  2 +-
 .../RAS/bubblePipe/system/controlDict         | 17 +++++-
 .../RAS/bubblePipe/system/singleGraph         | 41 -------------
 .../RAS/bubblePipe/validation/createGraphs    |  4 +-
 .../RAS/wallBoiling/Allrun                    | 10 +++-
 .../RAS/wallBoiling/system/controlDict.orig   |  3 +-
 .../RAS/wallBoiling/system/singleGraph        | 38 ------------
 .../RAS/wallBoiling/validation/createGraphs   |  4 +-
 .../RAS/wallBoilingIATE/Allrun                | 10 +++-
 .../wallBoilingIATE/system/controlDict.orig   |  2 +-
 .../RAS/wallBoilingIATE/system/singleGraph    | 39 ------------
 .../wallBoilingIATE/validation/createGraphs   |  6 +-
 .../RAS/wallBoilingPolydisperse/Allrun        | 10 +++-
 .../system/singleGraph                        | 39 ------------
 .../validation/createGraphs                   |  6 +-
 .../wallBoilingPolydisperseTwoGroups/Allrun   | 10 +++-
 .../system/singleGraph                        | 41 -------------
 .../validation/createGraphs                   |  6 +-
 .../titaniaSynthesis/system/controlDict       |  8 ++-
 .../titaniaSynthesis/system/singleGraph       | 37 ------------
 .../titaniaSynthesis/validation/createGraphs  |  2 +-
 .../system/controlDict                        |  8 ++-
 .../system/singleGraph                        | 37 ------------
 .../validation/createGraphs                   |  2 +-
 .../solidDisplacementFoam/plateHole/Allrun    | 13 +++-
 .../plateHole/system/singleGraph              | 23 --------
 68 files changed, 257 insertions(+), 947 deletions(-)
 delete mode 100644 test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/system/singleGraph
 delete mode 100644 tutorials/compressible/rhoPimpleFoam/laminar/blockedChannel/system/scalarTransport
 delete mode 100644 tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/system/streamlines
 delete mode 100644 tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/Qdot
 delete mode 100644 tutorials/incompressible/pimpleFoam/RAS/flowWithOpenBoundary/system/scalarTransport
 delete mode 100644 tutorials/incompressible/pimpleFoam/laminar/blockedChannel/system/scalarTransport
 delete mode 100644 tutorials/incompressible/pimpleFoam/laminar/planarContraction/system/graphs
 delete mode 100644 tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/system/probes
 delete mode 100644 tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/system/singleGraph
 delete mode 100644 tutorials/incompressible/simpleFoam/T3A/system/kGraph
 delete mode 100644 tutorials/incompressible/simpleFoam/T3A/system/wallShearStressGraph
 delete mode 100644 tutorials/incompressible/simpleFoam/drivaerFastback/system/car
 delete mode 100644 tutorials/incompressible/simpleFoam/drivaerFastback/system/slices
 delete mode 100644 tutorials/incompressible/simpleFoam/drivaerFastback/system/streamlines
 delete mode 100644 tutorials/incompressible/simpleFoam/pitzDaily/system/streamlines
 delete mode 100644 tutorials/incompressible/simpleFoam/roomResidenceTime/system/age
 delete mode 100644 tutorials/incompressible/simpleFoam/roomResidenceTime/system/flowRatePatch
 delete mode 100644 tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/system/singleGraph
 delete mode 100644 tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/system/singleGraph
 delete mode 100644 tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/system/singleGraph
 delete mode 100644 tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/system/singleGraph
 delete mode 100644 tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/system/singleGraph
 delete mode 100644 tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/system/singleGraph
 delete mode 100644 tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/system/singleGraph
 delete mode 100644 tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/system/singleGraph
 delete mode 100644 tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/singleGraph

diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/system/controlDict b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/system/controlDict
index 71431c5118..b927311d46 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/system/controlDict
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/system/controlDict
@@ -52,12 +52,30 @@ maxDeltaT       1;
 
 functions
 {
-    #includeFunc    residuals(p_rgh, f3.air1.bubbles, f9.air2.bubbles, f15.air3.bubbles)
-    #includeFunc    singleGraph
-    #includeFunc    cellZoneAverage
-    #includeFunc    writeObjects(d.air1)
-    #includeFunc    writeObjects(d.air2)
-    #includeFunc    writeObjects(d.air3)
+    #includeFunc residuals
+    (
+        p_rgh,
+        f3.air1.bubbles,
+        f9.air2.bubbles,
+        f15.air3.bubbles
+    )
+    #includeFunc graphCell
+    (
+        funcName=graph,
+        start=(0.05 0 0.05),
+        end=(0.05 1.0 0.05),
+        axis=y,
+        d.bubbles,
+        p,
+        alpha.air1,
+        alpha.air2,
+        alpha.air3,
+        alpha.bubbles
+    )
+    #includeFunc cellZoneAverage
+    #includeFunc writeObjects(d.air1)
+    #includeFunc writeObjects(d.air2)
+    #includeFunc writeObjects(d.air3)
 }
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/system/singleGraph b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/system/singleGraph
deleted file mode 100644
index a1e1284070..0000000000
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/system/singleGraph
+++ /dev/null
@@ -1,39 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-Description
-    Writes graph data for specified fields along a line, specified by start
-    and end points.
-
-\*---------------------------------------------------------------------------*/
-
-start   (0.05 0 0.05);
-end     (0.05 1.0 0.05);
-fields
-(
-    d.bubbles
-    p
-    alpha.air1
-    alpha.air2
-    alpha.air3
-    alpha.bubbles
-);
-
-// Sampling and I/O settings
-#includeEtc "caseDicts/postProcessing/graphs/sampleDict.cfg"
-
-// Override settings here, e.g.
-setConfig
-{
-    type lineCell;
-    axis y;        // y, z, xyz
-}
-
-// Must be last entry
-#includeEtc "caseDicts/postProcessing/graphs/graph.cfg"
-
-// ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/validation/createGraphs b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/validation/createGraphs
index 913ace8d77..09bd0b6ead 100755
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/validation/createGraphs
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/validation/createGraphs
@@ -17,7 +17,7 @@ gnuplot<<EOF
 
     latestTime = system("foamListTimes -case .. -latestTime")
     p0 = $(tail -n1 ../postProcessing/cellZoneAverage/0/volFieldValue.dat | awk '{print $2}')
-    file = '../postProcessing/singleGraph/'.latestTime.'/line_d.bubbles_p_alpha.air1_alpha.air2_alpha.air3_alpha.bubbles.xy'
+    file = '../postProcessing/graph/'.latestTime.'/line_d.bubbles_p_alpha.air1_alpha.air2_alpha.air3_alpha.bubbles.xy'
 
     plot ''.file.'' u (\$2*1000):1 w l lc rgb 'black' t 'prediction',\
     ''.file.'' u (0.003*(p0/\$3)**(1./3.)*1000):1 w l dt 2 lc rgb 'black' t 'exact result'
diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/blockedChannel/system/controlDict b/tutorials/compressible/rhoPimpleFoam/laminar/blockedChannel/system/controlDict
index aeecdc4e7a..ff785af4f4 100644
--- a/tutorials/compressible/rhoPimpleFoam/laminar/blockedChannel/system/controlDict
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/blockedChannel/system/controlDict
@@ -50,7 +50,7 @@ maxCo           5;
 
 functions
 {
-    #includeFunc scalarTransport
+    #includeFunc scalarTransport(tracer)
 }
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoPimpleFoam/laminar/blockedChannel/system/scalarTransport b/tutorials/compressible/rhoPimpleFoam/laminar/blockedChannel/system/scalarTransport
deleted file mode 100644
index 7e9f0b6e5b..0000000000
--- a/tutorials/compressible/rhoPimpleFoam/laminar/blockedChannel/system/scalarTransport
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-Description
-    Solves a transport equation for a scalar field.
-
-    The name of the scalar field is specified in this file.  A sample scalar
-    field file, that must be initialised for the case, typically in the 0
-    directory, is available in $FOAM_ETC/caseDicts/solvers/scalarTransport.
-
-\*---------------------------------------------------------------------------*/
-
-#includeEtc     "caseDicts/postProcessing/solvers/scalarTransport/scalarTransport.cfg"
-
-field           tracer;
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/system/controlDict b/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/system/controlDict
index 1a7ad8db3b..4edf2dd2cf 100644
--- a/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/system/controlDict
+++ b/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/system/controlDict
@@ -47,7 +47,7 @@ runTimeModifiable true;
 functions
 {
     #includeFunc residuals(p_rgh)
-    #includeFunc streamlines
+    #includeFunc streamLinesLine(funcName=streamlines, start=(0 0.5 0), end=(9 0.5 0), nPoints=24, U)
 }
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/system/streamlines b/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/system/streamlines
deleted file mode 100644
index a8c59600c0..0000000000
--- a/tutorials/heatTransfer/buoyantPimpleFoam/BernardCells/system/streamlines
+++ /dev/null
@@ -1,28 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-Description
-    Writes out files of streamlines with interpolated field data in VTK format.
-
-\*---------------------------------------------------------------------------*/
-
-direction       both;
-
-seedSampleSet
-{
-    type            lineUniform;
-    start           (0 0.5 0);
-    end             (9 0.5 0);
-    nPoints         24;
-    axis            x;
-}
-
-fields          (U);
-
-#includeEtc "caseDicts/postProcessing/visualisation/streamlines.cfg"
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/coolingCylinder2D/system/controlDict b/tutorials/heatTransfer/chtMultiRegionFoam/coolingCylinder2D/system/controlDict
index 57518571a5..542615d9f0 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/coolingCylinder2D/system/controlDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/coolingCylinder2D/system/controlDict
@@ -53,8 +53,22 @@ maxDeltaT       1;
 
 functions
 {
-    #includeFunc "patchAverage(funcName=cylinderT, region=fluid, name=fluid_to_solid, field=T)"
-    #includeFunc "patchAverage(funcName=inletU, region=fluid, name=inlet, field=U)"
+    #includeFunc patchAverage
+    (
+        funcName=cylinderT,
+        region=fluid,
+        patch=fluid_to_solid,
+        field=T
+    )
+    #includeFunc patchAverage
+    (
+        funcName=inletU,
+        region=fluid,
+        patch=inlet,
+        field=U
+    )
+ }
+
 }
 
 // ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/Qdot b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/Qdot
deleted file mode 100644
index 50b4deff85..0000000000
--- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/Qdot
+++ /dev/null
@@ -1,17 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-Description
-    Calculates the heat release rate Qdot, outputting the data as a Qdot field.
-
-\*---------------------------------------------------------------------------*/
-
-#includeEtc "caseDicts/postProcessing/combustion/Qdot.cfg"
-
-region gas;
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/controlDict b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/controlDict
index 54019ae5d3..f9d03a07fb 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/controlDict
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/system/controlDict
@@ -52,7 +52,7 @@ adjustTimeStep  yes;
 
 functions
 {
-    #includeFunc Qdot
+    #includeFunc Qdot(region=gas)
 }
 
 
diff --git a/tutorials/incompressible/pimpleFoam/RAS/flowWithOpenBoundary/system/controlDict b/tutorials/incompressible/pimpleFoam/RAS/flowWithOpenBoundary/system/controlDict
index b8a870cc77..0d878bd7ae 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/flowWithOpenBoundary/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/flowWithOpenBoundary/system/controlDict
@@ -45,7 +45,7 @@ runTimeModifiable true;
 
 functions
 {
-    #includeFunc scalarTransport
+    #includeFunc scalarTransport(T, alphaD=1, alphaDt=1)
     #includeFunc time
 }
 
diff --git a/tutorials/incompressible/pimpleFoam/RAS/flowWithOpenBoundary/system/scalarTransport b/tutorials/incompressible/pimpleFoam/RAS/flowWithOpenBoundary/system/scalarTransport
deleted file mode 100644
index a0601c41e7..0000000000
--- a/tutorials/incompressible/pimpleFoam/RAS/flowWithOpenBoundary/system/scalarTransport
+++ /dev/null
@@ -1,23 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-Description
-    Solves a transport equation for a scalar field.
-
-    The name of the scalar field is specified in this file.  A sample scalar
-    field file, that must be initialised for the case, typically in the 0
-    directory, is available in $FOAM_ETC/caseDicts/solvers/scalarTransport.
-
-\*---------------------------------------------------------------------------*/
-
-#includeEtc     "caseDicts/postProcessing/solvers/scalarTransport/scalarTransport.cfg"
-
-field           T;
-alphaD          1;
-alphaDt         1;
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/system/controlDict b/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/system/controlDict
index 77ab7ee47f..4fb95cc840 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/RAS/pitzDaily/system/controlDict
@@ -50,7 +50,7 @@ maxCo           5;
 
 functions
 {
-    #includeFunc patchAverage(name=inlet, fields=(p U))
+    #includeFunc patchAverage(patch=inlet, fields=(p U))
 }
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/laminar/blockedChannel/system/controlDict b/tutorials/incompressible/pimpleFoam/laminar/blockedChannel/system/controlDict
index ab35adc129..ddf7058ea7 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/blockedChannel/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/blockedChannel/system/controlDict
@@ -50,7 +50,7 @@ maxCo           5;
 
 functions
 {
-    #includeFunc scalarTransport
+    #includeFunc scalarTransport(tracer)
 }
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/laminar/blockedChannel/system/scalarTransport b/tutorials/incompressible/pimpleFoam/laminar/blockedChannel/system/scalarTransport
deleted file mode 100644
index 7e9f0b6e5b..0000000000
--- a/tutorials/incompressible/pimpleFoam/laminar/blockedChannel/system/scalarTransport
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-Description
-    Solves a transport equation for a scalar field.
-
-    The name of the scalar field is specified in this file.  A sample scalar
-    field file, that must be initialised for the case, typically in the 0
-    directory, is available in $FOAM_ETC/caseDicts/solvers/scalarTransport.
-
-\*---------------------------------------------------------------------------*/
-
-#includeEtc     "caseDicts/postProcessing/solvers/scalarTransport/scalarTransport.cfg"
-
-field           tracer;
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/laminar/pitzDailyPulse/system/controlDict b/tutorials/incompressible/pimpleFoam/laminar/pitzDailyPulse/system/controlDict
index 1bc76eefb2..fa42da103c 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/pitzDailyPulse/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/pitzDailyPulse/system/controlDict
@@ -50,7 +50,7 @@ maxCo           5;
 
 functions
 {
-    #includeFunc patchAverage(name=inlet, fields=(p U))
+    #includeFunc patchAverage(patch=inlet, fields=(p U))
 }
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarContraction/system/controlDict b/tutorials/incompressible/pimpleFoam/laminar/planarContraction/system/controlDict
index 4aea58b80b..2d6f306f1c 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/planarContraction/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarContraction/system/controlDict
@@ -45,7 +45,9 @@ runTimeModifiable true;
 
 functions
 {
-    #includeFunc graphs
+    #includeFunc graphCell(funcName=lineA, start=(-0.0016 0 0), end=(-0.0016 0.0128 0), U)
+    #includeFunc graphCell(funcName=lineB, start=(-0.0048 0 0), end=(-0.0048 0.0128 0), U)
+    #includeFunc graphCell(funcName=lineC, start=(-0.0032 0 0), end=(-0.0032 0.0128 0), U)
 }
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarContraction/system/graphs b/tutorials/incompressible/pimpleFoam/laminar/planarContraction/system/graphs
deleted file mode 100644
index 8777f797e9..0000000000
--- a/tutorials/incompressible/pimpleFoam/laminar/planarContraction/system/graphs
+++ /dev/null
@@ -1,59 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-Description
-    Writes graph data for specified fields along a line, specified by start
-    and end points.
-
-\*---------------------------------------------------------------------------*/
-
-
-// Sampling and I/O settings
-#includeEtc "caseDicts/postProcessing/graphs/sampleDict.cfg"
-
-type            sets;
-libs            ("libsampling.so");
-
-writeControl    writeTime;
-
-interpolationScheme cellPoint;
-
-setFormat   raw;
-
-setConfig
-{
-    type    lineCell;
-    axis    distance;  // x, y, z, xyz
-}
-
-sets
-(
-    lineA
-    {
-        $setConfig;
-        start (-0.0016 0      0);
-        end   (-0.0016 0.0128 0);
-    }
-
-    lineB
-    {
-        $setConfig;
-        start (-0.0048 0      0);
-        end   (-0.0048 0.0128 0);
-    }
-
-    lineC
-    {
-        $setConfig;
-        start (-0.032 0      0);
-        end   (-0.032 0.0128 0);
-    }
-);
-
-fields  (U);
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/system/controlDict b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/system/controlDict
index e910f1fe48..49d5740aae 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/system/controlDict
@@ -46,8 +46,8 @@ runTimeModifiable true;
 functions
 {
     #includeFunc residuals(p, sigma)
-    #includeFunc singleGraph
-    #includeFunc probes
+    #includeFunc graphCell(funcName=graph, start=(0 0 0), end=(0 1 0), U)
+    #includeFunc probes(funcName=probes, points=((0 1 0)), U)
 }
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/system/probes b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/system/probes
deleted file mode 100644
index 8a9cc4444a..0000000000
--- a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/system/probes
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-Description
-    Writes out values of fields from cells nearest to specified locations.
-
-\*---------------------------------------------------------------------------*/
-
-#includeEtc "caseDicts/postProcessing/probes/probes.cfg"
-
-fields (U);
-probeLocations
-(
-    (0 1 0)
-);
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/system/singleGraph b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/system/singleGraph
deleted file mode 100644
index 24377c0225..0000000000
--- a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/system/singleGraph
+++ /dev/null
@@ -1,45 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-Description
-    Writes graph data for specified fields along a line, specified by start
-    and end points.
-
-\*---------------------------------------------------------------------------*/
-
-
-// Sampling and I/O settings
-#includeEtc "caseDicts/postProcessing/graphs/sampleDict.cfg"
-
-type            sets;
-libs            ("libsampling.so");
-
-writeControl    writeTime;
-
-interpolationScheme cellPoint;
-
-setFormat   raw;
-
-setConfig
-{
-    type    lineCell;
-    axis    distance;  // x, y, z, xyz
-}
-
-sets
-(
-    line
-    {
-        $setConfig;
-        start (0 0 0);
-        end   (0 1 0);
-    }
-);
-
-fields  (U);
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/validation/WatersKing/createFields.H b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/validation/WatersKing/createFields.H
index a0e84f3aac..149bb59723 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/validation/WatersKing/createFields.H
+++ b/tutorials/incompressible/pimpleFoam/laminar/planarPoiseuille/validation/WatersKing/createFields.H
@@ -53,5 +53,6 @@ const dictionary& gradPDict =
     fvModels.subDict("momentumSource").subDict("sources");
 const scalar K(vector(gradPDict.subDict("U").lookup("explicit")).x());
 
-dictionary probes(IFstream(runTime.system()/"probes")());
-const point location = pointField(probes.lookup("probeLocations"))[0];
+const dictionary& probesDict =
+    runTime.controlDict().subDict("functions").subDict("probes");
+const point location = pointField(probesDict.lookup("probeLocations"))[0];
diff --git a/tutorials/incompressible/pisoFoam/LES/pitzDaily/system/controlDict b/tutorials/incompressible/pisoFoam/LES/pitzDaily/system/controlDict
index cd81777d7c..df283012e3 100644
--- a/tutorials/incompressible/pisoFoam/LES/pitzDaily/system/controlDict
+++ b/tutorials/incompressible/pisoFoam/LES/pitzDaily/system/controlDict
@@ -50,13 +50,11 @@ functions
     {
         type            probes;
         libs            ("libsampling.so");
+
         writeControl    timeStep;
         writeInterval   1;
 
-        fields
-        (
-            p
-        );
+        fields          (p);
 
         probeLocations
         (
@@ -68,37 +66,29 @@ functions
             (0.1524 0.0253 0)
             (0.1778 0.0253 0)
         );
-
     }
 
     #includeFunc fieldAverage(U, p, prime2Mean = yes)
 
     surfaceSampling
     {
-        // Sample near-wall velocity
-
-        type surfaces;
-
-        // Where to load it from (if not already in solver)
+        type            surfaces;
         libs            ("libsampling.so");
+
         writeControl    writeTime;
 
         interpolationScheme cellPoint;
 
-        surfaceFormat vtk;
+        surfaceFormat   vtk;
 
-        // Fields to be sampled
-        fields
-        (
-            U
-        );
+        fields          (U);
 
         surfaces
         (
             nearWall
             {
                 type            patchInternalField;
-                patches         ( lowerWall );
+                patches         (lowerWall);
                 distance        1e-6;
                 interpolate     true;
                 triangulate     false;
@@ -106,7 +96,7 @@ functions
         );
     }
 
-    #includeFunc scalarTransport
+    #includeFunc scalarTransport(s)
 }
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/T3A/system/controlDict b/tutorials/incompressible/simpleFoam/T3A/system/controlDict
index b54f5c7393..0b64788d2e 100644
--- a/tutorials/incompressible/simpleFoam/T3A/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/T3A/system/controlDict
@@ -47,8 +47,26 @@ runTimeModifiable true;
 functions
 {
     #includeFunc wallShearStress
-    #includeFunc wallShearStressGraph
-    #includeFunc kGraph
+
+    #includeFunc graphUniform
+    (
+        funcName=wallShearStressGraph,
+        start=(0.04075 0.00075 0),
+        end=(3.04 0.00075 0),
+        nPoints=100,
+        axis=x,
+        wallShearStress
+    )
+
+    #includeFunc graphUniform
+    (
+        funcName=kGraph,
+        start=(0.04075 0.05 0),
+        end=(3.04 0.05 0),
+        nPoints=100,
+        axis=x,
+        k
+    )
 }
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/T3A/system/kGraph b/tutorials/incompressible/simpleFoam/T3A/system/kGraph
deleted file mode 100644
index 8adab317ce..0000000000
--- a/tutorials/incompressible/simpleFoam/T3A/system/kGraph
+++ /dev/null
@@ -1,30 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-Description
-    Writes graph data for specified fields along a line, specified by start
-    and end points.
-
-\*---------------------------------------------------------------------------*/
-
-start   (0.04075 0.05 0);
-end     (3.04 0.05 0);
-fields  (k);
-
-// Sampling and I/O settings
-#includeEtc "caseDicts/postProcessing/graphs/sampleDict.cfg"
-
-// Override settings here, e.g.
-setConfig
-{
-    axis x;
-}
-
-// Must be last entry
-#includeEtc "caseDicts/postProcessing/graphs/graph.cfg"
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/T3A/system/wallShearStressGraph b/tutorials/incompressible/simpleFoam/T3A/system/wallShearStressGraph
deleted file mode 100644
index e0e6124125..0000000000
--- a/tutorials/incompressible/simpleFoam/T3A/system/wallShearStressGraph
+++ /dev/null
@@ -1,30 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-Description
-    Writes graph data for specified fields along a line, specified by start
-    and end points.
-
-\*---------------------------------------------------------------------------*/
-
-start   (0.04075 0.00075 0);
-end     (3.04 0.00075 0);
-fields  (wallShearStress);
-
-// Sampling and I/O settings
-#includeEtc "caseDicts/postProcessing/graphs/sampleDict.cfg"
-
-// Override settings here, e.g.
-setConfig
-{
-    axis x;
-}
-
-// Must be last entry
-#includeEtc "caseDicts/postProcessing/graphs/graph.cfg"
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/drivaerFastback/system/car b/tutorials/incompressible/simpleFoam/drivaerFastback/system/car
deleted file mode 100644
index 8fadf09561..0000000000
--- a/tutorials/incompressible/simpleFoam/drivaerFastback/system/car
+++ /dev/null
@@ -1,30 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-Description
-    Writes out surface files with interpolated field data in VTK format, e.g.
-    cutting planes, iso-surfaces and patch boundary surfaces.
-
-    This file includes a selection of example surfaces, each of which the user
-    should configure and/or remove.
-
-\*---------------------------------------------------------------------------*/
-
-#includeEtc "caseDicts/postProcessing/visualisation/surfaces.cfg"
-
-fields  (p);
-
-surfaces
-(
-    car
-    {
-        $patchSurface;
-        patches  ( ".*(body|Wheels)" );
-    }
-);
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/drivaerFastback/system/controlDict.orig b/tutorials/incompressible/simpleFoam/drivaerFastback/system/controlDict.orig
index ed64d56c83..bd818a9f5c 100644
--- a/tutorials/incompressible/simpleFoam/drivaerFastback/system/controlDict.orig
+++ b/tutorials/incompressible/simpleFoam/drivaerFastback/system/controlDict.orig
@@ -50,10 +50,35 @@ runTimeModifiable true;
 functions
 {
     #includeFunc forceCoeffsIncompressible
+
     #includeFunc time
-    #includeFunc car
-    #includeFunc streamlines
-    #includeFunc slices
+
+    #includeFunc streamLinesSphere
+    (
+        funcName=streamlines,
+        centre=(4 0 0.7),
+        radius=1,
+        nPoints=30,
+        fields=(U)
+    )
+
+    #includeFunc cutPlaneSurface
+    (
+        funcName=xNormal,
+        point=(4 0 1),
+        normal=(1 0 0),
+        fields=(p U)
+    )
+
+    #includeFunc cutPlaneSurface
+    (
+        funcName=yNormal,
+        point=(-5 0.02 1),
+        normal=(0 1 0),
+        fields=(p U)
+    )
+
+    #includeFunc patchSurface(funcName=car, patch=".*(body|Wheels)", p)
 }
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/drivaerFastback/system/forceCoeffsIncompressible b/tutorials/incompressible/simpleFoam/drivaerFastback/system/forceCoeffsIncompressible
index 56c3bef5e7..01bd8aca49 100644
--- a/tutorials/incompressible/simpleFoam/drivaerFastback/system/forceCoeffsIncompressible
+++ b/tutorials/incompressible/simpleFoam/drivaerFastback/system/forceCoeffsIncompressible
@@ -7,25 +7,26 @@
 -------------------------------------------------------------------------------
 Description
     Calculates lift, drag and moment coefficients by summing forces on
-    specified patches for a case where the solver is incompressible (pressure
-    is kinematic, e.g. m^2/s^2).
+    specified patches for a case where the solver is incompressible; i.e.,
+    pressure is kinematic and has units of m^2/s^2.
 
 \*---------------------------------------------------------------------------*/
 
-#include    "$FOAM_CASE/0/U"
-
-patches     ( ".*(body|Wheels)" );
-
-magUInf     $Uinlet;
-lRef        $wheelBase;
-Aref        2.154;
-
-liftDir     (0 0 1);
-dragDir     (1 0 0);
-
-CofR        (1.391 0 0);
-pitchAxis   (0 1 0);
-
 #includeEtc "caseDicts/postProcessing/forces/forceCoeffsIncompressible.cfg"
 
+#include    "$FOAM_CASE/0/U"
+
+patches     (".*(body|Wheels)"); // Patches on which to calculate forces
+
+magUInf     $Uinlet;        // Far field velocity magnitude; e.g., 20 m/s
+lRef        $wheelBase;     // Reference length scale for moment calculations;
+                            // e.g., 1 m
+Aref        2.154;          // Reference area; e.g., 1 m^2
+
+CofR        (1.391 0 0);    // Centre of rotation; e.g., (0 0 0)
+
+liftDir     (0 0 1);        // Direction of lift force; e.g., (0 0 1)
+dragDir     (1 0 0);        // Direction of drag force; e.g., (1 0 0)
+pitchAxis   (0 1 0);        // Pitch axis; e.g., (0 1 0)
+
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/drivaerFastback/system/slices b/tutorials/incompressible/simpleFoam/drivaerFastback/system/slices
deleted file mode 100644
index d7f3de9a47..0000000000
--- a/tutorials/incompressible/simpleFoam/drivaerFastback/system/slices
+++ /dev/null
@@ -1,46 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-Description
-    Writes out surface files with interpolated field data in VTK format, e.g.
-    cutting planes, iso-surfaces and patch boundary surfaces.
-
-    This file includes a selection of example surfaces, each of which the user
-    should configure and/or remove.
-
-\*---------------------------------------------------------------------------*/
-
-#includeEtc "caseDicts/postProcessing/visualisation/surfaces.cfg"
-
-fields  (p U);
-
-surfaces
-(
-    xNormal
-    {
-        $cuttingPlane;
-        pointAndNormalDict
-        {
-            point    (4 0 1);
-            normal   $x;
-        }
-        filtering    full;
-    }
-
-    yNormal
-    {
-        $cuttingPlane;
-        pointAndNormalDict
-        {
-            point    (-5 0.02 1);
-            normal   $y;
-        }
-        filtering    full;
-    }
-);
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/drivaerFastback/system/streamlines b/tutorials/incompressible/simpleFoam/drivaerFastback/system/streamlines
deleted file mode 100644
index 2e63c41805..0000000000
--- a/tutorials/incompressible/simpleFoam/drivaerFastback/system/streamlines
+++ /dev/null
@@ -1,28 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-Description
-    Writes out files of streamlines with interpolated field data in VTK format.
-
-\*---------------------------------------------------------------------------*/
-
-#includeEtc "caseDicts/postProcessing/visualisation/streamlines.cfg"
-
-fields  (U);
-
-direction       both;
-
-seedSampleSet
-{
-    type            sphereRandom;
-    centre          (4 0 0.7);
-    radius          1;
-    nPoints         30;
-    axis x;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict b/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict
index 9cdf788be3..560e0948ba 100644
--- a/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/pitzDaily/system/controlDict
@@ -51,7 +51,15 @@ cacheTemporaryObjects
 
 functions
 {
-    #includeFunc streamlines
+    #includeFunc streamLinesLine
+    (
+        funcName=streamlines,
+        start=(-0.0205 0.001 0.00001),
+        end=(-0.0205 0.0251 0.00001),
+        nPoints=10,
+        fields=(p k U)
+    )
+
     #includeFunc writeObjects(kEpsilon:G)
 }
 
diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/system/streamlines b/tutorials/incompressible/simpleFoam/pitzDaily/system/streamlines
deleted file mode 100644
index dc125c73e7..0000000000
--- a/tutorials/incompressible/simpleFoam/pitzDaily/system/streamlines
+++ /dev/null
@@ -1,28 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-Description
-    Writes out files of streamlines with interpolated field data in VTK format.
-
-\*---------------------------------------------------------------------------*/
-
-direction       both;
-
-seedSampleSet
-{
-    type            lineUniform;
-    start           (-0.0205 0.001  0.00001);
-    end             (-0.0205 0.0251 0.00001);
-    nPoints         10;
-    axis            x;
-}
-
-fields          (p k U);
-
-#includeEtc "caseDicts/postProcessing/visualisation/streamlines.cfg"
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/roomResidenceTime/Allrun b/tutorials/incompressible/simpleFoam/roomResidenceTime/Allrun
index 9344689094..357361faf4 100755
--- a/tutorials/incompressible/simpleFoam/roomResidenceTime/Allrun
+++ b/tutorials/incompressible/simpleFoam/roomResidenceTime/Allrun
@@ -6,10 +6,12 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 runApplication blockMesh
 runApplication simpleFoam
-runApplication -s age simpleFoam -latestTime -postProcess -func age
+runApplication -s age simpleFoam -postProcess -latestTime \
+    -func "age(diffusion=true)"
 runApplication -s probes1 postProcess -func probes1 -latestTime
 runApplication -s probes2 postProcess -func probes2 -latestTime
-runApplication -s flowRatePatch postProcess -func flowRatePatch -latestTime
+runApplication -s patchFlowRate postProcess -latestTime \
+    -func "patchFlowRate(funcName=inletFlowRate,patch=inlet)" -latestTime
 
 (cd validation && ./Allrun $*)
 
diff --git a/tutorials/incompressible/simpleFoam/roomResidenceTime/system/age b/tutorials/incompressible/simpleFoam/roomResidenceTime/system/age
deleted file mode 100644
index 336ce3a707..0000000000
--- a/tutorials/incompressible/simpleFoam/roomResidenceTime/system/age
+++ /dev/null
@@ -1,31 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-Description
-    Solves a transport equation to determine the time taken for a particle to
-    convect from an inlet to the location in the flow.
-
-    This will output a field, age, with units of time. This field needs a
-    solver setting in fvSolution and a div(phi,age) scheme in fvSchemes.
-    Alternatively, a schemesField entry can be used to reuse settings from
-    another field.
-
-    The number of correctors, nCorr, determines how many times the solution is
-    repeated to iterate away any non-linearities in the choice of scheme. If
-    the divergence scheme is set to upwind, no corrections will be necessary.
-
-\*---------------------------------------------------------------------------*/
-
-type            age;
-libs            ("libfieldFunctionObjects.so");
-
-diffusion       true;
-
-executeControl  writeTime;
-writeControl    writeTime;
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/roomResidenceTime/system/controlDict b/tutorials/incompressible/simpleFoam/roomResidenceTime/system/controlDict
index 15388e4e0c..867e363ea8 100644
--- a/tutorials/incompressible/simpleFoam/roomResidenceTime/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/roomResidenceTime/system/controlDict
@@ -46,7 +46,7 @@ runTimeModifiable true;
 
 functions
 {
-    #includeFunc residuals
+    #includeFunc residuals(p, U)
 }
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/roomResidenceTime/system/flowRatePatch b/tutorials/incompressible/simpleFoam/roomResidenceTime/system/flowRatePatch
deleted file mode 100644
index d1e8dae85c..0000000000
--- a/tutorials/incompressible/simpleFoam/roomResidenceTime/system/flowRatePatch
+++ /dev/null
@@ -1,19 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-Description
-    Calculates the flow rate through a specified patch by summing the flux on
-    patch faces.  For solvers where the flux is volumetric, the flow rate is
-    volumetric; where flux is mass flux, the flow rate is mass flow rate.
-
-\*---------------------------------------------------------------------------*/
-
-name    inlet;
-
-#includeEtc "caseDicts/postProcessing/flowRate/flowRatePatch.cfg"
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/roomResidenceTime/system/probes1 b/tutorials/incompressible/simpleFoam/roomResidenceTime/system/probes1
index 0604c87225..187d326a3b 100644
--- a/tutorials/incompressible/simpleFoam/roomResidenceTime/system/probes1
+++ b/tutorials/incompressible/simpleFoam/roomResidenceTime/system/probes1
@@ -10,10 +10,7 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#includeEtc "caseDicts/postProcessing/probes/probes.cfg"
-
-fields (age);
-probeLocations
+points
 (
     (1.13 1.8 0.0)
     (1.13 1.8 0.1)
@@ -47,4 +44,8 @@ probeLocations
     (1.13 1.8 3.0)
 );
 
+fields  (age);
+
+#includeEtc "caseDicts/postProcessing/probes/probes.cfg"
+
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/roomResidenceTime/system/probes2 b/tutorials/incompressible/simpleFoam/roomResidenceTime/system/probes2
index c66ef5deaf..6c5e94c976 100644
--- a/tutorials/incompressible/simpleFoam/roomResidenceTime/system/probes2
+++ b/tutorials/incompressible/simpleFoam/roomResidenceTime/system/probes2
@@ -10,10 +10,7 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-#includeEtc "caseDicts/postProcessing/probes/probes.cfg"
-
-fields (age);
-probeLocations
+points
 (
     (3.2 1.8 0.0)
     (3.2 1.8 0.1)
@@ -47,4 +44,8 @@ probeLocations
     (3.2 1.8 3.0)
 );
 
+fields  (age);
+
+#includeEtc "caseDicts/postProcessing/probes/probes.cfg"
+
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/roomResidenceTime/validation/Allrun b/tutorials/incompressible/simpleFoam/roomResidenceTime/validation/Allrun
index 53d63276bf..9bf0240c8b 100755
--- a/tutorials/incompressible/simpleFoam/roomResidenceTime/validation/Allrun
+++ b/tutorials/incompressible/simpleFoam/roomResidenceTime/validation/Allrun
@@ -7,7 +7,7 @@ head -n 30 ../postProcessing/probes1/*/age | cut -d' ' -f6 | cut -d')' -f1 > pos
 
 # Build dimless age value
 V=45.36
-Vdot=`cat ../postProcessing/flowRatePatch/0/surfaceFieldValue.dat | tail -n 1 | xargs | cut -d' ' -f2`
+Vdot=`cat ../postProcessing/inletFlowRate/*/surfaceFieldValue.dat | tail -n 1 | xargs | cut -d' ' -f2`
 Vdot=`echo $Vdot | sed 's/e/*10^/'`
 
 while IFS= read -r line
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/system/controlDict b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/system/controlDict
index ba7e89ce8d..4b3d3add71 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/system/controlDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/system/controlDict
@@ -52,7 +52,14 @@ maxDeltaT       0.001;
 
 functions
 {
-    #includeFunc        singleGraph
+    #includeFunc graphCell
+    (
+        funcName=graph,
+        start=(0.0101 0 0),
+        end=(0.0101 0.01905 0),
+        fields=(alpha.gas)
+    )
+
     #includeFunc yPlus(phase=liquid)
 }
 
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/system/singleGraph b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/system/singleGraph
deleted file mode 100644
index 498de372d7..0000000000
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/system/singleGraph
+++ /dev/null
@@ -1,34 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-Description
-    Writes graph data for specified fields along a line, specified by start
-    and end points.
-
-\*---------------------------------------------------------------------------*/
-
-start   (0.0101 0       0);
-end     (0.0101 0.01905 0);
-fields
-(
-    alpha.gas
-);
-
-// Sampling and I/O settings
-#includeEtc "caseDicts/postProcessing/graphs/sampleDict.cfg"
-
-// Override settings here, e.g.
-setConfig
-{
-    type lineCell;
-    axis y;        // y, z, xyz
-}
-
-// Must be last entry
-#includeEtc "caseDicts/postProcessing/graphs/graph.cfg"
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/validation/createGraphs b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/validation/createGraphs
index 9876780f8d..69e308bbf9 100755
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/validation/createGraphs
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/Grossetete/validation/createGraphs
@@ -17,7 +17,7 @@ gnuplot<<EOF
     set xrange [0:1]
     set yrange [0:0.15]
 
-    file = system("ls ../postProcessing/singleGraph/$(foamListTimes -case .. | tail -1)/*.xy")
+    file = system("ls ../postProcessing/graph/$(foamListTimes -case .. | tail -1)/*.xy")
 
     plot file u (\$1/0.01905):2 w lp lt 1 t 'Simulation', \
     './exptData/alpha.gas' u 1:2 w p lt rgb "black" pt 4 t 'Experiment'
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/system/controlDict b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/system/controlDict
index f9b8a48430..190bd75f81 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/system/controlDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/system/controlDict
@@ -56,7 +56,22 @@ functions
     #includeFunc    writeObjects(d.air1)
     #includeFunc    writeObjects(d.air2)
     #includeFunc    phaseForces(phase=water)
-    #includeFunc    singleGraph
+    #includeFunc    graphUniform
+    (
+        funcName=graph,
+        start=(0 0 0.89),
+        end=(0.025 0 0.89),
+        nPoints=100,
+        fields=
+        (
+            alpha.air1
+            alpha.air2
+            alpha.bubbles
+            liftForce.water
+            wallLubricationForce.water
+            turbulentDispersionForce.water
+        )
+    )
 
     probabilityDensity.injection
     {
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/system/singleGraph b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/system/singleGraph
deleted file mode 100644
index e6c1b6545b..0000000000
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/system/singleGraph
+++ /dev/null
@@ -1,41 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-Description
-    Writes graph data for specified fields along a line, specified by start
-    and end points.
-
-\*---------------------------------------------------------------------------*/
-
-start   (0     0 0.89);
-end     (0.025 0 0.89);
-fields
-(
-    alpha.air1
-    alpha.air2
-    alpha.bubbles
-    liftForce.water
-    wallLubricationForce.water
-    turbulentDispersionForce.water
-);
-
-// Sampling and I/O settings
-#includeEtc "caseDicts/postProcessing/graphs/sampleDict.cfg"
-
-// Override settings here, e.g.
-/*
-setConfig
-{
-    type lineCell;
-    axis x;        // y, z, xyz
-}
-*/
-
-// Must be last entry
-#includeEtc "caseDicts/postProcessing/graphs/graph.cfg"
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/validation/createGraphs b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/validation/createGraphs
index 9841f06f3f..d4ce48118e 100755
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/validation/createGraphs
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/validation/createGraphs
@@ -13,8 +13,8 @@ gnuplot<<EOF
     set xlabel 'r (mm)'
     set ylabel '{/Symbol a} (-)'
 
-    alpha = system("ls ../postProcessing/singleGraph/$(foamListTimes -case .. -latestTime)/line_alpha*.xy")
-    forces = system("ls ../postProcessing/singleGraph/$(foamListTimes -case .. -latestTime)/line_lift*.xy")
+    alpha = system("ls ../postProcessing/graph/$(foamListTimes -case .. -latestTime)/line_alpha*.xy")
+    forces = system("ls ../postProcessing/graph/$(foamListTimes -case .. -latestTime)/line_lift*.xy")
 
     plot alpha u (\$1*1000):4 w l lw 3 lc rgb 'black' t 'total',\
     alpha u (\$1*1000):2 w l lw 2 lc rgb 'green' t 'd < 5.5mm',\
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/Allrun b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/Allrun
index 48668c20ad..363631db77 100755
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/Allrun
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/Allrun
@@ -20,7 +20,15 @@ then
 fi
 
 runApplication reconstructPar -latestTime
-runApplication postProcess -func singleGraph -latestTime
+runApplication postProcess -latestTime -func "
+    graphCell
+    (
+        funcName=graph,
+        start=(3.4901 0 0),
+        end=(3.4901 0.0096 0),
+        fields=(alpha.gas T.liquid T.gas)
+    )"
+
 ./validation/createGraphs
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/system/controlDict.orig b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/system/controlDict.orig
index 5860578930..96c009dc62 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/system/controlDict.orig
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/system/controlDict.orig
@@ -52,7 +52,7 @@ maxDeltaT       0.001;
 
 functions
 {
-   outflow
+    outflow
     {
         type            surfaceFieldValue;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
@@ -122,7 +122,6 @@ functions
         weightField     alphaRhoPhi.liquid;
         fields          ( h.liquid );
     }
-
     writeObjects1
     {
         type        writeObjects;
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/system/singleGraph b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/system/singleGraph
deleted file mode 100644
index bab40148e4..0000000000
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/system/singleGraph
+++ /dev/null
@@ -1,38 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-Description
-    Writes graph data for specified fields along a line, specified by start
-    and end points.
-
-\*---------------------------------------------------------------------------*/
-
-start           (3.4901 0      0);
-end             (3.4901 0.0096 0);
-
-fields
-(
-    alpha.gas
-    T.liquid
-    T.gas
-);
-
-// Sampling and I/O settings
-#includeEtc "caseDicts/postProcessing/graphs/sampleDict.cfg"
-
-// Override settings here, e.g.
-
-setConfig
-{
-    type            lineCell;
-    axis            y;
-}
-
-// Must be last entry
-#includeEtc "caseDicts/postProcessing/graphs/graph.cfg"
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/validation/createGraphs b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/validation/createGraphs
index 410b345236..10d4aa3a70 100755
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/validation/createGraphs
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/validation/createGraphs
@@ -26,14 +26,14 @@ gnuplot<<EOF
 
     set ylabel 'Void fraction (-)'
     plot \
-        "postProcessing/singleGraph/$graphFile" \
+        "postProcessing/graph/$graphFile" \
         u (\$1/0.0096):2 w lp lt 1 t 'Simulation', \
         './validation/exptData/vof_deb1.txt' \
         u 1:2 w p lt rgb "black" pt 4 t 'Experiment'
 
     set ylabel 'Liquid temperature (K)'
     plot \
-        "postProcessing/singleGraph/$graphFile" \
+        "postProcessing/graph/$graphFile" \
         u (\$1/0.0096):3 w lp lt 1 t 'Simulation', \
         './validation/exptData/T_deb1.txt' \
         u 1:2 w p lt rgb "black" pt 4 t 'Experiment'
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/Allrun b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/Allrun
index 48668c20ad..10563dbcf2 100755
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/Allrun
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/Allrun
@@ -20,7 +20,15 @@ then
 fi
 
 runApplication reconstructPar -latestTime
-runApplication postProcess -func singleGraph -latestTime
+runApplication postProcess -latestTime -func "
+    graphCell
+    (
+        funcName=graph,
+        start=(3.4901 0 0),
+        end=(3.4901 0.0096 0),
+        fields=(alpha.gas T.liquid T.gas d.gas)
+    )"
+
 ./validation/createGraphs
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/system/controlDict.orig b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/system/controlDict.orig
index 1b5e3ce561..acb15c563e 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/system/controlDict.orig
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/system/controlDict.orig
@@ -52,7 +52,7 @@ maxDeltaT       0.001;
 
 functions
 {
-   outflow
+    outflow
     {
         type            surfaceFieldValue;
         functionObjectLibs ( "libfieldFunctionObjects.so" );
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/system/singleGraph b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/system/singleGraph
deleted file mode 100644
index ff2c73c8e5..0000000000
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/system/singleGraph
+++ /dev/null
@@ -1,39 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-Description
-    Writes graph data for specified fields along a line, specified by start
-    and end points.
-
-\*---------------------------------------------------------------------------*/
-
-start           (3.4901 0      0);
-end             (3.4901 0.0096 0);
-
-fields
-(
-    alpha.gas
-    T.liquid
-    T.gas
-    d.gas
-);
-
-// Sampling and I/O settings
-#includeEtc "caseDicts/postProcessing/graphs/sampleDict.cfg"
-
-// Override settings here, e.g.
-
-setConfig
-{
-    type            lineCell;
-    axis            y;
-}
-
-// Must be last entry
-#includeEtc "caseDicts/postProcessing/graphs/graph.cfg"
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/validation/createGraphs b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/validation/createGraphs
index cb31b9f73e..1d6aa72a7f 100755
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/validation/createGraphs
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/validation/createGraphs
@@ -26,21 +26,21 @@ gnuplot<<EOF
 
     set ylabel 'Void fraction (-)'
     plot \
-        "postProcessing/singleGraph/$graphFile" \
+        "postProcessing/graph/$graphFile" \
         u (\$1/0.0096):2 w lp lt 1 t 'Simulation', \
         './validation/exptData/vof_deb1.txt' \
         u 1:2 w p lt rgb "black" pt 4 t 'Experiment'
 
     set ylabel 'Liquid temperature (K)'
     plot \
-        "postProcessing/singleGraph/$graphFile" \
+        "postProcessing/graph/$graphFile" \
         u (\$1/0.0096):3 w lp lt 1 t 'Simulation', \
         './validation/exptData/T_deb1.txt' \
         u 1:2 w p lt rgb "black" pt 4 t 'Experiment'
 
     set ylabel 'Sauter mean diameter (mm)'
     plot \
-        "postProcessing/singleGraph/$graphFile" \
+        "postProcessing/graph/$graphFile" \
         u (\$1/0.0096):(\$5*1000) w lp lt 1 t 'Simulation', \
         './validation/exptData/d_deb1.txt' \
         u 1:(\$2*1000) w p lt rgb "black" pt 4 t 'Experiment'
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/Allrun b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/Allrun
index 07db5e9a6a..2eea7c6949 100755
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/Allrun
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/Allrun
@@ -21,7 +21,15 @@ then
 fi
 
 runApplication reconstructPar -latestTime
-runApplication postProcess -func singleGraph -latestTime
+runApplication postProcess -latestTime -func "
+    graphCell
+    (
+        funcName=graph,
+        start=(3.4901 0 0),
+        end=(3.4901 0.0096 0),
+        fields=(alpha.gas T.liquid T.gas d.gas)
+    )"
+
 ./validation/createGraphs
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/system/singleGraph b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/system/singleGraph
deleted file mode 100644
index ff2c73c8e5..0000000000
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/system/singleGraph
+++ /dev/null
@@ -1,39 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-Description
-    Writes graph data for specified fields along a line, specified by start
-    and end points.
-
-\*---------------------------------------------------------------------------*/
-
-start           (3.4901 0      0);
-end             (3.4901 0.0096 0);
-
-fields
-(
-    alpha.gas
-    T.liquid
-    T.gas
-    d.gas
-);
-
-// Sampling and I/O settings
-#includeEtc "caseDicts/postProcessing/graphs/sampleDict.cfg"
-
-// Override settings here, e.g.
-
-setConfig
-{
-    type            lineCell;
-    axis            y;
-}
-
-// Must be last entry
-#includeEtc "caseDicts/postProcessing/graphs/graph.cfg"
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/validation/createGraphs b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/validation/createGraphs
index cb31b9f73e..1d6aa72a7f 100755
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/validation/createGraphs
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/validation/createGraphs
@@ -26,21 +26,21 @@ gnuplot<<EOF
 
     set ylabel 'Void fraction (-)'
     plot \
-        "postProcessing/singleGraph/$graphFile" \
+        "postProcessing/graph/$graphFile" \
         u (\$1/0.0096):2 w lp lt 1 t 'Simulation', \
         './validation/exptData/vof_deb1.txt' \
         u 1:2 w p lt rgb "black" pt 4 t 'Experiment'
 
     set ylabel 'Liquid temperature (K)'
     plot \
-        "postProcessing/singleGraph/$graphFile" \
+        "postProcessing/graph/$graphFile" \
         u (\$1/0.0096):3 w lp lt 1 t 'Simulation', \
         './validation/exptData/T_deb1.txt' \
         u 1:2 w p lt rgb "black" pt 4 t 'Experiment'
 
     set ylabel 'Sauter mean diameter (mm)'
     plot \
-        "postProcessing/singleGraph/$graphFile" \
+        "postProcessing/graph/$graphFile" \
         u (\$1/0.0096):(\$5*1000) w lp lt 1 t 'Simulation', \
         './validation/exptData/d_deb1.txt' \
         u 1:(\$2*1000) w p lt rgb "black" pt 4 t 'Experiment'
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/Allrun b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/Allrun
index 07db5e9a6a..3583850804 100755
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/Allrun
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/Allrun
@@ -21,7 +21,15 @@ then
 fi
 
 runApplication reconstructPar -latestTime
-runApplication postProcess -func singleGraph -latestTime
+runApplication postProcess -latestTime -func "
+    graphCell
+    (
+        funcName=graph,
+        start=(3.4901 0 0),
+        end=(3.4901 0.0096 0),
+        fields=(alpha.gas alpha.gas2 alpha.liquid T.liquid T.gas d.bubbles)
+    )"
+
 ./validation/createGraphs
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/system/singleGraph b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/system/singleGraph
deleted file mode 100644
index 893c40d263..0000000000
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/system/singleGraph
+++ /dev/null
@@ -1,41 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-Description
-    Writes graph data for specified fields along a line, specified by start
-    and end points.
-
-\*---------------------------------------------------------------------------*/
-
-start           (3.4901 0      0);
-end             (3.4901 0.0096 0);
-
-fields
-(
-    alpha.gas
-    alpha.gas2
-    alpha.liquid
-    T.liquid
-    T.gas
-    d.bubbles
-);
-
-// Sampling and I/O settings
-#includeEtc "caseDicts/postProcessing/graphs/sampleDict.cfg"
-
-// Override settings here, e.g.
-
-setConfig
-{
-    type            lineCell;
-    axis            y;
-}
-
-// Must be last entry
-#includeEtc "caseDicts/postProcessing/graphs/graph.cfg"
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/validation/createGraphs b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/validation/createGraphs
index 33731cd3f0..e885b866a6 100755
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/validation/createGraphs
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/validation/createGraphs
@@ -26,21 +26,21 @@ gnuplot<<EOF
 
     set ylabel 'Void fraction (-)'
     plot \
-        "postProcessing/singleGraph/$graphFile" \
+        "postProcessing/graph/$graphFile" \
         u (\$1/0.0096):(1-\$4) w lp lt 1 t 'Simulation', \
         './validation/exptData/vof_deb1.txt' \
         u 1:2 w p lt rgb "black" pt 4 t 'Experiment'
 
     set ylabel 'Liquid temperature (K)'
     plot \
-        "postProcessing/singleGraph/$graphFile" \
+        "postProcessing/graph/$graphFile" \
         u (\$1/0.0096):5 w lp lt 1 t 'Simulation', \
         './validation/exptData/T_deb1.txt' \
         u 1:2 w p lt rgb "black" pt 4 t 'Experiment'
 
     set ylabel 'Sauter mean diameter (mm)'
     plot \
-        "postProcessing/singleGraph/$graphFile" \
+        "postProcessing/graph/$graphFile" \
         u (\$1/0.0096):(\$7*1000) w lp lt 1 t 'Simulation', \
         './validation/exptData/d_deb1.txt' \
         u 1:(\$2*1000) w p lt rgb "black" pt 4 t 'Experiment'
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/system/controlDict b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/system/controlDict
index ae973aa7e6..4e2beadbb1 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/system/controlDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/system/controlDict
@@ -52,7 +52,13 @@ maxDeltaT       1e-3;
 
 functions
 {
-    #includeFunc        singleGraph
+    #includeFunc graphCell
+    (
+        funcName=graph,
+        start=(0 0 1e-3),
+        end=(0.44 0 1e-3),
+        fields=(TiCl4.vapor O2.vapor Cl2.vapor alpha.particles)
+    )
 
     numberConcentration
     {
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/system/singleGraph b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/system/singleGraph
deleted file mode 100644
index 2d4f889574..0000000000
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/system/singleGraph
+++ /dev/null
@@ -1,37 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-Description
-    Writes graph data for specified fields along a line, specified by start
-    and end points.
-
-\*---------------------------------------------------------------------------*/
-
-start   (0 0 1e-3);
-end     (0.44 0 1e-3);
-fields
-(
-    TiCl4.vapor
-    O2.vapor
-    Cl2.vapor
-    alpha.particles
-);
-
-// Sampling and I/O settings
-#includeEtc "caseDicts/postProcessing/graphs/sampleDict.cfg"
-
-// Override settings here, e.g.
-setConfig
-{
-    type lineCell;
-    axis x;        // y, z, xyz
-}
-
-// Must be last entry
-#includeEtc "caseDicts/postProcessing/graphs/graph.cfg"
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/validation/createGraphs b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/validation/createGraphs
index b8937ce2d0..6690a72dae 100755
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/validation/createGraphs
+++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/validation/createGraphs
@@ -17,7 +17,7 @@ gnuplot<<EOF
     set y2tics nomirror
     set key center
 
-    file = system("ls ../postProcessing/singleGraph/$(foamListTimes -case .. | tail -1)/*.xy")
+    file = system("ls ../postProcessing/graph/$(foamListTimes -case .. | tail -1)/*.xy")
 
     plot file u 1:2 w l t 'TiCl4',\
     file u 1:3 w l t 'O2',\
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/system/controlDict b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/system/controlDict
index 90fb003ea4..429afdc7d9 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/system/controlDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/system/controlDict
@@ -52,7 +52,13 @@ maxDeltaT       1e-3;
 
 functions
 {
-    #includeFunc        singleGraph
+    #includeFunc graphCell
+    (
+        funcName=graph,
+        start=(0 0 1e-3),
+        end=(0.44 0 1e-3),
+        fields=(TiCl4.vapor O2.vapor Cl2.vapor alpha.particles)
+    )
 
     numberConcentration
     {
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/system/singleGraph b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/system/singleGraph
deleted file mode 100644
index 2d4f889574..0000000000
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/system/singleGraph
+++ /dev/null
@@ -1,37 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-Description
-    Writes graph data for specified fields along a line, specified by start
-    and end points.
-
-\*---------------------------------------------------------------------------*/
-
-start   (0 0 1e-3);
-end     (0.44 0 1e-3);
-fields
-(
-    TiCl4.vapor
-    O2.vapor
-    Cl2.vapor
-    alpha.particles
-);
-
-// Sampling and I/O settings
-#includeEtc "caseDicts/postProcessing/graphs/sampleDict.cfg"
-
-// Override settings here, e.g.
-setConfig
-{
-    type lineCell;
-    axis x;        // y, z, xyz
-}
-
-// Must be last entry
-#includeEtc "caseDicts/postProcessing/graphs/graph.cfg"
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/validation/createGraphs b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/validation/createGraphs
index b8937ce2d0..6690a72dae 100755
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/validation/createGraphs
+++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/validation/createGraphs
@@ -17,7 +17,7 @@ gnuplot<<EOF
     set y2tics nomirror
     set key center
 
-    file = system("ls ../postProcessing/singleGraph/$(foamListTimes -case .. | tail -1)/*.xy")
+    file = system("ls ../postProcessing/graph/$(foamListTimes -case .. | tail -1)/*.xy")
 
     plot file u 1:2 w l t 'TiCl4',\
     file u 1:3 w l t 'O2',\
diff --git a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/Allrun b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/Allrun
index dc58288426..ab4890541a 100755
--- a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/Allrun
+++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/Allrun
@@ -8,7 +8,16 @@ application=$(getApplication)
 
 runApplication blockMesh
 runApplication $application
-runApplication -s sigma        postProcess -func "components(sigma)"
-runApplication -s singleGraph  postProcess -func singleGraph
+runApplication -s sigma postProcess -func "components(sigma)"
+runApplication -s singleGraph postProcess -func "
+    graphUniform
+    (
+        funcName=graph,
+        start=(0 0.5 0.25),
+        end=(0 2 0.25),
+        nPoints=100,
+        axis=y,
+        sigmaxx
+    )"
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/singleGraph b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/singleGraph
deleted file mode 100644
index 8edeedb434..0000000000
--- a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/singleGraph
+++ /dev/null
@@ -1,23 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-
-start   (0 0.5 0.25);
-end     (0   2 0.25);
-fields  (sigmaxx);
-
-#includeEtc "caseDicts/postProcessing/graphs/sampleDict.cfg"
-
-setConfig
-{
-    axis    y;
-}
-
-// Must be last entry
-#includeEtc "caseDicts/postProcessing/graphs/graph.cfg"
-
-// ************************************************************************* //