diff --git a/applications/solvers/financial/financialFoam/financialFoam.C b/applications/solvers/financial/financialFoam/financialFoam.C
index 8b21f09285..68b3f9fbbe 100644
--- a/applications/solvers/financial/financialFoam/financialFoam.C
+++ b/applications/solvers/financial/financialFoam/financialFoam.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,8 +30,9 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "writeCellGraph.H"
 #include "OSspecific.H"
+#include "setWriter.H"
+#include "writeFile.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -73,8 +74,20 @@ int main(int argc, char *argv[])
 
         if (runTime.writeTime())
         {
-            writeCellGraph(V, runTime.graphFormat());
-            writeCellGraph(delta, runTime.graphFormat());
+            setWriter::New(runTime.graphFormat())->write
+            (
+                runTime.globalPath()
+               /functionObjects::writeFile::outputPrefix
+               /args.executable()
+               /runTime.timeName(),
+
+                args.executable(),
+
+                coordSet(true, word::null, mesh.C().primitiveField(), "x"),
+
+                "V", V.primitiveField(),
+                "delta", delta.primitiveField()
+            );
         }
 
         Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
diff --git a/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C b/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C
index a7c67c5fbe..4441e5a29c 100644
--- a/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C
+++ b/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C
@@ -41,7 +41,8 @@ Description
 #include "fvModels.H"
 #include "fvConstraints.H"
 #include "wallFvPatch.H"
-#include "makeGraph.H"
+#include "setWriter.H"
+#include "writeFile.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/applications/solvers/incompressible/boundaryFoam/makeGraphs.H b/applications/solvers/incompressible/boundaryFoam/makeGraphs.H
index 2691a796fa..17bbdaf89f 100644
--- a/applications/solvers/incompressible/boundaryFoam/makeGraphs.H
+++ b/applications/solvers/incompressible/boundaryFoam/makeGraphs.H
@@ -13,21 +13,32 @@ volSymmTensorField R
 
 runTime.write();
 
-const word& gFormat = runTime.graphFormat();
+setWriter::New(runTime.graphFormat())->write
+(
+    runTime.globalPath()
+   /functionObjects::writeFile::outputPrefix
+   /args.executable()
+   /runTime.timeName(),
 
-makeGraph(y, flowDirection & U, "Uf", gFormat);
+    args.executable(),
 
-makeGraph(y, turbulence->nu(), gFormat);
-makeGraph(y, turbulence->k(), gFormat);
-makeGraph(y, turbulence->epsilon(), gFormat);
+    coordSet(true, "y", y),
 
-makeGraph(y, flowDirection & R & flowDirection, "Rff", gFormat);
-makeGraph(y, wallNormal & R & wallNormal, "Rww", gFormat);
-makeGraph(y, flowDirection & R & wallNormal, "Rfw", gFormat);
+    "Uf", (flowDirection & U)().primitiveField(),
 
-makeGraph(y, sqrt(mag(R.component(symmTensor::XX))), "u", gFormat);
-makeGraph(y, sqrt(mag(R.component(symmTensor::YY))), "v", gFormat);
-makeGraph(y, sqrt(mag(R.component(symmTensor::ZZ))), "w", gFormat);
-makeGraph(y, R.component(symmTensor::XY), "uv", gFormat);
+    "nu", turbulence->nu()().primitiveField(),
+    "k", turbulence->nu()().primitiveField(),
+    "epsilon", turbulence->nu()().primitiveField(),
 
-makeGraph(y, mag(fvc::grad(U)), "gammaDot", gFormat);
+    "Rff", (flowDirection & R & flowDirection)().primitiveField(),
+    "Rww", (wallNormal & R & wallNormal)().primitiveField(),
+    "Rfw", (flowDirection & R & wallNormal)().primitiveField(),
+
+    "u", sqrt(mag(R.component(symmTensor::XX)))().primitiveField(),
+    "v", sqrt(mag(R.component(symmTensor::YY)))().primitiveField(),
+    "w", sqrt(mag(R.component(symmTensor::ZZ)))().primitiveField(),
+
+    "uv", R.component(symmTensor::XY)().primitiveField(),
+
+    "gammaDot", mag(fvc::grad(U))().primitiveField()
+);
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/functionObjects/sizeDistribution/sizeDistribution.C b/applications/solvers/multiphase/multiphaseEulerFoam/functionObjects/sizeDistribution/sizeDistribution.C
index 6fe1fc5871..02b761dc47 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/functionObjects/sizeDistribution/sizeDistribution.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/functionObjects/sizeDistribution/sizeDistribution.C
@@ -130,16 +130,10 @@ void Foam::functionObjects::sizeDistribution::correctVolAverages()
         }
 
         N_[i] = gSum(V*Ni)/this->V();
+        V_[i] = fi.x().value();
         a_[i] = gSum(V*ai)/this->V();
         d_[i] = gSum(V*di)/this->V();
     }
-
-    forAll(bins_, i)
-    {
-        const Foam::diameterModels::sizeGroup& fi = popBal_.sizeGroups()[i];
-
-        bins_[i] = point(fi.x().value(), a_[i], d_[i]);
-    }
 }
 
 
@@ -154,13 +148,15 @@ void Foam::functionObjects::sizeDistribution::writeMoments()
         writeTime(file());
     }
 
+    const scalarField& bin = this->bin();
+
     for (label k = 0; k <= maxOrder_; k++)
     {
         scalar result = 0;
 
         forAll(N_, i)
         {
-            result += pow(bins_[i][binCmpt_], k)*N_[i];
+            result += pow(bin[i], k)*N_[i];
         }
 
         if (Pstream::master())
@@ -192,23 +188,25 @@ void Foam::functionObjects::sizeDistribution::writeStdDev()
     scalar mean = 0;
     scalar var = 0;
 
-    if(sum(N_) != 0)
+    const scalarField& bin = this->bin();
+
+    if (sum(N_) != 0)
     {
         if (geometric_)
         {
-            mean = exp(sum(Foam::log(bins_.component(binCmpt_))*N_/sum(N_)));
+            mean = exp(sum(Foam::log(bin)*N_/sum(N_)));
 
             var =
-                sum(sqr(Foam::log(bins_.component(binCmpt_)) - Foam::log(mean))
+                sum(sqr(Foam::log(bin) - Foam::log(mean))
                *N_/sum(N_));
 
             stdDev = exp(sqrt(var));
         }
         else
         {
-            mean = sum(bins_.component(binCmpt_)*N_/sum(N_));
+            mean = sum(bin*N_/sum(N_));
 
-            var = sum(sqr(bins_.component(binCmpt_) - mean)*N_/sum(N_));
+            var = sum(sqr(bin - mean)*N_/sum(N_));
 
             stdDev = sqrt(var);
         }
@@ -225,6 +223,8 @@ void Foam::functionObjects::sizeDistribution::writeDistribution()
 {
     scalarField result(N_);
 
+    const scalarField& bin = this->bin();
+
     switch (functionType_)
     {
         case ftNumber:
@@ -239,7 +239,7 @@ void Foam::functionObjects::sizeDistribution::writeDistribution()
             Log << "    writing volume distribution. "
                 << endl;
 
-            result *= bins_.component(0);
+            result *= V_;
 
             break;
         }
@@ -263,12 +263,12 @@ void Foam::functionObjects::sizeDistribution::writeDistribution()
     {
         List<scalar> bndrs(N_.size() + 1);
 
-        bndrs.first() = bins_.first()[binCmpt_];
-        bndrs.last() = bins_.last()[binCmpt_];
+        bndrs.first() = bin.first();
+        bndrs.last() = bin.last();
 
         for (label i = 1; i < N_.size(); i++)
         {
-            bndrs[i] = (bins_[i][binCmpt_] + bins_[i-1][binCmpt_])/2.0;
+            bndrs[i] = (bin[i]+ bin[i-1])/2.0;
         }
 
         forAll(result, i)
@@ -287,15 +287,19 @@ void Foam::functionObjects::sizeDistribution::writeDistribution()
 
     if (Pstream::master())
     {
-        const coordSet coords
+        formatterPtr_->write
         (
-            "sizeDistribution",
-            "xyz",
-            bins_,
-            mag(bins_)
+            file_.baseTimeDir(),
+            name(),
+            coordSet(true, "volume", V_),
+            "area",
+            a_,
+            "diameter",
+            d_,
+            word(functionTypeNames_[functionType_])
+          + (densityFunction_ ? "Density" : "Concentration"),
+            result
         );
-
-        writeGraph(coords, functionTypeNames_[functionType_], result);
     }
 }
 
@@ -347,44 +351,6 @@ void Foam::functionObjects::sizeDistribution::writeFileHeader
 }
 
 
-void Foam::functionObjects::sizeDistribution::writeGraph
-(
-    const coordSet& coords,
-    const word& functionTypeName,
-    const scalarField& values
-)
-{
-    const wordList functionTypeNames(1, functionTypeName);
-
-    fileName outputPath = file_.baseTimeDir();
-
-    mkDir(outputPath);
-    OFstream graphFile
-    (
-        outputPath/(this->name() + ".dat")
-    );
-
-    volRegion::writeFileHeader(file_, graphFile);
-
-    file_.writeCommented(graphFile, "Volume area diameter " + functionTypeName);
-
-    if (densityFunction_)
-    {
-        graphFile << "Density";
-    }
-    else
-    {
-        graphFile << "Concentration";
-    }
-
-    graphFile << endl;
-
-    List<const scalarField*> yPtrs(1);
-    yPtrs[0] = &values;
-    scalarFormatter_().write(coords, functionTypeNames, yPtrs, graphFile);
-}
-
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::functionObjects::sizeDistribution::sizeDistribution
@@ -409,42 +375,11 @@ Foam::functionObjects::sizeDistribution::sizeDistribution
     functionType_(functionTypeNames_.read(dict.lookup("functionType"))),
     coordinateType_(coordinateTypeNames_.read(dict.lookup("coordinateType"))),
     N_(popBal_.sizeGroups().size(), 0),
+    V_(popBal_.sizeGroups().size(), 0),
     a_(popBal_.sizeGroups().size(), 0),
-    d_(popBal_.sizeGroups().size(), 0),
-    bins_(N_.size()),
-    binCmpt_(0)
+    d_(popBal_.sizeGroups().size(), 0)
 {
     read(dict);
-
-    switch (coordinateType_)
-    {
-        case ctVolume:
-        {
-            binCmpt_ = 0;
-
-            break;
-        }
-        case ctArea:
-        {
-            binCmpt_ = 1;
-
-            break;
-        }
-        case ctDiameter:
-        {
-            binCmpt_ = 2;
-
-            break;
-        }
-        case ctProjectedAreaDiameter:
-        {
-            binCmpt_ = 2;
-
-            break;
-        }
-    }
-
-    scalarFormatter_ = setWriter<scalar>::New("raw");
 }
 
 
@@ -465,6 +400,8 @@ bool Foam::functionObjects::sizeDistribution::read(const dictionary& dict)
     geometric_ = dict.lookupOrDefault<Switch>("geometric", false);
     maxOrder_ = dict.lookupOrDefault("maxOrder", 3);
 
+    formatterPtr_ = setWriter::New(dict.lookup("setFormat"), dict);
+
     resetName(name());
 
     return false;
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/functionObjects/sizeDistribution/sizeDistribution.H b/applications/solvers/multiphase/multiphaseEulerFoam/functionObjects/sizeDistribution/sizeDistribution.H
index 3a2c859f4e..ea684746cc 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/functionObjects/sizeDistribution/sizeDistribution.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/functionObjects/sizeDistribution/sizeDistribution.H
@@ -134,8 +134,8 @@ protected:
         //- File containing data for all functionTypes except moments
         writeFile file_;
 
-        //- Output formatter, set to raw
-        autoPtr<setWriter<scalar>> scalarFormatter_;
+        //- Output formatter
+        autoPtr<setWriter> formatterPtr_;
 
         //- Reference to populationBalanceModel
         const Foam::diameterModels::populationBalanceModel& popBal_;
@@ -149,6 +149,9 @@ protected:
         //- List of volume-averaged number concentrations
         scalarField N_;
 
+        //- ???
+        scalarField V_;
+
         //- List of volume-averaged surface areas
         scalarField a_;
 
@@ -167,18 +170,29 @@ protected:
         //- Highest moment order
         label maxOrder_;
 
-        //- Bins (representative volume/area/diameter)
-        pointField bins_;
-
-        //- Bin component used according to chosen coordinate type
-        label binCmpt_;
-
 
     // Protected Member Functions
 
         //- Filter field according to cellIds
         tmp<scalarField> filterField(const scalarField& field) const;
 
+        //- Bin component used according to chosen coordinate type
+        inline const scalarField& bin() const
+        {
+            switch (coordinateType_)
+            {
+                case ctVolume:
+                    return V_;
+                case ctArea:
+                    return a_;
+                case ctDiameter:
+                    return d_;
+                case ctProjectedAreaDiameter:
+                    return d_;
+            }
+            return scalarField::null();
+        }
+
         //- Correct volume averages
         void correctVolAverages();
 
@@ -194,14 +208,6 @@ protected:
         //- Output file header information for functionType moments
         virtual void writeFileHeader(const label i);
 
-        //- Output function for all functionType number/volume
-        void writeGraph
-        (
-            const coordSet& coords,
-            const word& functionTypeName,
-            const scalarField& values
-        );
-
 
 public:
 
diff --git a/applications/test/graph/Make/files b/applications/test/graph/Make/files
deleted file mode 100644
index 337a894c04..0000000000
--- a/applications/test/graph/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-Test-graph.C
-
-EXE = $(FOAM_USER_APPBIN)/Test-graph
diff --git a/applications/test/graph/Make/options b/applications/test/graph/Make/options
deleted file mode 100644
index 73db7f9560..0000000000
--- a/applications/test/graph/Make/options
+++ /dev/null
@@ -1,7 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/sampling/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude
-
-EXE_LIBS = \
-    -lsampling \
-    -lmeshTools
diff --git a/applications/test/graph/Test-graph.C b/applications/test/graph/Test-graph.C
deleted file mode 100644
index 42dc9d735d..0000000000
--- a/applications/test/graph/Test-graph.C
+++ /dev/null
@@ -1,70 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Application
-    graphTest
-
-Description
-    Test program for making graphs
-
-\*---------------------------------------------------------------------------*/
-
-#include "graph.H"
-
-using namespace Foam;
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-int main()
-{
-    scalarField alpha(200);
-    scalarField phie(alpha.size());
-    scalarField phic(alpha.size());
-
-    forAll(alpha, i)
-    {
-        alpha[i] = scalar(i)/50.0;
-    }
-
-    scalar R = 5.0;
-
-    phie = (R - 1)/(sqrt(R/(alpha + 1.0e-6)) + 1.0) + 1.0;
-    phic = (R - 1)/(sqrt(R*alpha) + 1.0) + 1.0;
-
-
-    graph phi("@f! (R = 5)", "@a!", "@f!", alpha);
-    phi.insert
-    (
-        "@f!&e!", new curve("@f!&e!", curve::curveStyle::CONTINUOUS, phie)
-    );
-    phi.insert
-    (
-        "@f!&c!", new curve("@f!&c!", curve::curveStyle::CONTINUOUS, phic)
-    );
-    phi.write("phi", "xmgr");
-
-    Info<< "end" << endl;
-}
-
-
-// ************************************************************************* //
diff --git a/applications/test/graph/graphTest2.C b/applications/test/graph/graphTest2.C
deleted file mode 100644
index 9a463e836e..0000000000
--- a/applications/test/graph/graphTest2.C
+++ /dev/null
@@ -1,64 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Application
-    graphTest
-
-Description
-    Test program for making graphs
-
-\*---------------------------------------------------------------------------*/
-
-#include "graph.H"
-
-using namespace Foam;
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-int main()
-{
-    scalarField eta(200);
-    scalarField C1mR(eta.size());
-
-    forAll(eta, i)
-    {
-        eta[i] = scalar(i)/10.0;
-    }
-
-    scalar C1 = 1.42;
-    scalar eta0 = 4.38;
-    scalar beta = 0.012;
-
-    C1mR = C1 - ((eta*(1.0 - eta/eta0))/(1.0 + beta*pow(eta, 3.0)));
-
-    graph("C&1! - R", "C&1! - R", "@h!", eta,  C1mR).write
-    (
-        "C1mR",
-        "xmgr"
-    );
-
-    Info<< "end" << endl;
-}
-
-
-// ************************************************************************* //
diff --git a/applications/test/graphXi/Make/files b/applications/test/graphXi/Make/files
deleted file mode 100644
index 344e4ddc20..0000000000
--- a/applications/test/graphXi/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-Test-graphXi.C
-
-EXE = $(FOAM_USER_APPBIN)/Test-graphXi
diff --git a/applications/test/graphXi/Make/options b/applications/test/graphXi/Make/options
deleted file mode 100644
index 73db7f9560..0000000000
--- a/applications/test/graphXi/Make/options
+++ /dev/null
@@ -1,7 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/sampling/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude
-
-EXE_LIBS = \
-    -lsampling \
-    -lmeshTools
diff --git a/applications/test/graphXi/Test-graphXi.C b/applications/test/graphXi/Test-graphXi.C
deleted file mode 100644
index b507ee2bdb..0000000000
--- a/applications/test/graphXi/Test-graphXi.C
+++ /dev/null
@@ -1,66 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Application
-    graphTest
-
-Description
-    Test program for making graphs
-
-\*---------------------------------------------------------------------------*/
-
-#include "graph.H"
-#include "OFstream.H"
-#include "mathematicalConstants.H"
-
-using namespace Foam;
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-int main()
-{
-    scalarField x(100);
-    scalarField r(x.size());
-
-    forAll(x, i)
-    {
-        x[i] = -3 + 0.06*i;
-    }
-
-    scalarField b(0.5*(1.0 + erf(x)));
-    scalarField c(1.0 - b);
-    scalarField gradb((1/::sqrt(constant::mathematical::pi))*exp(-sqr(x)));
-    scalarField lapb(-2*x*gradb);
-
-    r = lapb*b*c/(gradb*gradb);
-
-
-    graph("r", "x", "r", x, r).write("r", "xmgr");
-
-    Info<< "end" << endl;
-
-    return 0;
-}
-
-
-// ************************************************************************* //
diff --git a/applications/test/graphXi/r.agr b/applications/test/graphXi/r.agr
deleted file mode 100644
index d012ca6512..0000000000
--- a/applications/test/graphXi/r.agr
+++ /dev/null
@@ -1,107 +0,0 @@
-@title "r"
-@xaxis label "x"
-@yaxis label "r"
-@s0 legend "r"
-@target G0.S0
-@type xy
--3 0.951803
--2.94 0.950065
--2.88 0.948234
--2.82 0.946302
--2.76 0.944261
--2.7 0.942103
--2.64 0.939817
--2.58 0.937392
--2.52 0.934816
--2.46 0.932074
--2.4 0.929149
--2.34 0.926023
--2.28 0.922673
--2.22 0.919075
--2.16 0.915199
--2.1 0.911012
--2.04 0.906476
--1.98 0.901547
--1.92 0.896176
--1.86 0.890307
--1.8 0.883875
--1.74 0.87681
--1.68 0.869032
--1.62 0.860453
--1.56 0.850978
--1.5 0.840503
--1.44 0.828916
--1.38 0.8161
--1.32 0.801931
--1.26 0.786282
--1.2 0.769024
--1.14 0.750029
--1.08 0.729172
--1.02 0.706337
--0.96 0.681414
--0.9 0.654311
--0.84 0.624951
--0.78 0.59328
--0.72 0.559268
--0.66 0.522911
--0.6 0.48424
--0.54 0.443314
--0.48 0.40023
--0.42 0.355116
--0.36 0.308137
--0.3 0.259489
--0.24 0.2094
--0.18 0.158121
--0.12 0.10593
--0.06 0.0531214
--1.11022e-16 9.8391e-17
-0.06 -0.0531214
-0.12 -0.10593
-0.18 -0.158121
-0.24 -0.2094
-0.3 -0.259489
-0.36 -0.308137
-0.42 -0.355116
-0.48 -0.40023
-0.54 -0.443314
-0.6 -0.48424
-0.66 -0.522911
-0.72 -0.559268
-0.78 -0.59328
-0.84 -0.624951
-0.9 -0.654311
-0.96 -0.681414
-1.02 -0.706337
-1.08 -0.729172
-1.14 -0.750029
-1.2 -0.769024
-1.26 -0.786282
-1.32 -0.801931
-1.38 -0.8161
-1.44 -0.828916
-1.5 -0.840503
-1.56 -0.850978
-1.62 -0.860453
-1.68 -0.869032
-1.74 -0.87681
-1.8 -0.883875
-1.86 -0.890307
-1.92 -0.896176
-1.98 -0.901547
-2.04 -0.906476
-2.1 -0.911012
-2.16 -0.915199
-2.22 -0.919075
-2.28 -0.922673
-2.34 -0.926023
-2.4 -0.929149
-2.46 -0.932074
-2.52 -0.934816
-2.58 -0.937392
-2.64 -0.939817
-2.7 -0.942103
-2.76 -0.944261
-2.82 -0.946302
-2.88 -0.948234
-2.94 -0.950065
-
diff --git a/applications/test/graphXi/r.dat b/applications/test/graphXi/r.dat
deleted file mode 100644
index 28642e4680..0000000000
--- a/applications/test/graphXi/r.dat
+++ /dev/null
@@ -1,103 +0,0 @@
-# JPlot file
-# column 1: x
-# column 2: r
--3 0.951803
--2.94 0.950065
--2.88 0.948234
--2.82 0.946302
--2.76 0.944261
--2.7 0.942103
--2.64 0.939817
--2.58 0.937392
--2.52 0.934816
--2.46 0.932074
--2.4 0.929149
--2.34 0.926023
--2.28 0.922673
--2.22 0.919075
--2.16 0.915199
--2.1 0.911012
--2.04 0.906476
--1.98 0.901547
--1.92 0.896176
--1.86 0.890307
--1.8 0.883875
--1.74 0.87681
--1.68 0.869032
--1.62 0.860453
--1.56 0.850978
--1.5 0.840503
--1.44 0.828916
--1.38 0.8161
--1.32 0.801931
--1.26 0.786282
--1.2 0.769024
--1.14 0.750029
--1.08 0.729172
--1.02 0.706337
--0.96 0.681414
--0.9 0.654311
--0.84 0.624951
--0.78 0.59328
--0.72 0.559268
--0.66 0.522911
--0.6 0.48424
--0.54 0.443314
--0.48 0.40023
--0.42 0.355116
--0.36 0.308137
--0.3 0.259489
--0.24 0.2094
--0.18 0.158121
--0.12 0.10593
--0.06 0.0531214
--1.11022e-16 9.8391e-17
-0.06 -0.0531214
-0.12 -0.10593
-0.18 -0.158121
-0.24 -0.2094
-0.3 -0.259489
-0.36 -0.308137
-0.42 -0.355116
-0.48 -0.40023
-0.54 -0.443314
-0.6 -0.48424
-0.66 -0.522911
-0.72 -0.559268
-0.78 -0.59328
-0.84 -0.624951
-0.9 -0.654311
-0.96 -0.681414
-1.02 -0.706337
-1.08 -0.729172
-1.14 -0.750029
-1.2 -0.769024
-1.26 -0.786282
-1.32 -0.801931
-1.38 -0.8161
-1.44 -0.828916
-1.5 -0.840503
-1.56 -0.850978
-1.62 -0.860453
-1.68 -0.869032
-1.74 -0.87681
-1.8 -0.883875
-1.86 -0.890307
-1.92 -0.896176
-1.98 -0.901547
-2.04 -0.906476
-2.1 -0.911012
-2.16 -0.915199
-2.22 -0.919075
-2.28 -0.922673
-2.34 -0.926023
-2.4 -0.929149
-2.46 -0.932074
-2.52 -0.934816
-2.58 -0.937392
-2.64 -0.939817
-2.7 -0.942103
-2.76 -0.944261
-2.82 -0.946302
-2.88 -0.948234
-2.94 -0.950065
diff --git a/applications/test/graphXi/r.gplt b/applications/test/graphXi/r.gplt
deleted file mode 100644
index 29092adf71..0000000000
--- a/applications/test/graphXi/r.gplt
+++ /dev/null
@@ -1,110 +0,0 @@
-#set term postscript color
-set output "r.ps"
-set title "r" 0,0
-show title
-set xlabel "x" 0,0
-show xlabel
-set ylabel "r" 0,0
-show ylabel
-plot'-' title "r" with lines; pause -1
-
--3 0.951803
--2.94 0.950065
--2.88 0.948234
--2.82 0.946302
--2.76 0.944261
--2.7 0.942103
--2.64 0.939817
--2.58 0.937392
--2.52 0.934816
--2.46 0.932074
--2.4 0.929149
--2.34 0.926023
--2.28 0.922673
--2.22 0.919075
--2.16 0.915199
--2.1 0.911012
--2.04 0.906476
--1.98 0.901547
--1.92 0.896176
--1.86 0.890307
--1.8 0.883875
--1.74 0.87681
--1.68 0.869032
--1.62 0.860453
--1.56 0.850978
--1.5 0.840503
--1.44 0.828916
--1.38 0.8161
--1.32 0.801931
--1.26 0.786282
--1.2 0.769024
--1.14 0.750029
--1.08 0.729172
--1.02 0.706337
--0.96 0.681414
--0.9 0.654311
--0.84 0.624951
--0.78 0.59328
--0.72 0.559268
--0.66 0.522911
--0.6 0.48424
--0.54 0.443314
--0.48 0.40023
--0.42 0.355116
--0.36 0.308137
--0.3 0.259489
--0.24 0.2094
--0.18 0.158121
--0.12 0.10593
--0.06 0.0531214
--1.11022e-16 9.8391e-17
-0.06 -0.0531214
-0.12 -0.10593
-0.18 -0.158121
-0.24 -0.2094
-0.3 -0.259489
-0.36 -0.308137
-0.42 -0.355116
-0.48 -0.40023
-0.54 -0.443314
-0.6 -0.48424
-0.66 -0.522911
-0.72 -0.559268
-0.78 -0.59328
-0.84 -0.624951
-0.9 -0.654311
-0.96 -0.681414
-1.02 -0.706337
-1.08 -0.729172
-1.14 -0.750029
-1.2 -0.769024
-1.26 -0.786282
-1.32 -0.801931
-1.38 -0.8161
-1.44 -0.828916
-1.5 -0.840503
-1.56 -0.850978
-1.62 -0.860453
-1.68 -0.869032
-1.74 -0.87681
-1.8 -0.883875
-1.86 -0.890307
-1.92 -0.896176
-1.98 -0.901547
-2.04 -0.906476
-2.1 -0.911012
-2.16 -0.915199
-2.22 -0.919075
-2.28 -0.922673
-2.34 -0.926023
-2.4 -0.929149
-2.46 -0.932074
-2.52 -0.934816
-2.58 -0.937392
-2.64 -0.939817
-2.7 -0.942103
-2.76 -0.944261
-2.82 -0.946302
-2.88 -0.948234
-2.94 -0.950065
diff --git a/applications/test/graphXi/r.ps b/applications/test/graphXi/r.ps
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/applications/test/graphXi/r.xy b/applications/test/graphXi/r.xy
deleted file mode 100644
index d6d8f2b40c..0000000000
--- a/applications/test/graphXi/r.xy
+++ /dev/null
@@ -1,100 +0,0 @@
--3 0.951803
--2.94 0.950065
--2.88 0.948234
--2.82 0.946302
--2.76 0.944261
--2.7 0.942103
--2.64 0.939817
--2.58 0.937392
--2.52 0.934816
--2.46 0.932074
--2.4 0.929149
--2.34 0.926023
--2.28 0.922673
--2.22 0.919075
--2.16 0.915199
--2.1 0.911012
--2.04 0.906476
--1.98 0.901547
--1.92 0.896176
--1.86 0.890307
--1.8 0.883875
--1.74 0.87681
--1.68 0.869032
--1.62 0.860453
--1.56 0.850978
--1.5 0.840503
--1.44 0.828916
--1.38 0.8161
--1.32 0.801931
--1.26 0.786282
--1.2 0.769024
--1.14 0.750029
--1.08 0.729172
--1.02 0.706337
--0.96 0.681414
--0.9 0.654311
--0.84 0.624951
--0.78 0.59328
--0.72 0.559268
--0.66 0.522911
--0.6 0.48424
--0.54 0.443314
--0.48 0.40023
--0.42 0.355116
--0.36 0.308137
--0.3 0.259489
--0.24 0.2094
--0.18 0.158121
--0.12 0.10593
--0.06 0.0531214
--1.11022e-16 9.8391e-17
-0.06 -0.0531214
-0.12 -0.10593
-0.18 -0.158121
-0.24 -0.2094
-0.3 -0.259489
-0.36 -0.308137
-0.42 -0.355116
-0.48 -0.40023
-0.54 -0.443314
-0.6 -0.48424
-0.66 -0.522911
-0.72 -0.559268
-0.78 -0.59328
-0.84 -0.624951
-0.9 -0.654311
-0.96 -0.681414
-1.02 -0.706337
-1.08 -0.729172
-1.14 -0.750029
-1.2 -0.769024
-1.26 -0.786282
-1.32 -0.801931
-1.38 -0.8161
-1.44 -0.828916
-1.5 -0.840503
-1.56 -0.850978
-1.62 -0.860453
-1.68 -0.869032
-1.74 -0.87681
-1.8 -0.883875
-1.86 -0.890307
-1.92 -0.896176
-1.98 -0.901547
-2.04 -0.906476
-2.1 -0.911012
-2.16 -0.915199
-2.22 -0.919075
-2.28 -0.922673
-2.34 -0.926023
-2.4 -0.929149
-2.46 -0.932074
-2.52 -0.934816
-2.58 -0.937392
-2.64 -0.939817
-2.7 -0.942103
-2.76 -0.944261
-2.82 -0.946302
-2.88 -0.948234
-2.94 -0.950065
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.C
index 49cc85a356..392a580224 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.C
@@ -300,7 +300,8 @@ Foam::tmp<Foam::triSurfacePointScalarField> Foam::automatic::load()
 
         vtkSurfaceWriter
         (
-            surface_.searchableSurface::time().writeFormat()
+            surface_.searchableSurface::time().writeFormat(),
+            surface_.searchableSurface::time().writeCompression()
         ).write
         (
             surface_.searchableSurface::time().constant()/
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C b/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
index f539b5ef14..08d6a28e2d 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
@@ -523,7 +523,11 @@ void Foam::writeAMIWeightsSum
     // Write the surface
     if (Pstream::master())
     {
-        vtkSurfaceWriter(mesh.time().writeFormat()).write
+        vtkSurfaceWriter
+        (
+            mesh.time().writeFormat(),
+            mesh.time().writeCompression()
+        ).write
         (
             file.path(),
             "weightsSum_" + file.name(),
@@ -581,7 +585,7 @@ Foam::label Foam::checkGeometry
     const polyMesh& mesh,
     const bool allGeometry,
     const autoPtr<surfaceWriter>& surfWriter,
-    const autoPtr<Foam::setWriter<scalar>>& setWriter
+    const autoPtr<Foam::setWriter>& setWriter
 )
 {
     label noFailedChecks = 0;
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.H b/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.H
index ba95d7488f..21c7234f94 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.H
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkGeometry.H
@@ -40,6 +40,6 @@ namespace Foam
         const polyMesh& mesh,
         const bool allGeometry,
         const autoPtr<surfaceWriter>&,
-        const autoPtr<setWriter<scalar>>&
+        const autoPtr<setWriter>&
     );
 }
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C b/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C
index d3d976c855..94bf2a252e 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C
@@ -160,17 +160,20 @@ int main(int argc, char *argv[])
 
 
     autoPtr<surfaceWriter> surfWriter;
-    autoPtr<Foam::setWriter<scalar>> setWriter;
+    autoPtr<Foam::setWriter> setWriter;
     if (writeSets)
     {
         surfWriter = surfaceWriter::New
         (
             surfaceFormat,
-            mesh.time().writeFormat()
+            mesh.time().writeFormat(),
+            mesh.time().writeCompression()
         );
-        setWriter = Foam::setWriter<scalar>::New
+        setWriter = Foam::setWriter::New
         (
-            vtkSetWriter<scalar>::typeName
+            vtkSetWriter::typeName,
+            mesh.time().writeFormat(),
+            mesh.time().writeCompression()
         );
     }
 
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkTools.C b/applications/utilities/mesh/manipulation/checkMesh/checkTools.C
index 827ac5dea0..e182adaacf 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkTools.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkTools.C
@@ -42,6 +42,7 @@ License
 #include "globalIndex.H"
 #include "PatchTools.H"
 #include "writeFile.H"
+#include "coordSet.H"
 
 
 void Foam::printMeshStats(const polyMesh& mesh, const bool allTopology)
@@ -377,7 +378,7 @@ void Foam::mergeAndWrite
 
 void Foam::mergeAndWrite
 (
-    const setWriter<scalar>& writer,
+    const setWriter& writer,
     const pointSet& set
 )
 {
@@ -447,41 +448,19 @@ void Foam::mergeAndWrite
         mergedPts = pointField(mesh.points(), mergedIDs);
     }
 
-
     // Write with scalar pointID
     if (Pstream::master())
     {
-        scalarField scalarPointIDs(mergedIDs.size());
-        forAll(mergedIDs, i)
-        {
-            scalarPointIDs[i] = 1.0*mergedIDs[i];
-        }
-
-        coordSet points(set.name(), "distance", mergedPts, mag(mergedPts));
-
-        List<const scalarField*> flds(1, &scalarPointIDs);
-
-        wordList fldNames(1, "pointID");
-
-        // Output e.g. pointSet p0 to
-        // postProcessing/<time>/p0.vtk
-        fileName outputDir
+        writer.write
         (
-            set.time().path()
-          / (Pstream::parRun() ? ".." : "")
-          / "postProcessing"
-          / mesh.pointsInstance()
-          // set.name()
+            set.time().globalPath()
+           /functionObjects::writeFile::outputPrefix
+           /mesh.pointsInstance(),
+            set.name(),
+            coordSet(false, word::null, mergedPts),
+            "pointID",
+            scalarField(scalarList(mergedIDs))
         );
-        outputDir.clean();
-        mkDir(outputDir);
-
-        fileName outputFile(outputDir/writer.getFileName(points, wordList()));
-        // fileName outputFile(outputDir/set.name());
-
-        OFstream os(outputFile);
-
-        writer.write(points, fldNames, flds, os);
     }
 }
 
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkTools.H b/applications/utilities/mesh/manipulation/checkMesh/checkTools.H
index ffc9ff1a30..12b94d3545 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkTools.H
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkTools.H
@@ -35,7 +35,7 @@ namespace Foam
 
     //- Write vtk representation of (assembled) pointSet to 'set' file in
     //  postProcessing/ directory
-    void mergeAndWrite(const setWriter<scalar>&, const pointSet&);
+    void mergeAndWrite(const setWriter&, const pointSet&);
 }
 
 
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
index 4a8837c4ea..d121bd0964 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
@@ -44,7 +44,7 @@ Foam::label Foam::checkTopology
     const bool allTopology,
     const bool allGeometry,
     const autoPtr<surfaceWriter>& surfWriter,
-    const autoPtr<Foam::setWriter<scalar>>& setWriter
+    const autoPtr<Foam::setWriter>& setWriter
 )
 {
     label noFailedChecks = 0;
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.H b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.H
index 07ca1e2ca3..ffad9fee69 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.H
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.H
@@ -13,6 +13,6 @@ namespace Foam
         const bool,
         const bool,
         const autoPtr<surfaceWriter>&,
-        const autoPtr<setWriter<scalar>>&
+        const autoPtr<setWriter>&
     );
 }
diff --git a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C
index ff16ba0586..0e3ba386f4 100644
--- a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C
+++ b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C
@@ -193,53 +193,24 @@ int main(int argc, char *argv[])
         }
     }
 
-
     if (allTracks.size() && Pstream::master())
     {
-        PtrList<coordSet> tracks(allTracks.size());
+        DynamicList<point> allTrack;
+        DynamicList<label> allTrackIDs;
         forAll(allTracks, trackI)
         {
-            tracks.set
-            (
-                trackI,
-                new coordSet
-                (
-                    "track" + Foam::name(trackI),
-                    "distance"
-                )
-            );
-            tracks[trackI].transfer(allTracks[trackI]);
+            allTrack.append(allTracks[trackI]);
+            allTrackIDs.append(labelList(allTracks[trackI].size(), trackI));
         }
 
-        autoPtr<setWriter<scalar>> scalarFormatterPtr =
-            setWriter<scalar>::New(setFormat);
-
-        // OFstream vtkTracks(vtkPath/"particleTracks.vtk");
-        fileName vtkFile
-        (
-            scalarFormatterPtr().getFileName
-            (
-                tracks[0],
-                wordList(0)
-            )
-        );
-
-        OFstream vtkTracks
-        (
-            vtkPath/("particleTracks." + vtkFile.ext())
-        );
-
         Info<< "\nWriting particle tracks in " << setFormat
-            << " format to " << vtkTracks.name()
-            << nl << endl;
+            << " format to " << vtkPath << nl << endl;
 
-        scalarFormatterPtr().write
+        setWriter::New(setFormat, propsDict)->write
         (
-            true,
-            tracks,
-            wordList(0),
-            List<List<scalarField>>(0),
-            vtkTracks
+            vtkPath,
+            "tracks",
+            coordSet(allTrackIDs, word::null, pointField(allTrack))
         );
     }
 
diff --git a/applications/utilities/postProcessing/miscellaneous/pdfPlot/createFields.H b/applications/utilities/postProcessing/miscellaneous/pdfPlot/createFields.H
index db55619910..6cf3dc6a06 100644
--- a/applications/utilities/postProcessing/miscellaneous/pdfPlot/createFields.H
+++ b/applications/utilities/postProcessing/miscellaneous/pdfPlot/createFields.H
@@ -16,8 +16,12 @@
 
     const bool writeData(readBool(pdfDictionary.lookup("writeData")));
 
+    const fileName pdfPath =
+        runTime.globalPath()
+       /functionObjects::writeFile::outputPrefix
+       /args.executable()
+       /runTime.timeName();
 
-    const fileName pdfPath = runTime.path()/"pdf";
     mkDir(pdfPath);
 
     Random rndGen(label(0));
@@ -35,6 +39,7 @@
     const scalar xMax = p->maxValue();
 
     autoPtr<OFstream> filePtr(nullptr);
+
     if (writeData)
     {
         fileName fName = pdfPath/(p->type() + ".data");
diff --git a/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfPlot.C b/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfPlot.C
index 8fbf37acfd..ad2bb073d0 100644
--- a/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfPlot.C
+++ b/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfPlot.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,8 @@ Description
 
 #include "fvCFD.H"
 #include "distributionModel.H"
-#include "makeGraph.H"
+#include "setWriter.H"
+#include "writeFile.H"
 #include "OFstream.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -66,13 +67,19 @@ int main(int argc, char *argv[])
     }
 
     scalarField x(nIntervals);
-
     forAll(x, i)
     {
         x[i] = xMin + i*(xMax - xMin)/(nIntervals - 1);
     }
 
-    makeGraph(x, samples, p->type(), pdfPath, runTime.graphFormat());
+    setWriter::New(runTime.graphFormat())->write
+    (
+        pdfPath,
+        args.executable(),
+        coordSet(true, "x", x),
+        p->type(),
+        samples
+    );
 
     Info<< "End\n" << endl;
 
diff --git a/applications/utilities/postProcessing/miscellaneous/postChannel/collapse.H b/applications/utilities/postProcessing/miscellaneous/postChannel/collapse.H
index ceaf75e476..d7afa04147 100644
--- a/applications/utilities/postProcessing/miscellaneous/postChannel/collapse.H
+++ b/applications/utilities/postProcessing/miscellaneous/postChannel/collapse.H
@@ -1,13 +1,3 @@
-    fileName path
-    (
-        UMean.rootPath()
-       /UMean.caseName()
-       /functionObjects::writeFile::outputPrefix
-       /"graphs"
-       /UMean.instance()
-    );
-    mkDir(path);
-
     scalarField UMeanXvalues
     (
         channelIndexing.collapse(UMean.component(vector::X)())
@@ -49,22 +39,31 @@
         0.5*(sqr(urmsValues) + sqr(vrmsValues) + sqr(wrmsValues))
     );
 
+    setWriter::New(runTime.graphFormat())->write
+    (
+        runTime.globalPath()
+       /functionObjects::writeFile::outputPrefix
+       /args.executable()
+       /runTime.timeName(),
 
-    const scalarField& y = channelIndexing.y();
+       args.executable(),
 
-    makeGraph(y, UMeanXvalues, "Uf", path, gFormat);
-    makeGraph(y, urmsValues, "u", path, gFormat);
-    makeGraph(y, vrmsValues, "v", path, gFormat);
-    makeGraph(y, wrmsValues, "w", path, gFormat);
-    makeGraph(y, RxyValues, "uv", path, gFormat);
-    makeGraph(y, kValues, "k", path, gFormat);
+       coordSet(true, "y", channelIndexing.y()),
 
-    makeGraph(y, pPrime2MeanValues, "pPrime2Mean", path, gFormat);
+       "Uf", UMeanXvalues,
 
-    /*
-    makeGraph(y, epsilonValues, "epsilon", path, gFormat);
-    makeGraph(y, nuMeanValues, "nu", path, gFormat);
-    makeGraph(y, nuPrimeValues, "nuPrime", path, gFormat);
-    makeGraph(y, gammaDotMeanValues, "gammaDot", path, gFormat);
-    makeGraph(y, gammaDotPrimeValues, "gammaDotPrime", path, gFormat);
-    */
+       "u", urmsValues,
+       "v", vrmsValues,
+       "w", wrmsValues,
+       "uv", RxyValues,
+
+       "k", kValues,
+
+       "pPrime2Mean", pPrime2MeanValues
+
+       // "epsilon", epsilonValues,
+       // "nu", nuMeanValues,
+       // "nuPrime", nuPrimeValues,
+       // "gammaDot", gammaDotMeanValues,
+       // "gammaDotPrime", gammaDotPrimeValues
+    );
diff --git a/applications/utilities/postProcessing/miscellaneous/postChannel/postChannel.C b/applications/utilities/postProcessing/miscellaneous/postChannel/postChannel.C
index cf51a27943..a56a8a73b8 100644
--- a/applications/utilities/postProcessing/miscellaneous/postChannel/postChannel.C
+++ b/applications/utilities/postProcessing/miscellaneous/postChannel/postChannel.C
@@ -38,7 +38,7 @@ Description
 #include "timeSelector.H"
 #include "volFields.H"
 #include "channelIndex.H"
-#include "makeGraph.H"
+#include "setWriter.H"
 #include "writeFile.H"
 
 using namespace Foam;
@@ -59,8 +59,6 @@ int main(int argc, char *argv[])
     #include "createMeshNoChangers.H"
     #include "readPhysicalProperties.H"
 
-    const word& gFormat = runTime.graphFormat();
-
     // Setup channel indexing for averaging over channel down to a line
 
     IOdictionary channelDict
diff --git a/applications/utilities/surface/surfaceCheck/surfaceCheck.C b/applications/utilities/surface/surfaceCheck/surfaceCheck.C
index 8c8c748a70..54fdb592e2 100644
--- a/applications/utilities/surface/surfaceCheck/surfaceCheck.C
+++ b/applications/utilities/surface/surfaceCheck/surfaceCheck.C
@@ -629,7 +629,7 @@ int main(int argc, char *argv[])
                     faces[i] = surf[i].triFaceFace();
                 }
 
-                vtkSurfaceWriter(IOstream::ASCII).write
+                vtkSurfaceWriter(IOstream::ASCII, IOstream::UNCOMPRESSED).write
                 (
                     surfFileName.path(),
                     "zone_" + surfFileNameBase,
diff --git a/etc/caseDicts/postProcessing/graphs/graphCellFace b/etc/caseDicts/postProcessing/graphs/graphCellFace
new file mode 100644
index 0000000000..9c02d11066
--- /dev/null
+++ b/etc/caseDicts/postProcessing/graphs/graphCellFace
@@ -0,0 +1,26 @@
+/*--------------------------------*- 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. One graph point is generated on each face and in each cell that
+    the line intersects.
+
+\*---------------------------------------------------------------------------*/
+
+start           <point>;
+end             <point>;
+
+fields          (<fieldNames>);
+
+axis            distance; // The independent variable of the graph. Can be "x",
+                          // "y", "z", "xyz" (all coordinates written out), or
+                          // "distance" (from the start point).
+
+#includeEtc "caseDicts/postProcessing/graphs/graphCellFace.cfg"
+
+// ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/graphs/graphCellFace.cfg b/etc/caseDicts/postProcessing/graphs/graphCellFace.cfg
new file mode 100644
index 0000000000..66da2f1d8f
--- /dev/null
+++ b/etc/caseDicts/postProcessing/graphs/graphCellFace.cfg
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Version:  dev
+     \\/     M anipulation  |
+\*---------------------------------------------------------------------------*/
+
+#includeEtc "caseDicts/postProcessing/graphs/graph.cfg"
+
+sets
+(
+    line
+    {
+        type            lineCellFace;
+        axis            $axis;
+        start           $start;
+        end             $end;
+    }
+);
+
+// ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/graphs/graphFace b/etc/caseDicts/postProcessing/graphs/graphFace
new file mode 100644
index 0000000000..96d83d66ed
--- /dev/null
+++ b/etc/caseDicts/postProcessing/graphs/graphFace
@@ -0,0 +1,26 @@
+/*--------------------------------*- 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. One graph point is generated on each face that the line
+    intersects.
+
+\*---------------------------------------------------------------------------*/
+
+start           <point>;
+end             <point>;
+
+fields          (<fieldNames>);
+
+axis            distance; // The independent variable of the graph. Can be "x",
+                          // "y", "z", "xyz" (all coordinates written out), or
+                          // "distance" (from the start point).
+
+#includeEtc "caseDicts/postProcessing/graphs/graphFace.cfg"
+
+// ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/graphs/graphFace.cfg b/etc/caseDicts/postProcessing/graphs/graphFace.cfg
new file mode 100644
index 0000000000..12a3b45c19
--- /dev/null
+++ b/etc/caseDicts/postProcessing/graphs/graphFace.cfg
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Version:  dev
+     \\/     M anipulation  |
+\*---------------------------------------------------------------------------*/
+
+#includeEtc "caseDicts/postProcessing/graphs/graph.cfg"
+
+sets
+(
+    line
+    {
+        type            lineFace;
+        axis            $axis;
+        start           $start;
+        end             $end;
+    }
+);
+
+// ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/probes/boundaryProbes.cfg b/etc/caseDicts/postProcessing/probes/boundaryProbes.cfg
index 50f1ff70d1..2455352a11 100644
--- a/etc/caseDicts/postProcessing/probes/boundaryProbes.cfg
+++ b/etc/caseDicts/postProcessing/probes/boundaryProbes.cfg
@@ -21,7 +21,6 @@ sets
     points
     {
         type    boundaryPoints;
-        axis    xyz;
         points  $points;
         maxDistance $maxDistance;
         patches $patches;
diff --git a/etc/caseDicts/postProcessing/probes/internalProbes b/etc/caseDicts/postProcessing/probes/internalProbes
index 6a91f11932..e81933cd49 100644
--- a/etc/caseDicts/postProcessing/probes/internalProbes
+++ b/etc/caseDicts/postProcessing/probes/internalProbes
@@ -14,6 +14,8 @@ points  (<points>);
 
 fields  (<fieldNames>);
 
+ordered no;
+
 #includeEtc "caseDicts/postProcessing/probes/internalProbes.cfg"
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/probes/internalProbes.cfg b/etc/caseDicts/postProcessing/probes/internalProbes.cfg
index 908fbfd77f..773ce3ca1e 100644
--- a/etc/caseDicts/postProcessing/probes/internalProbes.cfg
+++ b/etc/caseDicts/postProcessing/probes/internalProbes.cfg
@@ -21,8 +21,7 @@ sets
     points
     {
         type    points;
-        axis    xyz;
-        ordered yes;
+        ordered $ordered;
         points  $points;
     }
 );
diff --git a/etc/caseDicts/postProcessing/streamlines/streamlinesLine.cfg b/etc/caseDicts/postProcessing/streamlines/streamlinesLine.cfg
index 5810fb527c..9f9b59852d 100644
--- a/etc/caseDicts/postProcessing/streamlines/streamlinesLine.cfg
+++ b/etc/caseDicts/postProcessing/streamlines/streamlinesLine.cfg
@@ -11,7 +11,6 @@
 seedSampleSet
 {
     type    lineUniform;
-    axis    distance;
     start   $start;
     end     $end;
     nPoints $nPoints;
diff --git a/etc/caseDicts/postProcessing/streamlines/streamlinesPatch.cfg b/etc/caseDicts/postProcessing/streamlines/streamlinesPatch.cfg
index 7282423ee3..ca465f69ee 100644
--- a/etc/caseDicts/postProcessing/streamlines/streamlinesPatch.cfg
+++ b/etc/caseDicts/postProcessing/streamlines/streamlinesPatch.cfg
@@ -11,7 +11,6 @@
 seedSampleSet
 {
     type    boundaryRandom;
-    axis    xyz;
     patches ($patch);
     nPoints $nPoints;
 }
diff --git a/etc/caseDicts/postProcessing/streamlines/streamlinesPoints.cfg b/etc/caseDicts/postProcessing/streamlines/streamlinesPoints.cfg
index e1f52e362b..5501d280b1 100644
--- a/etc/caseDicts/postProcessing/streamlines/streamlinesPoints.cfg
+++ b/etc/caseDicts/postProcessing/streamlines/streamlinesPoints.cfg
@@ -13,7 +13,6 @@ seedSampleSet
     type    points;
     points  $points;
     ordered yes;
-    axis    xyz;
 }
 
 // ************************************************************************* //
diff --git a/etc/caseDicts/postProcessing/streamlines/streamlinesSphere.cfg b/etc/caseDicts/postProcessing/streamlines/streamlinesSphere.cfg
index 6288ea3661..6bd9ee1254 100644
--- a/etc/caseDicts/postProcessing/streamlines/streamlinesSphere.cfg
+++ b/etc/caseDicts/postProcessing/streamlines/streamlinesSphere.cfg
@@ -11,7 +11,6 @@
 seedSampleSet
 {
     type    sphereRandom;
-    axis    xyz;
     centre  $centre;
     radius  $radius;
     nPoints $nPoints;
diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index 67d598b9f3..028394fd11 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -725,15 +725,6 @@ algorithms/polygonTriangulate/polygonTriangulate.C
 algorithms/dynamicIndexedOctree/dynamicIndexedOctreeName.C
 algorithms/dynamicIndexedOctree/dynamicTreeDataPoint.C
 
-graph/curve/curve.C
-graph/graph.C
-
-writers = graph/writers
-$(writers)/rawGraph/rawGraph.C
-$(writers)/gnuplotGraph/gnuplotGraph.C
-$(writers)/xmgrGraph/xmgrGraph.C
-$(writers)/jplotGraph/jplotGraph.C
-
 meshes/data/data.C
 meshes/Residuals/residuals.C
 
diff --git a/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H b/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H
index 953f7b342f..460228c182 100644
--- a/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H
+++ b/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -234,6 +234,23 @@ public:
 
             //- Move assignment to List
             inline void operator=(List<T>&&);
+
+
+        // IOstream Operators
+
+            // Write DynamicField to Ostream.
+            friend Ostream& operator<< <T, SizeInc, SizeMult, SizeDiv>
+            (
+                Ostream&,
+                const DynamicField<T, SizeInc, SizeMult, SizeDiv>&
+            );
+
+            //- Read from Istream, discarding contents of existing DynamicField.
+            friend Istream& operator>> <T, SizeInc, SizeMult, SizeDiv>
+            (
+                Istream&,
+                DynamicField<T, SizeInc, SizeMult, SizeDiv>&
+            );
 };
 
 
diff --git a/src/functionObjects/field/histogram/histogram.C b/src/functionObjects/field/histogram/histogram.C
index 34a6c15291..51aa63e1f3 100644
--- a/src/functionObjects/field/histogram/histogram.C
+++ b/src/functionObjects/field/histogram/histogram.C
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "histogram.H"
+#include "coordSet.H"
 #include "volFields.H"
 #include "addToRunTimeSelectionTable.H"
 
@@ -39,33 +40,6 @@ namespace functionObjects
 }
 
 
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-void Foam::functionObjects::histogram::writeGraph
-(
-    const coordSet& coords,
-    const word& fieldName,
-    const scalarField& values
-) const
-{
-    const wordList fieldNames(1, fieldName);
-
-    fileName outputPath = file_.baseTimeDir();
-    mkDir(outputPath);
-    OFstream graphFile
-    (
-        outputPath/formatterPtr_().getFileName(coords, fieldNames)
-    );
-
-    Log << "    Writing histogram of " << fieldName
-        << " to " << graphFile.name() << endl;
-
-    List<const scalarField*> yPtrs(1);
-    yPtrs[0] = &values;
-    formatterPtr_().write(coords, fieldNames, yPtrs, graphFile);
-}
-
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::functionObjects::histogram::histogram
@@ -97,8 +71,7 @@ bool Foam::functionObjects::histogram::read(const dictionary& dict)
     min_ = dict.lookupOrDefault<scalar>("min", 0);
     dict.lookup("nBins") >> nBins_;
 
-    word format(dict.lookup("setFormat"));
-    formatterPtr_ = setWriter<scalar>::New(format);
+    formatterPtr_ = setWriter::New(dict.lookup("setFormat"), dict);
 
     return true;
 }
@@ -153,13 +126,12 @@ bool Foam::functionObjects::histogram::write()
     );
 
     // Calculate the mid-points of bins for the graph axis
-    pointField xBin(nBins_);
+    scalarField xBin(nBins_);
     const scalar delta = (max_- min_)/nBins_;
-
     scalar x = min_ + 0.5*delta;
     forAll(xBin, i)
     {
-        xBin[i] = point(x, 0, 0);
+        xBin[i] = x;
         x += delta;
     }
 
@@ -185,15 +157,14 @@ bool Foam::functionObjects::histogram::write()
         {
             volFrac /= sumVol;
 
-            const coordSet coords
+            formatterPtr_().write
             (
-                "Volume_Fraction",
-                "x",
-                xBin,
-                mag(xBin)
+                file_.baseTimeDir(),
+                typeName,
+                coordSet(true, fieldName_, xBin),
+                field.name(),
+                volFrac
             );
-
-            writeGraph(coords, field.name(), volFrac);
         }
     }
 
diff --git a/src/functionObjects/field/histogram/histogram.H b/src/functionObjects/field/histogram/histogram.H
index 7d328336c7..7a37a20e9d 100644
--- a/src/functionObjects/field/histogram/histogram.H
+++ b/src/functionObjects/field/histogram/histogram.H
@@ -103,17 +103,7 @@ class histogram
         label nBins_;
 
         //- Output formatter to write
-        autoPtr<setWriter<scalar>> formatterPtr_;
-
-
-    // Private Member Functions
-
-        void writeGraph
-        (
-            const coordSet& coords,
-            const word& valueName,
-            const scalarField& values
-        ) const;
+        autoPtr<setWriter> formatterPtr_;
 
 
 public:
diff --git a/src/functionObjects/field/interfaceHeight/interfaceHeight.C b/src/functionObjects/field/interfaceHeight/interfaceHeight.C
index f779415125..e6672aaa5b 100644
--- a/src/functionObjects/field/interfaceHeight/interfaceHeight.C
+++ b/src/functionObjects/field/interfaceHeight/interfaceHeight.C
@@ -77,13 +77,16 @@ void Foam::functionObjects::interfaceHeight::writePositions()
             "",
             mesh_,
             meshSearch(mesh_),
-            "xyz",
+            coordSet::axisTypeNames_[coordSet::axisType::XYZ],
             locations_[li] + gHat*mesh_.bounds().mag(),
             locations_[li] - gHat*mesh_.bounds().mag()
         );
 
         // Find the height of the location above the boundary
-        scalar hLB = set.size() ? - gHat & (locations_[li] - set[0]) : - vGreat;
+        scalar hLB =
+            set.size()
+          ? - gHat & (locations_[li] - set.pointCoord(0))
+          : - vGreat;
         reduce(hLB, maxOp<scalar>());
 
         // Calculate the integrals of length and length*alpha along the sampling
@@ -97,7 +100,7 @@ void Foam::functionObjects::interfaceHeight::writePositions()
                 continue;
             }
 
-            const vector& p0 = set[si], p1 = set[si+1];
+            const vector& p0 = set.pointCoord(si), p1 = set.pointCoord(si+1);
             const label c0 = set.cells()[si], c1 = set.cells()[si+1];
             const label f0 = set.faces()[si], f1 = set.faces()[si+1];
             const scalar a0 = interpolator->interpolate(p0, c0, f0);
diff --git a/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C b/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
index fe878de21f..08f6709544 100644
--- a/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
+++ b/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
@@ -65,29 +65,6 @@ namespace Foam
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void Foam::functionObjects::regionSizeDistribution::writeGraph
-(
-    const coordSet& coords,
-    const word& valueName,
-    const scalarField& values
-) const
-{
-    const wordList valNames(1, valueName);
-
-    fileName outputPath = file_.baseTimeDir();
-    mkDir(outputPath);
-
-    OFstream str(outputPath/formatterPtr_().getFileName(coords, valNames));
-
-    Info<< "    Writing distribution of " << valueName << " to " << str.name()
-        << endl;
-
-    List<const scalarField*> valPtrs(1);
-    valPtrs[0] = &values;
-    formatterPtr_().write(coords, valNames, valPtrs, str);
-}
-
-
 void Foam::functionObjects::regionSizeDistribution::writeAlphaFields
 (
     const regionSplit& regions,
@@ -216,15 +193,16 @@ Foam::functionObjects::regionSizeDistribution::findPatchRegions
 }
 
 
-Foam::tmp<Foam::scalarField>
+template<class Type>
+Foam::tmp<Foam::Field<Type>>
 Foam::functionObjects::regionSizeDistribution::divide
 (
-    const scalarField& num,
+    const Field<Type>& num,
     const scalarField& denom
 )
 {
-    tmp<scalarField> tresult(new scalarField(num.size()));
-    scalarField& result = tresult.ref();
+    tmp<Field<Type>> tresult(new Field<Type>(num.size()));
+    Field<Type>& result = tresult.ref();
 
     forAll(denom, i)
     {
@@ -234,35 +212,71 @@ Foam::functionObjects::regionSizeDistribution::divide
         }
         else
         {
-            result[i] = 0.0;
+            result[i] = Zero;
         }
     }
+
     return tresult;
 }
 
 
-void Foam::functionObjects::regionSizeDistribution::writeGraphs
+template<class Type>
+void Foam::functionObjects::regionSizeDistribution::generateFields
 (
     const word& fieldName,              // name of field
     const labelList& indices,           // index of bin for each region
-    const scalarField& sortedField,     // per region field data
+    const Field<Type>& sortedField,     // per region field data
     const scalarField& binCount,        // per bin number of regions
-    const coordSet& coords              // graph data for bins
+    wordList& fieldNames,
+    PtrList<Field<Type>>& fields
 ) const
 {
     if (Pstream::master())
     {
-        // Calculate per-bin average
-        scalarField binSum(nBins_, 0.0);
+        // Calculate per-bin sum
+        Field<Type> binSum(nBins_, Zero);
         forAll(sortedField, i)
         {
             binSum[indices[i]] += sortedField[i];
         }
 
+        // Calculate per-bin average
+        Field<Type> binAvg(divide(binSum, binCount));
+
+        // Append
+        fields.setSize(fieldNames.size());
+        fieldNames.append(fieldName + "_sum");
+        fields.append(binSum);
+        fieldNames.append(fieldName + "_avg");
+        fields.append(binAvg);
+    }
+}
+
+
+void Foam::functionObjects::regionSizeDistribution::generateFields
+(
+    const word& fieldName,              // name of field
+    const labelList& indices,           // index of bin for each region
+    const scalarField& sortedField,     // per region field data
+    const scalarField& binCount,        // per bin number of regions
+    wordList& fieldNames,
+    PtrList<scalarField>& fields
+) const
+{
+    if (Pstream::master())
+    {
+        // Calculate per-bin sum
+        scalarField binSum(nBins_, Zero);
+        forAll(sortedField, i)
+        {
+            binSum[indices[i]] += sortedField[i];
+        }
+
+        // Calculate per-bin average
         scalarField binAvg(divide(binSum, binCount));
 
-        // Per bin deviation
-        scalarField binSqrSum(nBins_, 0.0);
+        // Calculate per-bin deviation
+        scalarField binSqrSum(nBins_, Zero);
         forAll(sortedField, i)
         {
             binSqrSum[indices[i]] += Foam::sqr(sortedField[i]);
@@ -272,50 +286,50 @@ void Foam::functionObjects::regionSizeDistribution::writeGraphs
             sqrt(divide(binSqrSum, binCount) - Foam::sqr(binAvg))
         );
 
-        // Write average
-        writeGraph(coords, fieldName + "_sum", binSum);
-        // Write average
-        writeGraph(coords, fieldName + "_avg", binAvg);
-        // Write deviation
-        writeGraph(coords, fieldName + "_dev", binDev);
+        // Append
+        fields.setSize(fieldNames.size());
+        fieldNames.append(fieldName + "_sum");
+        fields.append(binSum);
+        fieldNames.append(fieldName + "_avg");
+        fields.append(binAvg);
+        fieldNames.append(fieldName + "_dev");
+        fields.append(binDev);
     }
 }
 
 
-void Foam::functionObjects::regionSizeDistribution::writeGraphs
+template<class Type>
+void Foam::functionObjects::regionSizeDistribution::generateFields
 (
     const word& fieldName,              // name of field
-    const scalarField& cellField,       // per cell field data
+    const Field<Type>& cellField,       // per cell field data
     const regionSplit& regions,         // per cell the region(=droplet)
     const labelList& sortedRegions,     // valid regions in sorted order
     const scalarField& sortedNormalisation,
-
-    const labelList& indices,           // per region index of bin
+    const labelList& indices,           // index of bin for each region
     const scalarField& binCount,        // per bin number of regions
-    const coordSet& coords              // graph data for bins
+    wordList& fieldNames,
+    PtrList<Field<Type>>& fields
 ) const
 {
     // Sum on a per-region basis. Parallel reduced.
-    Map<scalar> regionField(regionSum(regions, cellField));
+    Map<Type> regionField(regionSum(regions, cellField));
 
     // Extract in region order
-    scalarField sortedField
+    Field<Type> sortedField
     (
-        sortedNormalisation
-      * extractData
-        (
-            sortedRegions,
-            regionField
-        )
+        sortedNormalisation*extractData(sortedRegions, regionField)
     );
 
-    writeGraphs
+    // Generate fields
+    generateFields
     (
         fieldName,      // name of field
         indices,        // index of bin for each region
         sortedField,    // per region field data
         binCount,       // per bin number of regions
-        coords          // graph data for bins
+        fieldNames,
+        fields
     );
 }
 
@@ -348,7 +362,7 @@ Foam::functionObjects::regionSizeDistribution::~regionSizeDistribution()
 
 bool Foam::functionObjects::regionSizeDistribution::read(const dictionary& dict)
 {
-    dict.lookup("field") >> alphaName_;
+    dict.lookup("alpha") >> alphaName_;
     dict.lookup("patches") >> patchNames_;
     dict.lookup("threshold") >> threshold_;
     dict.lookup("maxDiameter") >> maxDiam_;
@@ -357,16 +371,7 @@ bool Foam::functionObjects::regionSizeDistribution::read(const dictionary& dict)
     dict.lookup("nBins") >> nBins_;
     dict.lookup("fields") >> fields_;
 
-    word format(dict.lookup("setFormat"));
-    formatterPtr_ = setWriter<scalar>::New(format);
-
-    if (dict.found("coordinateSystem"))
-    {
-        coordSysPtr_ = coordinateSystem::New(obr_, dict);
-
-        Info<< "Transforming all vectorFields with coordinate system "
-            << coordSysPtr_().name() << endl;
-    }
+    formatterPtr_ = setWriter::New(dict.lookup("setFormat"), dict);
 
     return true;
 }
@@ -664,18 +669,14 @@ bool Foam::functionObjects::regionSizeDistribution::write()
     if (allRegionVolume.size())
     {
         // Construct mids of bins for plotting
-        pointField xBin(nBins_);
-
+        scalarField xBin(nBins_);
         scalar x = 0.5*delta;
         forAll(xBin, i)
         {
-            xBin[i] = point(x, 0, 0);
+            xBin[i] = x;
             x += delta;
         }
 
-        const coordSet coords("diameter", "x", xBin, mag(xBin));
-
-
         // Get in region order the alpha*volume and diameter
         // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -715,12 +716,6 @@ bool Foam::functionObjects::regionSizeDistribution::write()
             binCount[indices[i]] += 1.0;
         }
 
-        // Write counts
-        if (Pstream::master())
-        {
-            writeGraph(coords, "count", binCount);
-        }
-
         // Write to log
         {
             Info<< "    Bins:" << endl;
@@ -740,103 +735,80 @@ bool Foam::functionObjects::regionSizeDistribution::write()
             Info<< endl;
         }
 
+        // Declare fields and field names
+        wordList fieldNames;
+        #define DeclareTypeFields(Type, nullArg) \
+            PtrList<Field<Type>> Type##Fields;
+        FOR_ALL_FIELD_TYPES(DeclareTypeFields);
+        #undef DeclareTypeFields
 
-        // Write average and deviation of droplet volume.
-        writeGraphs
+        // Add the bin count
+        fieldNames.append("binCount");
+        #define TypeFieldsAppend(Type, nullArg) \
+            appendFields(binCount, Type##Fields);
+        #undef TypeFieldsAppend
+
+        // Add the volumes
+        generateFields
         (
-            "volume",           // name of field
-            indices,            // per region the bin index
-            sortedVols,         // per region field data
-            binCount,           // per bin number of regions
-            coords              // graph data for bins
+            "volume",
+            indices,
+            sortedVols,
+            binCount,
+            fieldNames,
+            scalarFields
         );
 
-        // Collect some more field
+        // Add other sampled fields
+        forAll(fields_, fieldi)
         {
-            forAll(fields_, i)
-            {
-                if (obr_.foundObject<volScalarField>(fields_[i]))
-                {
-                    Info<< "    Scalar field " << fields_[i] << endl;
+            bool found = false;
 
-                    const scalarField& fld =
-                        obr_.lookupObject<volScalarField>(fields_[i])
-                       .primitiveField();
-
-                    writeGraphs
-                    (
-                        fields_[i],         // name of field
-                        alphaVol*fld,       // per cell field data
-
-                        regions,            // per cell the region(=droplet)
-                        sortedRegions,      // valid regions in sorted order
-                        1.0/sortedVols,     // per region normalisation
-
-                        indices,            // index of bin for each region
-                        binCount,           // per bin number of regions
-                        coords              // graph data for bins
-                    );
+            #define GenerateTypeFields(Type, nullArg)                       \
+                                                                            \
+                if (obr_.foundObject<VolField<Type>>(fields_[fieldi]))      \
+                {                                                           \
+                    found = true;                                           \
+                                                                            \
+                    const VolField<Type>& field =                           \
+                        obr_.lookupObject<VolField<Type>>(fields_[fieldi]); \
+                                                                            \
+                    generateFields                                          \
+                    (                                                       \
+                        fields_[fieldi],                                    \
+                        (alphaVol*field)(),                                 \
+                        regions,                                            \
+                        sortedRegions,                                      \
+                        1.0/sortedVols,                                     \
+                        indices,                                            \
+                        binCount,                                           \
+                        fieldNames,                                         \
+                        Type##Fields                                        \
+                    );                                                      \
                 }
-            }
+            FOR_ALL_FIELD_TYPES(GenerateTypeFields);
+            #undef GenerateTypeFields
+
+            if (!found) cannotFindObject(fields_[fieldi]);
         }
-        {
-            forAll(fields_, i)
-            {
-                if (obr_.foundObject<volScalarField>(fields_[i]))
-                {
-                    Info<< "    Vector field " << fields_[i] << endl;
 
-                    vectorField fld =
-                        obr_.lookupObject<volVectorField>(fields_[i])
-                       .primitiveField();
+        // Expand all field lists
+        #define TypeFieldsExpand(Type, nullArg) \
+            Type##Fields.setSize(fieldNames.size());
+        FOR_ALL_FIELD_TYPES(TypeFieldsExpand)
+        #undef TypeFieldsAppend
 
-                    if (coordSysPtr_.valid())
-                    {
-                        Info<< "Transforming vector field " << fields_[i]
-                            << " with coordinate system "
-                            << coordSysPtr_().name()
-                            << endl;
-
-                        fld = coordSysPtr_().localVector(fld);
-                    }
-
-
-                    // Components
-
-                    for (direction cmp = 0; cmp < vector::nComponents; cmp++)
-                    {
-                        writeGraphs
-                        (
-                            fields_[i] + vector::componentNames[cmp],
-                            alphaVol*fld.component(cmp),// per cell field data
-
-                            regions,        // per cell the region(=droplet)
-                            sortedRegions,  // valid regions in sorted order
-                            1.0/sortedVols, // per region normalisation
-
-                            indices,        // index of bin for each region
-                            binCount,       // per bin number of regions
-                            coords          // graph data for bins
-                        );
-                    }
-
-                    // Magnitude
-                    writeGraphs
-                    (
-                        fields_[i] + "mag",    // name of field
-                        alphaVol*mag(fld),  // per cell field data
-
-                        regions,            // per cell the region(=droplet)
-                        sortedRegions,      // valid regions in sorted order
-                        1.0/sortedVols,     // per region normalisation
-
-                        indices,            // index of bin for each region
-                        binCount,           // per bin number of regions
-                        coords              // graph data for bins
-                    );
-                }
-            }
-        }
+        // Write
+        formatterPtr_().write
+        (
+            file_.baseTimeDir(),
+            typeName,
+            coordSet(true, "diameter", xBin),
+            fieldNames
+            #define TypeFieldsParameter(Type, nullArg) , Type##Fields
+            FOR_ALL_FIELD_TYPES(TypeFieldsParameter)
+            #undef TypeFieldsParameter
+        );
     }
 
     return true;
diff --git a/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H b/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H
index 5c6c76d316..45d5684ddd 100644
--- a/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H
+++ b/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.H
@@ -66,13 +66,6 @@ Description
         maxDiameter     0.5e-4;
         minDiameter     0;
         setFormat       gnuplot;
-        coordinateSystem
-        {
-            type            cartesian;
-            origin          (0 0 0);
-            e3              (0 1 1);
-            e1              (1 0 0);
-        }
     }
     \endverbatim
 
@@ -88,7 +81,6 @@ Usage
         maxDiameter  | maximum region equivalent diameter | yes |
         minDiameter  | minimum region equivalent diameter | no  | 0
         setFormat    | writing format          | yes         |
-        coordinateSystem | transformation for vector fields | no         |
     \endtable
 
 See also
@@ -157,10 +149,7 @@ class regionSizeDistribution
         wordList fields_;
 
         //- Output formatter to write
-        autoPtr<setWriter<scalar>> formatterPtr_;
-
-        //- Optional coordinate system
-        autoPtr<coordinateSystem> coordSysPtr_;
+        autoPtr<setWriter> formatterPtr_;
 
 
     // Private Member Functions
@@ -173,13 +162,6 @@ class regionSizeDistribution
         List<Type> extractData(const UList<label>& keys, const Map<Type>&)
         const;
 
-        void writeGraph
-        (
-            const coordSet& coords,
-            const word& valueName,
-            const scalarField& values
-        ) const;
-
         //- Write volfields with the parts of alpha which are not
         //  droplets (liquidCore, backGround)
         void writeAlphaFields
@@ -194,31 +176,46 @@ class regionSizeDistribution
         Map<label> findPatchRegions(const regionSplit&) const;
 
         //- Helper: divide if denom != 0
-        static tmp<scalarField> divide(const scalarField&, const scalarField&);
+        template<class Type>
+        static tmp<Field<Type>> divide(const Field<Type>&, const scalarField&);
 
-        //- Given per-region data calculate per-bin average/deviation and graph
-        void writeGraphs
+        //- Generate fields for writing
+        template<class Type>
+        void generateFields
+        (
+            const word& fieldName,              // name of field
+            const labelList& indices,           // index of bin for each region
+            const Field<Type>& sortedField,     // per region field data
+            const scalarField& binCount,        // per bin number of regions
+            wordList& fieldNames,
+            PtrList<Field<Type>>& fields
+        ) const;
+
+        //- Generate fields for writing. Scalar overload. It is possible to
+        //  generate more fields for scalar input.
+        void generateFields
         (
             const word& fieldName,              // name of field
             const labelList& indices,           // index of bin for each region
             const scalarField& sortedField,     // per region field data
             const scalarField& binCount,        // per bin number of regions
-            const coordSet& coords              // graph data for bins
+            wordList& fieldNames,
+            PtrList<scalarField>& fields
         ) const;
 
-        //- Given per-cell data calculate per-bin average/deviation and graph
-        void writeGraphs
+        //- Generate fields for writing
+        template<class Type>
+        void generateFields
         (
             const word& fieldName,              // name of field
-            const scalarField& cellField,       // per cell field data
-
+            const Field<Type>& cellField,       // per cell field data
             const regionSplit& regions,         // per cell the region(=droplet)
             const labelList& sortedRegions,     // valid regions in sorted order
             const scalarField& sortedNormalisation,
-
             const labelList& indices,           // index of bin for each region
             const scalarField& binCount,        // per bin number of regions
-            const coordSet& coords              // graph data for bins
+            wordList& fieldNames,
+            PtrList<Field<Type>>& fields
         ) const;
 
 
diff --git a/src/functionObjects/field/streamlines/streamlines.C b/src/functionObjects/field/streamlines/streamlines.C
index 8b45e6f4f2..788f1f7488 100644
--- a/src/functionObjects/field/streamlines/streamlines.C
+++ b/src/functionObjects/field/streamlines/streamlines.C
@@ -38,6 +38,29 @@ License
 #include "writeFile.H"
 #include "addToRunTimeSelectionTable.H"
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+template<class Type>
+void gatherAndFlatten(DynamicField<Type>& field)
+{
+    List<List<Type>> gatheredField(Pstream::nProcs());
+    gatheredField[Pstream::myProcNo()] = field;
+    Pstream::gatherList(gatheredField);
+
+    field =
+        ListListOps::combine<List<Type>>
+        (
+            gatheredField,
+            accessOp<List<Type>>()
+        );
+}
+
+}
+
+
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
@@ -58,250 +81,6 @@ namespace Foam
 }
 
 
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-Foam::autoPtr<Foam::indirectPrimitivePatch>
-Foam::functionObjects::streamlines::wallPatch() const
-{
-    const polyBoundaryMesh& patches = mesh_.boundaryMesh();
-
-    label nFaces = 0;
-
-    forAll(patches, patchi)
-    {
-        if (isA<wallPolyPatch>(patches[patchi]))
-        {
-            nFaces += patches[patchi].size();
-        }
-    }
-
-    labelList addressing(nFaces);
-
-    nFaces = 0;
-
-    forAll(patches, patchi)
-    {
-        if (isA<wallPolyPatch>(patches[patchi]))
-        {
-            const polyPatch& pp = patches[patchi];
-
-            forAll(pp, i)
-            {
-                addressing[nFaces++] = pp.start()+i;
-            }
-        }
-    }
-
-    return autoPtr<indirectPrimitivePatch>
-    (
-        new indirectPrimitivePatch
-        (
-            IndirectList<face>
-            (
-                mesh_.faces(),
-                addressing
-            ),
-            mesh_.points()
-        )
-    );
-}
-
-
-void Foam::functionObjects::streamlines::track()
-{
-    IDLList<streamlinesParticle> initialParticles;
-    streamlinesCloud particles
-    (
-        mesh_,
-        cloudName_,
-        initialParticles
-    );
-
-    const sampledSet& seedPoints = sampledSetPtr_();
-
-    forAll(seedPoints, i)
-    {
-        particles.addParticle
-        (
-            new streamlinesParticle
-            (
-                mesh_,
-                seedPoints[i],
-                seedPoints.cells()[i],
-                lifeTime_
-            )
-        );
-    }
-
-    label nSeeds = returnReduce(particles.size(), sumOp<label>());
-
-    Info << "    seeded " << nSeeds << " particles" << endl;
-
-    // Read or lookup fields
-    PtrList<volScalarField> vsFlds;
-    PtrList<interpolation<scalar>> vsInterp;
-    PtrList<volVectorField> vvFlds;
-    PtrList<interpolation<vector>> vvInterp;
-
-    label UIndex = -1;
-
-    label nScalar = 0;
-    label nVector = 0;
-
-    forAll(fields_, i)
-    {
-        if (mesh_.foundObject<volScalarField>(fields_[i]))
-        {
-            nScalar++;
-        }
-        else if (mesh_.foundObject<volVectorField>(fields_[i]))
-        {
-            nVector++;
-        }
-        else
-        {
-            FatalErrorInFunction
-                << "Cannot find field " << fields_[i] << nl
-                << "Valid scalar fields are:"
-                << mesh_.names(volScalarField::typeName) << nl
-                << "Valid vector fields are:"
-                << mesh_.names(volVectorField::typeName)
-                << exit(FatalError);
-        }
-    }
-    vsInterp.setSize(nScalar);
-    nScalar = 0;
-    vvInterp.setSize(nVector);
-    nVector = 0;
-
-    forAll(fields_, i)
-    {
-        if (mesh_.foundObject<volScalarField>(fields_[i]))
-        {
-            const volScalarField& f = mesh_.lookupObject<volScalarField>
-            (
-                fields_[i]
-            );
-            vsInterp.set
-            (
-                nScalar++,
-                interpolation<scalar>::New
-                (
-                    interpolationScheme_,
-                    f
-                )
-            );
-        }
-        else if (mesh_.foundObject<volVectorField>(fields_[i]))
-        {
-            const volVectorField& f = mesh_.lookupObject<volVectorField>
-            (
-                fields_[i]
-            );
-
-            if (f.name() == UName_)
-            {
-                UIndex = nVector;
-            }
-
-            vvInterp.set
-            (
-                nVector++,
-                interpolation<vector>::New
-                (
-                    interpolationScheme_,
-                    f
-                )
-            );
-        }
-    }
-
-    // Store the names
-    scalarNames_.setSize(vsInterp.size());
-    forAll(vsInterp, i)
-    {
-        scalarNames_[i] = vsInterp[i].psi().name();
-    }
-    vectorNames_.setSize(vvInterp.size());
-    forAll(vvInterp, i)
-    {
-        vectorNames_[i] = vvInterp[i].psi().name();
-    }
-
-    // Check that we know the index of U in the interpolators.
-
-    if (UIndex == -1)
-    {
-        FatalErrorInFunction
-            << "Cannot find field to move particles with : " << UName_ << nl
-            << "This field has to be present in the sampled fields " << fields_
-            << " and in the objectRegistry."
-            << exit(FatalError);
-    }
-
-    // Sampled data
-    // ~~~~~~~~~~~~
-
-    // Size to maximum expected sizes.
-    allTracks_.clear();
-    allTracks_.setCapacity(nSeeds);
-    allAges_.clear();
-    allAges_.setCapacity(nSeeds);
-    allScalars_.setSize(vsInterp.size());
-    forAll(allScalars_, i)
-    {
-        allScalars_[i].clear();
-        allScalars_[i].setCapacity(nSeeds);
-    }
-    allVectors_.setSize(vvInterp.size());
-    forAll(allVectors_, i)
-    {
-        allVectors_[i].clear();
-        allVectors_[i].setCapacity(nSeeds);
-    }
-
-
-    // Additional particle info
-    streamlinesParticle::trackingData td
-    (
-        particles,
-        vsInterp,
-        vvInterp,
-        UIndex,         // index of U in vvInterp
-
-        trackDirection_ == trackDirection::forward,
-        trackOutside_,
-
-        nSubCycle_,     // automatic track control:step through cells in steps?
-        trackLength_,   // fixed track length
-
-        allTracks_,
-        allAges_,
-        allScalars_,
-        allVectors_
-    );
-
-    // Set very large dt. Note: cannot use great since 1/great is small
-    // which is a trigger value for the tracking...
-    const scalar trackTime = Foam::sqrt(great);
-
-    // Track
-    if (trackDirection_ == trackDirection::both)
-    {
-        initialParticles = particles;
-    }
-
-    particles.move(particles, td, trackTime);
-
-    if (trackDirection_ == trackDirection::both)
-    {
-        particles.IDLList<streamlinesParticle>::operator=(initialParticles);
-        td.trackForward_ = !td.trackForward_;
-        particles.move(particles, td, trackTime);
-    }
-}
-
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::functionObjects::streamlines::streamlines
@@ -337,34 +116,17 @@ bool Foam::functionObjects::streamlines::read(const dictionary& dict)
     Info<< type() << " " << name() << ":" << nl;
 
     dict.lookup("fields") >> fields_;
-    UName_ = dict.lookupOrDefault("U", word("U"));
 
-    if (findIndex(fields_, UName_) == -1)
-    {
-        FatalIOErrorInFunction(dict)
-            << "Velocity field for tracking " << UName_
-            << " should be present in the list of fields " << fields_
-            << exit(FatalIOError);
-    }
+    UName_ = dict.lookupOrDefault("U", word("U"));
 
     writeAge_ = dict.lookupOrDefault<Switch>("writeAge", true);
 
-    // The trackForward entry is maintained here for backwards compatibility
-    if (!dict.found("direction") && dict.found("trackForward"))
-    {
-        trackDirection_ =
-            dict.lookup<bool>("trackForward")
-          ? trackDirection::forward
-          : trackDirection::backward;
-    }
-    else
-    {
-        trackDirection_ = trackDirectionNames_[word(dict.lookup("direction"))];
-    }
+    trackDirection_ = trackDirectionNames_[word(dict.lookup("direction"))];
 
     trackOutside_ = dict.lookupOrDefault<Switch>("outside", false);
 
     dict.lookup("lifeTime") >> lifeTime_;
+
     if (lifeTime_ < 1)
     {
         FatalErrorInFunction
@@ -372,10 +134,8 @@ bool Foam::functionObjects::streamlines::read(const dictionary& dict)
             << exit(FatalError);
     }
 
-
     bool subCycling = dict.found("nSubCycle");
     bool fixedLength = dict.found("trackLength");
-
     if (subCycling && fixedLength)
     {
         FatalIOErrorInFunction(dict)
@@ -384,33 +144,27 @@ bool Foam::functionObjects::streamlines::read(const dictionary& dict)
             << "trackLength')"
             << exit(FatalIOError);
     }
-
-
-    nSubCycle_ = 1;
-    if (dict.readIfPresent("nSubCycle", nSubCycle_))
+    if (subCycling)
     {
+        nSubCycle_ = max(dict.lookup<scalar>("nSubCycle"), 1);
         trackLength_ = vGreat;
-        if (nSubCycle_ < 1)
-        {
-            nSubCycle_ = 1;
-        }
         Info<< "    automatic track length specified through"
             << " number of sub cycles : " << nSubCycle_ << nl << endl;
     }
     else
     {
+        nSubCycle_ = 1;
         dict.lookup("trackLength") >> trackLength_;
-
         Info<< "    fixed track length specified : "
             << trackLength_ << nl << endl;
     }
 
-
-    interpolationScheme_ = dict.lookupOrDefault
-    (
-        "interpolationScheme",
-        interpolationCellPoint<scalar>::typeName
-    );
+    interpolationScheme_ =
+        dict.lookupOrDefault
+        (
+            "interpolationScheme",
+            interpolationCellPoint<scalar>::typeName
+        );
 
     cloudName_ = dict.lookupOrDefault<word>("cloudName", "streamlines");
 
@@ -423,10 +177,8 @@ bool Foam::functionObjects::streamlines::read(const dictionary& dict)
         meshSearchPtr_(),
         dict.subDict("seedSampleSet")
     );
-    sampledSetAxis_ = sampledSetPtr_->axis();
 
-    scalarFormatterPtr_ = setWriter<scalar>::New(dict.lookup("setFormat"));
-    vectorFormatterPtr_ = setWriter<vector>::New(dict.lookup("setFormat"));
+    formatterPtr_ = setWriter::New(dict.lookup("setFormat"), dict);
 
     return true;
 }
@@ -451,276 +203,382 @@ bool Foam::functionObjects::streamlines::write()
 {
     Info<< type() << " " << name() << " write:" << nl;
 
-    const Time& runTime = obr_.time();
+    // Create list of available fields
+    wordList fieldNames;
+    forAll(fields_, fieldi)
+    {
+        if
+        (
+            false
+            #define FoundTypeField(Type, nullArg) \
+              || foundObject<VolField<Type>>(fields_[fieldi])
+            FOR_ALL_FIELD_TYPES(FoundTypeField)
+            #undef FoundTypeField
+        )
+        {
+            fieldNames.append(fields_[fieldi]);
+        }
+        else
+        {
+            cannotFindObject(fields_[fieldi]);
+        }
+    }
 
-    // Do all injection and tracking
-    track();
+    // Lookup fields and construct interpolators
+    #define DeclareTypeInterpolator(Type, nullArg) \
+        PtrList<interpolation<Type>> Type##Interp(fieldNames.size());
+    FOR_ALL_FIELD_TYPES(DeclareTypeInterpolator);
+    #undef DeclareTypeInterpolator
+    forAll(fieldNames, fieldi)
+    {
+        #define ConstructTypeInterpolator(Type, nullArg)                       \
+            if (mesh_.foundObject<VolField<Type>>(fieldNames[fieldi]))         \
+            {                                                                  \
+                Type##Interp.set                                               \
+                (                                                              \
+                    fieldi,                                                    \
+                    interpolation<Type>::New                                   \
+                    (                                                          \
+                        interpolationScheme_,                                  \
+                        mesh_.lookupObject<VolField<Type>>(fieldNames[fieldi]) \
+                    )                                                          \
+                );                                                             \
+            }
+        FOR_ALL_FIELD_TYPES(ConstructTypeInterpolator);
+        #undef ConstructTypeInterpolator
+    }
 
+    // Create a velocity interpolator if it is not already available
+    const label UIndex = findIndex(fieldNames, UName_);
+    tmpNrc<interpolation<vector>> UInterp(nullptr);
+    if (UIndex == -1)
+    {
+        UInterp =
+            tmpNrc<interpolation<vector>>
+            (
+                interpolation<vector>::New
+                (
+                    interpolationScheme_,
+                    mesh_.lookupObject<volVectorField>(UName_)
+                ).ptr()
+            );
+    }
 
+    // Do tracking to create sampled data
+    DynamicField<point> allPositions;
+    DynamicField<label> allTracks;
+    DynamicField<label> allTrackParts;
+    DynamicField<scalar> allAges;
+    #define DeclareAllTypes(Type, nullArg) \
+        List<DynamicField<Type>> all##Type##s(fieldNames.size());
+    FOR_ALL_FIELD_TYPES(DeclareAllTypes);
+    #undef DeclareAllTypes
+    {
+        // Create a cloud and initialise with points from the sampled set
+        globalIndex gi(sampledSetPtr_().size());
+        streamlinesCloud particles
+        (
+            mesh_,
+            cloudName_,
+            IDLList<streamlinesParticle>()
+        );
+        forAll(sampledSetPtr_(), i)
+        {
+            particles.addParticle
+            (
+                new streamlinesParticle
+                (
+                    mesh_,
+                    sampledSetPtr_().positions()[i],
+                    sampledSetPtr_().cells()[i],
+                    lifeTime_,
+                    gi.toGlobal(i)
+                )
+            );
+        }
+
+        // Report the number of successful seeds
+        const label nSeeds = returnReduce(particles.size(), sumOp<label>());
+        Info << "    Seeded " << nSeeds << " particles" << endl;
+
+        // Create tracking data
+        streamlinesParticle::trackingData td
+        (
+            particles,
+            #define TypeInterpolatorParameter(Type, nullArg) \
+                Type##Interp,
+            FOR_ALL_FIELD_TYPES(TypeInterpolatorParameter)
+            #undef TypeInterpolatorParameter
+            UIndex != -1 ? vectorInterp[UIndex] : UInterp(),
+            trackDirection_ == trackDirection::forward,
+            trackOutside_,
+            nSubCycle_,
+            trackLength_,
+            allPositions,
+            allTracks,
+            allTrackParts,
+            allAges
+            #define AllTypesParameter(Type, nullArg) \
+                , all##Type##s
+            FOR_ALL_FIELD_TYPES(AllTypesParameter)
+            #undef AllTypesParameter
+        );
+
+        // Track
+        IDLList<streamlinesParticle> initialParticles;
+        if (trackDirection_ == trackDirection::both)
+        {
+            initialParticles = particles;
+        }
+
+        particles.move(particles, td, rootGreat);
+
+        if (trackDirection_ == trackDirection::both)
+        {
+            particles.IDLList<streamlinesParticle>::operator=(initialParticles);
+            td.trackForward_ = !td.trackForward_;
+            particles.move(particles, td, rootGreat);
+        }
+    }
+
+    // Gather data on the master
     if (Pstream::parRun())
     {
-        // Append slave tracks to master ones
-        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-        globalIndex globalTrackIDs(allTracks_.size());
-
-        // Construct a distribution map to pull all to the master.
-        labelListList sendMap(Pstream::nProcs());
-        labelListList recvMap(Pstream::nProcs());
-
-        if (Pstream::master())
+        gatherAndFlatten(allPositions);
+        gatherAndFlatten(allTracks);
+        gatherAndFlatten(allTrackParts);
+        gatherAndFlatten(allAges);
+        forAll(fieldNames, fieldi)
         {
-            // Master: receive all. My own first, then consecutive
-            // processors.
-            label trackI = 0;
-
-            forAll(recvMap, proci)
-            {
-                labelList& fromProc = recvMap[proci];
-                fromProc.setSize(globalTrackIDs.localSize(proci));
-                forAll(fromProc, i)
-                {
-                    fromProc[i] = trackI++;
+            #define GatherAndFlattenAllTypes(Type, nullArg) \
+                if (Type##Interp.set(fieldi))               \
+                {                                           \
+                    gatherAndFlatten(all##Type##s[fieldi]); \
                 }
+            FOR_ALL_FIELD_TYPES(GatherAndFlattenAllTypes);
+            #undef GatherAndFlattenAllTypes
+        }
+    }
+
+    // Report the total number of samples
+    Info<< "    Sampled " << allPositions.size() << " locations" << endl;
+
+    // Bin-sort by track and trackPart to build an ordering
+    labelList order(allPositions.size());
+    if (Pstream::master())
+    {
+        const label nTracks = max(allTracks) + 1;
+        const label trackParti0 = min(allTrackParts);
+        const label trackParti1 = max(allTrackParts) + 1;
+
+        labelListList trackPartCounts
+        (
+            nTracks,
+            labelList(trackParti1 - trackParti0, 0)
+        );
+        forAll(allPositions, samplei)
+        {
+            const label tracki = allTracks[samplei];
+            const label trackParti = -trackParti0 + allTrackParts[samplei];
+            trackPartCounts[tracki][trackParti] ++;
+        }
+
+        label offset = 0;
+        labelListList trackPartOffsets
+        (
+            nTracks,
+            labelList(trackParti1 - trackParti0, 0)
+        );
+        forAll(trackPartOffsets, tracki)
+        {
+            forAll(trackPartOffsets[tracki], trackParti)
+            {
+                trackPartOffsets[tracki][trackParti] += offset;
+                offset += trackPartCounts[tracki][trackParti];
             }
         }
 
-        labelList& toMaster = sendMap[0];
-        toMaster.setSize(globalTrackIDs.localSize());
-        forAll(toMaster, i)
+        forAll(trackPartCounts, tracki)
         {
-            toMaster[i] = i;
+            trackPartCounts[tracki] = 0;
         }
 
-        const mapDistribute distMap
-        (
-            globalTrackIDs.size(),
-            move(sendMap),
-            move(recvMap)
-        );
-
-
-        // Distribute the track positions. Note: use scheduled comms
-        // to prevent buffering.
-        mapDistributeBase::distribute
-        (
-            Pstream::commsTypes::scheduled,
-            distMap.schedule(),
-            distMap.constructSize(),
-            distMap.subMap(),
-            false,
-            distMap.constructMap(),
-            false,
-            allTracks_,
-            flipOp()
-        );
-
-        // Distribute the ages
-        mapDistributeBase::distribute
-        (
-            Pstream::commsTypes::scheduled,
-            distMap.schedule(),
-            distMap.constructSize(),
-            distMap.subMap(),
-            false,
-            distMap.constructMap(),
-            false,
-            allAges_,
-            flipOp()
-        );
-
-        // Distribute the scalars
-        forAll(allScalars_, scalari)
+        forAll(allPositions, samplei)
         {
-            allScalars_[scalari].shrink();
-            mapDistributeBase::distribute
-            (
-                Pstream::commsTypes::scheduled,
-                distMap.schedule(),
-                distMap.constructSize(),
-                distMap.subMap(),
-                false,
-                distMap.constructMap(),
-                false,
-                allScalars_[scalari],
-                flipOp()
-            );
-            allScalars_[scalari].setCapacity(allScalars_[scalari].size());
-        }
-        // Distribute the vectors
-        forAll(allVectors_, vectori)
-        {
-            allVectors_[vectori].shrink();
-            mapDistributeBase::distribute
-            (
-                Pstream::commsTypes::scheduled,
-                distMap.schedule(),
-                distMap.constructSize(),
-                distMap.subMap(),
-                false,
-                distMap.constructMap(),
-                false,
-                allVectors_[vectori],
-                flipOp()
-            );
-            allVectors_[vectori].setCapacity(allVectors_[vectori].size());
+            const label tracki = allTracks[samplei];
+            const label trackParti = -trackParti0 + allTrackParts[samplei];
+
+            order[samplei] =
+                trackPartOffsets[tracki][trackParti]
+              + trackPartCounts[tracki][trackParti];
+
+            trackPartCounts[tracki][trackParti] ++;
         }
     }
 
+    //auto reportTrackParts = [&]()
+    //{
+    //    Info<< nl;
+    //    forAll(allPositions, samplei)
+    //    {
+    //        if
+    //        (
+    //            samplei == 0
+    //         || allTracks[samplei] != allTracks[samplei - 1]
+    //         || allTrackParts[samplei] != allTrackParts[samplei - 1]
+    //        )
+    //        {
+    //            Info<< "track #" << allTracks[samplei]
+    //                << " part #" << allTrackParts[samplei]
+    //                << " from i=" << samplei << " to ";
+    //        }
+    //        if
+    //        (
+    //            samplei == allPositions.size() - 1
+    //         || allTracks[samplei + 1] != allTracks[samplei]
+    //         || allTrackParts[samplei + 1] != allTrackParts[samplei]
+    //        )
+    //        {
+    //            Info<< "i=" << samplei << nl;
+    //        }
+    //    }
+    //};
 
-    label n = 0;
-    forAll(allTracks_, trackI)
+    //reportTrackParts();
+
+    // Reorder
+    if (Pstream::master())
     {
-        n += allTracks_[trackI].size();
+        allPositions.rmap(allPositions, order);
+        allTracks.rmap(allTracks, order);
+        allTrackParts.rmap(allTrackParts, order);
+        allAges.rmap(allAges, order);
+        forAll(fieldNames, fieldi)
+        {
+            #define RMapAllTypes(Type, nullArg)                             \
+                if (Type##Interp.set(fieldi))                               \
+                {                                                           \
+                    all##Type##s[fieldi].rmap(all##Type##s[fieldi], order); \
+                }
+            FOR_ALL_FIELD_TYPES(RMapAllTypes);
+            #undef RMapAllTypes
+        }
     }
 
-    Info<< "    Tracks:" << allTracks_.size() << nl
-        << "    Total samples:" << n
-        << endl;
+    //reportTrackParts();
 
+    // Relabel tracks and track parts into track labels only, and join the
+    // forward and backward track parts that are connected to the seed
+    if (Pstream::master())
+    {
+        label samplei = 0, tracki = 0;
+        forAll(allPositions, samplej)
+        {
+            const label trackj = allTracks[samplej];
+            const label trackPartj = allTrackParts[samplej];
 
-    // Massage into form suitable for writers
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            allPositions[samplei] = allPositions[samplej];
+            allTracks[samplei] = tracki;
+            allTrackParts[samplei] = 0;
+            allAges[samplei] = allAges[samplej];
+            forAll(fieldNames, fieldi)
+            {
+                #define ShuffleUpAllTypes(Type, nullArg)   \
+                    if (Type##Interp.set(fieldi))          \
+                    {                                      \
+                        all##Type##s[fieldi][samplei] =    \
+                            all##Type##s[fieldi][samplej]; \
+                    }
+                FOR_ALL_FIELD_TYPES(ShuffleUpAllTypes);
+                #undef ShuffleUpAllTypes
+            }
 
-    if (Pstream::master() && allTracks_.size())
+            const bool joinNewParts =
+                samplej != allPositions.size() - 1
+             && trackPartj == -1
+             && allTrackParts[samplej + 1] == 0;
+
+            if (!joinNewParts) samplei ++;
+
+            const bool newPart =
+                samplej == allPositions.size() - 1
+             || trackj != allTracks[samplej + 1]
+             || trackPartj != allTrackParts[samplej + 1];
+
+            if (!joinNewParts && newPart) tracki ++;
+        }
+
+        allPositions.resize(samplei);
+        allTracks.resize(samplei);
+        allTrackParts.resize(samplei);
+        allAges.resize(samplei);
+        forAll(fieldNames, fieldi)
+        {
+            #define ResizeAllTypes(Type, nullArg)         \
+                if (Type##Interp.set(fieldi))             \
+                {                                         \
+                    all##Type##s[fieldi].resize(samplei); \
+                }
+            FOR_ALL_FIELD_TYPES(ResizeAllTypes);
+            #undef ResizeAllTypes
+        }
+    }
+
+    //reportTrackParts();
+
+    // Write
+    if (Pstream::master() && allPositions.size())
     {
         // Make output directory
-
-        fileName vtkPath
+        fileName outputPath
         (
-            runTime.globalPath()/writeFile::outputPrefix/"sets"/name()
+            mesh_.time().globalPath()/writeFile::outputPrefix/name()
         );
         if (mesh_.name() != fvMesh::defaultRegion)
         {
-            vtkPath = vtkPath/mesh_.name();
+            outputPath = outputPath/mesh_.name();
         }
-        vtkPath = vtkPath/mesh_.time().timeName();
-        mkDir(vtkPath);
+        outputPath = outputPath/mesh_.time().timeName();
+        mkDir(outputPath);
 
-        // Convert track positions
-
-        PtrList<coordSet> tracks(allTracks_.size());
-        forAll(allTracks_, trackI)
+        // Pass data to the formatter to write
+        const label nValueSets = fieldNames.size() + writeAge_;
+        wordList valueSetNames(nValueSets);
+        #define DeclareTypeValueSets(Type, nullArg) \
+            UPtrList<const Field<Type>> Type##ValueSets(nValueSets);
+        FOR_ALL_FIELD_TYPES(DeclareTypeValueSets);
+        #undef DeclareTypeValueSets
+        if (writeAge_)
         {
-            tracks.set
-            (
-                trackI,
-                new coordSet
-                (
-                    "track" + Foam::name(trackI),
-                    sampledSetAxis_                 //"xyz"
-                )
-            );
-            tracks[trackI].transfer(allTracks_[trackI]);
+            valueSetNames[0] = "age";
+            scalarValueSets.set(0, &allAges);
         }
-
-        // Convert scalar values
-
-        if (allScalars_.size() > 0 || writeAge_)
+        forAll(fieldNames, fieldi)
         {
-            List<List<scalarField>> ageAndScalarValues
-            (
-                allScalars_.size() + writeAge_
-            );
-            wordList ageAndScalarNames(allScalars_.size() + writeAge_);
+            valueSetNames[fieldi + writeAge_] = fieldNames[fieldi];
 
-            if (writeAge_)
-            {
-                DynamicList<scalarList>& allTrackAges = allAges_;
-
-                ageAndScalarValues[0].setSize(allTrackAges.size());
-                forAll(allTrackAges, trackI)
-                {
-                    ageAndScalarValues[0][trackI].transfer
-                    (
-                        allTrackAges[trackI]
-                    );
+            #define SetTypeValueSetPtr(Type, nullArg) \
+                if (Type##Interp.set(fieldi))         \
+                {                                     \
+                    Type##ValueSets.set               \
+                    (                                 \
+                        fieldi + writeAge_,           \
+                        &all##Type##s[fieldi]         \
+                    );                                \
                 }
-
-                ageAndScalarNames[0] = "age";
-            }
-
-            forAll(allScalars_, scalari)
-            {
-                const label ageAndScalari = scalari + writeAge_;
-
-                DynamicList<scalarList>& allTrackVals = allScalars_[scalari];
-
-                ageAndScalarValues[ageAndScalari].setSize(allTrackVals.size());
-                forAll(allTrackVals, trackI)
-                {
-                    ageAndScalarValues[ageAndScalari][trackI].transfer
-                    (
-                        allTrackVals[trackI]
-                    );
-                }
-
-                ageAndScalarNames[ageAndScalari] = scalarNames_[scalari];
-            }
-
-            fileName vtkFile
-            (
-                vtkPath
-              / scalarFormatterPtr_().getFileName
-                (
-                    tracks[0],
-                    ageAndScalarNames
-                )
-            );
-
-            Info<< "    Writing data to " << vtkFile.path() << endl;
-
-            scalarFormatterPtr_().write
-            (
-                true,           // writeTracks
-                tracks,
-                ageAndScalarNames,
-                ageAndScalarValues,
-                OFstream(vtkFile)()
-            );
-        }
-
-        // Convert vector values
-
-        if (allVectors_.size() > 0)
-        {
-            List<List<vectorField>> vectorValues(allVectors_.size());
-
-            forAll(allVectors_, vectori)
-            {
-                DynamicList<vectorList>& allTrackVals = allVectors_[vectori];
-
-                vectorValues[vectori].setSize(allTrackVals.size());
-                forAll(allTrackVals, trackI)
-                {
-                    vectorValues[vectori][trackI].transfer
-                    (
-                        allTrackVals[trackI]
-                    );
-                }
-            }
-
-            fileName vtkFile
-            (
-                vtkPath
-              / vectorFormatterPtr_().getFileName
-                (
-                    tracks[0],
-                    vectorNames_
-                )
-            );
-
-            Info<< "    Writing data to " << vtkFile.path() << endl;
-
-            vectorFormatterPtr_().write
-            (
-                true,           // writeTracks
-                tracks,
-                vectorNames_,
-                vectorValues,
-                OFstream(vtkFile)()
-            );
+            FOR_ALL_FIELD_TYPES(SetTypeValueSetPtr);
+            #undef SetTypeValueSetPtr
         }
+        formatterPtr_->write
+        (
+            outputPath,
+            "tracks",
+            coordSet(allTracks, word::null, allPositions),
+            valueSetNames
+            #define TypeValueSetsParameter(Type, nullArg) , Type##ValueSets
+            FOR_ALL_FIELD_TYPES(TypeValueSetsParameter)
+            #undef TypeValueSetsParameter
+        );
     }
 
     return true;
diff --git a/src/functionObjects/field/streamlines/streamlines.H b/src/functionObjects/field/streamlines/streamlines.H
index 7d9e408dc4..69d965b402 100644
--- a/src/functionObjects/field/streamlines/streamlines.H
+++ b/src/functionObjects/field/streamlines/streamlines.H
@@ -50,12 +50,11 @@ Description
         lifeTime        10000;
         trackLength     1e-3;
         nSubCycle       5;
-        cloudName       particleTracks;
 
         seedSampleSet
         {
-            type        uniform;
-            axis        x;  // distance;
+            type        lineUniform;
+            axis        xyz;
             start       (-0.0205 0.0001 0.00001);
             end         (-0.0205 0.0005 0.00001);
             nPoints     100;
@@ -65,26 +64,27 @@ Description
 
 Usage
     \table
-        Property     | Description             | Required    | Default value
-        type         | Type name: streamlines  | yes         |
-        setFormat    | Output data type        | yes         |
-        U            | Tracking velocity field name | no     | U
-        direction    | Direction in which to track | yes     |
-        outside      | Track outside of periodic meshes | no | no
-        fields       | Fields to sample        | yes         |
-        writeTime    | Write the flow time along the streamlines | no | no
-        lifetime     | Maximum number of particle tracking steps | yes |
-        trackLength  | Tracking segment length | no          |
-        nSubCycle    | Number of tracking steps per cell | no |
-        cloudName    | Cloud name to use       | yes         |
-        seedSampleSet| Seeding method (see below)| yes       |
+        Property      | Description                | Required   | Default value
+        type          | Type name: streamlines     | yes        |
+        setFormat     | Output data type           | yes        |
+        U             | Tracking velocity field name | no       | U
+        direction     | Direction in which to track | yes       |
+        outside       | Track outside of periodic meshes | no   | no
+        fields        | Fields to sample           | yes        |
+        writeTime     | Write the flow time along the streamlines | no | no
+        lifetime      | Maximum number of particle tracking steps | yes |
+        trackLength   | Tracking segment length    | no         |
+        nSubCycle     | Number of tracking steps per cell | no  |
+        cloudName     | Cloud name to use          | no         |
+        seedSampleSet | Seeding method (see below) | yes        |
     \endtable
 
-    Where \c seedSampleSet \c type is typically one of
+    Where the \c seedSampleSet \c type is typically one of
     \plaintable
-        uniform | uniform particle seeding
-        cloud   | cloud of points
-        triSurfaceMeshPointSet | points according to a tri-surface mesh
+        lineUniform    | uniform particle seeding along a line
+        sphereRandom   | random particle seeding within a sphere
+        boundaryRandom | random particle seeding on a number of patches
+        points         | a specified set of locations
     \endplaintable
 
 Note
@@ -107,6 +107,7 @@ SourceFiles
 #include "fvMeshFunctionObject.H"
 #include "volFieldsFwd.H"
 #include "DynamicList.H"
+#include "DynamicField.H"
 #include "scalarList.H"
 #include "vectorList.H"
 #include "setWriter.H"
@@ -183,15 +184,6 @@ private:
         //- Optional specified name of particles
         word cloudName_;
 
-        //- Type of seed
-        word seedSet_;
-
-        //- Names of scalar fields
-        wordList scalarNames_;
-
-        //- Names of vector fields
-        wordList vectorNames_;
-
         //- Write the streamlines ages
         Switch writeAge_;
 
@@ -204,36 +196,8 @@ private:
             //- Seed set engine
             autoPtr<sampledSet> sampledSetPtr_;
 
-            //- Axis of the sampled points to output
-            word sampledSetAxis_;
-
-            //- File writer for scalar data
-            autoPtr<setWriter<scalar>> scalarFormatterPtr_;
-
-            //- File writer for vector data
-            autoPtr<setWriter<vector>> vectorFormatterPtr_;
-
-
-        // Generated data
-
-            //- All tracks. Per particle the points it passed through
-            DynamicList<List<point>> allTracks_;
-
-            //- All ages. Per particle the age when it passed through the points
-            DynamicList<List<scalar>> allAges_;
-
-            //- Per scalarField, per particle, the sampled value.
-            List<DynamicList<scalarList>> allScalars_;
-
-            //- Per scalarField, per particle, the sampled value.
-            List<DynamicList<vectorList>> allVectors_;
-
-
-        //- Construct patch out of all wall patch faces
-        autoPtr<indirectPrimitivePatch> wallPatch() const;
-
-        //- Do all seeding and tracking
-        void track();
+            //- File writer
+            autoPtr<setWriter> formatterPtr_;
 
 
 public:
diff --git a/src/functionObjects/field/streamlines/streamlinesParticle.C b/src/functionObjects/field/streamlines/streamlinesParticle.C
index e5be99586d..76fcb51086 100644
--- a/src/functionObjects/field/streamlines/streamlinesParticle.C
+++ b/src/functionObjects/field/streamlines/streamlinesParticle.C
@@ -45,35 +45,46 @@ Foam::vector Foam::streamlinesParticle::interpolateFields
             << "Cell:" << celli << abort(FatalError);
     }
 
-    sampledScalars_.setSize(td.vsInterp_.size());
-    forAll(td.vsInterp_, scalarI)
-    {
-        const scalar s =
-            td.vsInterp_[scalarI].interpolate(position, celli, facei);
-
-        sampledScalars_[scalarI].append
-        (
-            td.trackOutside_ ? transform_.invTransform(s) : s
-        );
-    }
-
+    bool interpolatedU = false;
     vector U = vector::uniform(NaN);
 
-    sampledVectors_.setSize(td.vvInterp_.size());
-    forAll(td.vvInterp_, vectorI)
+    forAll(td.scalarInterp_, fieldi)
     {
-        const vector v =
-            td.vvInterp_[vectorI].interpolate(position, celli, facei);
+        #define InterpolateType(Type, nullArg)                        \
+            if (td.Type##Interp_.set(fieldi))                         \
+            {                                                         \
+                const Type s =                                        \
+                    td.Type##Interp_[fieldi].interpolate              \
+                    (                                                 \
+                        position,                                     \
+                        celli,                                        \
+                        facei                                         \
+                    );                                                \
+                                                                      \
+                sampled##Type##s_.setSize(td.Type##Interp_.size());   \
+                sampled##Type##s_[fieldi].append                      \
+                (                                                     \
+                    td.trackOutside_ ? transform_.invTransform(s) : s \
+                );                                                    \
+            }
+        FOR_ALL_FIELD_TYPES(InterpolateType);
+        #undef InterpolateType
 
-        if (vectorI == td.UIndex_)
-        {
-            U = v;
-        }
-
-        sampledVectors_[vectorI].append
+        if
         (
-            td.trackOutside_ ? transform_.invTransform(v) : v
-        );
+            td.vectorInterp_.set(fieldi)
+         && &td.vectorInterp_[fieldi] == &td.UInterp_
+        )
+        {
+            interpolatedU = true;
+            U = sampledvectors_[fieldi].last();
+        }
+    }
+
+    // Interpolate the velocity if it has not already been done
+    if (!interpolatedU)
+    {
+        U = td.UInterp_.interpolate(position, celli, facei);
     }
 
     return U;
@@ -82,30 +93,34 @@ Foam::vector Foam::streamlinesParticle::interpolateFields
 
 void Foam::streamlinesParticle::endTrack(trackingData& td)
 {
-    {
-        td.allPositions_.append(vectorList());
-        vectorList& top = td.allPositions_.last();
-        top.transfer(sampledPositions_);
-    }
+    const label n = sampledPositions_.size();
 
-    {
-        td.allTimes_.append(scalarList());
-        scalarList& top = td.allTimes_.last();
-        top.transfer(sampledTimes_);
-    }
+    const label trackPartIndex =
+        td.trackForward_ ? trackPartIndex_ : -1 - trackPartIndex_;
 
-    forAll(sampledScalars_, i)
-    {
-        td.allScalars_[i].append(scalarList());
-        scalarList& top = td.allScalars_[i].last();
-        top.transfer(sampledScalars_[i]);
-    }
+    if (!td.trackForward_) reverse(sampledPositions_);
+    td.allPositions_.append(sampledPositions_);
+    sampledPositions_.clear();
 
-    forAll(sampledVectors_, i)
+    td.allTracks_.append(List<label>(n, trackIndex_));
+    td.allTrackParts_.append(List<label>(n, trackPartIndex));
+    trackPartIndex_ ++;
+
+    if (!td.trackForward_) reverse(sampledAges_);
+    td.allAges_.append(sampledAges_);
+    sampledAges_.clear();
+
+    forAll(td.scalarInterp_, fieldi)
     {
-        td.allVectors_[i].append(vectorList());
-        vectorList& top = td.allVectors_[i].last();
-        top.transfer(sampledVectors_[i]);
+        #define EndTrackType(Type, nullArg)                                 \
+            if (td.Type##Interp_.set(fieldi))                               \
+            {                                                               \
+                if (!td.trackForward_) reverse(sampled##Type##s_[fieldi]);  \
+                td.all##Type##s_[fieldi].append(sampled##Type##s_[fieldi]); \
+                sampled##Type##s_[fieldi].clear();                          \
+            }
+        FOR_ALL_FIELD_TYPES(EndTrackType);
+        #undef EndTrackType
     }
 }
 
@@ -117,13 +132,16 @@ Foam::streamlinesParticle::streamlinesParticle
     const polyMesh& mesh,
     const vector& position,
     const label celli,
-    const label lifeTime
+    const label lifeTime,
+    const label trackIndex
 )
 :
     particle(mesh, position, celli),
     lifeTime_(lifeTime),
-    transform_(transformer::I),
-    age_(0)
+    trackIndex_(trackIndex),
+    trackPartIndex_(0),
+    age_(0),
+    transform_(transformer::I)
 {}
 
 
@@ -138,22 +156,19 @@ Foam::streamlinesParticle::streamlinesParticle
 {
     if (readFields)
     {
-        List<scalarList> sampledScalars;
-        List<vectorList> sampledVectors;
+        is  >> lifeTime_ >> trackIndex_ >> trackPartIndex_ >> age_
+            >> transform_ >> sampledPositions_ >> sampledAges_;
 
-        is  >> lifeTime_ >> transform_ >> age_ >> sampledPositions_
-            >> sampledTimes_ >> sampledScalars >> sampledVectors;
-
-        sampledScalars_.setSize(sampledScalars.size());
-        forAll(sampledScalars, i)
-        {
-            sampledScalars_[i].transfer(sampledScalars[i]);
-        }
-        sampledVectors_.setSize(sampledVectors.size());
-        forAll(sampledVectors, i)
-        {
-            sampledVectors_[i].transfer(sampledVectors[i]);
-        }
+        #define ReadSampledTypes(Type, nullArg)                     \
+            List<List<Type>> sampled##Type##s;                      \
+            is >> sampled##Type##s;                                 \
+            sampled##Type##s_.setSize(sampled##Type##s.size());     \
+            forAll(sampled##Type##s, i)                             \
+            {                                                       \
+                sampled##Type##s_[i].transfer(sampled##Type##s[i]); \
+            }
+        FOR_ALL_FIELD_TYPES(ReadSampledTypes);
+        #undef ReadSampledTypes
     }
 
     // Check state of Istream
@@ -172,12 +187,16 @@ Foam::streamlinesParticle::streamlinesParticle
 :
     particle(p),
     lifeTime_(p.lifeTime_),
-    transform_(p.transform_),
+    trackIndex_(p.trackIndex_),
+    trackPartIndex_(p.trackPartIndex_),
     age_(p.age_),
+    transform_(p.transform_),
     sampledPositions_(p.sampledPositions_),
-    sampledTimes_(p.sampledTimes_),
-    sampledScalars_(p.sampledScalars_),
-    sampledVectors_(p.sampledVectors_)
+    sampledAges_(p.sampledAges_)
+    #define SampledTypesInit(Type, nullArg) \
+        , sampled##Type##s_(p.sampled##Type##s_)
+    FOR_ALL_FIELD_TYPES(SampledTypesInit)
+    #undef SampledTypesInit
 {}
 
 
@@ -213,7 +232,7 @@ bool Foam::streamlinesParticle::move
               ? transform_.invTransformPosition(position())
               : position()
             );
-            sampledTimes_.append(age_);
+            sampledAges_.append(age_);
             vector U = interpolateFields(td, position(), cell(), face());
 
             if (!td.trackForward_)
@@ -284,7 +303,7 @@ bool Foam::streamlinesParticle::move
               ? transform_.invTransformPosition(position())
               : position()
             );
-            sampledTimes_.append(age_);
+            sampledAges_.append(age_);
             interpolateFields(td, position(), cell(), face());
 
             if (debug)
@@ -464,11 +483,33 @@ void Foam::streamlinesParticle::readFields(Cloud<streamlinesParticle>& c)
     );
     c.checkFieldIOobject(c, lifeTime);
 
+    IOField<label> trackIndex
+    (
+        c.fieldIOobject("trackIndex", IOobject::MUST_READ),
+        valid
+    );
+    c.checkFieldIOobject(c, trackIndex);
+
+    IOField<label> trackPartIndex
+    (
+        c.fieldIOobject("trackPartIndex", IOobject::MUST_READ),
+        valid
+    );
+    c.checkFieldIOobject(c, trackPartIndex);
+
+    IOField<scalar> age
+    (
+        c.fieldIOobject("age", IOobject::MUST_READ),
+        valid
+    );
+    c.checkFieldIOobject(c, age);
+
     transformerIOList transform
     (
         c.fieldIOobject("transform", IOobject::MUST_READ),
         valid
     );
+    //c.checkFieldIOobject(c, transform);
 
     vectorFieldIOField sampledPositions
     (
@@ -477,20 +518,23 @@ void Foam::streamlinesParticle::readFields(Cloud<streamlinesParticle>& c)
     );
     c.checkFieldIOobject(c, sampledPositions);
 
-    scalarFieldIOField sampledTimes
+    scalarFieldIOField sampledAges
     (
-        c.fieldIOobject("sampledTimes", IOobject::MUST_READ),
+        c.fieldIOobject("sampledAges", IOobject::MUST_READ),
         valid
     );
-    c.checkFieldIOobject(c, sampledTimes);
+    c.checkFieldIOobject(c, sampledAges);
 
     label i = 0;
     forAllIter(Cloud<streamlinesParticle>, c, iter)
     {
         iter().lifeTime_ = lifeTime[i];
+        iter().trackIndex_ = trackIndex[i];
+        iter().trackPartIndex_ = trackPartIndex[i];
+        iter().age_ = age[i];
         iter().transform_ = transform[i];
         iter().sampledPositions_.transfer(sampledPositions[i]);
-        iter().sampledTimes_.transfer(sampledTimes[i]);
+        iter().sampledAges_.transfer(sampledAges[i]);
         i++;
     }
 }
@@ -508,6 +552,24 @@ void Foam::streamlinesParticle::writeFields(const Cloud<streamlinesParticle>& c)
         np
     );
 
+    IOList<label> trackIndex
+    (
+        c.fieldIOobject("trackIndex", IOobject::NO_READ),
+        np
+    );
+
+    IOList<label> trackPartIndex
+    (
+        c.fieldIOobject("trackPartIndex", IOobject::NO_READ),
+        np
+    );
+
+    IOField<scalar> age
+    (
+        c.fieldIOobject("age", IOobject::NO_READ),
+        np
+    );
+
     transformerIOList transform
     (
         c.fieldIOobject("transform", IOobject::NO_READ),
@@ -520,9 +582,9 @@ void Foam::streamlinesParticle::writeFields(const Cloud<streamlinesParticle>& c)
         np
     );
 
-    scalarFieldIOField sampledTimes
+    scalarFieldIOField sampledAges
     (
-        c.fieldIOobject("sampledTimes", IOobject::NO_READ),
+        c.fieldIOobject("sampledAges", IOobject::NO_READ),
         np
     );
 
@@ -530,15 +592,22 @@ void Foam::streamlinesParticle::writeFields(const Cloud<streamlinesParticle>& c)
     forAllConstIter(Cloud<streamlinesParticle>, c, iter)
     {
         lifeTime[i] = iter().lifeTime_;
+        trackIndex[i] = iter().trackIndex_;
+        trackPartIndex[i] = iter().trackPartIndex_;
+        age[i] = iter().age_;
         transform[i] = iter().transform_;
         sampledPositions[i] = iter().sampledPositions_;
-        sampledTimes[i] = iter().sampledTimes_;
+        sampledAges[i] = iter().sampledAges_;
         i++;
     }
 
     lifeTime.write(np > 0);
+    trackIndex.write(np > 0);
+    trackPartIndex.write(np > 0);
+    age.write(np > 0);
+    transform.write(np > 0);
     sampledPositions.write(np > 0);
-    sampledTimes.write(np > 0);
+    sampledAges.write(np > 0);
 }
 
 
@@ -546,14 +615,19 @@ void Foam::streamlinesParticle::writeFields(const Cloud<streamlinesParticle>& c)
 
 Foam::Ostream& Foam::operator<<(Ostream& os, const streamlinesParticle& p)
 {
+
     os  << static_cast<const particle&>(p)
         << token::SPACE << p.lifeTime_
-        << token::SPACE << p.transform_
+        << token::SPACE << p.trackIndex_
+        << token::SPACE << p.trackPartIndex_
         << token::SPACE << p.age_
+        << token::SPACE << p.transform_
         << token::SPACE << p.sampledPositions_
-        << token::SPACE << p.sampledTimes_
-        << token::SPACE << p.sampledScalars_
-        << token::SPACE << p.sampledVectors_;
+        << token::SPACE << p.sampledAges_
+        #define WriteSampledTypes(Type, nullArg) \
+            << token::SPACE << p.sampled##Type##s_
+        FOR_ALL_FIELD_TYPES(WriteSampledTypes);
+        #undef WriteSampledTypes
 
     // Check state of Ostream
     os.check("Ostream& operator<<(Ostream&, const streamlinesParticle&)");
diff --git a/src/functionObjects/field/streamlines/streamlinesParticle.H b/src/functionObjects/field/streamlines/streamlinesParticle.H
index c4055ab305..44e81492dc 100644
--- a/src/functionObjects/field/streamlines/streamlinesParticle.H
+++ b/src/functionObjects/field/streamlines/streamlinesParticle.H
@@ -41,6 +41,7 @@ SourceFiles
 #include "autoPtr.H"
 #include "interpolation.H"
 #include "vectorList.H"
+#include "DynamicField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -72,11 +73,12 @@ public:
 
         // Public data
 
-            const PtrList<interpolation<scalar>>& vsInterp_;
+            #define DeclareTypeInterpolator(Type, nullArg) \
+                const PtrList<interpolation<Type>>& Type##Interp_;
+            FOR_ALL_FIELD_TYPES(DeclareTypeInterpolator);
+            #undef DeclareTypeInterpolator
 
-            const PtrList<interpolation<vector>>& vvInterp_;
-
-            const label UIndex_;
+            const interpolation<vector>& UInterp_;
 
             bool trackForward_;
 
@@ -86,13 +88,20 @@ public:
 
             const scalar trackLength_;
 
-            DynamicList<vectorList>& allPositions_;
+            label tracki;
 
-            DynamicList<scalarList>& allTimes_;
+            DynamicField<point>& allPositions_;
 
-            List<DynamicList<scalarList>>& allScalars_;
+            DynamicField<label>& allTracks_;
 
-            List<DynamicList<vectorList>>& allVectors_;
+            DynamicField<label>& allTrackParts_;
+
+            DynamicField<scalar>& allAges_;
+
+            #define DeclareAllTypes(Type, nullArg) \
+                List<DynamicField<Type>>& all##Type##s_;
+            FOR_ALL_FIELD_TYPES(DeclareAllTypes);
+            #undef DeclareAllTypes
 
 
         // Constructors
@@ -101,31 +110,43 @@ public:
             trackingData
             (
                 streamlinesCloud& cloud,
-                const PtrList<interpolation<scalar>>& vsInterp,
-                const PtrList<interpolation<vector>>& vvInterp,
-                const label UIndex,
+                #define TypeInterpolatorArg(Type, nullArg) \
+                    const PtrList<interpolation<Type>>& Type##Interp,
+                FOR_ALL_FIELD_TYPES(TypeInterpolatorArg)
+                #undef TypeInterpolatorArg
+                const interpolation<vector>& UInterp,
                 const bool trackForward,
                 const bool trackOutside,
                 const label nSubCycle,
                 const scalar trackLength,
-                DynamicList<List<point>>& allPositions,
-                DynamicList<List<scalar>>& allTimes,
-                List<DynamicList<scalarList>>& allScalars,
-                List<DynamicList<vectorList>>& allVectors
+                DynamicField<point>& allPositions,
+                DynamicField<label>& allTracks,
+                DynamicField<label>& allTrackParts,
+                DynamicField<scalar>& allAges
+                #define AllTypesArg(Type, nullArg) \
+                    , List<DynamicField<Type>>& all##Type##s
+                FOR_ALL_FIELD_TYPES(AllTypesArg)
+                #undef AllTypesArg
             )
             :
                 particle::trackingData(cloud),
-                vsInterp_(vsInterp),
-                vvInterp_(vvInterp),
-                UIndex_(UIndex),
+                #define TypeInterpolatorInit(Type, nullArg) \
+                    Type##Interp_(Type##Interp),
+                FOR_ALL_FIELD_TYPES(TypeInterpolatorInit)
+                #undef TypeInterpolatorInit
+                UInterp_(UInterp),
                 trackForward_(trackForward),
                 trackOutside_(trackOutside),
                 nSubCycle_(nSubCycle),
                 trackLength_(trackLength),
                 allPositions_(allPositions),
-                allTimes_(allTimes),
-                allScalars_(allScalars),
-                allVectors_(allVectors)
+                allTracks_(allTracks),
+                allTrackParts_(allTrackParts),
+                allAges_(allAges)
+                #define AllTypesInit(Type, nullArg) \
+                    , all##Type##s_(all##Type##s)
+                FOR_ALL_FIELD_TYPES(AllTypesInit)
+                #undef AllTypesInit
             {}
     };
 
@@ -137,23 +158,29 @@ private:
         //- Lifetime of particle. Particle dies when reaches 0.
         label lifeTime_;
 
-        //- Current compound transform
-        transformer transform_;
+        //- Index of the track
+        label trackIndex_;
+
+        //- Index of the part of the track
+        label trackPartIndex_;
 
         //- Age of the particle
         scalar age_;
 
+        //- Current compound transform
+        transformer transform_;
+
         //- Sampled positions
-        DynamicList<point> sampledPositions_;
+        DynamicField<point> sampledPositions_;
 
-        //- Sampled times
-        DynamicList<scalar> sampledTimes_;
+        //- Sampled ages
+        DynamicField<scalar> sampledAges_;
 
-        //- Sampled scalars
-        List<DynamicList<scalar>> sampledScalars_;
-
-        //- Sampled vectors
-        List<DynamicList<vector>> sampledVectors_;
+        //- Sampled types
+        #define DeclareSampledTypes(Type, nullArg) \
+            List<DynamicField<Type>> sampled##Type##s_;
+        FOR_ALL_FIELD_TYPES(DeclareSampledTypes);
+        #undef DeclareSampledTypes
 
 
     // Private Member Functions
@@ -181,7 +208,8 @@ public:
             const polyMesh& c,
             const vector& position,
             const label celli,
-            const label lifeTime
+            const label lifeTime,
+            const label trackIndex
         );
 
         //- Construct from Istream
diff --git a/src/lagrangian/basic/particle/particle.C b/src/lagrangian/basic/particle/particle.C
index af05951bf0..9685b8e9c5 100644
--- a/src/lagrangian/basic/particle/particle.C
+++ b/src/lagrangian/basic/particle/particle.C
@@ -814,7 +814,7 @@ Foam::scalar Foam::particle::trackToStationaryTri
     // Accumulate fraction behind
     if (muH*detA < small || nTracksBehind_ > 0)
     {
-        stepFractionBehind_ += fraction*muH*detA;
+        stepFractionBehind_ += (fraction != 0 ? fraction : 1)*muH*detA;
 
         if (stepFractionBehind_ > rootSmall)
         {
@@ -1011,7 +1011,7 @@ Foam::scalar Foam::particle::trackToMovingTri
     // Accumulate fraction behind
     if (muH*detA[0] < small || nTracksBehind_ > 0)
     {
-        stepFractionBehind_ += fraction*muH*detA[0];
+        stepFractionBehind_ += (fraction != 0 ? fraction : 1)*muH*detA[0];
 
         if (stepFractionBehind_ > rootSmall)
         {
diff --git a/src/lagrangian/parcel/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C b/src/lagrangian/parcel/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
index e507419797..81a725f6f2 100644
--- a/src/lagrangian/parcel/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
+++ b/src/lagrangian/parcel/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
@@ -453,7 +453,7 @@ void Foam::ParticleCollector<CloudType>::write()
         {
             autoPtr<surfaceWriter> writer
             (
-                surfaceWriter::New(surfaceFormat_, time.writeFormat())
+                surfaceWriter::New(surfaceFormat_, this->coeffDict())
             );
 
             writer->write
diff --git a/src/randomProcesses/Make/files b/src/randomProcesses/Make/files
index 90cb360357..10f52dfa17 100644
--- a/src/randomProcesses/Make/files
+++ b/src/randomProcesses/Make/files
@@ -22,4 +22,13 @@ $(turbulence)/turbGen.C
 
 $(noise)/noiseFFT.C
 
+graph/curve/curve.C
+graph/graph.C
+
+writers = graph/writers
+$(writers)/rawGraph/rawGraph.C
+$(writers)/gnuplotGraph/gnuplotGraph.C
+$(writers)/xmgrGraph/xmgrGraph.C
+$(writers)/jplotGraph/jplotGraph.C
+
 LIB = $(FOAM_LIBBIN)/librandomProcesses
diff --git a/src/OpenFOAM/graph/curve/curve.C b/src/randomProcesses/graph/curve/curve.C
similarity index 96%
rename from src/OpenFOAM/graph/curve/curve.C
rename to src/randomProcesses/graph/curve/curve.C
index a82ff2ae8d..3e4aaf2ffc 100644
--- a/src/OpenFOAM/graph/curve/curve.C
+++ b/src/randomProcesses/graph/curve/curve.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/graph/curve/curve.H b/src/randomProcesses/graph/curve/curve.H
similarity index 98%
rename from src/OpenFOAM/graph/curve/curve.H
rename to src/randomProcesses/graph/curve/curve.H
index 95cd402285..9e518f5c26 100644
--- a/src/OpenFOAM/graph/curve/curve.H
+++ b/src/randomProcesses/graph/curve/curve.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/graph/curve/curveTools.C b/src/randomProcesses/graph/curve/curveTools.C
similarity index 100%
rename from src/OpenFOAM/graph/curve/curveTools.C
rename to src/randomProcesses/graph/curve/curveTools.C
diff --git a/src/OpenFOAM/graph/curve/curveTools.H b/src/randomProcesses/graph/curve/curveTools.H
similarity index 100%
rename from src/OpenFOAM/graph/curve/curveTools.H
rename to src/randomProcesses/graph/curve/curveTools.H
diff --git a/src/OpenFOAM/graph/graph.C b/src/randomProcesses/graph/graph.C
similarity index 98%
rename from src/OpenFOAM/graph/graph.C
rename to src/randomProcesses/graph/graph.C
index 1d6fffd200..50a059821d 100644
--- a/src/OpenFOAM/graph/graph.C
+++ b/src/randomProcesses/graph/graph.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/graph/graph.H b/src/randomProcesses/graph/graph.H
similarity index 99%
rename from src/OpenFOAM/graph/graph.H
rename to src/randomProcesses/graph/graph.H
index 1869753fc7..21f9cb068e 100644
--- a/src/OpenFOAM/graph/graph.H
+++ b/src/randomProcesses/graph/graph.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/graph/writers/gnuplotGraph/gnuplotGraph.C b/src/randomProcesses/graph/writers/gnuplotGraph/gnuplotGraph.C
similarity index 97%
rename from src/OpenFOAM/graph/writers/gnuplotGraph/gnuplotGraph.C
rename to src/randomProcesses/graph/writers/gnuplotGraph/gnuplotGraph.C
index 1b5c32e399..5fb7770322 100644
--- a/src/OpenFOAM/graph/writers/gnuplotGraph/gnuplotGraph.C
+++ b/src/randomProcesses/graph/writers/gnuplotGraph/gnuplotGraph.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/graph/writers/gnuplotGraph/gnuplotGraph.H b/src/randomProcesses/graph/writers/gnuplotGraph/gnuplotGraph.H
similarity index 97%
rename from src/OpenFOAM/graph/writers/gnuplotGraph/gnuplotGraph.H
rename to src/randomProcesses/graph/writers/gnuplotGraph/gnuplotGraph.H
index 9e4d772a38..9c2df43775 100644
--- a/src/OpenFOAM/graph/writers/gnuplotGraph/gnuplotGraph.H
+++ b/src/randomProcesses/graph/writers/gnuplotGraph/gnuplotGraph.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/graph/writers/jplotGraph/jplotGraph.C b/src/randomProcesses/graph/writers/jplotGraph/jplotGraph.C
similarity index 96%
rename from src/OpenFOAM/graph/writers/jplotGraph/jplotGraph.C
rename to src/randomProcesses/graph/writers/jplotGraph/jplotGraph.C
index 8191e1cd12..31a2df0786 100644
--- a/src/OpenFOAM/graph/writers/jplotGraph/jplotGraph.C
+++ b/src/randomProcesses/graph/writers/jplotGraph/jplotGraph.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/graph/writers/jplotGraph/jplotGraph.H b/src/randomProcesses/graph/writers/jplotGraph/jplotGraph.H
similarity index 97%
rename from src/OpenFOAM/graph/writers/jplotGraph/jplotGraph.H
rename to src/randomProcesses/graph/writers/jplotGraph/jplotGraph.H
index 34271dfc49..58989a2382 100644
--- a/src/OpenFOAM/graph/writers/jplotGraph/jplotGraph.H
+++ b/src/randomProcesses/graph/writers/jplotGraph/jplotGraph.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/graph/writers/rawGraph/rawGraph.C b/src/randomProcesses/graph/writers/rawGraph/rawGraph.C
similarity index 96%
rename from src/OpenFOAM/graph/writers/rawGraph/rawGraph.C
rename to src/randomProcesses/graph/writers/rawGraph/rawGraph.C
index 67e08f3c15..4475c26993 100644
--- a/src/OpenFOAM/graph/writers/rawGraph/rawGraph.C
+++ b/src/randomProcesses/graph/writers/rawGraph/rawGraph.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/graph/writers/rawGraph/rawGraph.H b/src/randomProcesses/graph/writers/rawGraph/rawGraph.H
similarity index 97%
rename from src/OpenFOAM/graph/writers/rawGraph/rawGraph.H
rename to src/randomProcesses/graph/writers/rawGraph/rawGraph.H
index 537c9f007c..6d94bb9bea 100644
--- a/src/OpenFOAM/graph/writers/rawGraph/rawGraph.H
+++ b/src/randomProcesses/graph/writers/rawGraph/rawGraph.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/graph/writers/xmgrGraph/xmgrGraph.C b/src/randomProcesses/graph/writers/xmgrGraph/xmgrGraph.C
similarity index 97%
rename from src/OpenFOAM/graph/writers/xmgrGraph/xmgrGraph.C
rename to src/randomProcesses/graph/writers/xmgrGraph/xmgrGraph.C
index c22bdb320c..2829c3e8d9 100644
--- a/src/OpenFOAM/graph/writers/xmgrGraph/xmgrGraph.C
+++ b/src/randomProcesses/graph/writers/xmgrGraph/xmgrGraph.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/OpenFOAM/graph/writers/xmgrGraph/xmgrGraph.H b/src/randomProcesses/graph/writers/xmgrGraph/xmgrGraph.H
similarity index 97%
rename from src/OpenFOAM/graph/writers/xmgrGraph/xmgrGraph.H
rename to src/randomProcesses/graph/writers/xmgrGraph/xmgrGraph.H
index 86fef5f247..ca29b39b96 100644
--- a/src/OpenFOAM/graph/writers/xmgrGraph/xmgrGraph.H
+++ b/src/randomProcesses/graph/writers/xmgrGraph/xmgrGraph.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
diff --git a/src/sampling/Make/files b/src/sampling/Make/files
index c0e5dcf233..b468012038 100644
--- a/src/sampling/Make/files
+++ b/src/sampling/Make/files
@@ -5,8 +5,10 @@ probes/probesGrouping.C
 coordSet/coordSet.C
 
 sampledSet/sampledSet/sampledSet.C
+sampledSet/sampledSet/sampledSetParticle.C
+sampledSet/sampledSet/sampledSetCloud.C
 sampledSet/sampledSets/sampledSets.C
-sampledSet/sampledSets/sampledSetsGrouping.C
+
 sampledSet/arcUniform/arcUniform.C
 sampledSet/boxUniform/boxUniform.C
 sampledSet/circleRandom/circleRandom.C
@@ -24,14 +26,12 @@ sampledSet/faceSetSampledSet/faceSetSampledSet.C
 
 setWriters = sampledSet/writers
 
-$(setWriters)/setWriters.C
-$(setWriters)/ensight/ensightSetWriterRunTime.C
-$(setWriters)/gnuplot/gnuplotSetWriterRunTime.C
-$(setWriters)/jplot/jplotSetWriterRunTime.C
-$(setWriters)/raw/rawSetWriterRunTime.C
-$(setWriters)/vtk/vtkSetWriterRunTime.C
-$(setWriters)/xmgrace/xmgraceSetWriterRunTime.C
-$(setWriters)/csv/csvSetWriterRunTime.C
+$(setWriters)/setWriter.C
+$(setWriters)/ensight/ensightSetWriter.C
+$(setWriters)/raw/rawSetWriter.C
+$(setWriters)/vtk/vtkSetWriter.C
+$(setWriters)/csv/csvSetWriter.C
+$(setWriters)/gnuplot/gnuplotSetWriter.C
 
 cuttingPlane/cuttingPlane.C
 
@@ -59,10 +59,6 @@ $(surfWriters)/proxy/proxySurfaceWriter.C
 $(surfWriters)/raw/rawSurfaceWriter.C
 $(surfWriters)/vtk/vtkSurfaceWriter.C
 
-graphField/writePatchGraph.C
-graphField/writeCellGraph.C
-graphField/makeGraph.C
-
 meshToMesh/meshToMesh.C
 meshToMesh/meshToMeshParallelOps.C
 meshToMesh/distributedWeightedFvPatchFieldMapper.C
diff --git a/src/sampling/coordSet/coordSet.C b/src/sampling/coordSet/coordSet.C
index 5d5221c198..60bca36ec6 100644
--- a/src/sampling/coordSet/coordSet.C
+++ b/src/sampling/coordSet/coordSet.C
@@ -24,126 +24,494 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "coordSet.H"
+#include "ListListOps.H"
 
 // * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * * * //
 
 namespace Foam
 {
     template<>
-    const char* Foam::NamedEnum
-    <
-        Foam::coordSet::coordFormat,
-        5
-    >::names[] =
+    const char* Foam::NamedEnum<Foam::coordSet::axisType, 6>::names[] =
     {
         "xyz",
         "x",
         "y",
         "z",
-        "distance"
+        "distance",
+        "default"
     };
 }
 
 
-const Foam::NamedEnum<Foam::coordSet::coordFormat, 5>
-    Foam::coordSet::coordFormatNames_;
+const Foam::NamedEnum<Foam::coordSet::axisType, 6>
+    Foam::coordSet::axisTypeNames_;
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::coordSet::coordSet
-(
-    const word& name,
-    const word& axis
-)
+Foam::coordSet::coordSet()
 :
-    pointField(0),
-    name_(name),
-    axis_(coordFormatNames_[axis]),
-    curveDist_(0)
+    segments_(0),
+    positionName_(word::null),
+    positions_(nullptr),
+    distanceName_(word::null),
+    distances_(nullptr),
+    axis_(axisType::DEFAULT)
 {}
 
 
 Foam::coordSet::coordSet
 (
-    const word& name,
-    const word& axis,
-    const List<point>& points,
-    const scalarList& curveDist
+    const labelList& segments,
+    const word& positionName,
+    const pointField& positions,
+    const word& distanceName,
+    const scalarField& distances,
+    const word& axis
 )
 :
-    pointField(points),
-    name_(name),
-    axis_(coordFormatNames_[axis]),
-    curveDist_(curveDist)
+    segments_(segments),
+    positionName_(positionName),
+    positions_
+    (
+        isNull<pointField>(positions)
+      ? nullptr
+      : new pointField(positions)
+    ),
+    distanceName_(distanceName),
+    distances_
+    (
+        isNull<scalarField>(distances)
+      ? nullptr
+      : new scalarField(distances)
+    ),
+    axis_(axisTypeNames_[axis])
+{}
+
+
+Foam::coordSet::coordSet
+(
+    const bool contiguous,
+    const word& positionName,
+    const pointField& positions,
+    const word& axis
+)
+:
+    coordSet
+    (
+        contiguous
+      ? labelList(positions.size(), 0)
+      : identity(positions.size()),
+        positionName,
+        positions,
+        word::null,
+        scalarField::null(),
+        axis
+    )
+{}
+
+
+Foam::coordSet::coordSet
+(
+    const bool contiguous,
+    const word& distanceName,
+    const scalarField& distances,
+    const word& axis
+)
+:
+    coordSet
+    (
+        contiguous
+      ? labelList(distances.size(), 0)
+      : identity(distances.size()),
+        word::null,
+        pointField::null(),
+        distanceName,
+        distances,
+        axis
+    )
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-bool Foam::coordSet::hasVectorAxis() const
+bool Foam::coordSet::hasScalarAxis() const
 {
-    return axis_ == XYZ;
+    // If axis is default and both positions and distances are valid, take
+    // scalar distances in preference
+
+    return
+        (axis_ == axisType::X && positions_.valid())
+     || (axis_ == axisType::Y && positions_.valid())
+     || (axis_ == axisType::Z && positions_.valid())
+     || (axis_ == axisType::DISTANCE && distances_.valid())
+     || (axis_ == axisType::DEFAULT && distances_.valid());
 }
 
 
-Foam::scalar Foam::coordSet::scalarCoord
-(
-    const label index
-)   const
+bool Foam::coordSet::hasPointAxis() const
 {
-    const point& p = operator[](index);
+    // If axis is default and both positions and distances are valid, take
+    // scalar distances in preference
 
-    if (axis_ == X)
+    return
+        (axis_ == axisType::XYZ && positions_.valid())
+     || (axis_ == axisType::DEFAULT && positions_.valid());
+}
+
+
+Foam::scalar Foam::coordSet::scalarCoord(const label index) const
+{
+    switch (axis_)
     {
-        return p.x();
+        case axisType::XYZ:
+            FatalErrorInFunction
+                << "Scalar coordinate requested from coordinate set with "
+                << axisTypeNames_[axis_] << " axis" << exit(FatalError);
+            break;
+        case axisType::X:
+            return positions_()[index].x();
+        case axisType::Y:
+            return positions_()[index].y();
+        case axisType::Z:
+            return positions_()[index].z();
+        case axisType::DISTANCE:
+            return distances_()[index];
+        case axisType::DEFAULT:
+            if (distances_.valid()) return distances_()[index];
+            FatalErrorInFunction
+                << "Scalar coordinate requested from coordinate set with "
+                << axisTypeNames_[axis_] << " axis, but with no valid distances"
+                << exit(FatalError);
+            break;
     }
-    else if (axis_ == Y)
+
+    return NaN;
+}
+
+
+Foam::tmp<Foam::scalarField> Foam::coordSet::scalarCoords() const
+{
+    switch (axis_)
     {
-        return p.y();
+        case axisType::XYZ:
+            FatalErrorInFunction
+                << "Scalar coordinate requested from coordinate set with "
+                << axisTypeNames_[axis_] << " axis" << exit(FatalError);
+            break;
+        case axisType::X:
+            return positions_().component(point::X);
+        case axisType::Y:
+            return positions_().component(point::Y);
+        case axisType::Z:
+            return positions_().component(point::Z);
+        case axisType::DISTANCE:
+            return distances_();
+        case axisType::DEFAULT:
+            if (distances_.valid()) return distances_();
+            FatalErrorInFunction
+                << "Scalar coordinate requested from coordinate set with "
+                << axisTypeNames_[axis_] << " axis, but with no valid distances"
+                << exit(FatalError);
+            break;
     }
-    else if (axis_ == Z)
+
+    return scalarField::null();
+}
+
+
+Foam::word Foam::coordSet::scalarName() const
+{
+    switch (axis_)
     {
-        return p.z();
+        case axisType::XYZ:
+            FatalErrorInFunction
+                << "Scalar name requested from coordinate set with "
+                << axisTypeNames_[axis_] << " axis" << exit(FatalError);
+            break;
+        case axisType::X:
+        case axisType::Y:
+        case axisType::Z:
+            return
+                positionName_
+              + (positionName_ != word::null ? "_" : "")
+              + axis();
+        case axisType::DISTANCE:
+            return distanceName_;
+        case axisType::DEFAULT:
+            if (distances_.valid()) return distanceName_;
+            FatalErrorInFunction
+                << "Scalar coordinate requested from coordinate set with "
+                << axisTypeNames_[axis_] << " axis, but with no valid distances"
+                << exit(FatalError);
+            break;
     }
-    else if (axis_ == DISTANCE)
+
+    return word::null;
+}
+
+
+Foam::point Foam::coordSet::pointCoord(const label index) const
+{
+    switch (axis_)
     {
-        // Use distance to reference point
-        return curveDist_[index];
+        case axisType::XYZ:
+            return positions_()[index];
+        case axisType::X:
+        case axisType::Y:
+        case axisType::Z:
+        case axisType::DISTANCE:
+            FatalErrorInFunction
+                << "Point coordinate requested from coordinate set with "
+                << axisTypeNames_[axis_] << " axis" << exit(FatalError);
+            break;
+        case axisType::DEFAULT:
+            if (positions_.valid()) return positions_()[index];
+            FatalErrorInFunction
+                << "Point coordinate requested from coordinate set with "
+                << axisTypeNames_[axis_] << " axis, but with no valid point"
+                << exit(FatalError);
+            break;
+    }
+
+    return point::uniform(NaN);
+}
+
+
+Foam::tmp<Foam::pointField> Foam::coordSet::pointCoords() const
+{
+    switch (axis_)
+    {
+        case axisType::XYZ:
+            return positions_();
+        case axisType::X:
+        case axisType::Y:
+        case axisType::Z:
+        case axisType::DISTANCE:
+            FatalErrorInFunction
+                << "Point coordinate requested from coordinate set with "
+                << axisTypeNames_[axis_] << " axis" << exit(FatalError);
+            break;
+        case axisType::DEFAULT:
+            if (positions_.valid()) return positions_();
+            FatalErrorInFunction
+                << "Point coordinate requested from coordinate set with "
+                << axisTypeNames_[axis_] << " axis, but with no valid point"
+                << exit(FatalError);
+            break;
+    }
+
+    return pointField::null();
+}
+
+
+Foam::word Foam::coordSet::pointName() const
+{
+    switch (axis_)
+    {
+        case axisType::XYZ:
+            return positionName_;
+        case axisType::X:
+        case axisType::Y:
+        case axisType::Z:
+        case axisType::DISTANCE:
+            FatalErrorInFunction
+                << "Point name requested from coordinate set with "
+                << axisTypeNames_[axis_] << " axis" << exit(FatalError);
+            break;
+        case axisType::DEFAULT:
+            if (positions_.valid()) return positionName_;
+            FatalErrorInFunction
+                << "Point name requested from coordinate set with "
+                << axisTypeNames_[axis_] << " axis, but with no valid point"
+                << exit(FatalError);
+            break;
+    }
+
+    return word::null;
+}
+
+
+Foam::labelList Foam::coordSet::vertices() const
+{
+    label nVertices = 0;
+    labelList vertices(size());
+
+    forAll(*this, pointi)
+    {
+        const label s = segments_[pointi];
+        if
+        (
+            (pointi == 0 || s != segments_[pointi - 1])
+         && (pointi == size() - 1 || s != segments_[pointi + 1])
+        )
+        {
+            vertices[nVertices ++] = pointi;
+        }
+    }
+
+    vertices.resize(nVertices);
+
+    return vertices;
+}
+
+
+Foam::labelPairList Foam::coordSet::edges() const
+{
+    label nEdges = 0;
+    labelPairList edges(size() - 1);
+
+    for (label pointi = 0; pointi < size() - 1; ++ pointi)
+    {
+        if (segments_[pointi] == segments_[pointi + 1])
+        {
+            edges[nEdges ++] = labelPair(pointi, pointi + 1);
+        }
+    }
+
+    edges.resize(nEdges);
+
+    return edges;
+}
+
+
+Foam::labelListList Foam::coordSet::lines() const
+{
+    DynamicList<label> line;
+    DynamicList<labelList> lines;
+
+    forAll(*this, pointi)
+    {
+        line.append(pointi);
+
+        if
+        (
+            pointi == size() - 1
+         || segments_[pointi] != segments_[pointi + 1]
+        )
+        {
+            if (line.size() > 1)
+            {
+                lines.append(line);
+            }
+
+            line.clear();
+        }
+    }
+
+    labelListList linesNonDynamic;
+    linesNonDynamic.transfer(lines);
+
+    return linesNonDynamic;
+}
+
+
+Foam::Tuple2<Foam::coordSet, Foam::labelList> Foam::coordSet::gather() const
+{
+    // Collect data from all processors
+    List<List<point>> gatheredPositions;
+    if (positions_.valid())
+    {
+        gatheredPositions.resize(Pstream::nProcs());
+        gatheredPositions[Pstream::myProcNo()] = positions_();
+        Pstream::gatherList(gatheredPositions);
+    }
+
+    List<scalarList> gatheredDistances;
+    if (distances_.valid())
+    {
+        gatheredDistances.resize(Pstream::nProcs());
+        gatheredDistances[Pstream::myProcNo()] = distances_();
+        Pstream::gatherList(gatheredDistances);
+    }
+
+    List<labelField> gatheredSegments(Pstream::nProcs());
+    gatheredSegments[Pstream::myProcNo()] = segments_;
+    Pstream::gatherList(gatheredSegments);
+
+    // Combine processor lists into one big list.
+    List<point> allPositions;
+    if (positions_.valid())
+    {
+        allPositions =
+            ListListOps::combine<List<point>>
+            (
+                gatheredPositions,
+                accessOp<List<point>>()
+            );
+    };
+
+    scalarList allDistances;
+    if (distances_.valid())
+    {
+        allDistances =
+            ListListOps::combine<scalarList>
+            (
+                gatheredDistances,
+                accessOp<scalarList>()
+            );
+    }
+
+    labelList allSegments
+    (
+        ListListOps::combine<labelList>
+        (
+            gatheredSegments,
+            accessOp<labelList>()
+        )
+    );
+
+    // Construct a result tuple
+    Tuple2<coordSet, labelList> result
+    (
+        coordSet(),
+        identity(allSegments.size())
+    );
+    coordSet& set = result.first();
+    labelList& order = result.second();
+
+    // Sort by segment then by distance
+    if (distances_.valid())
+    {
+        stableSort
+        (
+            order,
+            [&](const label a, const label b)
+            {
+                return
+                    allSegments[a] < allSegments[b] ? true
+                  : allSegments[a] > allSegments[b] ? false
+                  : allDistances[a] < allDistances[b];
+            }
+        );
     }
     else
     {
-        FatalErrorInFunction
-            << "Illegal axis specification " << axis_
-            << " for sampling line " << name_
-            << exit(FatalError);
-
-        return 0;
+        stableSort
+        (
+            order,
+            [&](const label a, const label b)
+            {
+                return allSegments[a] < allSegments[b];
+            }
+        );
     }
-}
 
-
-Foam::point Foam::coordSet::vectorCoord(const label index) const
-{
-    const point& p = operator[](index);
-
-    return p;
-}
-
-
-Foam::Ostream& Foam::coordSet::write(Ostream& os) const
-{
-    os  << "name:" << name_ << " axis:" << axis_
-        << endl
-        << endl << "\t(coord)"
-        << endl;
-
-    forAll(*this, sampleI)
+    // Set the data in the coordinate set
+    set.segments_ = labelField(allSegments, order);
+    set.positionName_ = positionName_;
+    if (positions_.valid())
     {
-        os  << '\t' << operator[](sampleI) << endl;
+        set.positions_.set(new pointField(allPositions, order));
     }
+    set.distanceName_ = distanceName_;
+    if (distances_.valid())
+    {
+        set.distances_.set(new scalarField(allDistances, order));
+    }
+    set.axis_ = axis_;
 
-    return os;
+    return result;
 }
 
 
diff --git a/src/sampling/coordSet/coordSet.H b/src/sampling/coordSet/coordSet.H
index 5c39fcb6ac..8ef8c5415a 100644
--- a/src/sampling/coordSet/coordSet.H
+++ b/src/sampling/coordSet/coordSet.H
@@ -37,6 +37,7 @@ SourceFiles
 
 #include "pointField.H"
 #include "word.H"
+#include "labelPair.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -48,94 +49,156 @@ namespace Foam
 \*---------------------------------------------------------------------------*/
 
 class coordSet
-:
-    public pointField
 {
-
 public:
 
     // Public data types
 
         //- Enumeration defining the output format for coordinates
-        enum coordFormat
+        enum class axisType
         {
             XYZ,
             X,
             Y,
             Z,
-            DISTANCE
+            DISTANCE,
+            DEFAULT
         };
 
 
-private:
-
-        //- String representation of coordFormat enums
-        static const NamedEnum<coordFormat, 5> coordFormatNames_;
+        //- String representation of axis enums
+        static const NamedEnum<axisType, 6> axisTypeNames_;
 
 
 protected:
 
-        //- Name
-        const word name_;
+    // Protected Data
 
-        //- Axis write type
-        const coordFormat axis_;
+        //- Connected segments
+        labelList segments_;
 
-        //- Cumulative distance "distance" write specifier.
-        scalarList curveDist_;
+        //- Name of the positions
+        word positionName_;
+
+        //- Point positions
+        autoPtr<pointField> positions_;
+
+        //- Name of the distances
+        word distanceName_;
+
+        //- Scalar distances
+        autoPtr<scalarField> distances_;
+
+        //- Axis
+        axisType axis_;
 
 
 public:
 
     // Constructors
 
+        //- Construct null
+        coordSet();
+
         //- Construct from components
         coordSet
         (
-            const word& name,
-            const word& axis
+            const labelList& segments,
+            const word& positionName = word::null,
+            const pointField& positions = pointField::null(),
+            const word& distanceName = word::null,
+            const scalarField& distances = scalarField::null(),
+            const word& axis = axisTypeNames_[axisType::DEFAULT]
         );
 
-
-        //- Construct from components
+        //- Construct from positions
         coordSet
         (
-            const word& name,
-            const word& axis,
-            const List<point>& points,
-            const scalarList& curveDist
+            const bool contiguous,
+            const word& positionName,
+            const pointField& positions,
+            const word& axis = axisTypeNames_[axisType::DEFAULT]
+        );
+
+        //- Construct from distances
+        coordSet
+        (
+            const bool contiguous,
+            const word& distanceName,
+            const scalarField& distances,
+            const word& axis = axisTypeNames_[axisType::DEFAULT]
         );
 
 
     // Member Functions
 
-        const word& name() const
+        //- Return the size
+        inline label size() const
         {
-            return name_;
+            return segments_.size();
         }
 
-        word axis() const
+        //- Return the segments
+        inline const labelList& segments() const
         {
-            return coordFormatNames_[axis_];
+            return segments_;
         }
 
-        //- Cumulative distance
-        const scalarList& curveDist() const
+        //- Return the axis name
+        inline word axis() const
         {
-            return curveDist_;
+            return axisTypeNames_[axis_];
         }
 
-        //- Is axis specification a vector
-        bool hasVectorAxis() const;
+        //- Is the coordinate axis a scalar?
+        bool hasScalarAxis() const;
 
-        //- Get coordinate of point according to axis specification.
-        //  If axis="distance" is the curveDist[index]
+        //- Is the coordinate axis a point?
+        bool hasPointAxis() const;
+
+        //- Get scalar coordinate (axis is x, y, z or distance)
         scalar scalarCoord(const label index) const;
 
-        //- Get point according to axis="xyz" specification
-        vector vectorCoord(const label index) const;
+        //- Get scalar coordinates (axis is x, y, z or distance)
+        tmp<scalarField> scalarCoords() const;
 
-        Ostream& write(Ostream& os) const;
+        //- Return the name of the scalar coordinates
+        word scalarName() const;
+
+        //- Get vector coordinate (axis is xyz)
+        point pointCoord(const label index) const;
+
+        //- Get vector coordinate (axis is xyz)
+        tmp<pointField> pointCoords() const;
+
+        //- Return the name of the point coordinates
+        word pointName() const;
+
+        //- Return a list of isolated vertices. These are the points that are
+        //  not adjacent to any points in the same segment.
+        labelList vertices() const;
+
+        //- Return a list of edges. These are adjacent pairs of points which
+        //  are in the same segment.
+        labelPairList edges() const;
+
+        //- Return a list of lines. These are lists of points which are in the
+        //  same segment.
+        labelListList lines() const;
+
+        //- Combine coordinate sets onto the master. Return both the combined
+        //  coordinate set, and an ordering to be used for gathering associated
+        //  fields
+        Tuple2<coordSet, labelList> gather() const;
+
+        //- Combine a field using the ordering obtained from the coordinate set
+        //  gather operation
+        template<class Type>
+        static tmp<Field<Type>> gather
+        (
+            const Field<Type>& values,
+            const labelList& order
+        );
 };
 
 
@@ -145,6 +208,12 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#ifdef NoRepository
+    #include "coordSetTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/sampling/graphField/writePatchGraph.C b/src/sampling/coordSet/coordSetTemplates.C
similarity index 60%
rename from src/sampling/graphField/writePatchGraph.C
rename to src/sampling/coordSet/coordSetTemplates.C
index 30c42b8408..22cea71cf6 100644
--- a/src/sampling/graphField/writePatchGraph.C
+++ b/src/sampling/coordSet/coordSetTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -23,38 +23,36 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "writePatchGraph.H"
-#include "volFields.H"
-#include "fvMesh.H"
-#include "graph.H"
+#include "coordSet.H"
+#include "ListListOps.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-void writePatchGraph
+template<class Type>
+Foam::tmp<Foam::Field<Type>> Foam::coordSet::gather
 (
-    const volScalarField& vsf,
-    const label patchLabel,
-    const direction d,
-    const word& graphFormat
+    const Field<Type>& values,
+    const labelList& order
 )
 {
-    graph
+    // Collect data from all processors
+    List<List<Type>> gatheredValues(Pstream::nProcs());
+    gatheredValues[Pstream::myProcNo()] = values;
+    Pstream::gatherList(gatheredValues);
+
+    // Combine processor lists into one big list
+    List<Type> allValues
     (
-        vsf.name(),
-        "position",
-        vsf.name(),
-        vsf.mesh().boundary()[patchLabel].Cf().component(d),
-        vsf.boundaryField()[patchLabel]
-    ).write(vsf.time().timePath()/vsf.name(), graphFormat);
+        ListListOps::combine<List<Type>>
+        (
+            gatheredValues,
+            accessOp<List<Type>>()
+        )
+    );
+
+    // Sort by order and overwrite
+    return tmp<Field<Type>>(new Field<Type>(allValues, order));
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
 
 // ************************************************************************* //
diff --git a/src/sampling/graphField/makeGraph.C b/src/sampling/graphField/makeGraph.C
deleted file mode 100644
index 8532dd09ed..0000000000
--- a/src/sampling/graphField/makeGraph.C
+++ /dev/null
@@ -1,111 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Global
-    makeGraph
-
-Description
-    Write a graph file for a field given the data point locations field,
-    the field of interest and the name of the field to be used for the
-    graph file name.
-
-\*---------------------------------------------------------------------------*/
-
-#include "makeGraph.H"
-#include "volFields.H"
-#include "graph.H"
-#include "writeFile.H"
-#include "OSspecific.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-void makeGraph
-(
-    const scalarField& x,
-    const volScalarField& vsf,
-    const word& graphFormat
-)
-{
-    makeGraph(x, vsf, vsf.name(), graphFormat);
-}
-
-
-void makeGraph
-(
-    const scalarField& x,
-    const volScalarField& vsf,
-    const word& name,
-    const word& graphFormat
-)
-{
-    fileName path
-    (
-        vsf.rootPath()
-       /vsf.caseName()
-       /functionObjects::writeFile::outputPrefix
-       /"graphs"
-       /vsf.instance()
-    );
-    mkDir(path);
-
-    makeGraph
-    (
-        x,
-        vsf.primitiveField(),
-        name,
-        path,
-        graphFormat
-    );
-}
-
-
-void makeGraph
-(
-    const scalarField& x,
-    const scalarField& sf,
-    const word& name,
-    const fileName& path,
-    const word& graphFormat
-)
-{
-    graph
-    (
-        name,
-        "x",
-        name,
-        x,
-        sf
-    ).write(path/name, graphFormat);
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/sampling/graphField/makeGraph.H b/src/sampling/graphField/makeGraph.H
deleted file mode 100644
index 2de1fadc76..0000000000
--- a/src/sampling/graphField/makeGraph.H
+++ /dev/null
@@ -1,84 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Global
-    makeGraph
-
-Description
-
-SourceFiles
-    makeGraph.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef makeGraph_H
-#define makeGraph_H
-
-#include "primitiveFieldsFwd.H"
-#include "volFieldsFwd.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-class fileName;
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-void makeGraph
-(
-    const scalarField& x,
-    const volScalarField& vsf,
-    const word& graphFormat
-);
-
-
-void makeGraph
-(
-    const scalarField& x,
-    const volScalarField& vsf,
-    const word& name,
-    const word& graphFormat
-);
-
-
-void makeGraph
-(
-    const scalarField& x,
-    const scalarField& sf,
-    const word& name,
-    const fileName& path,
-    const word& graphFormat
-);
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/sampling/graphField/writeCellGraph.C b/src/sampling/graphField/writeCellGraph.C
deleted file mode 100644
index fed96e8b63..0000000000
--- a/src/sampling/graphField/writeCellGraph.C
+++ /dev/null
@@ -1,68 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2019-2020 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "writeCellGraph.H"
-#include "volFields.H"
-#include "graph.H"
-#include "writeFile.H"
-#include "OSspecific.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-void writeCellGraph
-(
-    const volScalarField& vsf,
-    const word& graphFormat
-)
-{
-    fileName path
-    (
-        vsf.time().path()
-       /functionObjects::writeFile::outputPrefix
-       /"graphs"
-       /vsf.time().timeName()
-    );
-    mkDir(path);
-
-    graph
-    (
-        vsf.name(),
-        "x",
-        vsf.name(),
-        vsf.mesh().C().primitiveField().component(vector::X),
-        vsf.primitiveField()
-    ).write(path/vsf.name(), graphFormat);
-}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/sampling/graphField/writeCellGraph.H b/src/sampling/graphField/writeCellGraph.H
deleted file mode 100644
index 15af42ffa2..0000000000
--- a/src/sampling/graphField/writeCellGraph.H
+++ /dev/null
@@ -1,60 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-InNamespace
-    Foam::writeCellGraph
-
-Description
-
-SourceFiles
-    writeCellGraph.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef writeCellGraph_H
-#define writeCellGraph_H
-
-#include "volFieldsFwd.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-void writeCellGraph
-(
-    const volScalarField& vsf,
-    const word& graphFormat
-);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/sampling/graphField/writePatchGraph.H b/src/sampling/graphField/writePatchGraph.H
deleted file mode 100644
index c7a4d7fd3f..0000000000
--- a/src/sampling/graphField/writePatchGraph.H
+++ /dev/null
@@ -1,61 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-InClass
-    Foam::writePatchGraph
-
-Description
-
-
-SourceFiles
-    writePatchGraph.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef writePatchGraph_H
-#define writePatchGraph_H
-
-#include "volFieldsFwd.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-void writePatchGraph
-(
-    const volScalarField& vsf,
-    const label patchLabel,
-    const direction d,
-    const word& graphFormat
-);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/sampling/sampledSet/arcUniform/arcUniform.C b/src/sampling/sampledSet/arcUniform/arcUniform.C
index 2d97cf27d7..9fe673c725 100644
--- a/src/sampling/sampledSet/arcUniform/arcUniform.C
+++ b/src/sampling/sampledSet/arcUniform/arcUniform.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -30,6 +30,7 @@ License
 #include "polyMesh.H"
 #include "addToRunTimeSelectionTable.H"
 #include "word.H"
+#include "points.H"
 #include "unitConversion.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -48,69 +49,77 @@ namespace sampledSets
 
 void Foam::sampledSets::arcUniform::calcSamples
 (
-    DynamicList<point>& samplingPts,
-    DynamicList<label>& samplingCells,
-    DynamicList<label>& samplingFaces,
+    DynamicList<point>& samplingPositions,
+    DynamicList<scalar>& samplingDistances,
     DynamicList<label>& samplingSegments,
-    DynamicList<scalar>& samplingCurveDist
+    DynamicList<label>& samplingCells,
+    DynamicList<label>& samplingFaces
 ) const
 {
+    // Get the coordinate system
     const vector axis1 = radial_ - (radial_ & normal_)*normal_;
     const vector axis2 = normal_ ^ axis1;
     const scalar radius = mag(axis1);
 
-    for (label i = 0; i < nPoints_; ++ i)
+    // Compute all point locations
+    const scalarField ts(scalarList(identity(nPoints_))/(nPoints_ - 1));
+    const scalarField theta((1 - ts)*startAngle_ + ts*endAngle_);
+    const scalarField c(cos(theta)), s(sin(theta));
+    const pointField points(centre_ + c*axis1 + s*axis2);
+
+    // Calculate the sampling topology
+    points::calcSamples
+    (
+        mesh(),
+        searchEngine(),
+        points,
+        samplingPositions,
+        samplingDistances,
+        samplingSegments,
+        samplingCells,
+        samplingFaces
+    );
+
+    // Overwrite the distances
+    forAll(samplingPositions, i)
     {
-        const scalar t = scalar(i)/(nPoints_ - 1);
-        const scalar theta = (1 - t)*startAngle_ + t*endAngle_;
-        const scalar c = cos(theta), s = sin(theta);
-
-        const point pt = centre_ + c*axis1 + s*axis2;
-        const label celli = searchEngine().findCell(pt);
-
-        if (celli != -1)
-        {
-            samplingPts.append(pt);
-            samplingCells.append(celli);
-            samplingFaces.append(-1);
-            samplingSegments.append(samplingSegments.size());
-            samplingCurveDist.append(radius*theta);
-        }
+        const vector v = samplingPositions[i] - centre_;
+        const scalar theta = atan2(v & axis2, v & axis1);
+        samplingDistances[i] = radius*theta;
     }
 }
 
 
 void Foam::sampledSets::arcUniform::genSamples()
 {
-    // Storage for sample points
-    DynamicList<point> samplingPts;
+    DynamicList<point> samplingPositions;
+    DynamicList<scalar> samplingDistances;
+    DynamicList<label> samplingSegments;
     DynamicList<label> samplingCells;
     DynamicList<label> samplingFaces;
-    DynamicList<label> samplingSegments;
-    DynamicList<scalar> samplingCurveDist;
 
     calcSamples
     (
-        samplingPts,
-        samplingCells,
-        samplingFaces,
+        samplingPositions,
+        samplingDistances,
         samplingSegments,
-        samplingCurveDist
+        samplingCells,
+        samplingFaces
     );
 
-    samplingPts.shrink();
+    samplingPositions.shrink();
+    samplingDistances.shrink();
+    samplingSegments.shrink();
     samplingCells.shrink();
     samplingFaces.shrink();
-    samplingSegments.shrink();
-    samplingCurveDist.shrink();
 
     setSamples
     (
-        samplingPts,
-        samplingCells,
-        samplingFaces,
+        samplingPositions,
+        samplingDistances,
         samplingSegments,
-        samplingCurveDist
+        samplingCells,
+        samplingFaces
     );
 }
 
@@ -134,11 +143,6 @@ Foam::sampledSets::arcUniform::arcUniform
     nPoints_(dict.lookup<scalar>("nPoints"))
 {
     genSamples();
-
-    if (debug)
-    {
-        write(Info);
-    }
 }
 
 
diff --git a/src/sampling/sampledSet/arcUniform/arcUniform.H b/src/sampling/sampledSet/arcUniform/arcUniform.H
index 2d4c3c3718..fac3237ffb 100644
--- a/src/sampling/sampledSet/arcUniform/arcUniform.H
+++ b/src/sampling/sampledSet/arcUniform/arcUniform.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -108,11 +108,11 @@ class arcUniform
         //- Calculate all the sampling points
         void calcSamples
         (
-            DynamicList<point>& samplingPts,
-            DynamicList<label>& samplingCells,
-            DynamicList<label>& samplingFaces,
+            DynamicList<point>& samplingPositions,
+            DynamicList<scalar>& samplingDistances,
             DynamicList<label>& samplingSegments,
-            DynamicList<scalar>& samplingCurveDist
+            DynamicList<label>& samplingCells,
+            DynamicList<label>& samplingFaces
         ) const;
 
         //- Uses calcSamples to obtain samples and copies them into *this
diff --git a/src/sampling/sampledSet/boundaryPoints/boundaryPoints.C b/src/sampling/sampledSet/boundaryPoints/boundaryPoints.C
index 1f4a805552..4e09d9ff3c 100644
--- a/src/sampling/sampledSet/boundaryPoints/boundaryPoints.C
+++ b/src/sampling/sampledSet/boundaryPoints/boundaryPoints.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,11 +48,10 @@ namespace sampledSets
 
 void Foam::sampledSets::boundaryPoints::calcSamples
 (
-    DynamicList<point>& samplingPts,
-    DynamicList<label>& samplingCells,
-    DynamicList<label>& samplingFaces,
+    DynamicList<point>& samplingPositions,
     DynamicList<label>& samplingSegments,
-    DynamicList<scalar>& samplingCurveDist
+    DynamicList<label>& samplingCells,
+    DynamicList<label>& samplingFaces
 ) const
 {
     // Get the patch IDs
@@ -176,11 +175,10 @@ void Foam::sampledSets::boundaryPoints::calcSamples
             {
                 label facei = nearHit.index();
 
-                samplingPts.append(nearHit.hitPoint());
+                samplingPositions.append(nearHit.hitPoint());
+                samplingSegments.append(sampleI);
                 samplingCells.append(mesh().faceOwner()[facei]);
                 samplingFaces.append(facei);
-                samplingSegments.append(0);
-                samplingCurveDist.append(sampleI);
             }
         }
         else
@@ -196,34 +194,30 @@ void Foam::sampledSets::boundaryPoints::calcSamples
 
 void Foam::sampledSets::boundaryPoints::genSamples()
 {
-    DynamicList<point> samplingPts;
+    DynamicList<point> samplingPositions;
+    DynamicList<label> samplingSegments;
     DynamicList<label> samplingCells;
     DynamicList<label> samplingFaces;
-    DynamicList<label> samplingSegments;
-    DynamicList<scalar> samplingCurveDist;
 
     calcSamples
     (
-        samplingPts,
-        samplingCells,
-        samplingFaces,
+        samplingPositions,
         samplingSegments,
-        samplingCurveDist
+        samplingCells,
+        samplingFaces
     );
 
-    samplingPts.shrink();
+    samplingPositions.shrink();
+    samplingSegments.shrink();
     samplingCells.shrink();
     samplingFaces.shrink();
-    samplingSegments.shrink();
-    samplingCurveDist.shrink();
 
     setSamples
     (
-        samplingPts,
-        samplingCells,
-        samplingFaces,
+        samplingPositions,
         samplingSegments,
-        samplingCurveDist
+        samplingCells,
+        samplingFaces
     );
 }
 
@@ -244,11 +238,6 @@ Foam::sampledSets::boundaryPoints::boundaryPoints
     maxDistance_(dict.lookup<scalar>("maxDistance"))
 {
     genSamples();
-
-    if (debug)
-    {
-        write(Info);
-    }
 }
 
 
diff --git a/src/sampling/sampledSet/boundaryPoints/boundaryPoints.H b/src/sampling/sampledSet/boundaryPoints/boundaryPoints.H
index 1d0e760e91..ff8b1a5787 100644
--- a/src/sampling/sampledSet/boundaryPoints/boundaryPoints.H
+++ b/src/sampling/sampledSet/boundaryPoints/boundaryPoints.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -97,11 +97,10 @@ class boundaryPoints
         //- Samples all points in sampleCoords
         void calcSamples
         (
-            DynamicList<point>& samplingPts,
-            DynamicList<label>& samplingCells,
-            DynamicList<label>& samplingFaces,
+            DynamicList<point>& samplingPositions,
             DynamicList<label>& samplingSegments,
-            DynamicList<scalar>& samplingCurveDist
+            DynamicList<label>& samplingCells,
+            DynamicList<label>& samplingFaces
         ) const;
 
         //- Uses calcSamples to obtain samples. Copies them into *this.
diff --git a/src/sampling/sampledSet/boundaryRandom/boundaryRandom.C b/src/sampling/sampledSet/boundaryRandom/boundaryRandom.C
index b9f67ef90f..073f913370 100644
--- a/src/sampling/sampledSet/boundaryRandom/boundaryRandom.C
+++ b/src/sampling/sampledSet/boundaryRandom/boundaryRandom.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,11 +52,10 @@ namespace sampledSets
 
 void Foam::sampledSets::boundaryRandom::calcSamples
 (
-    DynamicList<point>& samplingPts,
-    DynamicList<label>& samplingCells,
-    DynamicList<label>& samplingFaces,
+    DynamicList<point>& samplingPositions,
     DynamicList<label>& samplingSegments,
-    DynamicList<scalar>& samplingCurveDist
+    DynamicList<label>& samplingCells,
+    DynamicList<label>& samplingFaces
 ) const
 {
     // Get the patch IDs
@@ -153,11 +152,10 @@ void Foam::sampledSets::boundaryRandom::calcSamples
                 (1 - rootSmall)*r2D.c()
             );
 
-            samplingPts.append(tetIs.tet(mesh()).barycentricToPoint(r3D));
+            samplingPositions.append(tetIs.tet(mesh()).barycentricToPoint(r3D));
+            samplingSegments.append(i);
             samplingCells.append(tetIs.cell());
             samplingFaces.append(tetIs.face());
-            samplingSegments.append(0);
-            samplingCurveDist.append(scalar(i));
         }
     }
 }
@@ -165,35 +163,30 @@ void Foam::sampledSets::boundaryRandom::calcSamples
 
 void Foam::sampledSets::boundaryRandom::genSamples()
 {
-    // Storage for sample points
-    DynamicList<point> samplingPts;
+    DynamicList<point> samplingPositions;
+    DynamicList<label> samplingSegments;
     DynamicList<label> samplingCells;
     DynamicList<label> samplingFaces;
-    DynamicList<label> samplingSegments;
-    DynamicList<scalar> samplingCurveDist;
 
     calcSamples
     (
-        samplingPts,
-        samplingCells,
-        samplingFaces,
+        samplingPositions,
         samplingSegments,
-        samplingCurveDist
+        samplingCells,
+        samplingFaces
     );
 
-    samplingPts.shrink();
+    samplingPositions.shrink();
+    samplingSegments.shrink();
     samplingCells.shrink();
     samplingFaces.shrink();
-    samplingSegments.shrink();
-    samplingCurveDist.shrink();
 
     setSamples
     (
-        samplingPts,
-        samplingCells,
-        samplingFaces,
+        samplingPositions,
         samplingSegments,
-        samplingCurveDist
+        samplingCells,
+        samplingFaces
     );
 }
 
@@ -213,11 +206,6 @@ Foam::sampledSets::boundaryRandom::boundaryRandom
     nPoints_(dict.lookup<label>("nPoints"))
 {
     genSamples();
-
-    if (debug)
-    {
-        write(Info);
-    }
 }
 
 
diff --git a/src/sampling/sampledSet/boundaryRandom/boundaryRandom.H b/src/sampling/sampledSet/boundaryRandom/boundaryRandom.H
index df799951cb..e52d6af4d4 100644
--- a/src/sampling/sampledSet/boundaryRandom/boundaryRandom.H
+++ b/src/sampling/sampledSet/boundaryRandom/boundaryRandom.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,11 +86,10 @@ class boundaryRandom
         //- Sample all points
         void calcSamples
         (
-            DynamicList<point>& samplingPts,
-            DynamicList<label>& samplingCells,
-            DynamicList<label>& samplingFaces,
+            DynamicList<point>& samplingPositions,
             DynamicList<label>& samplingSegments,
-            DynamicList<scalar>& samplingCurveDist
+            DynamicList<label>& samplingCells,
+            DynamicList<label>& samplingFaces
         ) const;
 
         //- Use calcSamples to obtain samples and copy them into *this
diff --git a/src/sampling/sampledSet/boxUniform/boxUniform.C b/src/sampling/sampledSet/boxUniform/boxUniform.C
index aaa39bc291..8b8b0404ed 100644
--- a/src/sampling/sampledSet/boxUniform/boxUniform.C
+++ b/src/sampling/sampledSet/boxUniform/boxUniform.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,11 +48,10 @@ namespace sampledSets
 
 void Foam::sampledSets::boxUniform::calcSamples
 (
-    DynamicList<point>& samplingPts,
-    DynamicList<label>& samplingCells,
-    DynamicList<label>& samplingFaces,
+    DynamicList<point>& samplingPositions,
     DynamicList<label>& samplingSegments,
-    DynamicList<scalar>& samplingCurveDist
+    DynamicList<label>& samplingCells,
+    DynamicList<label>& samplingFaces
 ) const
 {
     for (label k = 0; k < nPoints_.z(); ++ k)
@@ -72,11 +71,13 @@ void Foam::sampledSets::boxUniform::calcSamples
 
                 if (celli != -1)
                 {
-                    samplingPts.append(pt);
+                    samplingPositions.append(pt);
+                    samplingSegments.append
+                    (
+                        i + j*nPoints_.x() + k*nPoints_.x()*nPoints_.y()
+                    );
                     samplingCells.append(celli);
                     samplingFaces.append(-1);
-                    samplingSegments.append(0);
-                    samplingCurveDist.append(scalar(i));
                 }
             }
         }
@@ -86,35 +87,30 @@ void Foam::sampledSets::boxUniform::calcSamples
 
 void Foam::sampledSets::boxUniform::genSamples()
 {
-    // Storage for sample points
-    DynamicList<point> samplingPts;
+    DynamicList<point> samplingPositions;
+    DynamicList<label> samplingSegments;
     DynamicList<label> samplingCells;
     DynamicList<label> samplingFaces;
-    DynamicList<label> samplingSegments;
-    DynamicList<scalar> samplingCurveDist;
 
     calcSamples
     (
-        samplingPts,
-        samplingCells,
-        samplingFaces,
+        samplingPositions,
         samplingSegments,
-        samplingCurveDist
+        samplingCells,
+        samplingFaces
     );
 
-    samplingPts.shrink();
+    samplingPositions.shrink();
+    samplingSegments.shrink();
     samplingCells.shrink();
     samplingFaces.shrink();
-    samplingSegments.shrink();
-    samplingCurveDist.shrink();
 
     setSamples
     (
-        samplingPts,
-        samplingCells,
-        samplingFaces,
+        samplingPositions,
         samplingSegments,
-        samplingCurveDist
+        samplingCells,
+        samplingFaces
     );
 }
 
@@ -134,11 +130,6 @@ Foam::sampledSets::boxUniform::boxUniform
     nPoints_(dict.lookup("nPoints"))
 {
     genSamples();
-
-    if (debug)
-    {
-        write(Info);
-    }
 }
 
 
diff --git a/src/sampling/sampledSet/boxUniform/boxUniform.H b/src/sampling/sampledSet/boxUniform/boxUniform.H
index 1fb281438a..078ace7b2e 100644
--- a/src/sampling/sampledSet/boxUniform/boxUniform.H
+++ b/src/sampling/sampledSet/boxUniform/boxUniform.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -62,11 +62,6 @@ SourceFiles
 
 namespace Foam
 {
-
-// Forward declaration of classes
-class passiveParticle;
-template<class Type> class particle;
-
 namespace sampledSets
 {
 
@@ -92,11 +87,10 @@ class boxUniform
         //- Samples all points in sampleCoords.
         void calcSamples
         (
-            DynamicList<point>& samplingPts,
-            DynamicList<label>& samplingCells,
-            DynamicList<label>& samplingFaces,
+            DynamicList<point>& samplingPositions,
             DynamicList<label>& samplingSegments,
-            DynamicList<scalar>& samplingCurveDist
+            DynamicList<label>& samplingCells,
+            DynamicList<label>& samplingFaces
         ) const;
 
         //- Uses calcSamples to obtain samples. Copies them into *this.
diff --git a/src/sampling/sampledSet/cellSetSampledSet/cellSetSampledSet.C b/src/sampling/sampledSet/cellSetSampledSet/cellSetSampledSet.C
index e376c2891b..b3dde4e986 100644
--- a/src/sampling/sampledSet/cellSetSampledSet/cellSetSampledSet.C
+++ b/src/sampling/sampledSet/cellSetSampledSet/cellSetSampledSet.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,10 +49,9 @@ void Foam::sampledSets::cellSetSampledSet::genSamples()
     setSamples
     (
         List<point>(IndirectList<point>(mesh().cellCentres(), cells)),
+        identity(cells.size()),
         cells,
-        labelList(cells.size(), -1),
-        labelList(cells.size(), 0),
-        scalarList(identity(cells.size()))
+        labelList(cells.size(), -1)
     );
 }
 
@@ -71,11 +70,6 @@ Foam::sampledSets::cellSetSampledSet::cellSetSampledSet
     setName_(dict.lookup("set"))
 {
     genSamples();
-
-    if (debug)
-    {
-        write(Info);
-    }
 }
 
 
diff --git a/src/sampling/sampledSet/circleRandom/circleRandom.C b/src/sampling/sampledSet/circleRandom/circleRandom.C
index 9326a2a8ec..a19b8d275e 100644
--- a/src/sampling/sampledSet/circleRandom/circleRandom.C
+++ b/src/sampling/sampledSet/circleRandom/circleRandom.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,11 +49,10 @@ namespace sampledSets
 
 void Foam::sampledSets::circleRandom::calcSamples
 (
-    DynamicList<point>& samplingPts,
-    DynamicList<label>& samplingCells,
-    DynamicList<label>& samplingFaces,
+    DynamicList<point>& samplingPositions,
     DynamicList<label>& samplingSegments,
-    DynamicList<scalar>& samplingCurveDist
+    DynamicList<label>& samplingCells,
+    DynamicList<label>& samplingFaces
 ) const
 {
     Random rndGen(261782);
@@ -75,11 +74,10 @@ void Foam::sampledSets::circleRandom::calcSamples
 
         if (celli != -1)
         {
-            samplingPts.append(pt);
+            samplingPositions.append(pt);
+            samplingSegments.append(i);
             samplingCells.append(celli);
             samplingFaces.append(-1);
-            samplingSegments.append(0);
-            samplingCurveDist.append(scalar(i));
         }
     }
 }
@@ -87,35 +85,30 @@ void Foam::sampledSets::circleRandom::calcSamples
 
 void Foam::sampledSets::circleRandom::genSamples()
 {
-    // Storage for sample points
-    DynamicList<point> samplingPts;
+    DynamicList<point> samplingPositions;
+    DynamicList<label> samplingSegments;
     DynamicList<label> samplingCells;
     DynamicList<label> samplingFaces;
-    DynamicList<label> samplingSegments;
-    DynamicList<scalar> samplingCurveDist;
 
     calcSamples
     (
-        samplingPts,
-        samplingCells,
-        samplingFaces,
+        samplingPositions,
         samplingSegments,
-        samplingCurveDist
+        samplingCells,
+        samplingFaces
     );
 
-    samplingPts.shrink();
+    samplingPositions.shrink();
+    samplingSegments.shrink();
     samplingCells.shrink();
     samplingFaces.shrink();
-    samplingSegments.shrink();
-    samplingCurveDist.shrink();
 
     setSamples
     (
-        samplingPts,
-        samplingCells,
-        samplingFaces,
+        samplingPositions,
         samplingSegments,
-        samplingCurveDist
+        samplingCells,
+        samplingFaces
     );
 }
 
@@ -137,11 +130,6 @@ Foam::sampledSets::circleRandom::circleRandom
     nPoints_(dict.lookup<label>("nPoints"))
 {
     genSamples();
-
-    if (debug)
-    {
-        write(Info);
-    }
 }
 
 
diff --git a/src/sampling/sampledSet/circleRandom/circleRandom.H b/src/sampling/sampledSet/circleRandom/circleRandom.H
index ba68064a0f..56afcc85da 100644
--- a/src/sampling/sampledSet/circleRandom/circleRandom.H
+++ b/src/sampling/sampledSet/circleRandom/circleRandom.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -95,11 +95,10 @@ class circleRandom
         //- Samples all points in sampleCoords
         void calcSamples
         (
-            DynamicList<point>& samplingPts,
-            DynamicList<label>& samplingCells,
-            DynamicList<label>& samplingFaces,
+            DynamicList<point>& samplingPositions,
             DynamicList<label>& samplingSegments,
-            DynamicList<scalar>& samplingCurveDist
+            DynamicList<label>& samplingCells,
+            DynamicList<label>& samplingFaces
         ) const;
 
         //- Uses calcSamples to obtain samples. Copies them into *this.
diff --git a/src/sampling/sampledSet/faceSetSampledSet/faceSetSampledSet.C b/src/sampling/sampledSet/faceSetSampledSet/faceSetSampledSet.C
index 7675658196..25022827c7 100644
--- a/src/sampling/sampledSet/faceSetSampledSet/faceSetSampledSet.C
+++ b/src/sampling/sampledSet/faceSetSampledSet/faceSetSampledSet.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2020-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,10 +49,9 @@ void Foam::sampledSets::faceSetSampledSet::genSamples()
     setSamples
     (
         List<point>(IndirectList<point>(mesh().faceCentres(), faces)),
-        labelList(IndirectList<label>(mesh().faceOwner(), faces)),
-        faces,
-        labelList(faces.size(), 0),
-        scalarList(identity(faces.size()))
+        identity(faces.size()),
+        labelList(UIndirectList<label>(mesh().faceOwner(), faces)),
+        faces
     );
 }
 
@@ -71,11 +70,6 @@ Foam::sampledSets::faceSetSampledSet::faceSetSampledSet
     setName_(dict.lookup("set"))
 {
     genSamples();
-
-    if (debug)
-    {
-        write(Info);
-    }
 }
 
 
diff --git a/src/sampling/sampledSet/lineCell/lineCell.C b/src/sampling/sampledSet/lineCell/lineCell.C
index 9a5d1282e2..a512a37d3c 100644
--- a/src/sampling/sampledSet/lineCell/lineCell.C
+++ b/src/sampling/sampledSet/lineCell/lineCell.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,149 +41,64 @@ namespace sampledSets
 }
 
 
-// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
-
-void Foam::sampledSets::lineCell::calcMidPointSample
-(
-    const polyMesh& mesh,
-    const point& prevPt,
-    const label prevFace,
-    const label prevSegment,
-    const scalar prevCurveDist,
-    const point& nextPt,
-    const label nextFace,
-    const label nextSegment,
-    DynamicList<point>& samplingPts,
-    DynamicList<label>& samplingCells,
-    DynamicList<label>& samplingFaces,
-    DynamicList<label>& samplingSegments,
-    DynamicList<scalar>& samplingCurveDist
-)
-{
-    if (prevSegment == nextSegment)
-    {
-        const point pt = (prevPt + nextPt)/2;
-        const vector delta = nextPt - prevPt;
-
-        const label prevOwner = mesh.faceOwner()[prevFace];
-        const label prevNeighbour =
-            prevFace < mesh.faceNeighbour().size()
-          ? mesh.faceNeighbour()[prevFace]
-          : -1;
-        const label nextOwner = mesh.faceOwner()[nextFace];
-        const label nextNeighbour =
-            nextFace < mesh.faceNeighbour().size()
-          ? mesh.faceNeighbour()[nextFace]
-          : -2;
-
-        label celli = -1;
-        if (prevOwner == nextOwner || prevOwner == nextNeighbour)
-        {
-            celli = prevOwner;
-        }
-        else if (prevNeighbour == nextOwner || prevNeighbour == nextNeighbour)
-        {
-            celli = prevNeighbour;
-        }
-        else
-        {
-            FatalErrorInFunction
-                << "Adjacent faces in the same segment do not share a cell. "
-                << "This is a bug." << exit(FatalError);
-        }
-
-        samplingPts.append(pt);
-        samplingCells.append(celli);
-        samplingFaces.append(-1);
-        samplingCurveDist.append(prevCurveDist + mag(delta)/2);
-        samplingSegments.append(prevSegment);
-    }
-}
-
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 void Foam::sampledSets::lineCell::calcSamples
 (
-    DynamicList<point>& samplingPts,
-    DynamicList<label>& samplingCells,
-    DynamicList<label>& samplingFaces,
+    DynamicList<point>& samplingPositions,
+    DynamicList<scalar>& samplingDistances,
     DynamicList<label>& samplingSegments,
-    DynamicList<scalar>& samplingCurveDist
+    DynamicList<label>& samplingCells,
+    DynamicList<label>& samplingFaces
 ) const
 {
-    // Run the algorithm from lineFaceSet to get all the face intersections
-    DynamicList<point> facePts;
-    DynamicList<label> faceCells;
-    DynamicList<label> faceFaces;
-    DynamicList<label> faceSegments;
-    DynamicList<scalar> faceCurveDist;
     lineFace::calcSamples
     (
         mesh(),
         searchEngine(),
         start_,
         end_,
-        facePts,
-        faceCells,
-        faceFaces,
-        faceSegments,
-        faceCurveDist
+        false,
+        true,
+        samplingPositions,
+        samplingDistances,
+        samplingSegments,
+        samplingCells,
+        samplingFaces
     );
-
-    // Append all mid points to the set
-    for (label facei = 1; facei < facePts.size(); ++ facei)
-    {
-        calcMidPointSample
-        (
-            mesh(),
-            facePts[facei - 1],
-            faceFaces[facei - 1],
-            faceSegments[facei - 1],
-            faceCurveDist[facei - 1],
-            facePts[facei],
-            faceFaces[facei],
-            faceSegments[facei],
-            samplingPts,
-            samplingCells,
-            samplingFaces,
-            samplingSegments,
-            samplingCurveDist
-        );
-    }
 }
 
 
 void Foam::sampledSets::lineCell::genSamples()
 {
-    DynamicList<point> samplingPts;
+    DynamicList<point> samplingPositions;
+    DynamicList<scalar> samplingDistances;
+    DynamicList<label> samplingSegments;
     DynamicList<label> samplingCells;
     DynamicList<label> samplingFaces;
-    DynamicList<label> samplingSegments;
-    DynamicList<scalar> samplingCurveDist;
 
     calcSamples
     (
-        samplingPts,
-        samplingCells,
-        samplingFaces,
+        samplingPositions,
+        samplingDistances,
         samplingSegments,
-        samplingCurveDist
+        samplingCells,
+        samplingFaces
     );
 
-    samplingPts.shrink();
+    samplingPositions.shrink();
+    samplingDistances.shrink();
+    samplingSegments.shrink();
     samplingCells.shrink();
     samplingFaces.shrink();
-    samplingSegments.shrink();
-    samplingCurveDist.shrink();
 
     setSamples
     (
-        samplingPts,
-        samplingCells,
-        samplingFaces,
+        samplingPositions,
+        samplingDistances,
         samplingSegments,
-        samplingCurveDist
+        samplingCells,
+        samplingFaces
     );
 }
 
@@ -203,11 +118,6 @@ Foam::sampledSets::lineCell::lineCell
     end_(dict.lookup("end"))
 {
     genSamples();
-
-    if (debug)
-    {
-        write(Info);
-    }
 }
 
 
diff --git a/src/sampling/sampledSet/lineCell/lineCell.H b/src/sampling/sampledSet/lineCell/lineCell.H
index a80e99264e..be68575143 100644
--- a/src/sampling/sampledSet/lineCell/lineCell.H
+++ b/src/sampling/sampledSet/lineCell/lineCell.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -84,11 +84,11 @@ class lineCell
         //- Calculate all the sampling points
         virtual void calcSamples
         (
-            DynamicList<point>& samplingPts,
-            DynamicList<label>& samplingCells,
-            DynamicList<label>& samplingFaces,
+            DynamicList<point>& samplingPositions,
+            DynamicList<scalar>& samplingDistances,
             DynamicList<label>& samplingSegments,
-            DynamicList<scalar>& samplingCurveDist
+            DynamicList<label>& samplingCells,
+            DynamicList<label>& samplingFaces
         ) const;
 
         //- Uses calcSamples to obtain samples and copies them into *this
@@ -101,27 +101,6 @@ public:
     TypeName("lineCell");
 
 
-    // Static Member Functions
-
-        //- Calculate the next mid point sample
-        static void calcMidPointSample
-        (
-            const polyMesh& mesh,
-            const point& prevPt,
-            const label prevFace,
-            const label prevSegment,
-            const scalar prevCurveDist,
-            const point& nextPt,
-            const label nextFace,
-            const label nextSegment,
-            DynamicList<point>& samplingPts,
-            DynamicList<label>& samplingCells,
-            DynamicList<label>& samplingFaces,
-            DynamicList<label>& samplingSegments,
-            DynamicList<scalar>& samplingCurveDist
-        );
-
-
     // Constructors
 
         //- Construct from dictionary
diff --git a/src/sampling/sampledSet/lineCellFace/lineCellFace.C b/src/sampling/sampledSet/lineCellFace/lineCellFace.C
index a41af97b1a..acf9199117 100644
--- a/src/sampling/sampledSet/lineCellFace/lineCellFace.C
+++ b/src/sampling/sampledSet/lineCellFace/lineCellFace.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,104 +45,60 @@ namespace sampledSets
 
 void Foam::sampledSets::lineCellFace::calcSamples
 (
-    DynamicList<point>& samplingPts,
-    DynamicList<label>& samplingCells,
-    DynamicList<label>& samplingFaces,
+    DynamicList<point>& samplingPositions,
+    DynamicList<scalar>& samplingDistances,
     DynamicList<label>& samplingSegments,
-    DynamicList<scalar>& samplingCurveDist
+    DynamicList<label>& samplingCells,
+    DynamicList<label>& samplingFaces
 ) const
 {
-    // Run the algorithm from lineFaceSet to get all the face intersections
-    DynamicList<point> facePts;
-    DynamicList<label> faceCells;
-    DynamicList<label> faceFaces;
-    DynamicList<label> faceSegments;
-    DynamicList<scalar> faceCurveDist;
     lineFace::calcSamples
     (
         mesh(),
         searchEngine(),
         start_,
         end_,
-        facePts,
-        faceCells,
-        faceFaces,
-        faceSegments,
-        faceCurveDist
+        true,
+        true,
+        samplingPositions,
+        samplingDistances,
+        samplingSegments,
+        samplingCells,
+        samplingFaces
     );
-
-    // If there are no intersections then quit
-    if (!facePts.size())
-    {
-        return;
-    }
-
-    // Append all the face intersections to the set, additionally adding mid
-    // points when the segment is the same
-    samplingPts.append(facePts[0]);
-    samplingCells.append(faceCells[0]);
-    samplingFaces.append(faceFaces[0]);
-    samplingSegments.append(faceSegments[0]);
-    samplingCurveDist.append(faceCurveDist[0]);
-
-    for (label facei = 1; facei < facePts.size(); ++ facei)
-    {
-        lineCell::calcMidPointSample
-        (
-            mesh(),
-            samplingPts.last(),
-            samplingFaces.last(),
-            samplingSegments.last(),
-            samplingCurveDist.last(),
-            facePts[facei],
-            faceFaces[facei],
-            faceSegments[facei],
-            samplingPts,
-            samplingCells,
-            samplingFaces,
-            samplingSegments,
-            samplingCurveDist
-        );
-
-        samplingPts.append(facePts[facei]);
-        samplingCells.append(faceCells[facei]);
-        samplingFaces.append(faceFaces[facei]);
-        samplingSegments.append(faceSegments[facei]);
-        samplingCurveDist.append(faceCurveDist[facei]);
-    }
 }
 
 
 void Foam::sampledSets::lineCellFace::genSamples()
 {
-    DynamicList<point> samplingPts;
+    DynamicList<point> samplingPositions;
+    DynamicList<scalar> samplingDistances;
+    DynamicList<label> samplingSegments;
     DynamicList<label> samplingCells;
     DynamicList<label> samplingFaces;
-    DynamicList<label> samplingSegments;
-    DynamicList<scalar> samplingCurveDist;
 
     calcSamples
     (
-        samplingPts,
-        samplingCells,
-        samplingFaces,
+        samplingPositions,
+        samplingDistances,
         samplingSegments,
-        samplingCurveDist
+        samplingCells,
+        samplingFaces
     );
 
-    samplingPts.shrink();
+    samplingPositions.shrink();
+    samplingDistances.shrink();
+    samplingSegments.shrink();
     samplingCells.shrink();
     samplingFaces.shrink();
-    samplingSegments.shrink();
-    samplingCurveDist.shrink();
 
     setSamples
     (
-        samplingPts,
-        samplingCells,
-        samplingFaces,
+        samplingPositions,
+        samplingDistances,
         samplingSegments,
-        samplingCurveDist
+        samplingCells,
+        samplingFaces
     );
 }
 
@@ -162,11 +118,6 @@ Foam::sampledSets::lineCellFace::lineCellFace
     end_(dict.lookup("end"))
 {
     genSamples();
-
-    if (debug)
-    {
-        write(Info);
-    }
 }
 
 
@@ -185,11 +136,6 @@ Foam::sampledSets::lineCellFace::lineCellFace
     end_(end)
 {
     genSamples();
-
-    if (debug)
-    {
-        write(Info);
-    }
 }
 
 
diff --git a/src/sampling/sampledSet/lineCellFace/lineCellFace.H b/src/sampling/sampledSet/lineCellFace/lineCellFace.H
index 21ec15a324..e3f451b123 100644
--- a/src/sampling/sampledSet/lineCellFace/lineCellFace.H
+++ b/src/sampling/sampledSet/lineCellFace/lineCellFace.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -85,11 +85,11 @@ class lineCellFace
         //- Calculate all the sampling points
         virtual void calcSamples
         (
-            DynamicList<point>& samplingPts,
-            DynamicList<label>& samplingCells,
-            DynamicList<label>& samplingFaces,
+            DynamicList<point>& samplingPositions,
+            DynamicList<scalar>& samplingDistances,
             DynamicList<label>& samplingSegments,
-            DynamicList<scalar>& samplingCurveDist
+            DynamicList<label>& samplingCells,
+            DynamicList<label>& samplingFaces
         ) const;
 
         //- Uses calcSamples to obtain samples and copies them into *this
diff --git a/src/sampling/sampledSet/lineFace/lineFace.C b/src/sampling/sampledSet/lineFace/lineFace.C
index 8f2f9e7668..aff64e07ed 100644
--- a/src/sampling/sampledSet/lineFace/lineFace.C
+++ b/src/sampling/sampledSet/lineFace/lineFace.C
@@ -27,6 +27,8 @@ License
 #include "meshSearch.H"
 #include "DynamicList.H"
 #include "polyMesh.H"
+#include "treeDataCell.H"
+#include "sampledSetCloud.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -49,176 +51,211 @@ void Foam::sampledSets::lineFace::calcSamples
     const meshSearch& searchEngine,
     const vector& start,
     const vector& end,
-    DynamicList<point>& samplingPts,
-    DynamicList<label>& samplingCells,
-    DynamicList<label>& samplingFaces,
+    const bool storeFaces,
+    const bool storeCells,
+    DynamicList<point>& samplingPositions,
+    DynamicList<scalar>& samplingDistances,
     DynamicList<label>& samplingSegments,
-    DynamicList<scalar>& samplingCurveDist
+    DynamicList<label>& samplingCells,
+    DynamicList<label>& samplingFaces
 )
 {
-    // Ask for the tetBasePtIs and oldCellCentres to trigger all processors to
-    // build them, otherwise, if some processors have no particles then there
-    // is a comms mismatch.
-    mesh.tetBasePtIs();
-    mesh.oldCellCentres();
-
-    // Create lists of initial positions from which to track, the faces and
-    // cells associated with those positions, and whether the track  propagates
-    // forward (true) or backward (false) along the line from start to end
-    DynamicList<point> initialPts;
-    DynamicList<label> initialFaces, initialCells;
-    DynamicList<bool> initialDirections;
-
-    // Add boundary hits
-    const List<pointIndexHit> bHits = searchEngine.intersections(start, end);
-    forAll(bHits, bHiti)
+    // Get all candidates for starting the tracks
+    List<DynamicList<label>> procCandidateCells(Pstream::nProcs());
+    List<DynamicList<scalar>> procCandidateTs(Pstream::nProcs());
     {
-        initialPts.append(bHits[bHiti].hitPoint());
-        const label facei = bHits[bHiti].index();
-        initialFaces.append(facei);
-        initialCells.append(mesh.faceOwner()[facei]);
-        initialDirections.append((mesh.faceAreas()[facei] & (end - start)) < 0);
-    }
-
-    // Add the start and end points if they can be found within the mesh
-    const label startCelli = searchEngine.findCell(start);
-    if (startCelli != -1)
-    {
-        initialPts.append(start);
-        initialFaces.append(-1);
-        initialCells.append(startCelli);
-        initialDirections.append(true);
-    }
-    const label endCelli = searchEngine.findCell(end);
-    if (endCelli != -1)
-    {
-        initialPts.append(end);
-        initialFaces.append(-1);
-        initialCells.append(endCelli);
-        initialDirections.append(false);
-    }
-
-    // Loop over the initial points, starting new segments each time
-    label sampleSegmenti = 0;
-    DynamicList<Pair<point>> lines;
-    forAll(initialPts, initiali)
-    {
-        // Get the sign
-        const scalar sign = initialDirections[initiali] ? +1 : -1;
-
-        // Create a particle. Track backwards into the boundary face so that
-        // the particle has the correct topology.
-        passiveParticle sampleParticle
-        (
-            mesh,
-            initialPts[initiali],
-            initialCells[initiali]
-        );
-        if (initialFaces[initiali] != -1)
+        const label startCelli = searchEngine.findCell(start);
+        if (startCelli != -1)
         {
-            sampleParticle.track(sign*(start - end), 0);
-            if (!sampleParticle.onBoundaryFace())
-            {
-                FatalErrorInFunction
-                    << "Failed to associate with the starting boundary face"
-                    << exit(FatalError);
-            }
+            procCandidateCells[Pstream::myProcNo()].append(startCelli);
+            procCandidateTs[Pstream::myProcNo()].append(0);
         }
 
-        // Track until a boundary is hit, appending the face intersections
-        // to the lists of samples, and storing the line
-        DynamicList<point> segmentPts;
-        DynamicList<label> segmentCells, segmentFaces;
-        Pair<point> line(sampleParticle.position(), sampleParticle.position());
-        while (true)
+        const label endCelli = searchEngine.findCell(end);
+        if (endCelli != -1)
         {
-            const point pt = sampleParticle.position();
-            const scalar dist = mag(pt - (sign > 0 ? start : end));
-            const bool first = segmentPts.size() == 0;
-
-            if (sampleParticle.onFace())
-            {
-                segmentPts.append(pt);
-                segmentCells.append(sampleParticle.cell());
-                segmentFaces.append(sampleParticle.face());
-            }
-
-            const vector s =
-                sign*(end - start)*(1 - dist/mag(end - start));
-
-            sampleParticle.reset(1);
-
-            if
-            (
-                (!first && sampleParticle.onBoundaryFace())
-             || sampleParticle.trackToCell(s, 0) == 0
-            )
-            {
-                break;
-            }
-        }
-        line[1] = sampleParticle.position();
-
-        // Reverse if going backwards
-        if (sign < 0)
-        {
-            inplaceReverseList(segmentPts);
-            inplaceReverseList(segmentCells);
-            inplaceReverseList(segmentFaces);
-            line = reverse(line);
+            procCandidateCells[Pstream::myProcNo()].append(endCelli);
+            procCandidateTs[Pstream::myProcNo()].append(1);
         }
 
-        // Mark point as not to be kept if they fall within the bounds of
-        // previous lines
-        boolList segmentKeep(segmentPts.size(), true);
-        forAll(segmentPts, segmentPti)
+        const List<pointIndexHit> bHits =
+            searchEngine.intersections(start, end);
+        forAll(bHits, bHiti)
         {
-            forAll(lines, linei)
+            for (label bHitj = bHiti + 1; bHitj < bHits.size(); ++ bHitj)
             {
-                const Pair<point>& l = lines[linei];
-                const vector dlHat = normalised(l[1] - l[0]);
-                if (magSqr(dlHat) == 0)
+                const point midP =
+                    (bHits[bHiti].hitPoint() + bHits[bHitj].hitPoint())/2;
+
+                const label midCelli = searchEngine.findCell(midP);
+                const scalar midT = mag(midP - start)/mag(end - start);
+
+                if (midCelli != -1)
                 {
-                    continue;
-                }
-                const scalar dot0 = (segmentPts[segmentPti] - l[0]) & dlHat;
-                const scalar dot1 = (l[1] - segmentPts[segmentPti]) & dlHat;
-                if (dot0 > 0 && dot1 > 0)
-                {
-                    segmentKeep[segmentPti] = false;
-                    break;
+                    procCandidateCells[Pstream::myProcNo()].append(midCelli);
+                    procCandidateTs[Pstream::myProcNo()].append(midT);
                 }
             }
         }
+    }
+    Pstream::gatherList(procCandidateCells);
+    Pstream::scatterList(procCandidateCells);
+    Pstream::gatherList(procCandidateTs);
+    Pstream::scatterList(procCandidateTs);
 
-        // Store the line
-        lines.append(line);
+    // Tracking data
+    const List<point> startEnd({start, end});
+    const List<point> endStart({end, start});
+    DynamicList<point> halfSegmentPositions;
+    DynamicList<scalar> halfSegmentDistances;
+    DynamicList<label> halfSegmentCells;
+    DynamicList<label> halfSegmentFaces;
 
-        // Add new segments to the lists, breaking the segment anywhere that
-        // points are not kept
-        bool newSampleSegment = false;
-        forAll(segmentPts, segmentPti)
+    // Create a cloud with which to track segments
+    sampledSetCloud particles
+    (
+        mesh,
+        lineFace::typeName,
+        IDLList<sampledSetParticle>()
+    );
+
+    // Create each segment in turn
+    label segmenti = 0;
+    forAll(procCandidateCells, proci)
+    {
+        forAll(procCandidateCells[proci], candidatei)
         {
-            if (segmentKeep[segmentPti])
+            const label celli = procCandidateCells[proci][candidatei];
+
+            if (celli == -1) continue;
+
+            const scalar t = procCandidateTs[proci][candidatei];
+            const point p = (1 - t)*start + t*end;
+
+            // Track in both directions to form parts of the segment either
+            // side of the candidate
+            Pair<scalar> segmentT;
+            forAll(segmentT, i)
             {
-                samplingPts.append(segmentPts[segmentPti]);
-                samplingCells.append(segmentCells[segmentPti]);
-                samplingFaces.append(segmentFaces[segmentPti]);
-                samplingSegments.append(sampleSegmenti);
-                samplingCurveDist.append(mag(segmentPts[segmentPti] - start));
-                newSampleSegment = true;
+                sampledSetParticle::trackingData tdBwd
+                (
+                    particles,
+                    i == 0 ? endStart : startEnd,
+                    false,
+                    storeFaces,
+                    storeCells,
+                    halfSegmentPositions,
+                    halfSegmentDistances,
+                    halfSegmentCells,
+                    halfSegmentFaces
+                );
+
+                particles.clear();
+                if (proci == Pstream::myProcNo())
+                {
+                    particles.addParticle
+                    (
+                        new sampledSetParticle
+                        (
+                            mesh,
+                            p,
+                            celli,
+                            0,
+                            i == 0 ? t : 1 - t,
+                            0
+                        )
+                    );
+                }
+
+                particles.move(particles, tdBwd, rootGreat);
+
+                segmentT[i] =
+                    returnReduce
+                    (
+                        particles.size()
+                      ? mag(particles.first()->position() - start)
+                       /mag(end - start)
+                      : i == 0 ? vGreat : -vGreat,
+                        [i](const scalar a, const scalar b)
+                        {
+                            return (i == 0) == (a < b) ? a : b;
+                        }
+                    );
+
+                if (i == 0)
+                {
+                    reverse(halfSegmentPositions);
+                    reverse(halfSegmentDistances);
+                    reverse(halfSegmentCells);
+                    reverse(halfSegmentFaces);
+                }
+
+                const label n = halfSegmentPositions.size();
+
+                samplingPositions.append(halfSegmentPositions);
+                samplingSegments.append(labelList(n, segmenti));
+                samplingCells.append(halfSegmentCells);
+                samplingFaces.append(halfSegmentFaces);
+
+                halfSegmentPositions.clear();
+                halfSegmentDistances.clear();
+                halfSegmentCells.clear();
+                halfSegmentFaces.clear();
+
+                // If storing cells we need to store the starting cells between
+                // the tracks
+                if (proci == Pstream::myProcNo() && i == 1 && storeCells)
+                {
+                    particle trackBwd(mesh, p, celli), trackFwd(trackBwd);
+                    trackBwd.trackToFace(start - p, 0);
+                    trackFwd.trackToFace(end - p, 0);
+                    if (trackBwd.onFace() && trackFwd.onFace())
+                    {
+                        samplingPositions.append
+                        (
+                            (trackBwd.position() + trackFwd.position())/2
+                        );
+                        samplingSegments.append(segmenti);
+                        samplingCells.append(celli);
+                        samplingFaces.append(-1);
+                    }
+                }
             }
-            else if (newSampleSegment)
+
+            // Disable all candidates that fall within the bounds of the
+            // computed segment
+            forAll(procCandidateCells, procj)
             {
-                ++ sampleSegmenti;
-                newSampleSegment = false;
+                forAll(procCandidateCells[procj], candidatej)
+                {
+                    const label cellj = procCandidateCells[procj][candidatej];
+
+                    if (cellj == -1) continue;
+
+                    const scalar t = procCandidateTs[procj][candidatej];
+
+                    if
+                    (
+                        t > segmentT.first() - rootSmall
+                     && t < segmentT.second() + rootSmall
+                    )
+                    {
+                        procCandidateCells[procj][candidatej] = -1;
+                        procCandidateTs[procj][candidatej] = NaN;
+                    }
+                }
             }
+
+            // Move onto the next segment
+            segmenti ++;
         }
-        if (newSampleSegment)
-        {
-            ++ sampleSegmenti;
-            newSampleSegment = false;
-        }
+    }
+
+    // Set the distances
+    samplingDistances.resize(samplingPositions.size());
+    forAll(samplingPositions, i)
+    {
+        samplingDistances[i] = mag(samplingPositions[i] - start);
     }
 }
 
@@ -227,11 +264,11 @@ void Foam::sampledSets::lineFace::calcSamples
 
 void Foam::sampledSets::lineFace::calcSamples
 (
-    DynamicList<point>& samplingPts,
-    DynamicList<label>& samplingCells,
-    DynamicList<label>& samplingFaces,
+    DynamicList<point>& samplingPositions,
+    DynamicList<scalar>& samplingDistances,
     DynamicList<label>& samplingSegments,
-    DynamicList<scalar>& samplingCurveDist
+    DynamicList<label>& samplingCells,
+    DynamicList<label>& samplingFaces
 ) const
 {
     calcSamples
@@ -240,45 +277,47 @@ void Foam::sampledSets::lineFace::calcSamples
         searchEngine(),
         start_,
         end_,
-        samplingPts,
-        samplingCells,
-        samplingFaces,
+        true,
+        false,
+        samplingPositions,
+        samplingDistances,
         samplingSegments,
-        samplingCurveDist
+        samplingCells,
+        samplingFaces
     );
 }
 
 
 void Foam::sampledSets::lineFace::genSamples()
 {
-    DynamicList<point> samplingPts;
+    DynamicList<point> samplingPositions;
+    DynamicList<scalar> samplingDistances;
+    DynamicList<label> samplingSegments;
     DynamicList<label> samplingCells;
     DynamicList<label> samplingFaces;
-    DynamicList<label> samplingSegments;
-    DynamicList<scalar> samplingCurveDist;
 
     calcSamples
     (
-        samplingPts,
-        samplingCells,
-        samplingFaces,
+        samplingPositions,
+        samplingDistances,
         samplingSegments,
-        samplingCurveDist
+        samplingCells,
+        samplingFaces
     );
 
-    samplingPts.shrink();
+    samplingPositions.shrink();
+    samplingDistances.shrink();
+    samplingSegments.shrink();
     samplingCells.shrink();
     samplingFaces.shrink();
-    samplingSegments.shrink();
-    samplingCurveDist.shrink();
 
     setSamples
     (
-        samplingPts,
-        samplingCells,
-        samplingFaces,
+        samplingPositions,
+        samplingDistances,
         samplingSegments,
-        samplingCurveDist
+        samplingCells,
+        samplingFaces
     );
 }
 
@@ -298,11 +337,6 @@ Foam::sampledSets::lineFace::lineFace
     end_(dict.lookup("end"))
 {
     genSamples();
-
-    if (debug)
-    {
-        write(Info);
-    }
 }
 
 
diff --git a/src/sampling/sampledSet/lineFace/lineFace.H b/src/sampling/sampledSet/lineFace/lineFace.H
index 2e78e9e069..00cb81ec5e 100644
--- a/src/sampling/sampledSet/lineFace/lineFace.H
+++ b/src/sampling/sampledSet/lineFace/lineFace.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,11 +86,11 @@ class lineFace
         //- Calculate all the sampling points
         void calcSamples
         (
-            DynamicList<point>& samplingPts,
-            DynamicList<label>& samplingCells,
-            DynamicList<label>& samplingFaces,
+            DynamicList<point>& samplingPositions,
+            DynamicList<scalar>& samplingDistances,
             DynamicList<label>& samplingSegments,
-            DynamicList<scalar>& samplingCurveDist
+            DynamicList<label>& samplingCells,
+            DynamicList<label>& samplingFaces
         ) const;
 
         //- Uses calcSamples to obtain samples and copies them into *this
@@ -112,11 +112,13 @@ public:
             const meshSearch& searchEngine,
             const vector& start,
             const vector& end,
-            DynamicList<point>& samplingPts,
-            DynamicList<label>& samplingCells,
-            DynamicList<label>& samplingFaces,
+            const bool storeFaces,
+            const bool storeCells,
+            DynamicList<point>& samplingPositions,
+            DynamicList<scalar>& samplingDistances,
             DynamicList<label>& samplingSegments,
-            DynamicList<scalar>& samplingCurveDist
+            DynamicList<label>& samplingCells,
+            DynamicList<label>& samplingFaces
         );
 
 
diff --git a/src/sampling/sampledSet/lineUniform/lineUniform.C b/src/sampling/sampledSet/lineUniform/lineUniform.C
index f33d09dd7e..9fa9a58752 100644
--- a/src/sampling/sampledSet/lineUniform/lineUniform.C
+++ b/src/sampling/sampledSet/lineUniform/lineUniform.C
@@ -27,6 +27,8 @@ License
 #include "meshSearch.H"
 #include "DynamicList.H"
 #include "polyMesh.H"
+#include "sampledSetCloud.H"
+#include "points.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -45,92 +47,68 @@ namespace sampledSets
 
 void Foam::sampledSets::lineUniform::calcSamples
 (
-    DynamicList<point>& samplingPts,
-    DynamicList<label>& samplingCells,
-    DynamicList<label>& samplingFaces,
+    DynamicList<point>& samplingPositions,
+    DynamicList<scalar>& samplingDistances,
     DynamicList<label>& samplingSegments,
-    DynamicList<scalar>& samplingCurveDist
+    DynamicList<label>& samplingCells,
+    DynamicList<label>& samplingFaces
 ) const
 {
-    // Ask for the tetBasePtIs and oldCellCentres to trigger all processors to
-    // build them, otherwise, if some processors have no particles then there
-    // is a comms mismatch.
-    mesh().tetBasePtIs();
-    mesh().oldCellCentres();
+    // Calculate all sampling points
+    const scalarField ts(scalarList(identity(nPoints_))/(nPoints_ - 1));
+    const pointField points((1 - ts)*start_ + ts*end_);
 
-    label sampleSegmentI = 0, sampleI = 0;
-    scalar sampleT = 0;
+    // Calculate the sampling topology
+    points::calcSamples
+    (
+        mesh(),
+        searchEngine(),
+        points,
+        samplingPositions,
+        samplingDistances,
+        samplingSegments,
+        samplingCells,
+        samplingFaces
+    );
 
-    while (sampleI < nPoints_)
+    // Overwrite the distances
+    forAll(samplingPositions, i)
     {
-        const point pt = (1 - sampleT)*start_ + sampleT*end_;
-
-        const label sampleCellI = searchEngine().findCell(pt);
-
-        if (sampleCellI == -1)
-        {
-            if (++ sampleI < nPoints_)
-            {
-                sampleT = scalar(sampleI)/(nPoints_ - 1);
-            }
-        }
-        else
-        {
-            passiveParticle sampleParticle(mesh(), pt, sampleCellI);
-
-            do
-            {
-                samplingPts.append(sampleParticle.position());
-                samplingCells.append(sampleParticle.cell());
-                samplingFaces.append(-1);
-                samplingSegments.append(sampleSegmentI);
-                samplingCurveDist.append(sampleT*mag(end_ - start_));
-
-                if (++ sampleI < nPoints_)
-                {
-                    sampleT = scalar(sampleI)/(nPoints_ - 1);
-                    sampleParticle.reset(1);
-                    sampleParticle.track((end_ - start_)/(nPoints_ - 1), 0);
-                }
-            }
-            while (sampleI < nPoints_ && !sampleParticle.onBoundaryFace());
-
-            ++ sampleSegmentI;
-        }
+        samplingDistances[i] = mag(samplingPositions[i] - start_);
     }
 }
 
 
 void Foam::sampledSets::lineUniform::genSamples()
 {
-    DynamicList<point> samplingPts;
+    DynamicList<point> samplingPositions;
+    DynamicList<scalar> samplingDistances;
+    DynamicList<label> samplingSegments;
     DynamicList<label> samplingCells;
     DynamicList<label> samplingFaces;
-    DynamicList<label> samplingSegments;
-    DynamicList<scalar> samplingCurveDist;
 
     calcSamples
     (
-        samplingPts,
-        samplingCells,
-        samplingFaces,
+        samplingPositions,
+        samplingDistances,
         samplingSegments,
-        samplingCurveDist
+        samplingCells,
+        samplingFaces
     );
 
-    samplingPts.shrink();
+    samplingPositions.shrink();
+    samplingDistances.shrink();
+    samplingSegments.shrink();
     samplingCells.shrink();
     samplingFaces.shrink();
-    samplingSegments.shrink();
-    samplingCurveDist.shrink();
 
     setSamples
     (
-        samplingPts,
-        samplingCells,
-        samplingFaces,
+        samplingPositions,
+        samplingDistances,
         samplingSegments,
-        samplingCurveDist
+        samplingCells,
+        samplingFaces
     );
 }
 
@@ -151,11 +129,6 @@ Foam::sampledSets::lineUniform::lineUniform
     nPoints_(dict.lookup<label>("nPoints"))
 {
     genSamples();
-
-    if (debug)
-    {
-        write(Pout);
-    }
 }
 
 
diff --git a/src/sampling/sampledSet/lineUniform/lineUniform.H b/src/sampling/sampledSet/lineUniform/lineUniform.H
index 1305c467bd..5691633cd8 100644
--- a/src/sampling/sampledSet/lineUniform/lineUniform.H
+++ b/src/sampling/sampledSet/lineUniform/lineUniform.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -92,11 +92,11 @@ class lineUniform
         //  for each sample.
         void calcSamples
         (
-            DynamicList<point>& samplingPts,
-            DynamicList<label>& samplingCells,
-            DynamicList<label>& samplingFaces,
+            DynamicList<point>& samplingPositions,
+            DynamicList<scalar>& samplingDistances,
             DynamicList<label>& samplingSegments,
-            DynamicList<scalar>& samplingCurveDist
+            DynamicList<label>& samplingCells,
+            DynamicList<label>& samplingFaces
         ) const;
 
         //- Uses calcSamples to obtain samples. Copies them into *this.
diff --git a/src/sampling/sampledSet/points/points.C b/src/sampling/sampledSet/points/points.C
index 51f327453b..29df4e2299 100644
--- a/src/sampling/sampledSet/points/points.C
+++ b/src/sampling/sampledSet/points/points.C
@@ -27,6 +27,7 @@ License
 #include "meshSearch.H"
 #include "DynamicList.H"
 #include "polyMesh.H"
+#include "sampledSetCloud.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -41,15 +42,137 @@ namespace sampledSets
 }
 
 
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
+
+void Foam::sampledSets::points::calcSamples
+(
+    const polyMesh& mesh,
+    const meshSearch& searchEngine,
+    const pointField& points,
+    DynamicList<point>& samplingPositions,
+    DynamicList<scalar>& samplingDistances,
+    DynamicList<label>& samplingSegments,
+    DynamicList<label>& samplingCells,
+    DynamicList<label>& samplingFaces
+)
+{
+    // Create a cloud with which to track segments
+    sampledSetCloud particles
+    (
+        mesh,
+        points::typeName,
+        IDLList<sampledSetParticle>()
+    );
+
+    // Consider each point
+    label segmenti = 0, samplei = 0, pointi0 = labelMax, pointi = 0;
+    scalar distance = 0;
+    while (pointi < points.size())
+    {
+        // Sum the distance to the start of the track
+        for (label pointj = pointi0; pointj < pointi; ++ pointj)
+        {
+            distance += mag(points[pointj + 1] - points[pointj]);
+        }
+
+        // Update the old point index
+        pointi0 = pointi;
+
+        // Get unique processor and cell that this sample point is in
+        const labelPair procAndCelli = returnReduce
+        (
+            labelPair
+            (
+                Pstream::myProcNo(),
+                searchEngine.findCell(points[pointi])
+            ),
+            [](const labelPair& a, const labelPair& b)
+            {
+                return
+                    a.second() != -1 && b.second() != -1
+                  ? a.first() < b.first() ? a : b
+                  : a.second() != -1 ? a : b;
+            }
+        );
+
+        // Skip this point if it is not in the global mesh
+        if (procAndCelli.second() == -1)
+        {
+            ++ pointi;
+        }
+
+        // If the point is in the global mesh then track to create a segment
+        else
+        {
+            sampledSetParticle::trackingData td
+            (
+                particles,
+                points,
+                true,
+                false,
+                false,
+                samplingPositions,
+                samplingDistances,
+                samplingCells,
+                samplingFaces
+            );
+
+            // Clear the cloud, then, if the point is in this local mesh,
+            // initialise a particle at the point
+            particles.clear();
+            if (procAndCelli.first() == Pstream::myProcNo())
+            {
+                particles.addParticle
+                (
+                    new sampledSetParticle
+                    (
+                        mesh,
+                        points[pointi],
+                        procAndCelli.second(),
+                        pointi,
+                        1,
+                        distance
+                    )
+                );
+
+                particles.first()->store(particles, td);
+            }
+
+            // Track to create this segment
+            particles.move(particles, td, rootGreat);
+
+            // Set the segment indices
+            samplingSegments.append
+            (
+                labelList
+                (
+                    samplingPositions.size() - samplingSegments.size(),
+                    segmenti
+                )
+            );
+
+            // Move on to the next segment
+            ++ segmenti;
+
+            // Determine the global number of samples completed
+            const label samplei0 = samplei;
+            samplei = returnReduce(samplingPositions.size(), sumOp<label>());
+
+            // Move to the next unsampled point
+            pointi += samplei - samplei0;
+        }
+    }
+}
+
+
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 void Foam::sampledSets::points::calcSamplesUnordered
 (
-    DynamicList<point>& samplingPts,
-    DynamicList<label>& samplingCells,
-    DynamicList<label>& samplingFaces,
+    DynamicList<point>& samplingPositions,
     DynamicList<label>& samplingSegments,
-    DynamicList<scalar>& samplingCurveDist
+    DynamicList<label>& samplingCells,
+    DynamicList<label>& samplingFaces
 ) const
 {
     forAll(points_, i)
@@ -59,122 +182,96 @@ void Foam::sampledSets::points::calcSamplesUnordered
 
         if (celli != -1)
         {
-            samplingPts.append(pt);
+            samplingPositions.append(pt);
+            samplingSegments.append(i);
             samplingCells.append(celli);
             samplingFaces.append(-1);
-            samplingSegments.append(samplingSegments.size());
-            samplingCurveDist.append(scalar(i));
         }
     }
 }
 
+
 void Foam::sampledSets::points::calcSamplesOrdered
 (
-    DynamicList<point>& samplingPts,
-    DynamicList<label>& samplingCells,
-    DynamicList<label>& samplingFaces,
+    DynamicList<point>& samplingPositions,
+    DynamicList<scalar>& samplingDistances,
     DynamicList<label>& samplingSegments,
-    DynamicList<scalar>& samplingCurveDist
+    DynamicList<label>& samplingCells,
+    DynamicList<label>& samplingFaces
 ) const
 {
-    // Ask for the tetBasePtIs and oldCellCentres to trigger all processors to
-    // build them, otherwise, if some processors have no particles then there
-    // is a comms mismatch.
-    mesh().tetBasePtIs();
-    mesh().oldCellCentres();
-
-    const label n = points_.size();
-
-    label sampleSegmentI = 0;
-    label sampleI = 0;
-    scalar sampleDist = 0;
-
-    while (sampleI < n)
-    {
-        const point pt = points_[sampleI];
-
-        const label sampleCellI = searchEngine().findCell(pt);
-
-        if (sampleCellI == -1)
-        {
-            if (++ sampleI < n)
-            {
-                sampleDist += mag(points_[sampleI] - points_[sampleI - 1]);
-            }
-        }
-        else
-        {
-            passiveParticle sampleParticle(mesh(), pt, sampleCellI);
-
-            do
-            {
-                samplingPts.append(sampleParticle.position());
-                samplingCells.append(sampleParticle.cell());
-                samplingFaces.append(-1);
-                samplingSegments.append(sampleSegmentI);
-                samplingCurveDist.append(sampleDist);
-
-                if (++ sampleI < n)
-                {
-                    const vector s = points_[sampleI] - points_[sampleI - 1];
-                    sampleDist += mag(s);
-                    sampleParticle.reset(1);
-                    sampleParticle.track(s, 0);
-                }
-            }
-            while (sampleI < n && !sampleParticle.onBoundaryFace());
-
-            ++ sampleSegmentI;
-        }
-    }
+    // Calculate the sampling topology
+    calcSamples
+    (
+        mesh(),
+        searchEngine(),
+        pointField(points_),
+        samplingPositions,
+        samplingDistances,
+        samplingSegments,
+        samplingCells,
+        samplingFaces
+    );
 }
 
 
 void Foam::sampledSets::points::genSamples()
 {
-    DynamicList<point> samplingPts;
+    DynamicList<point> samplingPositions;
+    DynamicList<scalar> samplingDistances;
+    DynamicList<label> samplingSegments;
     DynamicList<label> samplingCells;
     DynamicList<label> samplingFaces;
-    DynamicList<label> samplingSegments;
-    DynamicList<scalar> samplingCurveDist;
 
     if (!ordered_)
     {
         calcSamplesUnordered
         (
-            samplingPts,
-            samplingCells,
-            samplingFaces,
+            samplingPositions,
             samplingSegments,
-            samplingCurveDist
+            samplingCells,
+            samplingFaces
         );
     }
     else
     {
         calcSamplesOrdered
         (
-            samplingPts,
-            samplingCells,
-            samplingFaces,
+            samplingPositions,
+            samplingDistances,
             samplingSegments,
-            samplingCurveDist
+            samplingCells,
+            samplingFaces
         );
     }
 
-    samplingPts.shrink();
+    samplingPositions.shrink();
+    samplingDistances.shrink();
+    samplingSegments.shrink();
     samplingCells.shrink();
     samplingFaces.shrink();
-    samplingSegments.shrink();
-    samplingCurveDist.shrink();
 
-    setSamples
-    (
-        samplingPts,
-        samplingCells,
-        samplingFaces,
-        samplingSegments,
-        samplingCurveDist
-    );
+    if (!ordered_)
+    {
+        setSamples
+        (
+            samplingPositions,
+            samplingSegments,
+            samplingCells,
+            samplingFaces
+        );
+    }
+    else
+    {
+        setSamples
+        (
+            samplingPositions,
+            samplingDistances,
+            samplingSegments,
+            samplingCells,
+            samplingFaces
+        );
+    }
 }
 
 
@@ -193,11 +290,6 @@ Foam::sampledSets::points::points
     ordered_(dict.lookup("ordered"))
 {
     genSamples();
-
-    if (debug)
-    {
-        write(Info);
-    }
 }
 
 
diff --git a/src/sampling/sampledSet/points/points.H b/src/sampling/sampledSet/points/points.H
index 7ff9c25062..769c267ba4 100644
--- a/src/sampling/sampledSet/points/points.H
+++ b/src/sampling/sampledSet/points/points.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -100,21 +100,20 @@ class points
         //- Calculate all the sampling points
         void calcSamplesUnordered
         (
-            DynamicList<point>& samplingPts,
-            DynamicList<label>& samplingCells,
-            DynamicList<label>& samplingFaces,
+            DynamicList<point>& samplingPositions,
             DynamicList<label>& samplingSegments,
-            DynamicList<scalar>& samplingCurveDist
+            DynamicList<label>& samplingCells,
+            DynamicList<label>& samplingFaces
         ) const;
 
         //- Calculate all the sampling points
         void calcSamplesOrdered
         (
-            DynamicList<point>& samplingPts,
-            DynamicList<label>& samplingCells,
-            DynamicList<label>& samplingFaces,
+            DynamicList<point>& samplingPositions,
+            DynamicList<scalar>& samplingDistances,
             DynamicList<label>& samplingSegments,
-            DynamicList<scalar>& samplingCurveDist
+            DynamicList<label>& samplingCells,
+            DynamicList<label>& samplingFaces
         ) const;
 
         //- Uses calcSamples to obtain samples and copies them into *this
@@ -127,6 +126,22 @@ public:
     TypeName("points");
 
 
+    // Static Member Functions
+
+        //- Calculate all the sampling points
+        static void calcSamples
+        (
+            const polyMesh& mesh,
+            const meshSearch& searchEngine,
+            const pointField& points,
+            DynamicList<point>& samplingPositons,
+            DynamicList<scalar>& samplingDistances,
+            DynamicList<label>& samplingSegments,
+            DynamicList<label>& samplingCells,
+            DynamicList<label>& samplingFaces
+        );
+
+
     // Constructors
 
         //- Construct from dictionary
diff --git a/src/sampling/sampledSet/sampledSet/sampledSet.C b/src/sampling/sampledSet/sampledSet/sampledSet.C
index 3b2a559d62..2ad641e3a2 100644
--- a/src/sampling/sampledSet/sampledSet/sampledSet.C
+++ b/src/sampling/sampledSet/sampledSet/sampledSet.C
@@ -45,46 +45,88 @@ namespace Foam
 
 void Foam::sampledSet::setSamples
 (
-    const List<point>& samplingPts,
-    const labelList& samplingCells,
-    const labelList& samplingFaces,
+    const List<point>& samplingPositions,
     const labelList& samplingSegments,
-    const scalarList& samplingCurveDist
+    const labelList& samplingCells,
+    const labelList& samplingFaces
 )
 {
-    setSize(samplingPts.size());
-    cells_.setSize(samplingCells.size());
-    faces_.setSize(samplingFaces.size());
-    segments_.setSize(samplingSegments.size());
-    curveDist_.setSize(samplingCurveDist.size());
-
     if
     (
-        (cells_.size() != size())
-     || (faces_.size() != size())
-     || (segments_.size() != size())
-     || (curveDist_.size() != size())
+        (samplingCells.size() != samplingPositions.size())
+     || (samplingFaces.size() != samplingPositions.size())
+     || (samplingSegments.size() != samplingPositions.size())
     )
     {
         FatalErrorInFunction
             << "sizes not equal : "
-            << "  points:" << size()
-            << "  cells:" << cells_.size()
-            << "  faces:" << faces_.size()
-            << "  segments:" << segments_.size()
-            << "  curveDist:" << curveDist_.size()
+            << "  positions:" << samplingPositions.size()
+            << "  segments:" << samplingSegments.size()
+            << "  cells:" << samplingCells.size()
+            << "  faces:" << samplingFaces.size()
             << abort(FatalError);
     }
 
-    forAll(samplingPts, sampleI)
-    {
-        operator[](sampleI) = samplingPts[sampleI];
-    }
-    curveDist_ = samplingCurveDist;
+    (*this).coordSet::operator=
+    (
+        coordSet
+        (
+            samplingSegments,
+            word::null,
+            pointField(samplingPositions),
+            axisTypeNames_[axisType::DISTANCE],
+            scalarField::null(),
+            axisTypeNames_[axis_]
+        )
+    );
+
+    cells_ = samplingCells;
+    faces_ = samplingFaces;
+}
+
+
+void Foam::sampledSet::setSamples
+(
+    const List<point>& samplingPositions,
+    const List<scalar>& samplingDistances,
+    const labelList& samplingSegments,
+    const labelList& samplingCells,
+    const labelList& samplingFaces
+)
+{
+    if
+    (
+        (samplingDistances.size() != samplingPositions.size())
+     || (samplingCells.size() != samplingPositions.size())
+     || (samplingFaces.size() != samplingPositions.size())
+     || (samplingSegments.size() != samplingPositions.size())
+    )
+    {
+        FatalErrorInFunction
+            << "sizes not equal : "
+            << "  positions:" << samplingPositions.size()
+            << "  distances:" << samplingDistances.size()
+            << "  segments:" << samplingSegments.size()
+            << "  cells:" << samplingCells.size()
+            << "  faces:" << samplingFaces.size()
+            << abort(FatalError);
+    }
+
+    (*this).coordSet::operator=
+    (
+        coordSet
+        (
+            samplingSegments,
+            word::null,
+            pointField(samplingPositions),
+            axisTypeNames_[axisType::DISTANCE],
+            scalarField(samplingDistances),
+            axisTypeNames_[axis_]
+        )
+    );
 
     cells_ = samplingCells;
     faces_ = samplingFaces;
-    segments_ = samplingSegments;
 }
 
 
@@ -98,13 +140,15 @@ Foam::sampledSet::sampledSet
     const word& axis
 )
 :
-    coordSet(name, axis),
+    coordSet(),
+    name_(name),
     mesh_(mesh),
     searchEngine_(searchEngine),
-    segments_(0),
     cells_(0),
     faces_(0)
-{}
+{
+    axis_ = axisTypeNames_[axis];
+}
 
 
 Foam::sampledSet::sampledSet
@@ -115,13 +159,23 @@ Foam::sampledSet::sampledSet
     const dictionary& dict
 )
 :
-    coordSet(name, dict.lookup("axis")),
+    coordSet(),
+    name_(name),
     mesh_(mesh),
     searchEngine_(searchEngine),
-    segments_(0),
     cells_(0),
     faces_(0)
-{}
+{
+    axis_ =
+        axisTypeNames_
+        [
+            dict.lookupOrDefault<word>
+            (
+                "axis",
+                axisTypeNames_[axisType::DEFAULT]
+            )
+        ];
+}
 
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
@@ -194,21 +248,4 @@ Foam::autoPtr<Foam::sampledSet> Foam::sampledSet::New
 }
 
 
-Foam::Ostream& Foam::sampledSet::write(Ostream& os) const
-{
-    coordSet::write(os);
-
-    os  << endl << "\t(celli)\t(facei)" << endl;
-
-    forAll(*this, sampleI)
-    {
-        os  << '\t' << cells_[sampleI]
-            << '\t' << faces_[sampleI]
-            << endl;
-    }
-
-    return os;
-}
-
-
 // ************************************************************************* //
diff --git a/src/sampling/sampledSet/sampledSet/sampledSet.H b/src/sampling/sampledSet/sampledSet/sampledSet.H
index f2d90aec8f..b07abbd972 100644
--- a/src/sampling/sampledSet/sampledSet/sampledSet.H
+++ b/src/sampling/sampledSet/sampledSet/sampledSet.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -65,6 +65,9 @@ class sampledSet
 {
     // Private Data
 
+        //- Name of the set
+        const word name_;
+
         //- Reference to mesh
         const polyMesh& mesh_;
 
@@ -76,9 +79,6 @@ protected:
 
     // Protected data
 
-        //- Segment numbers
-        labelList segments_;
-
         //- Cell numbers
         labelList cells_;
 
@@ -91,11 +91,20 @@ protected:
         //- Sets sample data
         void setSamples
         (
-            const List<point>& samplingPts,
-            const labelList& samplingCells,
-            const labelList& samplingFaces,
+            const List<point>& samplingPositions,
             const labelList& samplingSegments,
-            const scalarList& samplingCurveDist
+            const labelList& samplingCells,
+            const labelList& samplingFaces
+        );
+
+        //- Sets sample data
+        void setSamples
+        (
+            const List<point>& samplingPositions,
+            const List<scalar>& samplingDistances,
+            const labelList& samplingSegments,
+            const labelList& samplingCells,
+            const labelList& samplingFaces
         );
 
 
@@ -192,33 +201,41 @@ public:
 
     // Member Functions
 
+        //- Access the name
+        const word& name() const
+        {
+            return name_;
+        }
+
+        //- Access the mesh
         const polyMesh& mesh() const
         {
             return mesh_;
         }
 
+        //- Access the search engine
         const meshSearch& searchEngine() const
         {
             return searchEngine_;
         }
 
-        const labelList& segments() const
+        //- Access the positions
+        const pointField& positions() const
         {
-            return segments_;
+            return positions_();
         }
 
+        //- Access the cells
         const labelList& cells() const
         {
             return cells_;
         }
 
+        //- Access the faces
         const labelList& faces() const
         {
             return faces_;
         }
-
-        //- Output for debugging
-        Ostream& write(Ostream&) const;
 };
 
 
diff --git a/src/sampling/sampledSet/writers/setWriters.C b/src/sampling/sampledSet/sampledSet/sampledSetCloud.C
similarity index 69%
rename from src/sampling/sampledSet/writers/setWriters.C
rename to src/sampling/sampledSet/sampledSet/sampledSetCloud.C
index eaa2b65df6..aa7c271d5c 100644
--- a/src/sampling/sampledSet/writers/setWriters.C
+++ b/src/sampling/sampledSet/sampledSet/sampledSetCloud.C
@@ -23,27 +23,42 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "setWriters.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
+#include "sampledSetCloud.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-#define defineSetWriterType(dataType)                                          \
-    defineNamedTemplateTypeNameAndDebug(setWriter<dataType >, 0);              \
-    defineTemplatedRunTimeSelectionTable(setWriter, word, dataType);
+namespace Foam
+{
+    defineTypeNameAndDebug(sampledSetCloud, 0);
+}
 
-defineSetWriterType(scalar);
-defineSetWriterType(vector);
-defineSetWriterType(sphericalTensor);
-defineSetWriterType(symmTensor);
-defineSetWriterType(tensor);
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+Foam::sampledSetCloud::sampledSetCloud
+(
+    const polyMesh& mesh,
+    const word& cloudName,
+    bool readFields
+)
+:
+    Cloud<sampledSetParticle>(mesh, cloudName, false)
+{
+    if (readFields)
+    {
+        sampledSetParticle::readFields(*this);
+    }
+}
+
+
+Foam::sampledSetCloud::sampledSetCloud
+(
+    const polyMesh& mesh,
+    const word& cloudName,
+    const IDLList<sampledSetParticle>& particles
+)
+:
+    Cloud<sampledSetParticle>(mesh, cloudName, particles)
+{}
 
-} // End namespace Foam
 
 // ************************************************************************* //
diff --git a/src/sampling/sampledSet/writers/xmgrace/xmgraceSetWriter.H b/src/sampling/sampledSet/sampledSet/sampledSetCloud.H
similarity index 63%
rename from src/sampling/sampledSet/writers/xmgrace/xmgraceSetWriter.H
rename to src/sampling/sampledSet/sampledSet/sampledSetCloud.H
index a47900c0df..346218b761 100644
--- a/src/sampling/sampledSet/writers/xmgrace/xmgraceSetWriter.H
+++ b/src/sampling/sampledSet/sampledSet/sampledSetCloud.H
@@ -22,19 +22,21 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::xmgraceSetWriter
+    Foam::sampledSetCloud
 
 Description
+    A Cloud of sampledSet particles
 
 SourceFiles
-    xmgraceSetWriter.C
+    sampledSetCloud.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef xmgraceSetWriter_H
-#define xmgraceSetWriter_H
+#ifndef sampledSetCloud_H
+#define sampledSetCloud_H
 
-#include "setWriter.H"
+#include "Cloud.H"
+#include "sampledSetParticle.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -42,55 +44,49 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                      Class xmgraceSetWriter Declaration
+                       Class sampledSetCloud Declaration
 \*---------------------------------------------------------------------------*/
 
-template<class Type>
-class xmgraceSetWriter
+class sampledSetCloud
 :
-    public setWriter<Type>
+    public Cloud<sampledSetParticle>
 {
-
 public:
 
+    //- Type of parcel the cloud was instantiated for
+    typedef sampledSetParticle parcelType;
+
+
     //- Runtime type information
-    TypeName("xmgr");
+    TypeName("sampledSetCloud");
 
 
     // Constructors
 
-        //- Construct null
-        xmgraceSetWriter();
-
-
-    //- Destructor
-    virtual ~xmgraceSetWriter();
-
-
-    // Member Functions
-
-        virtual fileName getFileName
+        //- Construct given mesh
+        sampledSetCloud
         (
-            const coordSet&,
-            const wordList&
-        ) const;
+            const polyMesh&,
+            const word& cloudName = "defaultCloud",
+            bool readFields = true
+        );
 
-        virtual void write
+        //- Construct from mesh, cloud name, and a list of particles
+        sampledSetCloud
         (
-            const coordSet&,
-            const wordList&,
-            const List<const Field<Type>*>&,
-            Ostream&
-        ) const;
+            const polyMesh& mesh,
+            const word& cloudName,
+            const IDLList<sampledSetParticle>& particles
+        );
 
-        virtual void write
-        (
-            const bool writeTracks,
-            const PtrList<coordSet>&,
-            const wordList& valueSetNames,
-            const List<List<Field<Type>>>&,
-            Ostream&
-        ) const;
+        //- Disallow default bitwise copy construction
+        sampledSetCloud(const sampledSetCloud&) = delete;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const sampledSetCloud&) = delete;
 };
 
 
@@ -100,12 +96,6 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#ifdef NoRepository
-    #include "xmgraceSetWriter.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 #endif
 
 // ************************************************************************* //
diff --git a/src/sampling/sampledSet/sampledSet/sampledSetParticle.C b/src/sampling/sampledSet/sampledSet/sampledSetParticle.C
new file mode 100644
index 0000000000..ac5a342f1a
--- /dev/null
+++ b/src/sampling/sampledSet/sampledSet/sampledSetParticle.C
@@ -0,0 +1,312 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Copyright (C) 2021 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "sampledSetParticle.H"
+#include "sampledSetCloud.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::sampledSetParticle::sampledSetParticle
+(
+    const polyMesh& mesh,
+    const point& position,
+    const label celli,
+    const label seti,
+    const scalar setF,
+    const scalar distance
+)
+:
+    particle(mesh, position, celli),
+    seti_(seti),
+    setF_(setF),
+    distance_(distance),
+    havePosition0_(false),
+    position0_(point::uniform(NaN))
+{}
+
+
+Foam::sampledSetParticle::sampledSetParticle
+(
+    const polyMesh& mesh,
+    Istream& is,
+    bool readFields
+)
+:
+    particle(mesh, is, readFields)
+{
+    if (readFields)
+    {
+        is  >> seti_ >> setF_ >> distance_ >> havePosition0_ >> position0_;
+    }
+
+    is.check(FUNCTION_NAME);
+}
+
+
+Foam::sampledSetParticle::sampledSetParticle
+(
+    const sampledSetParticle& p
+)
+:
+    particle(p),
+    seti_(p.seti_),
+    setF_(p.setF_),
+    distance_(p.distance_),
+    havePosition0_(p.havePosition0_),
+    position0_(p.position0_)
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+void Foam::sampledSetParticle::store
+(
+    sampledSetCloud& cloud,
+    trackingData& td
+)
+{
+    td.positions_.append(position());
+    td.distances_.append(distance_);
+    td.cells_.append(cell());
+    td.faces_.append(face());
+}
+
+
+void Foam::sampledSetParticle::storeFace
+(
+    sampledSetCloud& cloud,
+    trackingData& td
+)
+{
+    store(cloud, td);
+}
+
+
+void Foam::sampledSetParticle::storeCell
+(
+    sampledSetCloud& cloud,
+    trackingData& td
+)
+{
+    if (havePosition0_)
+    {
+        td.positions_.append((position() + position0_)/2);
+        td.distances_.append(distance_ - mag(position() - position0_)/2);
+        td.cells_.append(cell());
+        td.faces_.append(-1);
+    }
+
+    havePosition0_ = true;
+    position0_ = position();
+}
+
+
+bool Foam::sampledSetParticle::move
+(
+    sampledSetCloud& cloud,
+    trackingData& td,
+    const scalar
+)
+{
+    td.keepParticle = true;
+    td.switchProcessor = false;
+
+    while (td.keepParticle && !td.switchProcessor && seti_ < td.set_.size() - 1)
+    {
+        const vector s = td.set_[seti_ + 1] - td.set_[seti_];
+        const scalar magS = mag(s);
+
+        const scalar f = trackToFace(setF_*s, 0);
+        distance_ += (1 - f)*setF_*magS;
+        setF_ *= f;
+
+        while (onInternalFace())
+        {
+            if (td.storeFaces_) storeFace(cloud, td);
+            if (td.storeCells_) storeCell(cloud, td);
+
+            hitFace(setF_*s, 0, cloud, td);
+
+            const scalar f = trackToFace(setF_*s, 0);
+            distance_ += (1 - f)*setF_*magS;
+            setF_ *= f;
+        }
+
+        if (onFace())
+        {
+            if (td.storeFaces_) storeFace(cloud, td);
+            if (td.storeCells_) storeCell(cloud, td);
+
+            hitFace(setF_*s, 0, cloud, td);
+        }
+
+        if (onBoundaryFace() && setF_ < rootSmall)
+        {
+            if (td.storeSet_) store(cloud, td);
+        }
+
+        if (!onFace())
+        {
+            if (td.storeSet_) store(cloud, td);
+
+            ++ seti_;
+            setF_ = 1;
+        }
+    }
+
+    return true;
+}
+
+
+bool Foam::sampledSetParticle::hitPatch(sampledSetCloud&, trackingData&)
+{
+    return false;
+}
+
+
+void Foam::sampledSetParticle::hitWedgePatch
+(
+    sampledSetCloud&,
+    trackingData& td
+)
+{
+    seti_ = labelMax;
+}
+
+
+void Foam::sampledSetParticle::hitSymmetryPlanePatch
+(
+    sampledSetCloud&,
+    trackingData& td
+)
+{
+    seti_ = labelMax;
+}
+
+
+void Foam::sampledSetParticle::hitSymmetryPatch
+(
+    sampledSetCloud&,
+    trackingData& td
+)
+{
+    seti_ = labelMax;
+}
+
+
+void Foam::sampledSetParticle::hitCyclicPatch
+(
+    sampledSetCloud& cloud,
+    trackingData& td
+)
+{
+    seti_ = labelMax;
+}
+
+
+void Foam::sampledSetParticle::hitCyclicAMIPatch
+(
+    const vector& displacement,
+    const scalar fraction,
+    sampledSetCloud& cloud,
+    trackingData& td
+)
+{
+    seti_ = labelMax;
+}
+
+
+void Foam::sampledSetParticle::hitCyclicACMIPatch
+(
+    const vector& displacement,
+    const scalar fraction,
+    sampledSetCloud& cloud,
+    trackingData& td
+)
+{
+    seti_ = labelMax;
+}
+
+
+void Foam::sampledSetParticle::hitCyclicRepeatAMIPatch
+(
+    const vector& displacement,
+    const scalar fraction,
+    sampledSetCloud& cloud,
+    trackingData& td
+)
+{
+    seti_ = labelMax;
+}
+
+
+void Foam::sampledSetParticle::hitProcessorPatch
+(
+    sampledSetCloud&,
+    trackingData& td
+)
+{
+    const processorPolyPatch& ppp =
+        static_cast<const processorPolyPatch&>(mesh().boundaryMesh()[patch()]);
+
+    if (ppp.transform().transformsPosition())
+    {
+        seti_ = labelMax;
+    }
+    else
+    {
+        td.switchProcessor = true;
+    }
+}
+
+
+void Foam::sampledSetParticle::hitWallPatch
+(
+    sampledSetCloud&,
+    trackingData& td
+)
+{
+    seti_ = labelMax;
+}
+
+
+// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const sampledSetParticle& p)
+{
+    os  << static_cast<const particle&>(p)
+        << token::SPACE << p.seti_
+        << token::SPACE << p.setF_
+        << token::SPACE << p.distance_
+        << token::SPACE << p.havePosition0_
+        << token::SPACE << p.position0_;
+
+    os.check(FUNCTION_NAME);
+
+    return os;
+}
+
+
+// ************************************************************************* //
diff --git a/src/sampling/sampledSet/sampledSet/sampledSetParticle.H b/src/sampling/sampledSet/sampledSet/sampledSetParticle.H
new file mode 100644
index 0000000000..571ec9d3c7
--- /dev/null
+++ b/src/sampling/sampledSet/sampledSet/sampledSetParticle.H
@@ -0,0 +1,279 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Copyright (C) 2021 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::sampledSetParticle
+
+Description
+    Particle for generating line-type sampled sets
+
+SourceFiles
+    sampledSetParticle.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef sampledSetParticle_H
+#define sampledSetParticle_H
+
+#include "particle.H"
+#include "Cloud.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of friend functions and operators
+
+class sampledSetParticle;
+class sampledSetCloud;
+
+Ostream& operator<<(Ostream&, const sampledSetParticle&);
+
+
+/*---------------------------------------------------------------------------*\
+                          Class sampledSetParticle Declaration
+\*---------------------------------------------------------------------------*/
+
+class sampledSetParticle
+:
+    public particle
+{
+public:
+
+    //- Tracking data class
+    class trackingData
+    :
+        public particle::trackingData
+    {
+    public:
+
+        //- List of set points to track through
+        const List<point>& set_;
+
+        //- Are we storing the set points?
+        const bool storeSet_;
+
+        //- Are we storing the faces we track through?
+        const bool storeFaces_;
+
+        //- Are we storing the cells we track through?
+        const bool storeCells_;
+
+        //- Stored positions
+        DynamicList<point>& positions_;
+
+        //- Stored distances
+        DynamicList<scalar>& distances_;
+
+        //- Stored cell indices
+        DynamicList<label>& cells_;
+
+        //- Stored face indices
+        DynamicList<label>& faces_;
+
+        //- Construct from components
+        trackingData
+        (
+            sampledSetCloud& cloud,
+            const List<point>& set,
+            bool storeSet,
+            bool storeFaces,
+            bool storeCells,
+            DynamicList<point>& positions,
+            DynamicList<scalar>& distances,
+            DynamicList<label>& cells,
+            DynamicList<label>& faces
+        )
+        :
+            particle::trackingData(cloud),
+            set_(set),
+            storeSet_(storeSet),
+            storeFaces_(storeFaces),
+            storeCells_(storeCells),
+            positions_(positions),
+            distances_(distances),
+            cells_(cells),
+            faces_(faces)
+        {}
+    };
+
+
+private:
+
+    // Private Data
+
+        //- The set interval we are currently within
+        label seti_;
+
+        //- The fraction of this set interval from the end
+        scalar setF_;
+
+        //- The scalar distance through the set
+        scalar distance_;
+
+        //- Do we have the previous face position stored?
+        bool havePosition0_;
+
+        //- The previous face position
+        point position0_;
+
+
+public:
+
+    // Constructors
+
+        //- Construct from components
+        sampledSetParticle
+        (
+            const polyMesh& mesh,
+            const point& position,
+            const label celli,
+            const label seti,
+            const scalar setF,
+            const scalar distance
+        );
+
+        //- Construct from Istream
+        sampledSetParticle
+        (
+            const polyMesh& mesh,
+            Istream& is,
+            bool readFields = true
+        );
+
+        //- Copy constructor
+        sampledSetParticle(const sampledSetParticle&);
+
+        //- Construct and return a clone
+        autoPtr<particle> clone() const
+        {
+            return autoPtr<particle>(new sampledSetParticle(*this));
+        }
+
+        //- Factory class to read-construct particles used for parallel transfer
+        class iNew
+        {
+            const polyMesh& mesh_;
+
+        public:
+
+            iNew(const polyMesh& mesh)
+            :
+                mesh_(mesh)
+            {}
+
+            autoPtr<sampledSetParticle> operator()(Istream& is) const
+            {
+                return autoPtr<sampledSetParticle>
+                (
+                    new sampledSetParticle(mesh_, is, true)
+                );
+            }
+        };
+
+
+    // Member Functions
+
+        // Storage
+
+            //- Store a point
+            void store(sampledSetCloud&, trackingData&);
+
+            //- Store a point on a face
+            void storeFace(sampledSetCloud&, trackingData&);
+
+            //- Store a point in a cell
+            void storeCell(sampledSetCloud&, trackingData&);
+
+
+        // Tracking
+
+            //- Track all particles to their end point
+            bool move(sampledSetCloud&, trackingData&, const scalar);
+
+            //- Hit a generic patch. Does nothing.
+            bool hitPatch(sampledSetCloud&, trackingData&);
+
+            //- Hit a wedge patch. Ends the track.
+            void hitWedgePatch(sampledSetCloud&, trackingData&);
+
+            //- Hit a symmetry patch. Ends the track.
+            void hitSymmetryPlanePatch(sampledSetCloud&, trackingData&);
+
+            //- Hit a symmetry plane patch. Ends the track.
+            void hitSymmetryPatch(sampledSetCloud&, trackingData&);
+
+            //- Hit a cyclic patch. Ends the track.
+            void hitCyclicPatch(sampledSetCloud&, trackingData&);
+
+            //- Hit a cyclicAMI patch. Ends the track.
+            void hitCyclicAMIPatch
+            (
+                const vector&,
+                const scalar,
+                sampledSetCloud&,
+                trackingData&
+            );
+
+            //- Hit a cyclicACMI patch. Ends the track.
+            void hitCyclicACMIPatch
+            (
+                const vector&,
+                const scalar,
+                sampledSetCloud&,
+                trackingData&
+            );
+
+            //- Hit a cyclicRepeatAMI patch. Ends the track.
+            void hitCyclicRepeatAMIPatch
+            (
+                const vector&,
+                const scalar,
+                sampledSetCloud&,
+                trackingData&
+            );
+
+            //- Hit a processor patch. Transfers the particle if there is no
+            //  transformation. Ends the track if there is a transformation.
+            void hitProcessorPatch(sampledSetCloud&, trackingData&);
+
+            //- Hit a wall patch. Ends the track.
+            void hitWallPatch(sampledSetCloud&, trackingData&);
+
+
+    // IOstream Operators
+
+        friend Ostream& operator<<(Ostream&, const sampledSetParticle&);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/sampling/sampledSet/sampledSets/IOsampledSets.H b/src/sampling/sampledSet/sampledSets/IOsampledSets.H
deleted file mode 100644
index eb380b6871..0000000000
--- a/src/sampling/sampledSet/sampledSets/IOsampledSets.H
+++ /dev/null
@@ -1,49 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Typedef
-    Foam::IOsampledSets
-
-Description
-    Instance of the generic IOOutputFilter for sampledSets.
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef IOsampledSets_H
-#define IOsampledSets_H
-
-#include "sampledSets.H"
-#include "IOOutputFilter.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    typedef IOOutputFilter<sampledSets> IOsampledSets;
-}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/sampling/sampledSet/sampledSets/sampledSets.C b/src/sampling/sampledSet/sampledSets/sampledSets.C
index eaab2fe32c..dc5e72f379 100644
--- a/src/sampling/sampledSet/sampledSets/sampledSets.C
+++ b/src/sampling/sampledSet/sampledSets/sampledSets.C
@@ -32,11 +32,15 @@ License
 #include "volPointInterpolation.H"
 #include "mapPolyMesh.H"
 #include "writeFile.H"
+#include "OFstream.H"
+#include "OSspecific.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
+{
+namespace functionObjects
 {
     defineTypeNameAndDebug(sampledSets, 0);
 
@@ -47,121 +51,52 @@ namespace Foam
         dictionary
     );
 }
+}
 
-bool Foam::sampledSets::verbose_ = false;
+bool Foam::functionObjects::sampledSets::verbose_ = false;
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void Foam::sampledSets::combineSampledSets
-(
-    PtrList<coordSet>& masterSampledSets,
-    labelListList& indexSets
-)
+void Foam::functionObjects::sampledSets::combineSampledSets()
 {
-    // Combine sampleSets from processors. Sort by curveDist. Return
-    // ordering in indexSets.
-    // Note: only master results are valid
+    masterSets_.setSize(size());
+    masterSetOrders_.setSize(size());
 
-    masterSampledSets_.clear();
-    masterSampledSets_.setSize(size());
-    indexSets_.setSize(size());
-
-    const PtrList<sampledSet>& sampledSets = *this;
-
-    forAll(sampledSets, setI)
+    forAll(*this, seti)
     {
-        const sampledSet& samplePts = sampledSets[setI];
+        const sampledSet& s = operator[](seti);
 
-        // Collect data from all processors
-        List<List<point>> gatheredPts(Pstream::nProcs());
-        gatheredPts[Pstream::myProcNo()] = samplePts;
-        Pstream::gatherList(gatheredPts);
+        Tuple2<coordSet, labelList> g = s.gather();
 
-        List<labelList> gatheredSegments(Pstream::nProcs());
-        gatheredSegments[Pstream::myProcNo()] = samplePts.segments();
-        Pstream::gatherList(gatheredSegments);
+        masterSets_.set(seti, new coordSet(g.first()));
+        masterSetOrders_[seti] = g.second();
 
-        List<scalarList> gatheredDist(Pstream::nProcs());
-        gatheredDist[Pstream::myProcNo()] = samplePts.curveDist();
-        Pstream::gatherList(gatheredDist);
-
-
-        // Combine processor lists into one big list.
-        List<point> allPts
-        (
-            ListListOps::combine<List<point>>
-            (
-                gatheredPts, accessOp<List<point>>()
-            )
-        );
-        labelList allSegments
-        (
-            ListListOps::combine<labelList>
-            (
-                gatheredSegments, accessOp<labelList>()
-            )
-        );
-        scalarList allCurveDist
-        (
-            ListListOps::combine<scalarList>
-            (
-                gatheredDist, accessOp<scalarList>()
-            )
-        );
-
-
-        if (Pstream::master() && allCurveDist.size() == 0)
+        if (Pstream::master() && masterSets_[seti].size() == 0)
         {
             WarningInFunction
-                << "Sample set " << samplePts.name()
+                << "Sample set " << s.name()
                 << " has zero points." << endl;
         }
-
-        // Sort curveDist and use to fill masterSamplePts
-        SortableList<scalar> sortedDist(allCurveDist);
-        indexSets[setI] = sortedDist.indices();
-
-        masterSampledSets.set
-        (
-            setI,
-            new coordSet
-            (
-                samplePts.name(),
-                samplePts.axis(),
-                List<point>(UIndirectList<point>(allPts, indexSets[setI])),
-                scalarList(UIndirectList<scalar>(allCurveDist, indexSets[setI]))
-            )
-        );
     }
 }
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::sampledSets::sampledSets
+Foam::functionObjects::sampledSets::sampledSets
 (
     const word& name,
     const Time& t,
     const dictionary& dict
 )
 :
-    functionObject(name),
+    fvMeshFunctionObject(name, t, dict),
     PtrList<sampledSet>(),
-    mesh_
-    (
-        refCast<const fvMesh>
-        (
-            t.lookupObject<objectRegistry>
-            (
-                dict.lookupOrDefault("region", polyMesh::defaultRegion)
-            )
-        )
-    ),
     outputPath_(fileName::null),
     searchEngine_(mesh_),
     interpolationScheme_(word::null),
-    writeFormat_(word::null)
+    formatter_(nullptr)
 {
     outputPath_ =
         mesh_.time().globalPath()/functionObjects::writeFile::outputPrefix/name;
@@ -177,68 +112,113 @@ Foam::sampledSets::sampledSets
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::sampledSets::~sampledSets()
+Foam::functionObjects::sampledSets::~sampledSets()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::sampledSets::verbose(const bool verbosity)
+void Foam::functionObjects::sampledSets::verbose(const bool verbosity)
 {
     verbose_ = verbosity;
 }
 
 
-Foam::wordList Foam::sampledSets::fields() const
+Foam::wordList Foam::functionObjects::sampledSets::fields() const
 {
     return fields_;
 }
 
 
-bool Foam::sampledSets::execute()
+bool Foam::functionObjects::sampledSets::execute()
 {
     return true;
 }
 
 
-bool Foam::sampledSets::write()
+bool Foam::functionObjects::sampledSets::write()
 {
     if (size())
     {
-        const label nFields = classifyFields();
-
         if (Pstream::master())
         {
             if (debug)
             {
-                Pout<< "timeName = " << mesh_.time().timeName() << nl
-                    << "scalarFields    " << scalarFields_ << nl
-                    << "vectorFields    " << vectorFields_ << nl
-                    << "sphTensorFields " << sphericalTensorFields_ << nl
-                    << "symTensorFields " << symmTensorFields_ <<nl
-                    << "tensorFields    " << tensorFields_ <<nl;
+                Pout<< "Creating directory "
+                    << outputPath_/mesh_.time().timeName() << nl << endl;
             }
 
-            if (nFields)
-            {
-                if (debug)
-                {
-                    Pout<< "Creating directory "
-                        << outputPath_/mesh_.time().timeName()
-                            << nl << endl;
-                }
-
-                mkDir(outputPath_/mesh_.time().timeName());
-            }
+            mkDir(outputPath_/mesh_.time().timeName());
         }
 
-        if (nFields)
+        // Create a list of names of fields that are actually available
+        wordList fieldNames;
+        forAll(fields_, fieldi)
         {
-            sampleAndWrite(scalarFields_);
-            sampleAndWrite(vectorFields_);
-            sampleAndWrite(sphericalTensorFields_);
-            sampleAndWrite(symmTensorFields_);
-            sampleAndWrite(tensorFields_);
+            #define FoundFieldType(Type, nullArg)             \
+              || foundObject<VolField<Type>>(fields_[fieldi])
+            if (false FOR_ALL_FIELD_TYPES(FoundFieldType))
+            {
+                fieldNames.append(fields_[fieldi]);
+            }
+            else
+            {
+                cannotFindObject(fields_[fieldi]);
+            }
+            #undef FoundFieldType
+        }
+
+        // Create table of cached interpolations, to prevent unnecessary work
+        // when interpolating fields over multiple surfaces
+        #define DeclareInterpolations(Type, nullArg) \
+            HashPtrTable<interpolation<Type>> interpolation##Type##s;
+        FOR_ALL_FIELD_TYPES(DeclareInterpolations);
+        #undef DeclareInterpolations
+
+        // Sample and write the sets
+        forAll(*this, seti)
+        {
+            #define GenerateFieldTypeValues(Type, nullArg) \
+                PtrList<Field<Type>> field##Type##Values = \
+                    sampleType<Type>(seti, fieldNames, interpolation##Type##s);
+            FOR_ALL_FIELD_TYPES(GenerateFieldTypeValues);
+            #undef GenerateFieldTypeValues
+
+            if (Pstream::parRun())
+            {
+                if (Pstream::master() && masterSets_[seti].size())
+                {
+                    formatter_->write
+                    (
+                        outputPath_/mesh_.time().timeName(),
+                        operator[](seti).name(),
+                        masterSets_[seti],
+                        fieldNames
+                        #define FieldTypeValuesParameter(Type, nullArg) \
+                            , field##Type##Values
+                        FOR_ALL_FIELD_TYPES(FieldTypeValuesParameter)
+                        #undef FieldTypeValuesParameter
+                    );
+
+                }
+            }
+            else
+            {
+                if (operator[](seti).size())
+                {
+                    formatter_->write
+                    (
+                        outputPath_/mesh_.time().timeName(),
+                        operator[](seti).name(),
+                        operator[](seti),
+                        fieldNames
+                        #define FieldTypeValuesParameter(Type, nullArg) \
+                            , field##Type##Values
+                        FOR_ALL_FIELD_TYPES(FieldTypeValuesParameter)
+                        #undef FieldTypeValuesParameter
+                    );
+                }
+            }
         }
     }
 
@@ -246,7 +226,7 @@ bool Foam::sampledSets::write()
 }
 
 
-bool Foam::sampledSets::read(const dictionary& dict)
+bool Foam::functionObjects::sampledSets::read(const dictionary& dict)
 {
     dict_ = dict;
 
@@ -254,10 +234,13 @@ bool Foam::sampledSets::read(const dictionary& dict)
     if (setsFound)
     {
         dict_.lookup("fields") >> fields_;
-        clearFieldGroups();
 
         dict.lookup("interpolationScheme") >> interpolationScheme_;
-        dict.lookup("setFormat") >> writeFormat_;
+
+        const word writeType(dict.lookup("setFormat"));
+
+        // Define the set formatter
+        formatter_ = setWriter::New(writeType, dict);
 
         PtrList<sampledSet> newList
         (
@@ -265,36 +248,24 @@ bool Foam::sampledSets::read(const dictionary& dict)
             sampledSet::iNew(mesh_, searchEngine_)
         );
         transfer(newList);
-        combineSampledSets(masterSampledSets_, indexSets_);
+        combineSampledSets();
 
         if (this->size())
         {
             Info<< "Reading set description:" << nl;
-            forAll(*this, setI)
+            forAll(*this, seti)
             {
-                Info<< "    " << operator[](setI).name() << nl;
+                Info<< "    " << operator[](seti).name() << nl;
             }
             Info<< endl;
         }
     }
 
-    if (Pstream::master() && debug)
-    {
-        Pout<< "sample fields:" << fields_ << nl
-            << "sample sets:" << nl << "(" << nl;
-
-        forAll(*this, setI)
-        {
-            Pout<< "  " << operator[](setI) << endl;
-        }
-        Pout<< ")" << endl;
-    }
-
     return true;
 }
 
 
-void Foam::sampledSets::correct()
+void Foam::functionObjects::sampledSets::correct()
 {
     bool setsFound = dict_.found("sets");
     if (setsFound)
@@ -307,12 +278,12 @@ void Foam::sampledSets::correct()
             sampledSet::iNew(mesh_, searchEngine_)
         );
         transfer(newList);
-        combineSampledSets(masterSampledSets_, indexSets_);
+        combineSampledSets();
     }
 }
 
 
-void Foam::sampledSets::updateMesh(const mapPolyMesh& mpm)
+void Foam::functionObjects::sampledSets::updateMesh(const mapPolyMesh& mpm)
 {
     if (&mpm.mesh() == &mesh_)
     {
@@ -321,7 +292,7 @@ void Foam::sampledSets::updateMesh(const mapPolyMesh& mpm)
 }
 
 
-void Foam::sampledSets::movePoints(const polyMesh& mesh)
+void Foam::functionObjects::sampledSets::movePoints(const polyMesh& mesh)
 {
     if (&mesh == &mesh_)
     {
@@ -330,7 +301,10 @@ void Foam::sampledSets::movePoints(const polyMesh& mesh)
 }
 
 
-void Foam::sampledSets::readUpdate(const polyMesh::readUpdateState state)
+void Foam::functionObjects::sampledSets::readUpdate
+(
+    const polyMesh::readUpdateState state
+)
 {
     if (state != polyMesh::UNCHANGED)
     {
diff --git a/src/sampling/sampledSet/sampledSets/sampledSets.H b/src/sampling/sampledSet/sampledSets/sampledSets.H
index 61fe6abd0c..e3fea1ffbf 100644
--- a/src/sampling/sampledSet/sampledSets/sampledSets.H
+++ b/src/sampling/sampledSet/sampledSets/sampledSets.H
@@ -36,7 +36,7 @@ SourceFiles
 #ifndef sampledSets_H
 #define sampledSets_H
 
-#include "functionObject.H"
+#include "fvMeshFunctionObject.H"
 #include "sampledSet.H"
 #include "volFieldsFwd.H"
 #include "meshSearch.H"
@@ -44,6 +44,7 @@ SourceFiles
 #include "coordSet.H"
 #include "setWriter.H"
 #include "wordReList.H"
+#include "HashPtrTable.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -56,99 +57,18 @@ class objectRegistry;
 class dictionary;
 class fvMesh;
 
+namespace functionObjects
+{
+
 /*---------------------------------------------------------------------------*\
                          Class sampledSets Declaration
 \*---------------------------------------------------------------------------*/
 
 class sampledSets
 :
-    public functionObject,
+    public fvMeshFunctionObject,
     public PtrList<sampledSet>
 {
-    // Private classes
-
-        //- Class used for grouping field types
-        template<class Type>
-        class fieldGroup
-        :
-            public DynamicList<word>
-        {
-        public:
-
-            //- The set formatter
-            autoPtr<setWriter<Type>> formatter;
-
-            //- Construct null
-            fieldGroup()
-            :
-                DynamicList<word>(0),
-                formatter(nullptr)
-            {}
-
-            //- Construct for a particular format
-            fieldGroup(const word& writeFormat)
-            :
-                DynamicList<word>(0),
-                formatter(setWriter<Type>::New(writeFormat))
-            {}
-
-            //- Reset format and field list
-            void clear()
-            {
-                DynamicList<word>::clear();
-                formatter.clear();
-            }
-
-            //- Assign a new formatter
-            void operator=(const word& writeFormat)
-            {
-                formatter = setWriter<Type>::New(writeFormat);
-            }
-
-        };
-
-
-        //- Class used for sampling volFields
-        template<class Type>
-        class volFieldSampler
-        :
-            public List<Field<Type>>
-        {
-            //- Name of this collection of values
-            const word name_;
-
-        public:
-
-            //- Construct interpolating field to the sampleSets
-            volFieldSampler
-            (
-                const word& interpolationScheme,
-                const GeometricField<Type, fvPatchField, volMesh>& field,
-                const PtrList<sampledSet>&
-            );
-
-            //- Construct mapping field to the sampleSets
-            volFieldSampler
-            (
-                const GeometricField<Type, fvPatchField, volMesh>& field,
-                const PtrList<sampledSet>&
-            );
-
-            //- Construct from components
-            volFieldSampler
-            (
-                const List<Field<Type>>& values,
-                const word& name
-            );
-
-            //- Return the field name
-            const word& name() const
-            {
-                return name_;
-            }
-        };
-
-
     // Static Data Members
 
         //- Output verbosity
@@ -157,15 +77,9 @@ class sampledSets
 
     // Private Data
 
-        //- Const reference to fvMesh
-        const fvMesh& mesh_;
-
         //- Keep the dictionary to recreate sets for moving mesh cases
         dictionary dict_;
 
-        //- Load fields from files (not from objectRegistry)
-        bool loadFromFiles_;
-
         //- Output path
         fileName outputPath_;
 
@@ -181,66 +95,46 @@ class sampledSets
             //- Interpolation scheme to use
             word interpolationScheme_;
 
-            //- Output format to use
-            word writeFormat_;
-
-
-        // Categorised scalar/vector/tensor fields
-
-            fieldGroup<scalar> scalarFields_;
-            fieldGroup<vector> vectorFields_;
-            fieldGroup<sphericalTensor> sphericalTensorFields_;
-            fieldGroup<symmTensor> symmTensorFields_;
-            fieldGroup<tensor> tensorFields_;
-
 
         // Merging structures
 
-            PtrList<coordSet> masterSampledSets_;
-            labelListList indexSets_;
+            //- Global sets gathered on the master
+            PtrList<coordSet> masterSets_;
+
+            //- Mapping from local to global sets
+            labelListList masterSetOrders_;
+
+
+        // Calculated
+
+            //- Set formatter
+            autoPtr<setWriter> formatter_;
 
 
     // Private Member Functions
 
-        //- Clear old field groups
-        void clearFieldGroups();
-
-        //- Append fieldName to the appropriate group
-        label appendFieldGroup(const word& fieldName, const word& fieldType);
-
-        //- Classify field types, returns the number of fields
-        label classifyFields();
-
-        //- Combine points from all processors. Sort by curveDist and produce
+        //- Combine sets on all processors. Sort by curveDist and produce
         //  index list. Valid result only on master processor.
-        void combineSampledSets
-        (
-            PtrList<coordSet>& masterSampledSets,
-            labelListList& indexSets
-        );
-
-        //- Combine values from all processors.
-        //  Valid result only on master processor.
-        template<class T>
-        void combineSampledValues
-        (
-            const PtrList<volFieldSampler<T>>& sampledFields,
-            const labelListList& indexSets,
-            PtrList<volFieldSampler<T>>& masterFields
-        );
+        void combineSampledSets();
 
+        //- Sample all fields of a type on a given set
         template<class Type>
-        void writeSampleFile
+        PtrList<Field<Type>> sampleLocalType
         (
-            const coordSet& masterSampleSet,
-            const PtrList<volFieldSampler<Type>>& masterFields,
-            const label setI,
-            const fileName& timeDir,
-            const setWriter<Type>& formatter
+            const label seti,
+            const wordList& fieldNames,
+            HashPtrTable<interpolation<Type>>& interpolations
         );
 
+        //- Sample all fields of a type on a given set and combine on the
+        //  master for writing
         template<class Type>
-        void sampleAndWrite(fieldGroup<Type>& fields);
+        PtrList<Field<Type>> sampleType
+        (
+            const label seti,
+            const wordList& fieldNames,
+            HashPtrTable<interpolation<Type>>& interpolations
+        );
 
 
 public:
@@ -306,6 +200,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace functionObjects
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/sampling/sampledSet/sampledSets/sampledSetsGrouping.C b/src/sampling/sampledSet/sampledSets/sampledSetsGrouping.C
deleted file mode 100644
index 2fdb66f4c8..0000000000
--- a/src/sampling/sampledSet/sampledSets/sampledSetsGrouping.C
+++ /dev/null
@@ -1,109 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "sampledSets.H"
-#include "volFields.H"
-#include "IOobjectList.H"
-#include "stringListOps.H"
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-void Foam::sampledSets::clearFieldGroups()
-{
-    scalarFields_.clear();
-    vectorFields_.clear();
-    sphericalTensorFields_.clear();
-    symmTensorFields_.clear();
-    tensorFields_.clear();
-}
-
-
-Foam::label Foam::sampledSets::appendFieldGroup
-(
-    const word& fieldName,
-    const word& fieldType
-)
-{
-    if (fieldType == volScalarField::typeName)
-    {
-        scalarFields_.append(fieldName);
-        return 1;
-    }
-    else if (fieldType == volVectorField::typeName)
-    {
-        vectorFields_.append(fieldName);
-        return 1;
-    }
-    else if (fieldType == volSphericalTensorField::typeName)
-    {
-        sphericalTensorFields_.append(fieldName);
-        return 1;
-    }
-    else if (fieldType == volSymmTensorField::typeName)
-    {
-        symmTensorFields_.append(fieldName);
-        return 1;
-    }
-    else if (fieldType == volTensorField::typeName)
-    {
-        tensorFields_.append(fieldName);
-        return 1;
-    }
-
-    return 0;
-}
-
-
-Foam::label Foam::sampledSets::classifyFields()
-{
-    label nFields = 0;
-    clearFieldGroups();
-
-    // Check currently available fields
-    forAll(fields_, fieldi)
-    {
-        const word& fieldName = fields_[fieldi];
-
-        if (mesh_.objectRegistry::found(fieldName))
-        {
-            nFields += appendFieldGroup
-            (
-                fieldName,
-                mesh_.find(fieldName)()->type()
-            );
-        }
-        else
-        {
-            WarningInFunction
-                << "Cannot find registered field matching "
-                << fieldName << endl;
-        }
-    }
-
-    return nFields;
-}
-
-
-// ************************************************************************* //
diff --git a/src/sampling/sampledSet/sampledSets/sampledSetsTemplates.C b/src/sampling/sampledSet/sampledSets/sampledSetsTemplates.C
index be59511bd0..546df4a8dd 100644
--- a/src/sampling/sampledSet/sampledSets/sampledSetsTemplates.C
+++ b/src/sampling/sampledSet/sampledSets/sampledSetsTemplates.C
@@ -30,271 +30,99 @@ License
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class Type>
-Foam::sampledSets::volFieldSampler<Type>::volFieldSampler
+Foam::PtrList<Foam::Field<Type>>
+Foam::functionObjects::sampledSets::sampleLocalType
 (
-    const word& interpolationScheme,
-    const GeometricField<Type, fvPatchField, volMesh>& field,
-    const PtrList<sampledSet>& samplers
+    const label seti,
+    const wordList& fieldNames,
+    HashPtrTable<interpolation<Type>>& interpolations
 )
-:
-    List<Field<Type>>(samplers.size()),
-    name_(field.name())
 {
-    autoPtr<interpolation<Type>> interpolator
-    (
-        interpolation<Type>::New(interpolationScheme, field)
-    );
+    PtrList<Field<Type>> fieldTypeValues(fieldNames.size());
 
-    forAll(samplers, setI)
+    const sampledSet& s = operator[](seti);
+
+    forAll(fieldNames, fieldi)
     {
-        Field<Type>& values = this->operator[](setI);
-        const sampledSet& samples = samplers[setI];
+        const word& name = fieldNames[fieldi];
 
-        values.setSize(samples.size());
-        forAll(samples, sampleI)
+        if (mesh_.foundObject<VolField<Type>>(name))
         {
-            const point& samplePt = samples[sampleI];
-            label celli = samples.cells()[sampleI];
-            label facei = samples.faces()[sampleI];
+            const VolField<Type>& vf =
+                mesh_.lookupObject<VolField<Type>>(name);
 
-            if (celli == -1 && facei == -1)
+            if (!interpolations.found(name))
             {
-                // Special condition for illegal sampling points
-                values[sampleI] = pTraits<Type>::max;
-            }
-            else
-            {
-                values[sampleI] = interpolator().interpolate
+                interpolations.insert
                 (
-                    samplePt,
-                    celli,
-                    facei
-                );
-            }
-        }
-    }
-}
-
-
-template<class Type>
-Foam::sampledSets::volFieldSampler<Type>::volFieldSampler
-(
-    const GeometricField<Type, fvPatchField, volMesh>& field,
-    const PtrList<sampledSet>& samplers
-)
-:
-    List<Field<Type>>(samplers.size()),
-    name_(field.name())
-{
-    forAll(samplers, setI)
-    {
-        Field<Type>& values = this->operator[](setI);
-        const sampledSet& samples = samplers[setI];
-
-        values.setSize(samples.size());
-        forAll(samples, sampleI)
-        {
-            label celli = samples.cells()[sampleI];
-
-            if (celli ==-1)
-            {
-                values[sampleI] = pTraits<Type>::max;
-            }
-            else
-            {
-                values[sampleI] = field[celli];
-            }
-        }
-    }
-}
-
-
-template<class Type>
-Foam::sampledSets::volFieldSampler<Type>::volFieldSampler
-(
-    const List<Field<Type>>& values,
-    const word& name
-)
-:
-    List<Field<Type>>(values),
-    name_(name)
-{}
-
-
-template<class Type>
-void Foam::sampledSets::writeSampleFile
-(
-    const coordSet& masterSampleSet,
-    const PtrList<volFieldSampler<Type>>& masterFields,
-    const label setI,
-    const fileName& timeDir,
-    const setWriter<Type>& formatter
-)
-{
-    wordList valueSetNames(masterFields.size());
-    List<const Field<Type>*> valueSets(masterFields.size());
-
-    forAll(masterFields, fieldi)
-    {
-        valueSetNames[fieldi] = masterFields[fieldi].name();
-        valueSets[fieldi] = &masterFields[fieldi][setI];
-    }
-
-    fileName fName
-    (
-        timeDir/formatter.getFileName(masterSampleSet, valueSetNames)
-    );
-
-    OFstream ofs(fName);
-    if (ofs.opened())
-    {
-        formatter.write
-        (
-            masterSampleSet,
-            valueSetNames,
-            valueSets,
-            ofs
-        );
-    }
-    else
-    {
-        WarningInFunction
-            << "File " << ofs.name() << " could not be opened. "
-            << "No data will be written" << endl;
-    }
-}
-
-
-template<class T>
-void Foam::sampledSets::combineSampledValues
-(
-    const PtrList<volFieldSampler<T>>& sampledFields,
-    const labelListList& indexSets,
-    PtrList<volFieldSampler<T>>& masterFields
-)
-{
-    forAll(sampledFields, fieldi)
-    {
-        List<Field<T>> masterValues(indexSets.size());
-
-        forAll(indexSets, setI)
-        {
-            // Collect data from all processors
-            List<Field<T>> gatheredData(Pstream::nProcs());
-            gatheredData[Pstream::myProcNo()] = sampledFields[fieldi][setI];
-            Pstream::gatherList(gatheredData);
-
-            if (Pstream::master())
-            {
-                Field<T> allData
-                (
-                    ListListOps::combine<Field<T>>
-                    (
-                        gatheredData,
-                        Foam::accessOp<Field<T>>()
-                    )
-                );
-
-                masterValues[setI] = UIndirectList<T>
-                (
-                    allData,
-                    indexSets[setI]
-                )();
-            }
-        }
-
-        masterFields.set
-        (
-            fieldi,
-            new volFieldSampler<T>
-            (
-                masterValues,
-                sampledFields[fieldi].name()
-            )
-        );
-    }
-}
-
-
-template<class Type>
-void Foam::sampledSets::sampleAndWrite
-(
-    fieldGroup<Type>& fields
-)
-{
-    if (fields.size())
-    {
-        bool interpolate = interpolationScheme_ != "cell";
-
-        // Create or use existing writer
-        if (fields.formatter.empty())
-        {
-            fields = writeFormat_;
-        }
-
-        // Storage for interpolated values
-        PtrList<volFieldSampler<Type>> sampledFields(fields.size());
-
-        forAll(fields, fieldi)
-        {
-            if (Pstream::master() && verbose_)
-            {
-                Pout<< "sampledSets::sampleAndWrite: "
-                    << fields[fieldi] << endl;
-            }
-
-            if (interpolate)
-            {
-                sampledFields.set
-                (
-                    fieldi,
-                    new volFieldSampler<Type>
+                    name,
+                    interpolation<Type>::New
                     (
                         interpolationScheme_,
-                        mesh_.lookupObject
-                        <GeometricField<Type, fvPatchField, volMesh>>
-                        (fields[fieldi]),
-                        *this
-                    )
+                        vf
+                    ).ptr()
                 );
             }
-            else
+
+            const interpolation<Type>& interp = *interpolations[name];
+
+            tmp<Field<Type>> tfield(new Field<Type>(s.size()));
+            Field<Type>& field = tfield.ref();
+
+            forAll(s, i)
             {
-                sampledFields.set
-                (
-                    fieldi,
-                    new volFieldSampler<Type>
-                    (
-                        mesh_.lookupObject
-                        <GeometricField<Type, fvPatchField, volMesh>>
-                        (fields[fieldi]),
-                        *this
-                    )
-                );
+                const point& position = s.positions()[i];
+                const label celli = s.cells()[i];
+                const label facei = s.faces()[i];
+
+                if (celli == -1 && facei == -1)
+                {
+                    // Special condition for illegal sampling points
+                    field[i] = pTraits<Type>::max;
+                }
+                else
+                {
+                    field[i] = interp.interpolate(position, celli, facei);
+                }
             }
+
+            fieldTypeValues.set(fieldi, tfield.ptr());
         }
+    }
 
-        // Combine sampled fields from processors.
-        // Note: only master results are valid
+    return fieldTypeValues;
+}
 
-        PtrList<volFieldSampler<Type>> masterFields(sampledFields.size());
-        combineSampledValues(sampledFields, indexSets_, masterFields);
 
-        if (Pstream::master())
+template<class Type>
+Foam::PtrList<Foam::Field<Type>>
+Foam::functionObjects::sampledSets::sampleType
+(
+    const label seti,
+    const wordList& fieldNames,
+    HashPtrTable<interpolation<Type>>& interpolations
+)
+{
+    PtrList<Field<Type>> fieldTypeValues =
+        sampleLocalType<Type>(seti, fieldNames, interpolations);
+
+    if (Pstream::parRun())
+    {
+        forAll(fieldNames, fieldi)
         {
-            forAll(masterSampledSets_, setI)
+            if (fieldTypeValues.set(fieldi))
             {
-                writeSampleFile
-                (
-                    masterSampledSets_[setI],
-                    masterFields,
-                    setI,
-                    outputPath_/mesh_.time().timeName(),
-                    fields.formatter()
-                );
+                fieldTypeValues[fieldi] =
+                    coordSet::gather
+                    (
+                        fieldTypeValues[fieldi],
+                        masterSetOrders_[seti]
+                    );
             }
         }
     }
+
+    return fieldTypeValues;
 }
 
 
diff --git a/src/sampling/sampledSet/sphereRandom/sphereRandom.C b/src/sampling/sampledSet/sphereRandom/sphereRandom.C
index 64db545e35..74526445e2 100644
--- a/src/sampling/sampledSet/sphereRandom/sphereRandom.C
+++ b/src/sampling/sampledSet/sphereRandom/sphereRandom.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,11 +49,10 @@ namespace sampledSets
 
 void Foam::sampledSets::sphereRandom::calcSamples
 (
-    DynamicList<point>& samplingPts,
-    DynamicList<label>& samplingCells,
-    DynamicList<label>& samplingFaces,
+    DynamicList<point>& samplingPositions,
     DynamicList<label>& samplingSegments,
-    DynamicList<scalar>& samplingCurveDist
+    DynamicList<label>& samplingCells,
+    DynamicList<label>& samplingFaces
 ) const
 {
     Random rndGen(261782);
@@ -74,11 +73,10 @@ void Foam::sampledSets::sphereRandom::calcSamples
 
         if (celli != -1)
         {
-            samplingPts.append(pt);
+            samplingPositions.append(pt);
+            samplingSegments.append(i);
             samplingCells.append(celli);
             samplingFaces.append(-1);
-            samplingSegments.append(0);
-            samplingCurveDist.append(scalar(i));
         }
     }
 }
@@ -86,35 +84,30 @@ void Foam::sampledSets::sphereRandom::calcSamples
 
 void Foam::sampledSets::sphereRandom::genSamples()
 {
-    // Storage for sample points
-    DynamicList<point> samplingPts;
+    DynamicList<point> samplingPositions;
+    DynamicList<label> samplingSegments;
     DynamicList<label> samplingCells;
     DynamicList<label> samplingFaces;
-    DynamicList<label> samplingSegments;
-    DynamicList<scalar> samplingCurveDist;
 
     calcSamples
     (
-        samplingPts,
-        samplingCells,
-        samplingFaces,
+        samplingPositions,
         samplingSegments,
-        samplingCurveDist
+        samplingCells,
+        samplingFaces
     );
 
-    samplingPts.shrink();
+    samplingPositions.shrink();
+    samplingSegments.shrink();
     samplingCells.shrink();
     samplingFaces.shrink();
-    samplingSegments.shrink();
-    samplingCurveDist.shrink();
 
     setSamples
     (
-        samplingPts,
-        samplingCells,
-        samplingFaces,
+        samplingPositions,
         samplingSegments,
-        samplingCurveDist
+        samplingCells,
+        samplingFaces
     );
 }
 
@@ -135,11 +128,6 @@ Foam::sampledSets::sphereRandom::sphereRandom
     nPoints_(dict.lookup<label>("nPoints"))
 {
     genSamples();
-
-    if (debug)
-    {
-        write(Info);
-    }
 }
 
 
diff --git a/src/sampling/sampledSet/sphereRandom/sphereRandom.H b/src/sampling/sampledSet/sphereRandom/sphereRandom.H
index 1a30f7c1fe..7fa7a0dbd5 100644
--- a/src/sampling/sampledSet/sphereRandom/sphereRandom.H
+++ b/src/sampling/sampledSet/sphereRandom/sphereRandom.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -90,11 +90,10 @@ class sphereRandom
         //- Samples all points in sampleCoords
         void calcSamples
         (
-            DynamicList<point>& samplingPts,
-            DynamicList<label>& samplingCells,
-            DynamicList<label>& samplingFaces,
+            DynamicList<point>& samplingPositions,
             DynamicList<label>& samplingSegments,
-            DynamicList<scalar>& samplingCurveDist
+            DynamicList<label>& samplingCells,
+            DynamicList<label>& samplingFaces
         ) const;
 
         //- Uses calcSamples to obtain samples. Copies them into *this.
diff --git a/src/sampling/sampledSet/triSurfaceMeshSampledSet/triSurfaceMeshSampledSet.C b/src/sampling/sampledSet/triSurfaceMeshSampledSet/triSurfaceMeshSampledSet.C
index 5ef494c031..324426e2b3 100644
--- a/src/sampling/sampledSet/triSurfaceMeshSampledSet/triSurfaceMeshSampledSet.C
+++ b/src/sampling/sampledSet/triSurfaceMeshSampledSet/triSurfaceMeshSampledSet.C
@@ -47,11 +47,10 @@ namespace sampledSets
 
 void Foam::sampledSets::triSurfaceMeshSampledSet::calcSamples
 (
-    DynamicList<point>& samplingPts,
-    DynamicList<label>& samplingCells,
-    DynamicList<label>& samplingFaces,
+    DynamicList<point>& samplingPositions,
     DynamicList<label>& samplingSegments,
-    DynamicList<scalar>& samplingCurveDist
+    DynamicList<label>& samplingCells,
+    DynamicList<label>& samplingFaces
 ) const
 {
     forAll(points_, i)
@@ -61,11 +60,10 @@ void Foam::sampledSets::triSurfaceMeshSampledSet::calcSamples
 
         if (celli != -1)
         {
-            samplingPts.append(pt);
+            samplingPositions.append(pt);
+            samplingSegments.append(i);
             samplingCells.append(celli);
             samplingFaces.append(-1);
-            samplingSegments.append(0);
-            samplingCurveDist.append(scalar(i));
         }
     }
 }
@@ -73,35 +71,30 @@ void Foam::sampledSets::triSurfaceMeshSampledSet::calcSamples
 
 void Foam::sampledSets::triSurfaceMeshSampledSet::genSamples()
 {
-    // Storage for sample points
-    DynamicList<point> samplingPts;
+    DynamicList<point> samplingPositions;
+    DynamicList<label> samplingSegments;
     DynamicList<label> samplingCells;
     DynamicList<label> samplingFaces;
-    DynamicList<label> samplingSegments;
-    DynamicList<scalar> samplingCurveDist;
 
     calcSamples
     (
-        samplingPts,
-        samplingCells,
-        samplingFaces,
+        samplingPositions,
         samplingSegments,
-        samplingCurveDist
+        samplingCells,
+        samplingFaces
     );
 
-    samplingPts.shrink();
+    samplingPositions.shrink();
+    samplingSegments.shrink();
     samplingCells.shrink();
     samplingFaces.shrink();
-    samplingSegments.shrink();
-    samplingCurveDist.shrink();
 
     setSamples
     (
-        samplingPts,
-        samplingCells,
-        samplingFaces,
+        samplingPositions,
         samplingSegments,
-        samplingCurveDist
+        samplingCells,
+        samplingFaces
     );
 }
 
@@ -138,11 +131,6 @@ Foam::sampledSets::triSurfaceMeshSampledSet::triSurfaceMeshSampledSet
     )
 {
     genSamples();
-
-    if (debug)
-    {
-        write(Info);
-    }
 }
 
 
diff --git a/src/sampling/sampledSet/triSurfaceMeshSampledSet/triSurfaceMeshSampledSet.H b/src/sampling/sampledSet/triSurfaceMeshSampledSet/triSurfaceMeshSampledSet.H
index 08d1a37a3d..6e260273a7 100644
--- a/src/sampling/sampledSet/triSurfaceMeshSampledSet/triSurfaceMeshSampledSet.H
+++ b/src/sampling/sampledSet/triSurfaceMeshSampledSet/triSurfaceMeshSampledSet.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -83,11 +83,10 @@ class triSurfaceMeshSampledSet
         //- Samples all points in sampleCoords.
         void calcSamples
         (
-            DynamicList<point>& samplingPts,
-            DynamicList<label>& samplingCells,
-            DynamicList<label>& samplingFaces,
+            DynamicList<point>& samplingPositions,
             DynamicList<label>& samplingSegments,
-            DynamicList<scalar>& samplingCurveDist
+            DynamicList<label>& samplingCells,
+            DynamicList<label>& samplingFaces
         ) const;
 
         //- Uses calcSamples to obtain samples. Copies them into *this.
diff --git a/src/sampling/sampledSet/writers/csv/csvSetWriter.C b/src/sampling/sampledSet/writers/csv/csvSetWriter.C
index e57ba53d1a..8523202ed4 100644
--- a/src/sampling/sampledSet/writers/csv/csvSetWriter.C
+++ b/src/sampling/sampledSet/writers/csv/csvSetWriter.C
@@ -27,182 +27,84 @@ License
 #include "coordSet.H"
 #include "fileName.H"
 #include "OFstream.H"
+#include "OSspecific.H"
+#include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-template<class Type>
-Foam::csvSetWriter<Type>::csvSetWriter()
-:
-    setWriter<Type>()
+namespace Foam
+{
+    defineTypeNameAndDebug(csvSetWriter, 0);
+    addToRunTimeSelectionTable(setWriter, csvSetWriter, word);
+    addToRunTimeSelectionTable(setWriter, csvSetWriter, dict);
+}
+
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+void Foam::csvSetWriter::writeValueSeparator(Ostream& os) const
+{
+    os << ',';
+}
+
+
+void Foam::csvSetWriter::writeSegmentSeparator(Ostream& os) const
 {}
 
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-template<class Type>
-Foam::csvSetWriter<Type>::~csvSetWriter()
+Foam::csvSetWriter::~csvSetWriter()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class Type>
-Foam::fileName Foam::csvSetWriter<Type>::getFileName
+void Foam::csvSetWriter::write
 (
-    const coordSet& points,
+    const fileName& outputDir,
+    const fileName& setName,
+    const coordSet& set,
     const wordList& valueSetNames
+    #define TypeValueSetsConstArg(Type, nullArg) \
+        , const UPtrList<const Field<Type>>& Type##ValueSets
+    FOR_ALL_FIELD_TYPES(TypeValueSetsConstArg)
+    #undef TypeValueSetsConstArg
 ) const
 {
-    return this->getBaseName(points, valueSetNames) + ".csv";
-}
-
-
-template<class Type>
-void Foam::csvSetWriter<Type>::write
-(
-    const coordSet& points,
-    const wordList& valueSetNames,
-    const List<const Field<Type>*>& valueSets,
-    Ostream& os
-) const
-{
-    writeHeader(points,valueSetNames,os);
-
-    // Collect sets into columns
-    List<const List<Type>*> columns(valueSets.size());
-
-    forAll(valueSets, i)
+    if (!isDir(outputDir))
     {
-        columns[i] = valueSets[i];
+        mkDir(outputDir);
     }
 
-    this->writeTable(points, columns, os);
-}
-
-
-template<class Type>
-void Foam::csvSetWriter<Type>::write
-(
-    const bool writeTracks,
-    const PtrList<coordSet>& points,
-    const wordList& valueSetNames,
-    const List<List<Field<Type>>>& valueSets,
-    Ostream& os
-) const
-{
-    writeHeader(points[0],valueSetNames,os);
-
-    if (valueSets.size() != valueSetNames.size())
-    {
-        FatalErrorInFunction
-            << "Number of variables:" << valueSetNames.size() << endl
-            << "Number of valueSets:" << valueSets.size()
-            << exit(FatalError);
-    }
-
-    List<const List<Type>*> columns(valueSets.size());
-
-    forAll(points, trackI)
-    {
-        // Collect sets into columns
-        forAll(valueSets, i)
-        {
-            columns[i] = &valueSets[i][trackI];
-        }
-
-        this->writeTable(points[trackI], columns, os);
-        os  << nl << nl;
-    }
-}
-
-
-template<class Type>
-void Foam::csvSetWriter<Type>::writeSeparator(Ostream& os) const
-{
-    os << token::COMMA;
-}
-
-
-namespace Foam
-{
-    // otherwise compiler complains about specialisation
-    template<>
-    void csvSetWriter<scalar>::writeHeader
+    OFstream os
     (
-        const coordSet& points,
-        const wordList& valueSetNames,
-        Ostream& os
-    ) const
-    {
-        writeCoordHeader(points, os);
+        outputDir/setName + ".csv",
+        IOstream::ASCII,
+        IOstream::currentVersion,
+        writeCompression_
+    );
 
-        forAll(valueSetNames, i)
-        {
-            if (i > 0)
-            {
-                writeSeparator(os);
-            }
-            os << valueSetNames[i];
-        }
-
-        os << nl;
-    }
-}
-
-
-template<class Type>
-void Foam::csvSetWriter<Type>::writeHeader
-(
-    const coordSet& points,
-    const wordList& valueSetNames,
-    Ostream& os
-) const
-{
-    writeCoordHeader(points, os);
-
-    forAll(valueSetNames, i)
-    {
-        for (label j=0; j<Type::nComponents; j++)
-        {
-            if (i>0 || j>0)
-            {
-                writeSeparator(os);
-            }
-            os << valueSetNames[i] << "_" << j;
-        }
-    }
+    writeTableHeader
+    (
+        set,
+        valueSetNames,
+        #define TypeValueSetsParameter(Type, nullArg) Type##ValueSets,
+        FOR_ALL_FIELD_TYPES(TypeValueSetsParameter)
+        #undef TypeValueSetsParameter
+        os
+    );
 
     os << nl;
-}
 
-
-template<class Type>
-void Foam::csvSetWriter<Type>::writeCoordHeader
-(
-    const coordSet& points,
-    Ostream& os
-) const
-{
-    const word axisName(points.axis());
-
-    if (points.hasVectorAxis())
-    {
-        for
-        (
-            word::const_iterator iter = axisName.begin();
-            iter != axisName.end();
-            ++iter
-        )
-        {
-            os << *iter;
-            writeSeparator(os);
-        }
-    }
-    else
-    {
-        os << axisName;
-        writeSeparator(os);
-    }
+    writeTable
+    (
+        set,
+        #define TypeValueSetsParameter(Type, nullArg) Type##ValueSets,
+        FOR_ALL_FIELD_TYPES(TypeValueSetsParameter)
+        #undef TypeValueSetsParameter
+        os
+    );
 }
 
 
diff --git a/src/sampling/sampledSet/writers/csv/csvSetWriter.H b/src/sampling/sampledSet/writers/csv/csvSetWriter.H
index 2a9c5048bb..216b58b34a 100644
--- a/src/sampling/sampledSet/writers/csv/csvSetWriter.H
+++ b/src/sampling/sampledSet/writers/csv/csvSetWriter.H
@@ -46,22 +46,19 @@ namespace Foam
                         Class csvSetWriter Declaration
 \*---------------------------------------------------------------------------*/
 
-template<class Type>
 class csvSetWriter
 :
-    public setWriter<Type>
+    public setWriter
 {
-
-    // Private Member Functions
-
-        void writeCoordHeader(const coordSet&, Ostream&) const;
-
-        void writeHeader(const coordSet&, const wordList&, Ostream&) const;
-
-
 protected:
 
-    virtual void writeSeparator(Ostream&) const;
+    // Protected Member Functions
+
+        //- Write a value separator
+        virtual void writeValueSeparator(Ostream& os) const;
+
+        //- Write a segment separator
+        virtual void writeSegmentSeparator(Ostream& os) const;
 
 
 public:
@@ -72,8 +69,8 @@ public:
 
     // Constructors
 
-        //- Construct null
-        csvSetWriter();
+        //- Inherit constructors
+        using setWriter::setWriter;
 
 
     //- Destructor
@@ -82,27 +79,17 @@ public:
 
     // Member Functions
 
-        virtual fileName getFileName
-        (
-            const coordSet&,
-            const wordList&
-        ) const;
-
+        //- Write a coordSet and associated data
         virtual void write
         (
-            const coordSet&,
-            const wordList&,
-            const List<const Field<Type>*>&,
-            Ostream&
-        ) const;
-
-        virtual void write
-        (
-            const bool writeTracks,
-            const PtrList<coordSet>&,
-            const wordList& valueSetNames,
-            const List<List<Field<Type>>>&,
-            Ostream&
+            const fileName& outputDir,
+            const fileName& setName,
+            const coordSet& set,
+            const wordList& valueSetNames
+            #define TypeValueSetsConstArg(Type, nullArg) \
+                , const UPtrList<const Field<Type>>& Type##ValueSets
+            FOR_ALL_FIELD_TYPES(TypeValueSetsConstArg)
+            #undef TypeValueSetsConstArg
         ) const;
 };
 
@@ -113,12 +100,6 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#ifdef NoRepository
-    #include "csvSetWriter.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 #endif
 
 // ************************************************************************* //
diff --git a/src/sampling/sampledSet/writers/csv/csvSetWriterRunTime.C b/src/sampling/sampledSet/writers/csv/csvSetWriterRunTime.C
deleted file mode 100644
index 41cb3fa71d..0000000000
--- a/src/sampling/sampledSet/writers/csv/csvSetWriterRunTime.C
+++ /dev/null
@@ -1,37 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "csvSetWriter.H"
-#include "setWriters.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    makeSetWriters(csvSetWriter);
-}
-
-// ************************************************************************* //
diff --git a/src/sampling/sampledSet/writers/ensight/ensightSetWriter.C b/src/sampling/sampledSet/writers/ensight/ensightSetWriter.C
index 376e6bd58d..f0fa4d9f00 100644
--- a/src/sampling/sampledSet/writers/ensight/ensightSetWriter.C
+++ b/src/sampling/sampledSet/writers/ensight/ensightSetWriter.C
@@ -26,288 +26,198 @@ License
 #include "ensightSetWriter.H"
 #include "coordSet.H"
 #include "OFstream.H"
-#include "addToRunTimeSelectionTable.H"
+#include "OSspecific.H"
 #include "IOmanip.H"
-#include "foamVersion.H"
+#include "ensightPart.H"
+#include "ensightPTraits.H"
+#include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(ensightSetWriter, 0);
+    addToRunTimeSelectionTable(setWriter, ensightSetWriter, word);
+    addToRunTimeSelectionTable(setWriter, ensightSetWriter, dict);
+}
 
-template<class Type>
-Foam::ensightSetWriter<Type>::ensightSetWriter()
-:
-    setWriter<Type>()
-{}
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-template<class Type>
-Foam::ensightSetWriter<Type>::~ensightSetWriter()
+Foam::ensightSetWriter::~ensightSetWriter()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class Type>
-Foam::fileName Foam::ensightSetWriter<Type>::getFileName
+void Foam::ensightSetWriter::write
 (
-    const coordSet& points,
+    const fileName& outputDir,
+    const fileName& setName,
+    const coordSet& set,
     const wordList& valueSetNames
+    #define TypeValueSetsConstArg(Type, nullArg) \
+        , const UPtrList<const Field<Type>>& Type##ValueSets
+    FOR_ALL_FIELD_TYPES(TypeValueSetsConstArg)
+    #undef TypeValueSetsConstArg
 ) const
 {
-    return
-        this->getBaseName(points, valueSetNames)
-      //+ '_'
-      //+ pTraits<Type>::typeName
-      + ".case";
-}
-
-
-template<class Type>
-void Foam::ensightSetWriter<Type>::write
-(
-    const coordSet& points,
-    const wordList& valueSetNames,
-    const List<const Field<Type>*>& valueSets,
-    Ostream& os
-) const
-{
-    const fileName base(os.name().lessExt());
-    const fileName meshFile(base + ".mesh");
-
-    // Write .case file
-    os  << "FORMAT" << nl
-        << "type: ensight gold" << nl
-        << nl
-        << "GEOMETRY" << nl
-        << "model:        1     " << meshFile.name().c_str() << nl
-        << nl
-        << "VARIABLE"
-        << nl;
-    forAll(valueSetNames, setI)
+    if (!set.hasPointAxis())
     {
-        fileName dataFile(base + ".***." + valueSetNames[setI]);
-
-        os.setf(ios_base::left);
-        os  << pTraits<Type>::typeName
-            << " per node:            1       "
-            << setw(15) << valueSetNames[setI]
-            << " " << dataFile.name().c_str()
-            << nl;
+        FatalErrorInFunction
+            << "Cannot write " << setName << " in " << typeName
+            << " format as it does not have a point axis"
+            << exit(FatalError);
     }
-    os  << nl
+
+    if (!isDir(outputDir))
+    {
+        mkDir(outputDir);
+    }
+
+    // const scalar timeValue = Foam::name(this->mesh().time().timeValue());
+    const scalar timeValue = 0.0;
+
+    OFstream osCase(outputDir/setName + ".case");
+    ensightGeoFile osGeom
+    (
+        outputDir/setName + ".000.mesh",
+        writeFormat_
+    );
+
+    osCase
+        << "FORMAT" << nl
+        << "type: ensight gold" << nl
+        << nl;
+
+    osCase
+        << "GEOMETRY" << nl
+        << "model:        1     " << osGeom.name().name() << nl
+        << nl;
+
+    osCase
+        << "VARIABLE" << nl;
+    forAll(valueSetNames, fieldi)
+    {
+        #define WriteTypeCase(Type, nullArg)                               \
+            if (Type##ValueSets.set(fieldi))                               \
+            {                                                              \
+                osCase                                                     \
+                    << ensightPTraits<Type>::typeName << " per node:"      \
+                    << setw(10) << 1 << "       " << valueSetNames[fieldi] \
+                    << "       " << setName.c_str() << ".***."             \
+                    << valueSetNames[fieldi] << nl;                        \
+            }
+        FOR_ALL_FIELD_TYPES(WriteTypeCase);
+        #undef WriteTypeCase
+    }
+    osCase
+        << nl;
+
+    osCase
         << "TIME" << nl
         << "time set:                      1" << nl
         << "number of steps:               1" << nl
         << "filename start number:         0" << nl
         << "filename increment:            1" << nl
         << "time values:" << nl
-        << "0.00000e+00" << nl;
+        << timeValue << nl
+        << nl;
 
-    // Write .mesh file
+    // Write mesh file
     {
-        string desc = string("written by OpenFOAM-") + Foam::FOAMversion;
-        OFstream os(meshFile);
-        os.setf(ios_base::scientific, ios_base::floatfield);
-        os.precision(5);
-
-        os  << "EnSight Geometry File" << nl
-            << desc.c_str() << nl
-            << "node id assign" << nl
-            << "element id assign" << nl
+        osGeom
             << "part" << nl
             << setw(10) << 1 << nl
             << "internalMesh" << nl
             << "coordinates" << nl
-            << setw(10) << points.size() << nl;
+            << setw(10) << set.size() << nl;
+
+        const tmp<pointField> tPoints = set.pointCoords();
+        const pointField& points = tPoints();
 
         for (direction cmpt = 0; cmpt < vector::nComponents; cmpt++)
         {
-            forAll(points, pointi)
+            forAll(set, pointi)
             {
-                const scalar comp = points[pointi][cmpt];
-                if (mag(comp) >= scalar(floatScalarVSmall))
+                if (mag(points[pointi][cmpt]) >= scalar(floatScalarVSmall))
                 {
-                    os  << setw(12) << comp << nl;
+                    osGeom  << setw(12) << points[pointi][cmpt] << nl;
                 }
                 else
                 {
-                    os  << setw(12) << scalar(0) << nl;
+                    osGeom  << setw(12) << scalar(0) << nl;
                 }
             }
         }
-        os  << "point" << nl
-            << setw(10) << points.size() << nl;
-        forAll(points, pointi)
+
+        labelList vertices(set.vertices());
+        osGeom
+            << "point" << nl
+            << setw(10) << vertices.size() << nl;
+        forAll(vertices, vertexi)
         {
-            os  << setw(10) << pointi+1 << nl;
+            osGeom
+                << setw(10) << vertices[vertexi] + 1 << nl;
+        }
+
+        labelPairList edges(set.edges());
+        osGeom
+            << "bar2" << nl
+            << setw(10) << edges.size() << nl;
+        forAll(edges, edgei)
+        {
+            osGeom
+                << setw(10) << edges[edgei].first() + 1
+                << setw(10) << edges[edgei].second() + 1 << nl;
         }
     }
 
-    // Write data files
-    forAll(valueSetNames, setI)
+    // Write field files
+    forAll(valueSetNames, fieldi)
     {
-        fileName dataFile(base + ".000." + valueSetNames[setI]);
-        OFstream os(dataFile);
-        os.setf(ios_base::scientific, ios_base::floatfield);
-        os.precision(5);
-        {
-            os  << pTraits<Type>::typeName << nl
-                << "part" << nl
-                << setw(10) << 1 << nl
-                << "coordinates" << nl;
-            for (direction cmpt = 0; cmpt < pTraits<Type>::nComponents; cmpt++)
-            {
-                const scalarField fld(valueSets[setI]->component(cmpt));
-                forAll(fld, i)
-                {
-                    if (mag(fld[i]) >= scalar(floatScalarVSmall))
-                    {
-                        os  << setw(12) << fld[i] << nl;
-                    }
-                    else
-                    {
-                        os  << setw(12) << scalar(0) << nl;
-                    }
-                }
+        ensightFile osField
+        (
+            outputDir/setName
+          + ".000."
+          + valueSetNames[fieldi],
+            writeFormat_
+        );
+
+        #define WriteTypeValues(Type, nullArg)                        \
+            if (Type##ValueSets.set(fieldi))                          \
+            {                                                         \
+                osField                                               \
+                    << pTraits<Type>::typeName << nl                  \
+                    << "part" << nl                                   \
+                    << setw(10) << 1 << nl                            \
+                    << "coordinates" << nl;                           \
+                for                                                   \
+                (                                                     \
+                    direction cmpt = 0;                               \
+                    cmpt < pTraits<Type>::nComponents;                \
+                    cmpt++                                            \
+                )                                                     \
+                {                                                     \
+                    const scalarField fld                             \
+                    (                                                 \
+                        Type##ValueSets[fieldi].component(cmpt)       \
+                    );                                                \
+                    forAll(fld, i)                                    \
+                    {                                                 \
+                        if (mag(fld[i]) >= scalar(floatScalarVSmall)) \
+                        {                                             \
+                            osField << setw(12) << fld[i] << nl;      \
+                        }                                             \
+                        else                                          \
+                        {                                             \
+                            osField << setw(12) << scalar(0) << nl;   \
+                        }                                             \
+                    }                                                 \
+                }                                                     \
             }
-        }
-    }
-}
-
-
-template<class Type>
-void Foam::ensightSetWriter<Type>::write
-(
-    const bool writeTracks,
-    const PtrList<coordSet>& tracks,
-    const wordList& valueSetNames,
-    const List<List<Field<Type>>>& valueSets,
-    Ostream& os
-) const
-{
-    const fileName base(os.name().lessExt());
-    const fileName meshFile(base + ".mesh");
-
-    // Write .case file
-    os  << "FORMAT" << nl
-        << "type: ensight gold" << nl
-        << nl
-        << "GEOMETRY" << nl
-        << "model:        1     " << meshFile.name().c_str() << nl
-        << nl
-        << "VARIABLE"
-        << nl;
-    forAll(valueSetNames, setI)
-    {
-        fileName dataFile(base + ".***." + valueSetNames[setI]);
-
-        os.setf(ios_base::left);
-        os  << pTraits<Type>::typeName
-            << " per node:            1       "
-            << setw(15) << valueSetNames[setI]
-            << " " << dataFile.name().c_str()
-            << nl;
-    }
-    os  << nl
-        << "TIME" << nl
-        << "time set:                      1" << nl
-        << "number of steps:               1" << nl
-        << "filename start number:         0" << nl
-        << "filename increment:            1" << nl
-        << "time values:" << nl
-        << "0.00000e+00" << nl;
-
-    // Write .mesh file
-    {
-        string desc = string("written by OpenFOAM-") + Foam::FOAMversion;
-        OFstream os(meshFile);
-        os.setf(ios_base::scientific, ios_base::floatfield);
-        os.precision(5);
-        os  << "EnSight Geometry File" << nl
-            << desc.c_str() << nl
-            << "node id assign" << nl
-            << "element id assign" << nl;
-
-        forAll(tracks, trackI)
-        {
-            const coordSet& points = tracks[trackI];
-
-            os  << "part" << nl
-                << setw(10) << trackI+1 << nl
-                << "internalMesh" << nl
-                << "coordinates" << nl
-                << setw(10) << points.size() << nl;
-
-            for (direction cmpt = 0; cmpt < vector::nComponents; cmpt++)
-            {
-                forAll(points, pointi)
-                {
-                    const scalar comp = points[pointi][cmpt];
-                    if (mag(comp) >= scalar(floatScalarVSmall))
-                    {
-                        os  << setw(12) << comp << nl;
-                    }
-                    else
-                    {
-                        os  << setw(12) << scalar(0) << nl;
-                    }
-                }
-            }
-
-            if (writeTracks)
-            {
-                os  << "bar2" << nl
-                    << setw(10) << points.size()-1 << nl;
-                for (label i = 0; i < points.size()-1; i++)
-                {
-                    os  << setw(10) << i+1
-                        << setw(10) << i+2
-                        << nl;
-                }
-            }
-        }
-    }
-
-
-    // Write data files
-    forAll(valueSetNames, setI)
-    {
-        fileName dataFile(base + ".000." + valueSetNames[setI]);
-        OFstream os(dataFile);
-        os.setf(ios_base::scientific, ios_base::floatfield);
-        os.precision(5);
-        {
-            os  << pTraits<Type>::typeName << nl;
-
-            const List<Field<Type>>& fieldVals = valueSets[setI];
-            forAll(fieldVals, trackI)
-            {
-                os  << "part" << nl
-                    << setw(10) << trackI+1 << nl
-                    << "coordinates" << nl;
-
-                for
-                (
-                    direction cmpt = 0;
-                    cmpt < pTraits<Type>::nComponents;
-                    cmpt++
-                )
-                {
-                    const scalarField fld(fieldVals[trackI].component(cmpt));
-                    forAll(fld, i)
-                    {
-                        if (mag(fld[i]) >= scalar(floatScalarVSmall))
-                        {
-                            os  << setw(12) << fld[i] << nl;
-                        }
-                        else
-                        {
-                            os  << setw(12) << scalar(0) << nl;
-                        }
-                    }
-                }
-            }
-        }
+        FOR_ALL_FIELD_TYPES(WriteTypeValues);
+        #undef WriteTypeValues
     }
 }
 
diff --git a/src/sampling/sampledSet/writers/ensight/ensightSetWriter.H b/src/sampling/sampledSet/writers/ensight/ensightSetWriter.H
index b53af6e76c..f90ac2dc0d 100644
--- a/src/sampling/sampledSet/writers/ensight/ensightSetWriter.H
+++ b/src/sampling/sampledSet/writers/ensight/ensightSetWriter.H
@@ -45,12 +45,10 @@ namespace Foam
                       Class ensightSetWriter Declaration
 \*---------------------------------------------------------------------------*/
 
-template<class Type>
 class ensightSetWriter
 :
-    public setWriter<Type>
+    public setWriter
 {
-
 public:
 
     //- Runtime type information
@@ -59,8 +57,8 @@ public:
 
     // Constructors
 
-        //- Construct null
-        ensightSetWriter();
+        //- Inherit constructors
+        using setWriter::setWriter;
 
 
     //- Destructor
@@ -69,27 +67,17 @@ public:
 
     // Member Functions
 
-        virtual fileName getFileName
-        (
-            const coordSet&,
-            const wordList&
-        ) const;
-
+        //- Write a coordSet and associated data
         virtual void write
         (
-            const coordSet&,
-            const wordList&,
-            const List<const Field<Type>*>&,
-            Ostream&
-        ) const;
-
-        virtual void write
-        (
-            const bool writeTracks,
-            const PtrList<coordSet>&,
-            const wordList& valueSetNames,
-            const List<List<Field<Type>>>&,
-            Ostream&
+            const fileName& outputDir,
+            const fileName& setName,
+            const coordSet& set,
+            const wordList& valueSetNames
+            #define TypeValueSetsConstArg(Type, nullArg) \
+                , const UPtrList<const Field<Type>>& Type##ValueSets
+            FOR_ALL_FIELD_TYPES(TypeValueSetsConstArg)
+            #undef TypeValueSetsConstArg
         ) const;
 };
 
@@ -100,12 +88,6 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#ifdef NoRepository
-    #include "ensightSetWriter.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 #endif
 
 // ************************************************************************* //
diff --git a/src/sampling/sampledSet/writers/ensight/ensightSetWriterRunTime.C b/src/sampling/sampledSet/writers/ensight/ensightSetWriterRunTime.C
deleted file mode 100644
index b5a5f122c1..0000000000
--- a/src/sampling/sampledSet/writers/ensight/ensightSetWriterRunTime.C
+++ /dev/null
@@ -1,37 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "ensightSetWriter.H"
-#include "setWriters.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    makeSetWriters(ensightSetWriter);
-}
-
-// ************************************************************************* //
diff --git a/src/sampling/sampledSet/writers/gnuplot/gnuplotSetWriter.C b/src/sampling/sampledSet/writers/gnuplot/gnuplotSetWriter.C
index 67beeb52eb..04873aac3a 100644
--- a/src/sampling/sampledSet/writers/gnuplot/gnuplotSetWriter.C
+++ b/src/sampling/sampledSet/writers/gnuplot/gnuplotSetWriter.C
@@ -27,113 +27,135 @@ License
 #include "coordSet.H"
 #include "fileName.H"
 #include "OFstream.H"
+#include "OSspecific.H"
 #include "addToRunTimeSelectionTable.H"
 
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+namespace Foam
+{
+    defineTypeNameAndDebug(gnuplotSetWriter, 0);
+    addToRunTimeSelectionTable(setWriter, gnuplotSetWriter, word);
+    addToRunTimeSelectionTable(setWriter, gnuplotSetWriter, dict);
+}
 
-template<class Type>
-Foam::gnuplotSetWriter<Type>::gnuplotSetWriter()
-:
-    setWriter<Type>()
-{}
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-template<class Type>
-Foam::gnuplotSetWriter<Type>::~gnuplotSetWriter()
+Foam::gnuplotSetWriter::~gnuplotSetWriter()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class Type>
-Foam::fileName Foam::gnuplotSetWriter<Type>::getFileName
+void Foam::gnuplotSetWriter::write
 (
-    const coordSet& points,
+    const fileName& outputDir,
+    const fileName& setName,
+    const coordSet& set,
     const wordList& valueSetNames
+    #define TypeValueSetsConstArg(Type, nullArg) \
+        , const UPtrList<const Field<Type>>& Type##ValueSets
+    FOR_ALL_FIELD_TYPES(TypeValueSetsConstArg)
+    #undef TypeValueSetsConstArg
 ) const
 {
-    return this->getBaseName(points, valueSetNames) + ".gplt";
-}
-
-
-template<class Type>
-void Foam::gnuplotSetWriter<Type>::write
-(
-    const coordSet& points,
-    const wordList& valueSetNames,
-    const List<const Field<Type>*>& valueSets,
-    Ostream& os
-) const
-{
-    os  << "set term postscript color" << nl
-        << "set output \"" << points.name() << ".ps\"" << nl
-        << "plot";
-
-    forAll(valueSets, i)
-    {
-        if (i != 0)
-        {
-            os << ',';
-        }
-
-        os  << " \"-\" title \"" << valueSetNames[i] << "\" with lines";
-    }
-    os  << nl;
-
-
-    forAll(valueSets, i)
-    {
-        this->writeTable(points, *valueSets[i], os);
-        os  << "e" << nl;
-    }
-}
-
-
-template<class Type>
-void Foam::gnuplotSetWriter<Type>::write
-(
-    const bool writeTracks,
-    const PtrList<coordSet>& trackPoints,
-    const wordList& valueSetNames,
-    const List<List<Field<Type>>>& valueSets,
-    Ostream& os
-) const
-{
-    if (valueSets.size() != valueSetNames.size())
+    if (!set.hasScalarAxis())
     {
         FatalErrorInFunction
-            << "Number of variables:" << valueSetNames.size() << endl
-            << "Number of valueSets:" << valueSets.size()
+            << "Cannot write " << setName << " in " << typeName
+            << " format as it does not have a scalar axis"
             << exit(FatalError);
     }
-    if (trackPoints.size() > 0)
+
+    if (!isDir(outputDir))
     {
-        os  << "set term postscript color" << nl
-            << "set output \"" << trackPoints[0].name() << ".ps\"" << nl;
+        mkDir(outputDir);
+    }
 
-        forAll(trackPoints, trackI)
-        {
-            os  << "plot";
+    OFstream os
+    (
+        outputDir/setName + ".gplt",
+        IOstream::ASCII,
+        IOstream::currentVersion,
+        writeCompression_
+    );
 
-            forAll(valueSets, i)
-            {
-                if (i != 0)
-                {
-                    os << ',';
-                }
+    os << "$data << EOD" << nl;
 
-                os  << " \"-\" title \"" << valueSetNames[i] << "\" with lines";
+    writeTable
+    (
+        set.axis() == coordSet::axisTypeNames_[coordSet::axisType::DEFAULT]
+      ? coordSet
+        (
+            set.segments(),
+            word::null,
+            pointField::null(),
+            set.scalarName(),
+            set.scalarCoords()
+        )
+      : set,
+        #define TypeValueSetsParameter(Type, nullArg) Type##ValueSets,
+        FOR_ALL_FIELD_TYPES(TypeValueSetsParameter)
+        #undef TypeValueSetsParameter
+        os
+    );
+
+    os << nl << "EOD" << nl << nl;
+
+    os  << "set term postscript color" << nl
+        << "set output \"" << setName.c_str() << ".ps\"" << nl
+        << "set xlabel \"" << set.scalarName() << "\"" << nl;
+
+    if (valueSetNames.size() == 2)
+    {
+        os  << "set ytics nomirror" << nl
+            << "set ylabel \"" << valueSetNames[0] << "\"" << nl
+            << "set y2tics nomirror" << nl
+            << "set y2label \"" << valueSetNames[1] << "\"" << nl;
+    }
+
+    os << nl << "plot ";
+
+    label columni = 0;
+
+    forAll(valueSetNames, fieldi)
+    {
+        #define PlotTypeValueSets(Type, nullArg)                            \
+            if (Type##ValueSets.set(fieldi))                                \
+            {                                                               \
+                for                                                         \
+                (                                                           \
+                    direction cmpt = 0;                                     \
+                    cmpt < pTraits<Type>::nComponents;                      \
+                    cmpt++                                                  \
+                )                                                           \
+                {                                                           \
+                    const bool separator =                                  \
+                        !valueSetNames[fieldi].empty()                      \
+                     && strlen(pTraits<Type>::componentNames[cmpt]) > 0;    \
+                                                                            \
+                    const word w =                                          \
+                        valueSetNames[fieldi]                               \
+                      + (separator ? "_" : "")                              \
+                      + pTraits<Type>::componentNames[cmpt];                \
+                                                                            \
+                    if (columni != 0) os << ", ";                           \
+                                                                            \
+                    os  << "$data us 1:" << 2 + columni;                    \
+                                                                            \
+                    if (valueSetNames.size() == 2)                          \
+                    {                                                       \
+                        os  << " axis x1y" << 1 + fieldi;                   \
+                    }                                                       \
+                                                                            \
+                    os  << " title \"" << w << "\" with lines";             \
+                                                                            \
+                    ++ columni;                                             \
+                }                                                           \
             }
-            os << nl;
-
-            forAll(valueSets, i)
-            {
-                this->writeTable(trackPoints[trackI], valueSets[i][trackI], os);
-                os  << "e" << nl;
-            }
-        }
+        FOR_ALL_FIELD_TYPES(PlotTypeValueSets)
+        #undef PlotTypeValueSets
     }
 }
 
diff --git a/src/sampling/sampledSet/writers/gnuplot/gnuplotSetWriter.H b/src/sampling/sampledSet/writers/gnuplot/gnuplotSetWriter.H
index 49f3189cdb..b8e031085d 100644
--- a/src/sampling/sampledSet/writers/gnuplot/gnuplotSetWriter.H
+++ b/src/sampling/sampledSet/writers/gnuplot/gnuplotSetWriter.H
@@ -25,6 +25,7 @@ Class
     Foam::gnuplotSetWriter
 
 Description
+    Write set in gnuplot format
 
 SourceFiles
     gnuplotSetWriter.C
@@ -42,15 +43,13 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                      Class gnuplotSetWriter Declaration
+                        Class gnuplotSetWriter Declaration
 \*---------------------------------------------------------------------------*/
 
-template<class Type>
 class gnuplotSetWriter
 :
-    public setWriter<Type>
+    public setWriter
 {
-
 public:
 
     //- Runtime type information
@@ -59,8 +58,8 @@ public:
 
     // Constructors
 
-        //- Construct null
-        gnuplotSetWriter();
+        //- Inherit constructors
+        using setWriter::setWriter;
 
 
     //- Destructor
@@ -69,27 +68,17 @@ public:
 
     // Member Functions
 
-        virtual fileName getFileName
-        (
-            const coordSet&,
-            const wordList&
-        ) const;
-
+        //- Write a coordSet and associated data
         virtual void write
         (
-            const coordSet&,
-            const wordList&,
-            const List<const Field<Type>*>&,
-            Ostream&
-        ) const;
-
-        virtual void write
-        (
-            const bool writeTracks,
-            const PtrList<coordSet>&,
-            const wordList& valueSetNames,
-            const List<List<Field<Type>>>&,
-            Ostream&
+            const fileName& outputDir,
+            const fileName& setName,
+            const coordSet& set,
+            const wordList& valueSetNames
+            #define TypeValueSetsConstArg(Type, nullArg) \
+                , const UPtrList<const Field<Type>>& Type##ValueSets
+            FOR_ALL_FIELD_TYPES(TypeValueSetsConstArg)
+            #undef TypeValueSetsConstArg
         ) const;
 };
 
@@ -100,12 +89,6 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#ifdef NoRepository
-    #include "gnuplotSetWriter.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 #endif
 
 // ************************************************************************* //
diff --git a/src/sampling/sampledSet/writers/gnuplot/gnuplotSetWriterRunTime.C b/src/sampling/sampledSet/writers/gnuplot/gnuplotSetWriterRunTime.C
deleted file mode 100644
index 1ddba6ecdc..0000000000
--- a/src/sampling/sampledSet/writers/gnuplot/gnuplotSetWriterRunTime.C
+++ /dev/null
@@ -1,37 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "gnuplotSetWriter.H"
-#include "setWriters.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    makeSetWriters(gnuplotSetWriter);
-}
-
-// ************************************************************************* //
diff --git a/src/sampling/sampledSet/writers/jplot/jplotSetWriter.C b/src/sampling/sampledSet/writers/jplot/jplotSetWriter.C
deleted file mode 100644
index 4020581be8..0000000000
--- a/src/sampling/sampledSet/writers/jplot/jplotSetWriter.C
+++ /dev/null
@@ -1,103 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "jplotSetWriter.H"
-#include "clock.H"
-#include "coordSet.H"
-#include "fileName.H"
-#include "OFstream.H"
-
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-template<class Type>
-Foam::Ostream& Foam::jplotSetWriter<Type>::writeHeader(Ostream& os) const
-{
-    return os
-        << "# JPlot input file" << nl
-        << "#" << nl << nl
-        << "# Generated by sample on " << clock::date().c_str() << nl;
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::jplotSetWriter<Type>::jplotSetWriter()
-:
-    setWriter<Type>()
-{}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::jplotSetWriter<Type>::~jplotSetWriter()
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::fileName Foam::jplotSetWriter<Type>::getFileName
-(
-    const coordSet& points,
-    const wordList& valueSetNames
-) const
-{
-    return this->getBaseName(points, valueSetNames) + ".dat";
-}
-
-
-template<class Type>
-void Foam::jplotSetWriter<Type>::write
-(
-    const coordSet& points,
-    const wordList& valueSetNames,
-    const List<const Field<Type>*>& valueSets,
-    Ostream& os
-) const
-{
-    os  << "# JPlot file" << nl
-        << "# column 1: " << points.name() << nl;
-
-    forAll(valueSets, i)
-    {
-        os  << "# column " << i + 2 << ": " << valueSetNames[i] << nl;
-    }
-
-    // Collect sets into columns
-    List<const List<Type>*> columns(valueSets.size());
-
-    forAll(valueSets, i)
-    {
-        columns[i] = valueSets[i];
-    }
-
-    this->writeTable(points, columns, os);
-}
-
-
-// ************************************************************************* //
diff --git a/src/sampling/sampledSet/writers/jplot/jplotSetWriter.H b/src/sampling/sampledSet/writers/jplot/jplotSetWriter.H
deleted file mode 100644
index 83a6e01d46..0000000000
--- a/src/sampling/sampledSet/writers/jplot/jplotSetWriter.H
+++ /dev/null
@@ -1,118 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::jplotSetWriter
-
-SourceFiles
-    jplotSetWriter.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef jplotSetWriter_H
-#define jplotSetWriter_H
-
-#include "setWriter.H"
-#include "vector.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-                       Class jplotSetWriter Declaration
-\*---------------------------------------------------------------------------*/
-
-template<class Type>
-class jplotSetWriter
-:
-    public setWriter<Type>
-{
-
-    // Private Member Functions
-
-        //- Write header
-        Ostream& writeHeader(Ostream&) const;
-
-public:
-
-    //- Runtime type information
-    TypeName("jplot");
-
-
-    // Constructors
-
-        //- Construct null
-        jplotSetWriter();
-
-
-    //- Destructor
-    virtual ~jplotSetWriter();
-
-
-    // Member Functions
-
-        virtual fileName getFileName
-        (
-            const coordSet&,
-            const wordList&
-        ) const;
-
-        virtual void write
-        (
-            const coordSet&,
-            const wordList&,
-            const List<const Field<Type>*>&,
-            Ostream&
-        ) const;
-
-        virtual void write
-        (
-            const bool writeTracks,
-            const PtrList<coordSet>&,
-            const wordList& valueSetNames,
-            const List<List<Field<Type>>>&,
-            Ostream&
-        ) const
-        {
-            NotImplemented;
-        }
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#ifdef NoRepository
-    #include "jplotSetWriter.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/sampling/sampledSet/writers/raw/rawSetWriter.C b/src/sampling/sampledSet/writers/raw/rawSetWriter.C
index c544cfea6f..fcb00ca78b 100644
--- a/src/sampling/sampledSet/writers/raw/rawSetWriter.C
+++ b/src/sampling/sampledSet/writers/raw/rawSetWriter.C
@@ -25,90 +25,117 @@ License
 
 #include "rawSetWriter.H"
 #include "coordSet.H"
-#include "fileName.H"
 #include "OFstream.H"
+#include "OSspecific.H"
+#include "SubList.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(rawSetWriter, 0);
+    addToRunTimeSelectionTable(setWriter, rawSetWriter, word);
+    addToRunTimeSelectionTable(setWriter, rawSetWriter, dict);
+}
+
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+void Foam::rawSetWriter::writeSegmentSeparator(Ostream& os) const
+{
+    if (separateSegments_)
+    {
+        os << nl << nl;
+    }
+}
+
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-template<class Type>
-Foam::rawSetWriter<Type>::rawSetWriter()
+Foam::rawSetWriter::rawSetWriter
+(
+    const IOstream::streamFormat writeFormat,
+    const IOstream::compressionType writeCompression
+)
 :
-    setWriter<Type>()
+    setWriter(writeFormat, writeCompression),
+    separateSegments_(true)
+{}
+
+
+Foam::rawSetWriter::rawSetWriter(const dictionary& dict)
+:
+    setWriter(dict),
+    separateSegments_(true)
 {}
 
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-template<class Type>
-Foam::rawSetWriter<Type>::~rawSetWriter()
+Foam::rawSetWriter::~rawSetWriter()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class Type>
-Foam::fileName Foam::rawSetWriter<Type>::getFileName
+void Foam::rawSetWriter::write
 (
-    const coordSet& points,
+    const fileName& outputDir,
+    const fileName& setName,
+    const coordSet& set,
     const wordList& valueSetNames
+    #define TypeValueSetsConstArg(Type, nullArg) \
+        , const UPtrList<const Field<Type>>& Type##ValueSets
+    FOR_ALL_FIELD_TYPES(TypeValueSetsConstArg)
+    #undef TypeValueSetsConstArg
 ) const
 {
-    return this->getBaseName(points, valueSetNames) + ".xy";
-}
-
-
-template<class Type>
-void Foam::rawSetWriter<Type>::write
-(
-    const coordSet& points,
-    const wordList& valueSetNames,
-    const List<const Field<Type>*>& valueSets,
-    Ostream& os
-) const
-{
-    // Collect sets into columns
-    List<const List<Type>*> columns(valueSets.size());
-
-    forAll(valueSets, i)
+    if (!isDir(outputDir))
     {
-        columns[i] = valueSets[i];
+        mkDir(outputDir);
     }
 
-    this->writeTable(points, columns, os);
-}
+    OFstream os
+    (
+        outputDir/setName + ".xy",
+        IOstream::ASCII,
+        IOstream::currentVersion,
+        writeCompression_
+    );
 
+    separateSegments_ = set.segments() != identity(set.size());
 
-template<class Type>
-void Foam::rawSetWriter<Type>::write
-(
-    const bool writeTracks,
-    const PtrList<coordSet>& points,
-    const wordList& valueSetNames,
-    const List<List<Field<Type>>>& valueSets,
-    Ostream& os
-) const
-{
-    if (valueSets.size() != valueSetNames.size())
-    {
-        FatalErrorInFunction
-            << "Number of variables:" << valueSetNames.size() << endl
-            << "Number of valueSets:" << valueSets.size()
-            << exit(FatalError);
-    }
+    os << '#';
 
-    List<const List<Type>*> columns(valueSets.size());
+    OStringStream oss;
+    writeValueSeparator(oss);
 
-    forAll(points, trackI)
-    {
-        // Collect sets into columns
-        forAll(valueSets, i)
-        {
-            columns[i] = &valueSets[i][trackI];
-        }
+    os << oss.str().c_str();
 
-        this->writeTable(points[trackI], columns, os);
-        os  << nl << nl;
-    }
+    writeTableHeader
+    (
+        set,
+        valueSetNames,
+        #define TypeValueSetsParameter(Type, nullArg) Type##ValueSets,
+        FOR_ALL_FIELD_TYPES(TypeValueSetsParameter)
+        #undef TypeValueSetsParameter
+        os,
+        true,
+        1 + oss.str().size()
+    );
+
+    os << nl;
+
+    writeTable
+    (
+        set,
+        #define TypeValueSetsParameter(Type, nullArg) Type##ValueSets,
+        FOR_ALL_FIELD_TYPES(TypeValueSetsParameter)
+        #undef TypeValueSetsParameter
+        os,
+        true
+    );
 }
 
 
diff --git a/src/sampling/sampledSet/writers/raw/rawSetWriter.H b/src/sampling/sampledSet/writers/raw/rawSetWriter.H
index 9987999f60..fd33892750 100644
--- a/src/sampling/sampledSet/writers/raw/rawSetWriter.H
+++ b/src/sampling/sampledSet/writers/raw/rawSetWriter.H
@@ -25,6 +25,7 @@ Class
     Foam::rawSetWriter
 
 Description
+    Write set in raw tabulated format
 
 SourceFiles
     rawSetWriter.C
@@ -45,11 +46,25 @@ namespace Foam
                         Class rawSetWriter Declaration
 \*---------------------------------------------------------------------------*/
 
-template<class Type>
 class rawSetWriter
 :
-    public setWriter<Type>
+    public setWriter
 {
+private:
+
+    // Private Data
+
+        //- Whether or not to separate segments
+        mutable bool separateSegments_;
+
+
+protected:
+
+    // Protected Member Functions
+
+        //- Write a segment separator
+        virtual void writeSegmentSeparator(Ostream& os) const;
+
 
 public:
 
@@ -59,8 +74,15 @@ public:
 
     // Constructors
 
-        //- Construct null
-        rawSetWriter();
+        //- Construct given write options
+        rawSetWriter
+        (
+            const IOstream::streamFormat writeFormat,
+            const IOstream::compressionType writeCompression
+        );
+
+        //- Construct from dictionary
+        rawSetWriter(const dictionary& dict);
 
 
     //- Destructor
@@ -69,28 +91,21 @@ public:
 
     // Member Functions
 
-        virtual fileName getFileName
-        (
-            const coordSet&,
-            const wordList&
-        ) const;
-
+        //- Write a coordSet and associated data
         virtual void write
         (
-            const coordSet&,
-            const wordList&,
-            const List<const Field<Type>*>&,
-            Ostream&
+            const fileName& outputDir,
+            const fileName& setName,
+            const coordSet& set,
+            const wordList& valueSetNames
+            #define TypeValueSetsConstArg(Type, nullArg) \
+                , const UPtrList<const Field<Type>>& Type##ValueSets
+            FOR_ALL_FIELD_TYPES(TypeValueSetsConstArg)
+            #undef TypeValueSetsConstArg
         ) const;
 
-        virtual void write
-        (
-            const bool writeTracks,
-            const PtrList<coordSet>&,
-            const wordList& valueSetNames,
-            const List<List<Field<Type>>>&,
-            Ostream&
-        ) const;
+        //- Inherit base class write methods
+        using setWriter::write;
 };
 
 
@@ -100,12 +115,6 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#ifdef NoRepository
-    #include "rawSetWriter.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 #endif
 
 // ************************************************************************* //
diff --git a/src/sampling/sampledSet/writers/raw/rawSetWriterRunTime.C b/src/sampling/sampledSet/writers/raw/rawSetWriterRunTime.C
deleted file mode 100644
index 5942955f42..0000000000
--- a/src/sampling/sampledSet/writers/raw/rawSetWriterRunTime.C
+++ /dev/null
@@ -1,37 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "rawSetWriter.H"
-#include "setWriters.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    makeSetWriters(rawSetWriter);
-}
-
-// ************************************************************************* //
diff --git a/src/sampling/sampledSet/writers/setWriter.C b/src/sampling/sampledSet/writers/setWriter.C
index a2c5ec8e9d..ac9fd7f1a9 100644
--- a/src/sampling/sampledSet/writers/setWriter.C
+++ b/src/sampling/sampledSet/writers/setWriter.C
@@ -26,14 +26,228 @@ License
 #include "setWriter.H"
 #include "coordSet.H"
 #include "OFstream.H"
-#include "OSspecific.H"
+#include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-template<class Type>
-Foam::autoPtr<Foam::setWriter<Type>> Foam::setWriter<Type>::New
+namespace Foam
+{
+    defineTypeNameAndDebug(setWriter, 0);
+    defineRunTimeSelectionTable(setWriter, word);
+    defineRunTimeSelectionTable(setWriter, dict);
+}
+
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+void Foam::setWriter::writeValueSeparator(Ostream& os) const
+{
+    os << token::SPACE;
+}
+
+
+void Foam::setWriter::writeCoordSeparator(Ostream& os) const
+{
+    os << nl;
+}
+
+
+void Foam::setWriter::writeSegmentSeparator(Ostream& os) const
+{
+    os << nl << nl;
+}
+
+
+inline Foam::Ostream& Foam::setWriter::writeWord
 (
-    const word& writeType
+    const word& w,
+    Ostream& os,
+    const bool align,
+    const unsigned long alignPad
+) const
+{
+    if (!align)
+    {
+        os << w;
+    }
+    else if (w.size() < columnWidth(os) - alignPad)
+    {
+        os << string(columnWidth(os) - alignPad - w.size(), ' ').c_str() << w;
+    }
+    else
+    {
+        os << w(columnWidth(os) - alignPad - 3).c_str() << "...";
+    }
+
+    return os;
+}
+
+
+void Foam::setWriter::writeTableHeader
+(
+    const coordSet& set,
+    const wordList& valueSetNames,
+    #define TypeValueSetsConstArg(Type, nullArg) \
+        const UPtrList<const Field<Type>>& Type##ValueSets ,
+    FOR_ALL_FIELD_TYPES(TypeValueSetsConstArg)
+    #undef TypeValueSetsConstArg
+    Ostream& os,
+    const bool align,
+    const unsigned long alignPad
+) const
+{
+    bool first = true;
+
+    // Write coordinate names
+    if (set.hasScalarAxis())
+    {
+        if (!first) writeValueSeparator(os);
+
+        writeWord(set.scalarName(), os, align, first*alignPad);
+        first = false;
+    }
+    if (set.hasPointAxis())
+    {
+        for (direction cmpt = 0; cmpt < pTraits<point>::nComponents; ++ cmpt)
+        {
+            if (!first) writeValueSeparator(os);
+
+            const bool separator =
+                !set.pointName().empty()
+             && strlen(pTraits<point>::componentNames[cmpt]) > 0;
+
+            const word& w =
+                set.pointName()
+              + (separator ? "_" : "")
+              + pTraits<point>::componentNames[cmpt];
+
+            writeWord(w, os, align, first*alignPad);
+            first = false;
+        }
+    }
+
+    // Write value names
+    forAll(scalarValueSets, fieldi)
+    {
+        #define WriteTypeValueSetNames(Type, nullArg)                       \
+            if (Type##ValueSets.set(fieldi))                                \
+            {                                                               \
+                const label nCmpt = pTraits<Type>::nComponents;             \
+                                                                            \
+                for (direction cmpt = 0; cmpt < nCmpt; ++ cmpt)             \
+                {                                                           \
+                    if (!first) writeValueSeparator(os);                    \
+                                                                            \
+                    const bool separator =                                  \
+                        !valueSetNames[fieldi].empty()                      \
+                     && strlen(pTraits<Type>::componentNames[cmpt]) > 0;    \
+                                                                            \
+                    const word w =                                          \
+                        valueSetNames[fieldi]                               \
+                      + (separator ? "_" : "")                              \
+                      + pTraits<Type>::componentNames[cmpt];                \
+                                                                            \
+                    writeWord(w, os, align, first*alignPad);                \
+                    first = false;                                          \
+                }                                                           \
+            }
+        FOR_ALL_FIELD_TYPES(WriteTypeValueSetNames);
+        #undef WriteTypeValueSetNames
+    }
+}
+
+
+void Foam::setWriter::writeTable
+(
+    const coordSet& set,
+    #define TypeValueSetsConstArg(Type, nullArg) \
+        const UPtrList<const Field<Type>>& Type##ValueSets ,
+    FOR_ALL_FIELD_TYPES(TypeValueSetsConstArg)
+    #undef TypeValueSetsConstArg
+    Ostream& os,
+    const bool align
+) const
+{
+    forAll(set, pointi)
+    {
+        if (pointi != 0)
+        {
+            writeCoordSeparator(os);
+
+            if (set.segments()[pointi] != set.segments()[pointi - 1])
+            {
+                writeSegmentSeparator(os);
+            }
+        }
+
+        bool first = true;
+
+        if (set.hasScalarAxis())
+        {
+            if (!first) writeValueSeparator(os);
+            writeValue(set.scalarCoord(pointi), os, align);
+            first = false;
+        }
+        if (set.hasPointAxis())
+        {
+            if (!first) writeValueSeparator(os);
+            writeValue(set.pointCoord(pointi), os, align);
+            first = false;
+        }
+
+        forAll(scalarValueSets, fieldi)
+        {
+            #define WriteTypeValueSets(Type, nullArg)                       \
+                if (Type##ValueSets.set(fieldi))                            \
+                {                                                           \
+                    if (!first) writeValueSeparator(os);                    \
+                    writeValue(Type##ValueSets[fieldi][pointi], os, align); \
+                    first = false;                                          \
+                }
+            FOR_ALL_FIELD_TYPES(WriteTypeValueSets);
+            #undef WriteTypeValueSets
+        }
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::setWriter::setWriter
+(
+    const IOstream::streamFormat writeFormat,
+    const IOstream::compressionType writeCompression
+)
+:
+    writeFormat_(writeFormat),
+    writeCompression_(writeCompression)
+{}
+
+
+Foam::setWriter::setWriter(const dictionary& dict)
+:
+    writeFormat_
+    (
+        dict.found("writeFormat")
+      ? IOstream::formatEnum(dict.lookup("writeFormat"))
+      : IOstream::ASCII
+    ),
+    writeCompression_
+    (
+        dict.found("writeCompression")
+      ? IOstream::compressionEnum(dict.lookup("writeCompression"))
+      : IOstream::UNCOMPRESSED
+    )
+{}
+
+
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::setWriter> Foam::setWriter::New
+(
+    const word& writeType,
+    const IOstream::streamFormat writeFormat,
+    const IOstream::compressionType writeCompression
 )
 {
     typename wordConstructorTable::iterator cstrIter =
@@ -49,209 +263,50 @@ Foam::autoPtr<Foam::setWriter<Type>> Foam::setWriter<Type>::New
             << exit(FatalError);
     }
 
-    return autoPtr<setWriter<Type>>(cstrIter()());
+    return autoPtr<setWriter>(cstrIter()(writeFormat, writeCompression));
 }
 
 
-// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
-
-template<class Type>
-Foam::fileName Foam::setWriter<Type>::getBaseName
+Foam::autoPtr<Foam::setWriter> Foam::setWriter::New
 (
-    const coordSet& points,
-    const wordList& valueSets
-) const
+    const word& writeType,
+    const dictionary& dict
+)
 {
-    fileName fName(points.name());
+    // find constructors with dictionary options
+    dictConstructorTable::iterator cstrIter =
+        dictConstructorTablePtr_->find(writeType);
 
-    forAll(valueSets, i)
+    if (cstrIter == dictConstructorTablePtr_->end())
     {
-        fName += '_' + valueSets[i];
+        const IOstream::streamFormat writeFormat =
+            dict.found("writeFormat")
+          ? IOstream::formatEnum(dict.lookup("writeFormat"))
+          : IOstream::ASCII;
+
+        const IOstream::compressionType writeCompression =
+            dict.found("writeCompression")
+          ? IOstream::compressionEnum(dict.lookup("writeCompression"))
+          : IOstream::UNCOMPRESSED;
+
+        // Revert to versions without options
+        return
+            Foam::setWriter::New
+            (
+                writeType,
+                writeFormat,
+                writeCompression
+            );
     }
 
-    return fName;
+    return autoPtr<setWriter>(cstrIter()(dict));
 }
 
 
-template<class Type>
-void Foam::setWriter<Type>::writeCoord
-(
-    const coordSet& points,
-    const label pointi,
-    Ostream& os
-) const
-{
-    if (points.hasVectorAxis())
-    {
-        write(points.vectorCoord(pointi), os);
-    }
-    else
-    {
-        write(points.scalarCoord(pointi), os);
-    }
-}
-
-
-template<class Type>
-void Foam::setWriter<Type>::writeTable
-(
-    const coordSet& points,
-    const List<Type>& values,
-    Ostream& os
-) const
-{
-    forAll(points, pointi)
-    {
-        writeCoord(points, pointi, os);
-        writeSeparator(os);
-        write(values[pointi], os);
-        os << nl;
-    }
-}
-
-
-template<class Type>
-void Foam::setWriter<Type>::writeTable
-(
-    const coordSet& points,
-    const List<const List<Type>*>& valuesPtrList,
-    Ostream& os
-) const
-{
-    forAll(points, pointi)
-    {
-        writeCoord(points, pointi, os);
-
-        forAll(valuesPtrList, i)
-        {
-            writeSeparator(os);
-
-            const List<Type>& values = *valuesPtrList[i];
-            write(values[pointi], os);
-        }
-        os << nl;
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::setWriter<Type>::setWriter()
-{}
-
-
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-template<class Type>
-Foam::setWriter<Type>::~setWriter()
+Foam::setWriter::~setWriter()
 {}
 
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<class Type>
-void Foam::setWriter<Type>::write
-(
-    const coordSet& points,
-    const wordList& valueSetNames,
-    const List<Field<Type>>& valueSets,
-    Ostream& os
-) const
-{
-    List<const Field<Type>*> valueSetPtrs(valueSets.size());
-    forAll(valueSetPtrs, i)
-    {
-        valueSetPtrs[i] = &valueSets[i];
-    }
-    write(points, valueSetNames, valueSetPtrs, os);
-}
-
-
-template<class Type>
-Foam::Ostream& Foam::setWriter<Type>::write
-(
-    const scalar value,
-    Ostream& os
-) const
-{
-    return os << value;
-}
-
-
-template<class Type>
-template<class VSType>
-Foam::Ostream& Foam::setWriter<Type>::writeVS
-(
-    const VSType& value,
-    Ostream& os
-) const
-{
-    for (direction d=0; d<VSType::nComponents; d++)
-    {
-        if (d > 0)
-        {
-            writeSeparator(os);
-        }
-
-        os << value.component(d);
-    }
-    return os;
-}
-
-
-template<class Type>
-void Foam::setWriter<Type>::writeSeparator
-(
-    Ostream& os
-) const
-{
-    os << token::SPACE << token::TAB;
-}
-
-
-template<class Type>
-Foam::Ostream& Foam::setWriter<Type>::write
-(
-    const vector& value,
-    Ostream& os
-) const
-{
-    return writeVS(value, os);
-}
-
-
-template<class Type>
-Foam::Ostream& Foam::setWriter<Type>::write
-(
-    const sphericalTensor& value,
-    Ostream& os
-) const
-{
-    return writeVS(value, os);
-}
-
-
-template<class Type>
-Foam::Ostream& Foam::setWriter<Type>::write
-(
-    const symmTensor& value,
-    Ostream& os
-) const
-{
-    return writeVS(value, os);
-}
-
-
-template<class Type>
-Foam::Ostream& Foam::setWriter<Type>::write
-(
-    const tensor& value,
-    Ostream& os
-) const
-{
-    return writeVS(value, os);
-}
-
-
 // ************************************************************************* //
diff --git a/src/sampling/sampledSet/writers/setWriter.H b/src/sampling/sampledSet/writers/setWriter.H
index a6d7bca2c6..965d5b53f7 100644
--- a/src/sampling/sampledSet/writers/setWriter.H
+++ b/src/sampling/sampledSet/writers/setWriter.H
@@ -25,25 +25,17 @@ Class
     Foam::setWriter
 
 Description
-    Base class for graphics format writing. Entry points are
-    - write(..). \n
-      Write to an Ostream a table of points with corresponding values.
-    - write(scalar/vector/sphericalTensor/symmTensor/tensor). \n
-      Write single scalar/vector/sphericalTensor/symmTensor/tensor.
-      Default is to write space separated components.
+    Base class for writing coordinate sets with data
 
     Example:
     \verbatim
-        // Construct setWriter of xmgr type
-        autoPtr<setWriter<scalar>> scalarFormatter =
-            setWriter<scalar>::New("xmgr");
-
-        // Output list of points and corresponding values
-        scalarFormatter().write
+        setWriter::New("vtk")->write
         (
-            coordSet(...)
-            "U.component(0)",   // name of values
-            vals                // values
+            "myDirectory",
+            "mySet",
+            coordSet(points, true),
+            "p", p,
+            "U", U
         );
     \endverbatim
 
@@ -55,55 +47,165 @@ SourceFiles
 #ifndef setWriter_H
 #define setWriter_H
 
-#include "fileName.H"
-#include "wordList.H"
-#include "vector.H"
-#include "tensor.H"
-#include "typeInfo.H"
 #include "runTimeSelectionTables.H"
 #include "autoPtr.H"
-#include "Field.H"
+#include "fieldTypes.H"
+#include "coordSet.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-// Forward declaration of classes
-class coordSet;
-
 /*---------------------------------------------------------------------------*\
                            Class setWriter Declaration
 \*---------------------------------------------------------------------------*/
 
-template<class Type>
 class setWriter
 {
+public:
+
+    // Public Static Functions
+
+        //- Helper for variadic write
+        template<class Types, class Type>
+        static inline void setTypeValueSet
+        (
+            UPtrList<const Field<Types>>& valueSets,
+            const label valueSeti,
+            const Field<Type>& valueSet
+        )
+        {}
+
+        //- Helper for variadic write
+        template<class Type>
+        static inline void setTypeValueSet
+        (
+            UPtrList<const Field<Type>>& valueSets,
+            const label valueSeti,
+            const Field<Type>& valueSet
+        )
+        {
+            valueSets.set(valueSeti, &valueSet);
+        }
+
+        //- Helper for variadic write
+        static inline void unpackTypeValueSets
+        (
+            wordList& valueSetNames
+            #define TypeValueSetsNonConstArg(Type, nullArg) \
+                , UPtrList<const Field<Type>>& Type##ValueSets
+            FOR_ALL_FIELD_TYPES(TypeValueSetsNonConstArg)
+            #undef TypeValueSetsNonConstArg
+        )
+        {}
+
+        //- Helper for variadic write
+        template<class Type, class ... Args>
+        static inline void unpackTypeValueSets
+        (
+            wordList& valueSetNames
+            #define TypeValueSetsNonConstArg(Type, nullArg) \
+                , UPtrList<const Field<Type>>& Type##ValueSets
+            FOR_ALL_FIELD_TYPES(TypeValueSetsNonConstArg),
+            #undef TypeValueSetsNonConstArg
+            const word& valueSetName,
+            const Field<Type>& valueSet,
+            Args& ... args
+        )
+        {
+            const label valueSeti =
+                valueSetNames.size() - 1 - sizeof...(Args)/2;
+
+            valueSetNames[valueSeti] = valueSetName;
+            #define SetTypeValueSet(Type, nullArg) \
+                setTypeValueSet(Type##ValueSets, valueSeti, valueSet);
+            FOR_ALL_FIELD_TYPES(SetTypeValueSet);
+            #undef SetTypeValueSet
+
+            unpackTypeValueSets
+            (
+                valueSetNames
+                #define TypeValueSetsParameter(Type, nullArg) \
+                    , Type##ValueSets
+                FOR_ALL_FIELD_TYPES(TypeValueSetsParameter),
+                #undef TypeValueSetsParameter
+                args ...
+            );
+        }
+
 
 protected:
 
-    //- Generates filename from coordSet and sampled fields
-    fileName getBaseName(const coordSet&, const wordList&) const;
+    // Protected Data
 
-    void writeCoord(const coordSet&, const label sampleI, Ostream&) const;
+        //- Write format
+        IOstream::streamFormat writeFormat_;
 
-    //- Writes single-column ascii write. Column 1 is coordSet coordinate,
-    //  columns 2 is the value. Uses write() function
-    //  to write coordinate in correct format.
-    void writeTable(const coordSet&, const List<Type>&, Ostream&) const;
+        //- Write compression
+        IOstream::compressionType writeCompression_;
 
-    //- Writes multi-column ascii write. Column 1 is coordSet coordinate,
-    //  columns 2..n are the values. Uses write() function
-    //  to write coordinate in correct format.
-    void writeTable
-    (
-        const coordSet&,
-        const List<const List<Type>*>&,
-        Ostream& os
-    ) const;
 
-    //- Writes a separator. Used by write functions.
-    virtual void writeSeparator(Ostream& os) const;
+    // Protected Member Functions
+
+        //- Write a value separator
+        virtual void writeValueSeparator(Ostream& os) const;
+
+        //- Write a coordinate separator
+        virtual void writeCoordSeparator(Ostream& os) const;
+
+        //- Write a segment separator
+        virtual void writeSegmentSeparator(Ostream& os) const;
+
+        //- Width of columns in tabulated output
+        static inline unsigned long columnWidth(Ostream& os)
+        {
+            return os.precision() + 7;
+        }
+
+        //- Write a word
+        inline Ostream& writeWord
+        (
+            const word& w,
+            Ostream& os,
+            const bool align = false,
+            const unsigned long alignPad = 0
+        ) const;
+
+        //- Write a value
+        template<class Type>
+        Ostream& writeValue
+        (
+            const Type& value,
+            Ostream& os,
+            const bool align = false
+        ) const;
+
+        //- Write multi-column table header
+        void writeTableHeader
+        (
+            const coordSet& set,
+            const wordList& valueSetNames,
+            #define TypeValueSetsConstArg(Type, nullArg) \
+                const UPtrList<const Field<Type>>& Type##ValueSets ,
+            FOR_ALL_FIELD_TYPES(TypeValueSetsConstArg)
+            #undef TypeValueSetsConstArg
+            Ostream& os,
+            const bool align = false,
+            const unsigned long alignPad = 0
+        ) const;
+
+        //- Write multi-column table of data
+        void writeTable
+        (
+            const coordSet& set,
+            #define TypeValueSetsConstArg(Type, nullArg) \
+                const UPtrList<const Field<Type>>& Type##ValueSets ,
+            FOR_ALL_FIELD_TYPES(TypeValueSetsConstArg)
+            #undef TypeValueSetsConstArg
+            Ostream& os,
+            const bool align = false
+        ) const;
 
 
 public:
@@ -111,6 +213,7 @@ public:
     //- Runtime type information
     TypeName("setWriter");
 
+
     // Declare run-time constructor selection table
 
         declareRunTimeSelectionTable
@@ -118,21 +221,56 @@ public:
             autoPtr,
             setWriter,
             word,
-            (),
-            ()
+            (
+                const IOstream::streamFormat writeFormat,
+                const IOstream::compressionType writeCompression
+            ),
+            (writeFormat, writeCompression)
+        );
+
+        declareRunTimeSelectionTable
+        (
+            autoPtr,
+            setWriter,
+            dict,
+            (
+                const dictionary& dict
+            ),
+            (dict)
         );
 
 
     // Selectors
 
-        //- Return a reference to the selected setWriter
-        static autoPtr<setWriter> New(const word& writeFormat);
+        //- Select given write options
+        static autoPtr<setWriter> New
+        (
+            const word& writeType,
+            const IOstream::streamFormat writeFormat =
+                IOstream::ASCII,
+            const IOstream::compressionType writeCompression =
+                IOstream::UNCOMPRESSED
+        );
+
+        //- Select given a dictionary
+        static autoPtr<setWriter> New
+        (
+            const word& writeType,
+            const dictionary& dict
+        );
 
 
     // Constructors
 
-        //- Construct null
-        setWriter();
+        //- Construct given write options
+        setWriter
+        (
+            const IOstream::streamFormat writeFormat,
+            const IOstream::compressionType writeCompression
+        );
+
+        //- Construct from dictionary
+        setWriter(const dictionary& dict);
 
 
     //- Destructor
@@ -141,65 +279,102 @@ public:
 
     // Member Functions
 
-        //- Generate file name with correct extension
-        virtual fileName getFileName
-        (
-            const coordSet&,
-            const wordList&
-        ) const = 0;
-
-        //- General entry point for writing.
-        //  The data is organised in a set of point with one or more values
-        //  per point
+        //- Write a coordSet and associated data
         virtual void write
         (
-            const coordSet&,
-            const wordList&,
-            const List<const Field<Type>*>&,
-            Ostream&
+            const fileName& outputDir,
+            const fileName& setName,
+            const coordSet& set,
+            const wordList& valueSetNames
+            #define TypeValueSetsConstArg(Type, nullArg) \
+                , const UPtrList<const Field<Type>>& Type##ValueSets
+            FOR_ALL_FIELD_TYPES(TypeValueSetsConstArg)
+            #undef TypeValueSetsConstArg
         ) const = 0;
 
-        //- General entry point for writing.
-        //  The data is organised in a set of point with one or more values
-        //  per point
+        //- Write a coordSet and associated data
         virtual void write
         (
-            const coordSet&,
-            const wordList&,
-            const List<Field<Type>>&,
-            Ostream&
-        ) const;
+            const fileName& outputDir,
+            const fileName& setName,
+            const coordSet& set,
+            const wordList& valueSetNames
+            #define TypeValueSetsConstArg(Type, nullArg) \
+                , const PtrList<Field<Type>>& Type##ValueSets
+            FOR_ALL_FIELD_TYPES(TypeValueSetsConstArg)
+            #undef TypeValueSetsConstArg
+        ) const
+        {
+            write
+            (
+                outputDir,
+                setName,
+                set,
+                valueSetNames
+                #define TypeValueSetsParameter(Type, nullArg)              \
+                    , reinterpret_cast<const UPtrList<const Field<Type>>&> \
+                    (Type##ValueSets)
+                FOR_ALL_FIELD_TYPES(TypeValueSetsParameter)
+                #undef TypeValueSetsParameter
+            );
+        }
 
-        //- General entry point for writing of multiple coordSets.
-        //  Each coordSet (track) has same data variables.
-        //  The data is per variable, per track, per point of track.
-        //  If writeTracks adds connecting lines (wherever applicable)
-        virtual void write
+        //- Write fields for a single surface to file. For use in code where
+        //  the fields that are to be written are known. Takes any number of
+        //  name, values arguments at the end. E.g.:
+        //
+        //  write
+        //  (
+        //      // Output options
+        //      "myDirectory", "mySet",
+        //
+        //      // Geometry
+        //      coordSet(points, true),
+        //
+        //      // Fields
+        //      "p", Field<scalar>(points.size(), ...),
+        //      "U", Field<vector>(points.size(), ...)
+        //  );
+        //
+        template<class ... Args>
+        void inline write
         (
-            const bool writeTracks,
-            const PtrList<coordSet>&,
-            const wordList& valueSetNames,
-            const List<List<Field<Type>>>&,
-            Ostream&
-        ) const = 0;
+            const fileName& outputDir,
+            const fileName& setName,
+            const coordSet& set,
+            const Args& ... args
+        ) const
+        {
+            const label nFields = sizeof...(Args)/2;
 
-        //- Write scalar as ascii
-        virtual Ostream& write(const scalar, Ostream&) const;
+            wordList valueSetNames(nFields);
+            #define DeclareTypeValueSets(Type, nullArg) \
+                UPtrList<const Field<Type>> Type##ValueSets(nFields);
+            FOR_ALL_FIELD_TYPES(DeclareTypeValueSets);
+            #undef DeclareTypeValueSets
 
-        template<class VSType>
-        Ostream& writeVS(const VSType&, Ostream&) const;
+            unpackTypeValueSets
+            (
+                valueSetNames
+                #define TypeValueSetsParameter(Type, nullArg) \
+                    , Type##ValueSets
+                FOR_ALL_FIELD_TYPES(TypeValueSetsParameter),
+                #undef TypeValueSetsParameter
+                args ...
+            );
 
-        //- Write vector. Tab separated ascii
-        virtual Ostream& write(const vector&, Ostream&) const;
-
-        //- Write sphericalTensor. Tab separated ascii
-        virtual Ostream& write(const sphericalTensor&, Ostream&) const;
-
-        //- Write symmTensor. Tab separated ascii
-        virtual Ostream& write(const symmTensor&, Ostream&) const;
-
-        //- Write tensor. Tab separated ascii
-        virtual Ostream& write(const tensor&, Ostream&) const;
+            write
+            (
+                outputDir,
+                setName,
+                set,
+                valueSetNames
+                #define TypeValueSetsParameter(Type, nullArg) \
+                    , Type##ValueSets
+                FOR_ALL_FIELD_TYPES(TypeValueSetsParameter)
+                #undef TypeValueSetsParameter
+            );
+        }
 };
 
 
@@ -210,10 +385,9 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-    #include "setWriter.C"
+    #include "setWriterTemplates.C"
 #endif
 
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #endif
diff --git a/src/sampling/sampledSet/writers/jplot/jplotSetWriterRunTime.C b/src/sampling/sampledSet/writers/setWriterTemplates.C
similarity index 75%
rename from src/sampling/sampledSet/writers/jplot/jplotSetWriterRunTime.C
rename to src/sampling/sampledSet/writers/setWriterTemplates.C
index 85479da2bb..7a2e8eca2f 100644
--- a/src/sampling/sampledSet/writers/jplot/jplotSetWriterRunTime.C
+++ b/src/sampling/sampledSet/writers/setWriterTemplates.C
@@ -23,15 +23,30 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "jplotSetWriter.H"
-#include "setWriters.H"
-#include "addToRunTimeSelectionTable.H"
+#include "setWriter.H"
+#include "IOmanip.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-namespace Foam
+template<class Type>
+Foam::Ostream& Foam::setWriter::writeValue
+(
+    const Type& value,
+    Ostream& os,
+    const bool align
+) const
 {
-    makeSetWriters(jplotSetWriter);
+    const label nCmpt = pTraits<Type>::nComponents;
+
+    for (direction cpmt = 0; cpmt < nCmpt; ++ cpmt)
+    {
+        if (cpmt > 0) writeValueSeparator(os);
+        if (align) os << setw(columnWidth(os));
+        os << component(value, cpmt);
+    }
+
+    return os;
 }
 
+
 // ************************************************************************* //
diff --git a/src/sampling/sampledSet/writers/setWriters.H b/src/sampling/sampledSet/writers/setWriters.H
deleted file mode 100644
index 51ddfcd051..0000000000
--- a/src/sampling/sampledSet/writers/setWriters.H
+++ /dev/null
@@ -1,79 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-InClass
-    Foam::setWriter
-
-SourceFiles
-    setWriters.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef setWriters_H
-#define setWriters_H
-
-#include "setWriter.H"
-#include "fieldTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Only used internally
-#define makeTypeSetWritersTypeName(typeWriter, dataType)                       \
-                                                                               \
-    defineNamedTemplateTypeNameAndDebug(typeWriter<dataType>, 0)
-
-// Sometimes used externally
-#define makeSetWritersTypeName(typeWriter)                                     \
-                                                                               \
-    makeTypeSetWritersTypeName(typeWriter, scalar);                            \
-    makeTypeSetWritersTypeName(typeWriter, vector);                            \
-    makeTypeSetWritersTypeName(typeWriter, sphericalTensor);                   \
-    makeTypeSetWritersTypeName(typeWriter, symmTensor);                        \
-    makeTypeSetWritersTypeName(typeWriter, tensor)
-
-// Define type info for single dataType template instantiation (eg, vector)
-#define makeSetWriterType(typeWriter, dataType)                                \
-                                                                               \
-    defineNamedTemplateTypeNameAndDebug(typeWriter<dataType>, 0);              \
-    addTemplatedToRunTimeSelectionTable                                        \
-    (                                                                          \
-        setWriter, typeWriter, dataType, word                                  \
-    )
-
-
-// Define type info for scalar, vector etc. instantiations
-#define makeSetWriters(typeWriter)                                             \
-                                                                               \
-    makeSetWriterType(typeWriter, scalar);                                     \
-    makeSetWriterType(typeWriter, vector);                                     \
-    makeSetWriterType(typeWriter, sphericalTensor);                            \
-    makeSetWriterType(typeWriter, symmTensor);                                 \
-    makeSetWriterType(typeWriter, tensor)
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/sampling/sampledSet/writers/vtk/vtkSetWriter.C b/src/sampling/sampledSet/writers/vtk/vtkSetWriter.C
index 004d2bde9f..d5ac3971cd 100644
--- a/src/sampling/sampledSet/writers/vtk/vtkSetWriter.C
+++ b/src/sampling/sampledSet/writers/vtk/vtkSetWriter.C
@@ -25,176 +25,72 @@ License
 
 #include "vtkSetWriter.H"
 #include "coordSet.H"
-#include "fileName.H"
+#include "faceList.H"
 #include "OFstream.H"
+#include "OSspecific.H"
+#include "vtkWritePolyData.H"
 #include "addToRunTimeSelectionTable.H"
 
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+namespace Foam
+{
+    defineTypeNameAndDebug(vtkSetWriter, 0);
+    addToRunTimeSelectionTable(setWriter, vtkSetWriter, word);
+    addToRunTimeSelectionTable(setWriter, vtkSetWriter, dict);
+}
 
-template<class Type>
-Foam::vtkSetWriter<Type>::vtkSetWriter()
-:
-    setWriter<Type>()
-{}
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-template<class Type>
-Foam::vtkSetWriter<Type>::~vtkSetWriter()
+Foam::vtkSetWriter::~vtkSetWriter()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class Type>
-Foam::fileName Foam::vtkSetWriter<Type>::getFileName
+void Foam::vtkSetWriter::write
 (
-    const coordSet& points,
+    const fileName& outputDir,
+    const fileName& setName,
+    const coordSet& set,
     const wordList& valueSetNames
+    #define TypeValueSetsConstArg(Type, nullArg) \
+        , const UPtrList<const Field<Type>>& Type##ValueSets
+    FOR_ALL_FIELD_TYPES(TypeValueSetsConstArg)
+    #undef TypeValueSetsConstArg
 ) const
 {
-    return this->getBaseName(points, valueSetNames) + ".vtk";
-}
-
-
-template<class Type>
-void Foam::vtkSetWriter<Type>::write
-(
-    const coordSet& points,
-    const wordList& valueSetNames,
-    const List<const Field<Type>*>& valueSets,
-    Ostream& os
-) const
-{
-    os  << "# vtk DataFile Version 2.0" << nl
-        << points.name() << nl
-        << "ASCII" << nl
-        << "DATASET POLYDATA" << nl
-        << "POINTS " << points.size() << " float" << nl;
-
-    forAll(points, i)
-    {
-        const vector& pt = points[i];
-        os  << pt.x() << ' ' << pt.y() << ' ' << pt.z() << nl;
-    }
-
-    os  << "VERTICES " << points.size() << ' ' << 2*points.size() << nl;
-
-    forAll(points, i)
-    {
-        os  << 1 << ' ' << i << endl;
-    }
-
-    os  << "POINT_DATA " << points.size() << nl
-        << " FIELD attributes " << valueSetNames.size() << nl;
-
-    forAll(valueSetNames, setI)
-    {
-        os  << valueSetNames[setI] << ' ' << pTraits<Type>::nComponents << ' '
-            << points.size() << " float" << nl;
-
-        const Field<Type>& fld = *valueSets[setI];
-
-        forAll(fld, pointi)
-        {
-            if (pointi != 0)
-            {
-                os  << ' ';
-            }
-            setWriter<Type>::write(fld[pointi], os);
-        }
-        os  << nl;
-    }
-}
-
-
-template<class Type>
-void Foam::vtkSetWriter<Type>::write
-(
-    const bool writeTracks,
-    const PtrList<coordSet>& tracks,
-    const wordList& valueSetNames,
-    const List<List<Field<Type>>>& valueSets,
-    Ostream& os
-) const
-{
-    if (valueSets.size() != valueSetNames.size())
+    if (!set.hasPointAxis())
     {
         FatalErrorInFunction
-            << "Number of variables:" << valueSetNames.size() << endl
-            << "Number of valueSets:" << valueSets.size()
+            << "Cannot write " << setName << " in " << typeName
+            << " format as it does not have a point axis"
             << exit(FatalError);
     }
 
-    label nTracks = tracks.size();
-    label nPoints = 0;
-    forAll(tracks, i)
+    if (!isDir(outputDir))
     {
-        nPoints += tracks[i].size();
+        mkDir(outputDir);
     }
 
-    os  << "# vtk DataFile Version 2.0" << nl
-        << tracks[0].name() << nl
-        << "ASCII" << nl
-        << "DATASET POLYDATA" << nl
-        << "POINTS " << nPoints << " float" << nl;
-
-    forAll(tracks, trackI)
-    {
-        const coordSet& points = tracks[trackI];
-        forAll(points, i)
-        {
-            const vector& pt = points[i];
-            os  << pt.x() << ' ' << pt.y() << ' ' << pt.z() << nl;
-        }
-    }
-
-    if (writeTracks)
-    {
-        os  << "LINES " << nTracks << ' ' << nPoints+nTracks << nl;
-
-        // Write ids of track points to file
-        label globalPtI = 0;
-        forAll(tracks, trackI)
-        {
-            const coordSet& points = tracks[trackI];
-
-            os  << points.size();
-            forAll(points, i)
-            {
-                os  << ' ' << globalPtI;
-                globalPtI++;
-            }
-            os << nl;
-        }
-    }
-
-    os  << "POINT_DATA " << nPoints << nl
-        << " FIELD attributes " << valueSetNames.size() << nl;
-
-    forAll(valueSetNames, setI)
-    {
-        os  << valueSetNames[setI] << ' ' << pTraits<Type>::nComponents << ' '
-            << nPoints << " float" << nl;
-
-        const List<Field<Type>>& fieldVals = valueSets[setI];
-
-        forAll(fieldVals, i)
-        {
-            const Field<Type>& vals = fieldVals[i];
-
-            forAll(vals, j)
-            {
-                if (j != 0)
-                {
-                    os  << ' ';
-                }
-                setWriter<Type>::write(vals[j], os);
-            }
-            os  << nl;
-        }
-    }
+    // Write
+    vtkWritePolyData::write
+    (
+        outputDir/setName + ".vtk",
+        setName,
+        false,
+        set.pointCoords()(),
+        set.vertices(),
+        set.lines(),
+        faceList(),
+        valueSetNames,
+        boolList(valueSetNames.size(), true),
+        UPtrList<const Field<label>>(valueSetNames.size())
+        #define TypeValueSetsParameter(Type, nullArg) , Type##ValueSets
+        FOR_ALL_FIELD_TYPES(TypeValueSetsParameter)
+        #undef TypeValueSetsParameter
+    );
 }
 
 
diff --git a/src/sampling/sampledSet/writers/vtk/vtkSetWriter.H b/src/sampling/sampledSet/writers/vtk/vtkSetWriter.H
index 7fda9684cc..2e6ccaf926 100644
--- a/src/sampling/sampledSet/writers/vtk/vtkSetWriter.H
+++ b/src/sampling/sampledSet/writers/vtk/vtkSetWriter.H
@@ -45,10 +45,9 @@ namespace Foam
                         Class vtkSetWriter Declaration
 \*---------------------------------------------------------------------------*/
 
-template<class Type>
 class vtkSetWriter
 :
-    public setWriter<Type>
+    public setWriter
 {
 
 public:
@@ -59,8 +58,8 @@ public:
 
     // Constructors
 
-        //- Construct null
-        vtkSetWriter();
+        //- Inherit constructors
+        using setWriter::setWriter;
 
 
     //- Destructor
@@ -69,27 +68,17 @@ public:
 
     // Member Functions
 
-        virtual fileName getFileName
-        (
-            const coordSet&,
-            const wordList&
-        ) const;
-
+        //- Write a coordSet and associated data
         virtual void write
         (
-            const coordSet&,
-            const wordList&,
-            const List<const Field<Type>*>&,
-            Ostream&
-        ) const;
-
-        virtual void write
-        (
-            const bool writeTracks,
-            const PtrList<coordSet>&,
-            const wordList& valueSetNames,
-            const List<List<Field<Type>>>&,
-            Ostream&
+            const fileName& outputDir,
+            const fileName& setName,
+            const coordSet& set,
+            const wordList& valueSetNames
+            #define TypeValueSetsConstArg(Type, nullArg) \
+                , const UPtrList<const Field<Type>>& Type##ValueSets
+            FOR_ALL_FIELD_TYPES(TypeValueSetsConstArg)
+            #undef TypeValueSetsConstArg
         ) const;
 };
 
@@ -100,12 +89,6 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#ifdef NoRepository
-    #include "vtkSetWriter.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 #endif
 
 // ************************************************************************* //
diff --git a/src/sampling/sampledSet/writers/vtk/vtkSetWriterRunTime.C b/src/sampling/sampledSet/writers/vtk/vtkSetWriterRunTime.C
deleted file mode 100644
index 277a5e536f..0000000000
--- a/src/sampling/sampledSet/writers/vtk/vtkSetWriterRunTime.C
+++ /dev/null
@@ -1,37 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "vtkSetWriter.H"
-#include "setWriters.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    makeSetWriters(vtkSetWriter);
-}
-
-// ************************************************************************* //
diff --git a/src/sampling/sampledSet/writers/xmgrace/xmgraceSetWriter.C b/src/sampling/sampledSet/writers/xmgrace/xmgraceSetWriter.C
deleted file mode 100644
index 53443636ac..0000000000
--- a/src/sampling/sampledSet/writers/xmgrace/xmgraceSetWriter.C
+++ /dev/null
@@ -1,131 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "xmgraceSetWriter.H"
-#include "coordSet.H"
-#include "fileName.H"
-#include "OFstream.H"
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::xmgraceSetWriter<Type>::xmgraceSetWriter()
-:
-    setWriter<Type>()
-{}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::xmgraceSetWriter<Type>::~xmgraceSetWriter()
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::fileName Foam::xmgraceSetWriter<Type>::getFileName
-(
-    const coordSet& points,
-    const wordList& valueSetNames
-) const
-{
-    return this->getBaseName(points, valueSetNames) + ".agr";
-}
-
-
-template<class Type>
-void Foam::xmgraceSetWriter<Type>::write
-(
-    const coordSet& points,
-    const wordList& valueSetNames,
-    const List<const Field<Type>*>& valueSets,
-    Ostream& os
-) const
-{
-    os  << "@g0 on" << nl
-        << "@with g0" << nl
-        << "@    title \"" << points.name() << '"' << nl
-        << "@    xaxis label " << '"' << points.axis() << '"' << nl;
-
-    forAll(valueSets, i)
-    {
-        os  << "@    s" << i << " legend " << '"'
-            << valueSetNames[i] << '"' << nl
-            << "@target G0.S" << i << nl;
-
-        this->writeTable(points, *valueSets[i], os);
-
-        os  << '&' << nl;
-    }
-}
-
-
-template<class Type>
-void Foam::xmgraceSetWriter<Type>::write
-(
-    const bool writeTracks,
-    const PtrList<coordSet>& trackPoints,
-    const wordList& valueSetNames,
-    const List<List<Field<Type>>>& valueSets,
-    Ostream& os
-) const
-{
-    if (valueSets.size() != valueSetNames.size())
-    {
-        FatalErrorInFunction
-            << "Number of variables:" << valueSetNames.size() << endl
-            << "Number of valueSets:" << valueSets.size()
-            << exit(FatalError);
-    }
-    if (trackPoints.size() > 0)
-    {
-        os  << "@g0 on" << nl
-            << "@with g0" << nl
-            << "@    title \"" << trackPoints[0].name() << '"' << nl
-            << "@    xaxis label " << '"' << trackPoints[0].axis() << '"' << nl;
-
-        // Data index.
-        label sI = 0;
-
-        forAll(trackPoints, trackI)
-        {
-            forAll(valueSets, i)
-            {
-                os  << "@    s" << sI << " legend " << '"'
-                    << valueSetNames[i] << "_track" << i << '"' << nl
-                    << "@target G0.S" << sI << nl;
-                this->writeTable(trackPoints[trackI], valueSets[i][trackI], os);
-                os  << '&' << nl;
-
-                sI++;
-            }
-        }
-    }
-}
-
-// ************************************************************************* //
diff --git a/src/sampling/sampledSet/writers/xmgrace/xmgraceSetWriterRunTime.C b/src/sampling/sampledSet/writers/xmgrace/xmgraceSetWriterRunTime.C
deleted file mode 100644
index 3226f48b9f..0000000000
--- a/src/sampling/sampledSet/writers/xmgrace/xmgraceSetWriterRunTime.C
+++ /dev/null
@@ -1,37 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "xmgraceSetWriter.H"
-#include "setWriters.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    makeSetWriters(xmgraceSetWriter);
-}
-
-// ************************************************************************* //
diff --git a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
index effcea847f..72b36f7894 100644
--- a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
+++ b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
@@ -150,8 +150,8 @@ bool Foam::functionObjects::sampledSurfaces::write()
         {
             const sampledSurface& s = operator[](surfi);
 
-            #define GenerateFieldTypeValues(Type, nullArg)       \
-                PtrList<const Field<Type>> field##Type##Values = \
+            #define GenerateFieldTypeValues(Type, nullArg) \
+                PtrList<Field<Type>> field##Type##Values = \
                     sampleType<Type>(surfi, fieldNames, interpolation##Type##s);
             FOR_ALL_FIELD_TYPES(GenerateFieldTypeValues);
             #undef GenerateFieldTypeValues
@@ -210,6 +210,7 @@ bool Foam::functionObjects::sampledSurfaces::read(const dictionary& dict)
         dict.lookup("fields") >> fields_;
 
         dict.lookup("interpolationScheme") >> interpolationScheme_;
+
         const word writeType(dict.lookup("surfaceFormat"));
 
         // Define the surface formatter
diff --git a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H
index abea70919d..4fe76ae534 100644
--- a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H
+++ b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H
@@ -148,7 +148,7 @@ class sampledSurfaces
             word interpolationScheme_;
 
 
-        // surfaces
+        // Surfaces
 
             //- Information for merging surfaces
             List<mergeInfo> mergeList_;
@@ -164,7 +164,7 @@ class sampledSurfaces
 
         //- Sample all fields of a type on a given surface
         template<class Type>
-        PtrList<const Field<Type>> sampleLocalType
+        PtrList<Field<Type>> sampleLocalType
         (
             const label surfi,
             const wordList& fieldNames,
@@ -174,7 +174,7 @@ class sampledSurfaces
         //- Sample all fields of a type on a given surface and combine on the
         //  master for writing
         template<class Type>
-        PtrList<const Field<Type>> sampleType
+        PtrList<Field<Type>> sampleType
         (
             const label surfi,
             const wordList& fieldNames,
diff --git a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfacesTemplates.C b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfacesTemplates.C
index 65905be4ca..7edb4ab52f 100644
--- a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfacesTemplates.C
+++ b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfacesTemplates.C
@@ -32,7 +32,7 @@ License
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class Type>
-Foam::PtrList<const Foam::Field<Type>>
+Foam::PtrList<Foam::Field<Type>>
 Foam::functionObjects::sampledSurfaces::sampleLocalType
 (
     const label surfi,
@@ -40,12 +40,10 @@ Foam::functionObjects::sampledSurfaces::sampleLocalType
     HashPtrTable<interpolation<Type>>& interpolations
 )
 {
-    PtrList<const Field<Type>> fieldTypeValues(fieldNames.size());
+    PtrList<Field<Type>> fieldTypeValues(fieldNames.size());
 
     const sampledSurface& s = operator[](surfi);
 
-    autoPtr<interpolation<Type>> interpolationPtr;
-
     forAll(fieldNames, fieldi)
     {
         const word& name = fieldNames[fieldi];
@@ -95,7 +93,7 @@ Foam::functionObjects::sampledSurfaces::sampleLocalType
 
 
 template<class Type>
-Foam::PtrList<const Foam::Field<Type>>
+Foam::PtrList<Foam::Field<Type>>
 Foam::functionObjects::sampledSurfaces::sampleType
 (
     const label surfi,
@@ -104,7 +102,7 @@ Foam::functionObjects::sampledSurfaces::sampleType
 )
 {
     // Generate local samples
-    PtrList<const Field<Type>> fieldTypeValues =
+    PtrList<Field<Type>> fieldTypeValues =
         sampleLocalType<Type>(surfi, fieldNames, interpolations);
 
     if (Pstream::parRun())
diff --git a/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.C b/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.C
index 935afab3a3..de67419dab 100644
--- a/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.C
+++ b/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.C
@@ -36,27 +36,11 @@ License
 namespace Foam
 {
     defineTypeNameAndDebug(ensightSurfaceWriter, 0);
-    addToRunTimeSelectionTable(surfaceWriter, ensightSurfaceWriter, wordDict);
+    addToRunTimeSelectionTable(surfaceWriter, ensightSurfaceWriter, word);
+    addToRunTimeSelectionTable(surfaceWriter, ensightSurfaceWriter, dict);
 }
 
 
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::ensightSurfaceWriter::ensightSurfaceWriter
-(
-    const IOstream::streamFormat writeFormat
-)
-:
-    surfaceWriter(writeFormat)
-{}
-
-
-Foam::ensightSurfaceWriter::ensightSurfaceWriter(const dictionary& optDict)
-:
-    surfaceWriter(optDict)
-{}
-
-
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::ensightSurfaceWriter::~ensightSurfaceWriter()
@@ -118,7 +102,7 @@ void Foam::ensightSurfaceWriter::write
             {                                                           \
                 osCase                                                  \
                     << ensightPTraits<Type>::typeName << " per "        \
-                    << word(writePointValues? "node:" : "element:")     \
+                    << word(writePointValues ? "node:" : "element:")    \
                     << setw(10) << 1 << "       " << fieldNames[fieldi] \
                     << "       " << surfaceName.c_str() << ".***."      \
                     << fieldNames[fieldi] << nl;                        \
diff --git a/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.H b/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.H
index 00eef78dfc..33d2aad96b 100644
--- a/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.H
+++ b/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.H
@@ -58,11 +58,8 @@ public:
 
     // Constructors
 
-        //- Construct given write format
-        ensightSurfaceWriter(const IOstream::streamFormat writeFormat);
-
-        //- Construct with some output options
-        ensightSurfaceWriter(const dictionary& optDict);
+        //- Inherit constructors
+        using surfaceWriter::surfaceWriter;
 
 
     //- Destructor
diff --git a/src/sampling/sampledSurface/writers/foam/foamSurfaceWriter.C b/src/sampling/sampledSurface/writers/foam/foamSurfaceWriter.C
index 94f27ee34a..457983be5e 100644
--- a/src/sampling/sampledSurface/writers/foam/foamSurfaceWriter.C
+++ b/src/sampling/sampledSurface/writers/foam/foamSurfaceWriter.C
@@ -34,20 +34,10 @@ namespace Foam
 {
     defineTypeNameAndDebug(foamSurfaceWriter, 0);
     addToRunTimeSelectionTable(surfaceWriter, foamSurfaceWriter, word);
+    addToRunTimeSelectionTable(surfaceWriter, foamSurfaceWriter, dict);
 }
 
 
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::foamSurfaceWriter::foamSurfaceWriter
-(
-    const IOstream::streamFormat writeFormat
-)
-:
-    surfaceWriter(writeFormat)
-{}
-
-
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::foamSurfaceWriter::~foamSurfaceWriter()
@@ -82,11 +72,23 @@ void Foam::foamSurfaceWriter::write
         Info<< "Writing geometry to " << surfaceDir << endl;
     }
 
+    auto stream = [&](const fileName& file)
+    {
+        return
+            OFstream
+            (
+                file,
+                writeFormat_,
+                IOstream::currentVersion,
+                writeCompression_
+            );
+    };
+
     // Points
-    OFstream(surfaceDir/"points", writeFormat_)() << points;
+    stream(surfaceDir/"points")() << points;
 
     // Faces
-    OFstream(surfaceDir/"faces", writeFormat_)() << faces;
+    stream(surfaceDir/"faces")() << faces;
 
     // Face centers. Not really necessary but very handy when reusing as inputs
     // for e.g. timeVaryingMapped bc.
@@ -95,7 +97,7 @@ void Foam::foamSurfaceWriter::write
     {
         faceCentres[facei] = faces[facei].centre(points);
     }
-    OFstream(surfaceDir/"faceCentres", writeFormat_)() << faceCentres;
+    stream(surfaceDir/"faceCentres")() << faceCentres;
 
     // Fields
     forAll(fieldNames, fieldi)
@@ -106,25 +108,25 @@ void Foam::foamSurfaceWriter::write
                 << surfaceDir << endl;
         }
 
-        #define WriteFieldType(Type, nullArg)                          \
-            if (field##Type##Values.set(fieldi))                       \
-            {                                                          \
-                const fileName valuesDir                               \
-                (                                                      \
-                    surfaceDir                                         \
-                   /(                                                  \
-                       word(pTraits<Type>::typeName)                   \
-                     + word(Field<Type>::typeName)                     \
-                    )                                                  \
-                );                                                     \
-                                                                       \
-                if (!isDir(valuesDir))                                 \
-                {                                                      \
-                    mkDir(valuesDir);                                  \
-                }                                                      \
-                                                                       \
-                OFstream(valuesDir/fieldNames[fieldi], writeFormat_)() \
-                    << field##Type##Values[fieldi];                    \
+        #define WriteFieldType(Type, nullArg)          \
+            if (field##Type##Values.set(fieldi))       \
+            {                                          \
+                const fileName valuesDir               \
+                (                                      \
+                    surfaceDir                         \
+                   /(                                  \
+                       word(pTraits<Type>::typeName)   \
+                     + word(Field<Type>::typeName)     \
+                    )                                  \
+                );                                     \
+                                                       \
+                if (!isDir(valuesDir))                 \
+                {                                      \
+                    mkDir(valuesDir);                  \
+                }                                      \
+                                                       \
+                stream(valuesDir/fieldNames[fieldi])() \
+                    << field##Type##Values[fieldi];    \
             }
         FOR_ALL_FIELD_TYPES(WriteFieldType);
         #undef WriteFieldType
diff --git a/src/sampling/sampledSurface/writers/foam/foamSurfaceWriter.H b/src/sampling/sampledSurface/writers/foam/foamSurfaceWriter.H
index 22d734f2ca..79a7257d34 100644
--- a/src/sampling/sampledSurface/writers/foam/foamSurfaceWriter.H
+++ b/src/sampling/sampledSurface/writers/foam/foamSurfaceWriter.H
@@ -59,8 +59,8 @@ public:
 
     // Constructors
 
-        //- Construct given write format
-        foamSurfaceWriter(const IOstream::streamFormat writeFormat);
+        //- Inherit constructors
+        using surfaceWriter::surfaceWriter;
 
 
     //- Destructor
diff --git a/src/sampling/sampledSurface/writers/none/noSurfaceWriter.C b/src/sampling/sampledSurface/writers/none/noSurfaceWriter.C
index 3ff186cdad..2a704c802c 100644
--- a/src/sampling/sampledSurface/writers/none/noSurfaceWriter.C
+++ b/src/sampling/sampledSurface/writers/none/noSurfaceWriter.C
@@ -32,17 +32,10 @@ namespace Foam
 {
     defineTypeNameAndDebug(noSurfaceWriter, 0);
     addToRunTimeSelectionTable(surfaceWriter, noSurfaceWriter, word);
+    addToRunTimeSelectionTable(surfaceWriter, noSurfaceWriter, dict);
 }
 
 
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::noSurfaceWriter::noSurfaceWriter(const IOstream::streamFormat writeFormat)
-:
-    surfaceWriter(writeFormat)
-{}
-
-
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::noSurfaceWriter::~noSurfaceWriter()
diff --git a/src/sampling/sampledSurface/writers/none/noSurfaceWriter.H b/src/sampling/sampledSurface/writers/none/noSurfaceWriter.H
index 2286690b96..e2a0d40401 100644
--- a/src/sampling/sampledSurface/writers/none/noSurfaceWriter.H
+++ b/src/sampling/sampledSurface/writers/none/noSurfaceWriter.H
@@ -59,8 +59,8 @@ public:
 
     // Constructors
 
-        //- Construct given write format
-        noSurfaceWriter(const IOstream::streamFormat writeFormat);
+        //- Inherit constructors
+        using surfaceWriter::surfaceWriter;
 
 
     //- Destructor
diff --git a/src/sampling/sampledSurface/writers/proxy/proxySurfaceWriter.C b/src/sampling/sampledSurface/writers/proxy/proxySurfaceWriter.C
index 06b8983d88..2d12e6b8c6 100644
--- a/src/sampling/sampledSurface/writers/proxy/proxySurfaceWriter.C
+++ b/src/sampling/sampledSurface/writers/proxy/proxySurfaceWriter.C
@@ -38,7 +38,7 @@ namespace Foam
 
 Foam::proxySurfaceWriter::proxySurfaceWriter(const word& ext)
 :
-    surfaceWriter(IOstream::ASCII),
+    surfaceWriter(IOstream::ASCII, IOstream::UNCOMPRESSED),
     ext_(ext)
 {}
 
diff --git a/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.C b/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.C
index 51cb9acdc1..e602c3322b 100644
--- a/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.C
+++ b/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.C
@@ -26,6 +26,7 @@ License
 #include "rawSurfaceWriter.H"
 #include "OFstream.H"
 #include "OSspecific.H"
+#include "primitivePatch.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -33,98 +34,7 @@ License
 namespace Foam
 {
     defineTypeNameAndDebug(rawSurfaceWriter, 0);
-    addToRunTimeSelectionTable(surfaceWriter, rawSurfaceWriter, wordDict);
-}
-
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-inline void Foam::rawSurfaceWriter::writeLocation
-(
-    Ostream& os,
-    const pointField& points,
-    const label pointi
-)
-{
-    const point& pt = points[pointi];
-    os  << pt.x() << ' ' << pt.y() << ' ' << pt.z() << ' ';
-}
-
-
-inline void Foam::rawSurfaceWriter::writeLocation
-(
-    Ostream& os,
-    const pointField& points,
-    const faceList& faces,
-    const label facei
-)
-{
-    const point& ct = faces[facei].centre(points);
-    os  << ct.x() << ' ' << ct.y() << ' ' << ct.z() << ' ';
-}
-
-
-template<class Type>
-void Foam::rawSurfaceWriter::writeHeader
-(
-    Ostream& os,
-    const word& fieldName
-)
-{
-    const label nCmpt = pTraits<Type>::nComponents;
-
-    for (direction cmpt = 0; cmpt < nCmpt; ++ cmpt)
-    {
-        const bool separator =
-            !fieldName.empty()
-         && strlen(pTraits<Type>::componentNames[cmpt]) > 0;
-
-        if (cmpt) os  << token::SPACE;
-        os  << fieldName << (separator ? "_" : "")
-            << pTraits<Type>::componentNames[cmpt];
-    }
-}
-
-
-template<class Type>
-inline void Foam::rawSurfaceWriter::writeData
-(
-    Ostream& os,
-    const Type& v
-)
-{
-    const label nCmpt = pTraits<Type>::nComponents;
-
-    for (direction cmpt = 0; cmpt < nCmpt; ++ cmpt)
-    {
-        if (cmpt) os  << token::SPACE;
-        os  << component(v, cmpt);
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::rawSurfaceWriter::rawSurfaceWriter
-(
-    const IOstream::streamFormat writeFormat
-)
-:
-    surfaceWriter(writeFormat),
-    writeCompression_(IOstream::UNCOMPRESSED)
-{}
-
-
-Foam::rawSurfaceWriter::rawSurfaceWriter(const dictionary& optDict)
-:
-    surfaceWriter(optDict),
-    writeCompression_(IOstream::UNCOMPRESSED)
-{
-    if (optDict.found("compression"))
-    {
-        writeCompression_ =
-            IOstream::compressionEnum(optDict.lookup("compression"));
-    }
+    addToRunTimeSelectionTable(surfaceWriter, rawSurfaceWriter, word);
 }
 
 
@@ -150,83 +60,25 @@ void Foam::rawSurfaceWriter::write
     #undef FieldTypeValuesConstArg
 ) const
 {
-    if (!isDir(outputDir))
-    {
-        mkDir(outputDir);
-    }
+    const primitivePatch patch(SubList<face>(faces, faces.size()), points);
 
-    OFstream os
+    const coordSet set
     (
-        outputDir/surfaceName + ".raw",
-        IOstream::ASCII,
-        IOstream::currentVersion,
-        writeCompression_
+        false,
+        word::null,
+        writePointValues ? patch.points() : patch.faceCentres()
     );
 
-    // Get the number of values
-    label nValues = 0;
-    #define GetNValues(Type, nullArg)                \
-        if (field##Type##Values.set(0))              \
-        {                                            \
-            nValues = field##Type##Values[0].size(); \
-        }
-    FOR_ALL_FIELD_TYPES(GetNValues);
-    #undef GetNValues
-
-    // Top header
-    os << "# " << (writePointValues ? "POINT_DATA " : "FACE_DATA ")
-        << nValues << nl;
-
-    // Column headers
-    os << "# ";
-    writeHeader<vector>(os, word::null);
-    forAll(fieldNames, fieldi)
-    {
-        os << token::SPACE;
-
-        #define WriteTypeHeader(Type, nullArg)             \
-            if (field##Type##Values.set(fieldi))           \
-            {                                              \
-                writeHeader<Type>(os, fieldNames[fieldi]); \
-            }
-        FOR_ALL_FIELD_TYPES(WriteTypeHeader);
-        #undef WriteTypeHeader
-    }
-    os << nl;
-
-    // Write the values
-    #define WriteTypeValues(Type, nullArg)                 \
-        if (field##Type##Values.set(fieldi))               \
-        {                                                  \
-            writeData(os, field##Type##Values[fieldi][i]); \
-        }
-    if (writePointValues)
-    {
-        for (label i = 0; i < nValues; ++ i)
-        {
-            writeLocation(os, points, i);
-            forAll(fieldNames, fieldi)
-            {
-                if (fieldi) os << token::SPACE;
-                FOR_ALL_FIELD_TYPES(WriteTypeValues);
-            }
-            os << nl;
-        }
-    }
-    else
-    {
-        for (label i = 0; i < nValues; ++ i)
-        {
-            writeLocation(os, points, faces, i);
-            forAll(fieldNames, fieldi)
-            {
-                if (fieldi) os << token::SPACE;
-                FOR_ALL_FIELD_TYPES(WriteTypeValues);
-            }
-            os << nl;
-        }
-    }
-    #undef WriteTypeValues
+    rawSetWriter(writeFormat_, writeCompression_).write
+    (
+        outputDir,
+        surfaceName,
+        set,
+        fieldNames
+        #define FieldTypeValuesParameter(Type, nullArg) , field##Type##Values
+        FOR_ALL_FIELD_TYPES(FieldTypeValuesParameter)
+        #undef FieldTypeValuesParameter
+    );
 }
 
 
diff --git a/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.H b/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.H
index 5adfffdbdb..5a0e86b8b6 100644
--- a/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.H
+++ b/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.H
@@ -36,7 +36,7 @@ SourceFiles
 #define rawSurfaceWriter_H
 
 #include "surfaceWriter.H"
-
+#include "rawSetWriter.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -51,44 +51,6 @@ class rawSurfaceWriter
 :
     public surfaceWriter
 {
-    // Private Data
-
-        //- Output compression, defaults to uncompressed
-        IOstream::compressionType writeCompression_;
-
-
-    // Private Member Functions
-
-        //- Write a point location
-        static inline void writeLocation
-        (
-            Ostream&,
-            const pointField&,
-            const label pointi
-        );
-
-        //- Write a face location
-        static inline void writeLocation
-        (
-            Ostream&,
-            const pointField&,
-            const faceList&,
-            const label facei
-        );
-
-        //- Write the column header for a given field
-        template<class Type>
-        static void writeHeader
-        (
-            Ostream&,
-            const word& fieldName
-        );
-
-        //- Write a piece of data
-        template<class Type>
-        static inline void writeData(Ostream&, const Type&);
-
-
 public:
 
     //- Runtime type information
@@ -97,11 +59,8 @@ public:
 
     // Constructors
 
-        //- Construct given write format
-        rawSurfaceWriter(const IOstream::streamFormat writeFormat);
-
-        //- Construct with output options
-        rawSurfaceWriter(const dictionary& optDict);
+        //- Inherit constructors
+        using surfaceWriter::surfaceWriter;
 
 
     //- Destructor
diff --git a/src/sampling/sampledSurface/writers/surfaceWriter.C b/src/sampling/sampledSurface/writers/surfaceWriter.C
index 024d3af7a3..cc32f8c376 100644
--- a/src/sampling/sampledSurface/writers/surfaceWriter.C
+++ b/src/sampling/sampledSurface/writers/surfaceWriter.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -34,17 +34,48 @@ namespace Foam
 {
     defineTypeNameAndDebug(surfaceWriter, 0);
     defineRunTimeSelectionTable(surfaceWriter, word);
-    defineRunTimeSelectionTable(surfaceWriter, wordDict);
+    defineRunTimeSelectionTable(surfaceWriter, dict);
 }
 
 
-// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::surfaceWriter::surfaceWriter
+(
+    const IOstream::streamFormat writeFormat,
+    const IOstream::compressionType writeCompression
+)
+:
+    writeFormat_(writeFormat),
+    writeCompression_(writeCompression)
+{}
+
+
+Foam::surfaceWriter::surfaceWriter(const dictionary& dict)
+:
+    writeFormat_
+    (
+        dict.found("writeFormat")
+      ? IOstream::formatEnum(dict.lookup("writeFormat"))
+      : IOstream::ASCII
+    ),
+    writeCompression_
+    (
+        dict.found("writeCompression")
+      ? IOstream::compressionEnum(dict.lookup("writeCompression"))
+      : IOstream::UNCOMPRESSED
+    )
+{}
+
+
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
 Foam::autoPtr<Foam::surfaceWriter>
 Foam::surfaceWriter::New
 (
     const word& writeType,
-    const IOstream::streamFormat format
+    const IOstream::streamFormat writeFormat,
+    const IOstream::compressionType writeCompression
 )
 {
     wordConstructorTable::iterator cstrIter =
@@ -71,7 +102,7 @@ Foam::surfaceWriter::New
         }
     }
 
-    return autoPtr<surfaceWriter>(cstrIter()(format));
+    return autoPtr<surfaceWriter>(cstrIter()(writeFormat, writeCompression));
 }
 
 
@@ -79,52 +110,36 @@ Foam::autoPtr<Foam::surfaceWriter>
 Foam::surfaceWriter::New
 (
     const word& writeType,
-    const dictionary& optDict
+    const dictionary& dict
 )
 {
     // find constructors with dictionary options
-    wordDictConstructorTable::iterator cstrIter =
-        wordDictConstructorTablePtr_->find(writeType);
+    dictConstructorTable::iterator cstrIter =
+        dictConstructorTablePtr_->find(writeType);
 
-    if (cstrIter == wordDictConstructorTablePtr_->end())
+    if (cstrIter == dictConstructorTablePtr_->end())
     {
-        IOstream::streamFormat writeFormat = IOstream::ASCII;
+        const IOstream::streamFormat writeFormat =
+            dict.found("writeFormat")
+          ? IOstream::formatEnum(dict.lookup("writeFormat"))
+          : IOstream::ASCII;
 
-        if (optDict.found("writeFormat"))
-        {
-            writeFormat = IOstream::formatEnum
-            (
-                optDict.lookup("writeFormat")
-            );
-        }
+        const IOstream::compressionType writeCompression =
+            dict.found("writeCompression")
+          ? IOstream::compressionEnum(dict.lookup("writeCompression"))
+          : IOstream::UNCOMPRESSED;
 
         // Revert to versions without options
-        return Foam::surfaceWriter::New(writeType, writeFormat);
+        return
+            Foam::surfaceWriter::New
+            (
+                writeType,
+                writeFormat,
+                writeCompression
+            );
     }
 
-    return autoPtr<surfaceWriter>(cstrIter()(optDict));
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::surfaceWriter::surfaceWriter(const IOstream::streamFormat writeFormat)
-:
-    writeFormat_(writeFormat)
-{}
-
-
-Foam::surfaceWriter::surfaceWriter(const dictionary& optDict)
-:
-    writeFormat_(IOstream::ASCII)
-{
-    if (optDict.found("writeFormat"))
-    {
-        writeFormat_ = IOstream::formatEnum
-        (
-            optDict.lookup("writeFormat")
-        );
-    }
+    return autoPtr<surfaceWriter>(cstrIter()(dict));
 }
 
 
diff --git a/src/sampling/sampledSurface/writers/surfaceWriter.H b/src/sampling/sampledSurface/writers/surfaceWriter.H
index 4675541c21..d8e46f2b96 100644
--- a/src/sampling/sampledSurface/writers/surfaceWriter.H
+++ b/src/sampling/sampledSurface/writers/surfaceWriter.H
@@ -40,7 +40,7 @@ SourceFiles
 #include "pointField.H"
 #include "faceList.H"
 #include "fileName.H"
-
+#include "setWriter.H"
 #include "runTimeSelectionTables.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -54,76 +54,6 @@ namespace Foam
 
 class surfaceWriter
 {
-
-private:
-
-    //- Helper for variadic write
-    template<class Types, class Type>
-    static inline void setFieldTypeValue
-    (
-        UPtrList<const Field<Types>>& fieldTypeValues,
-        const label fieldi,
-        const Field<Type>& fieldTypeValue
-    )
-    {}
-
-    //- Helper for variadic write
-    template<class Type>
-    static inline void setFieldTypeValue
-    (
-        UPtrList<const Field<Type>>& fieldTypeValues,
-        const label fieldi,
-        const Field<Type>& fieldTypeValue
-    )
-    {
-        fieldTypeValues.set(fieldi, &fieldTypeValue);
-    }
-
-    //- Helper for variadic write
-    static inline void unpackFieldTypeValues
-    (
-        wordList& fieldNames
-        #define FieldTypeValuesNonConstArg(Type, nullArg) \
-        , UPtrList<const Field<Type>>& field##Type##Values
-        FOR_ALL_FIELD_TYPES(FieldTypeValuesNonConstArg)
-        #undef FieldTypeValuesNonConstArg
-    )
-    {}
-
-    //- Helper for variadic write
-    template<class Type, class ... Args>
-    static inline void unpackFieldTypeValues
-    (
-        wordList& fieldNames
-        #define FieldTypeValuesNonConstArg(Type, nullArg) \
-        , UPtrList<const Field<Type>>& field##Type##Values
-        FOR_ALL_FIELD_TYPES(FieldTypeValuesNonConstArg),
-        #undef FieldTypeValuesNonConstArg
-        const word& fieldName,
-        const Field<Type>& fieldTypeValue,
-        Args& ... args
-    )
-    {
-        const label fieldi = fieldNames.size() - 1 - sizeof...(Args)/2;
-
-        fieldNames[fieldi] = fieldName;
-        #define SetFieldTypeValue(Type, nullArg) \
-            setFieldTypeValue(field##Type##Values, fieldi, fieldTypeValue);
-        FOR_ALL_FIELD_TYPES(SetFieldTypeValue);
-        #undef SetFieldTypeValue
-
-        unpackFieldTypeValues
-        (
-            fieldNames
-            #define FieldTypeValuesParameter(Type, nullArg) \
-                , field##Type##Values
-            FOR_ALL_FIELD_TYPES(FieldTypeValuesParameter),
-            #undef FieldTypeValuesParameter
-            args ...
-        );
-    }
-
-
 protected:
 
     // Protected Data
@@ -131,6 +61,9 @@ protected:
         //- Write format
         IOstream::streamFormat writeFormat_;
 
+        //- Write compression
+        IOstream::compressionType writeCompression_;
+
 
 public:
 
@@ -145,48 +78,53 @@ public:
             surfaceWriter,
             word,
             (
-                const IOstream::streamFormat writeFormat
+                const IOstream::streamFormat writeFormat,
+                const IOstream::compressionType writeCompression
             ),
-            (writeFormat)
+            (writeFormat, writeCompression)
         );
 
         declareRunTimeSelectionTable
         (
             autoPtr,
             surfaceWriter,
-            wordDict,
+            dict,
             (
-                const dictionary& optDict
+                const dictionary& dict
             ),
-            (optDict)
+            (dict)
         );
 
 
     // Selectors
 
-        //- Return a reference to the selected surfaceWriter
+        //- Select given write options
         static autoPtr<surfaceWriter> New
         (
             const word& writeType,
-            const IOstream::streamFormat writeFormat
+            const IOstream::streamFormat writeFormat,
+            const IOstream::compressionType writeCompression
         );
 
-        //- Return a reference to the selected surfaceWriter
-        //  Select with extra write option
+        //- Select given a dictionary
         static autoPtr<surfaceWriter> New
         (
             const word& writeType,
-            const dictionary& optDict
+            const dictionary& dict
         );
 
 
     // Constructors
 
-        //- Construct given write format
-        surfaceWriter(const IOstream::streamFormat writeFormat);
+        //- Construct given write options
+        surfaceWriter
+        (
+            const IOstream::streamFormat writeFormat,
+            const IOstream::compressionType writeCompression
+        );
 
-        //- Construct with output options
-        surfaceWriter(const dictionary& optDict);
+        //- Construct from dictionary
+        surfaceWriter(const dictionary& dict);
 
 
     //- Destructor
@@ -210,6 +148,37 @@ public:
             #undef FieldTypeValuesConstArg
         ) const = 0;
 
+        //- Write fields for a single surface to file.
+        virtual void write
+        (
+            const fileName& outputDir,      // <case>/surface/TIME
+            const fileName& surfaceName,    // name of surface
+            const pointField& points,
+            const faceList& faces,
+            const wordList& fieldNames,     // names of fields
+            const bool writePointValues
+            #define FieldTypeValuesConstArg(Type, nullArg) \
+                , const PtrList<Field<Type>>& field##Type##Values
+            FOR_ALL_FIELD_TYPES(FieldTypeValuesConstArg)
+            #undef FieldTypeValuesConstArg
+        ) const
+        {
+            write
+            (
+                outputDir,
+                surfaceName,
+                points,
+                faces,
+                fieldNames,
+                writePointValues
+                #define FieldTypeValuesParameter(Type, nullArg)            \
+                    , reinterpret_cast<const UPtrList<const Field<Type>>&> \
+                    (field##Type##Values)
+                FOR_ALL_FIELD_TYPES(FieldTypeValuesParameter)
+                #undef FieldTypeValuesParameter
+            );
+        }
+
         //- Write the surface geometry only.
         void inline write
         (
@@ -270,7 +239,7 @@ public:
             FOR_ALL_FIELD_TYPES(DeclareFieldTypeValues);
             #undef DeclareFieldTypeValues
 
-            unpackFieldTypeValues
+            setWriter::unpackTypeValueSets
             (
                 fieldNames
                 #define FieldTypeValuesParameter(Type, nullArg) \
diff --git a/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.C b/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.C
index 34a58e0114..4674781863 100644
--- a/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.C
+++ b/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.C
@@ -34,20 +34,10 @@ namespace Foam
 {
     defineTypeNameAndDebug(vtkSurfaceWriter, 0);
     addToRunTimeSelectionTable(surfaceWriter, vtkSurfaceWriter, word);
+    addToRunTimeSelectionTable(surfaceWriter, vtkSurfaceWriter, dict);
 }
 
 
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::vtkSurfaceWriter::vtkSurfaceWriter
-(
-    const IOstream::streamFormat writeFormat
-)
-:
-    surfaceWriter(writeFormat)
-{}
-
-
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::vtkSurfaceWriter::~vtkSurfaceWriter()
diff --git a/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.H b/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.H
index 36a8a439f6..4b436d4b8b 100644
--- a/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.H
+++ b/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.H
@@ -59,8 +59,8 @@ public:
 
     // Constructors
 
-        //- Construct given write format
-        vtkSurfaceWriter(const IOstream::streamFormat writeFormat);
+        //- Inherit constructors
+        using surfaceWriter::surfaceWriter;
 
 
     //- Destructor
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/system/controlDict b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/system/controlDict
index 5c42bb0c2a..f52e70d8d2 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/system/controlDict
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/system/controlDict
@@ -60,6 +60,8 @@ functions
         writeControl        outputTime;
         writeInterval       1;
 
+        setFormat           raw;
+
         populationBalance   bubbles;
         functionType        number;
         coordinateType      volume;
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/validation/createGraphs b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/validation/createGraphs
index 6e07b38c40..8b7909d56c 100755
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/validation/createGraphs
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/validation/createGraphs
@@ -27,7 +27,7 @@ gnuplot<<EOF
 
     n(x,t) = N0*exp(-t*x**2.0)*2.0*t*v0
 
-    numberDensity = '../postProcessing/numberDensity/10/numberDensity.dat'
+    numberDensity = '../postProcessing/numberDensity/10/numberDensity.xy'
 
     plot '<printf "1 0.05\n1 1e-5\n"' w l lc rgb 'black' t 'Init. Cond.',\
     n(x,10.0) dt 2 lc rgb 'black' t 'Ziff and McGrady (1985)',\
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/system/controlDict b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/system/controlDict
index 5c42bb0c2a..f52e70d8d2 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/system/controlDict
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/system/controlDict
@@ -60,6 +60,8 @@ functions
         writeControl        outputTime;
         writeInterval       1;
 
+        setFormat           raw;
+
         populationBalance   bubbles;
         functionType        number;
         coordinateType      volume;
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/validation/createGraphs b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/validation/createGraphs
index 6e07b38c40..8b7909d56c 100755
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/validation/createGraphs
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/validation/createGraphs
@@ -27,7 +27,7 @@ gnuplot<<EOF
 
     n(x,t) = N0*exp(-t*x**2.0)*2.0*t*v0
 
-    numberDensity = '../postProcessing/numberDensity/10/numberDensity.dat'
+    numberDensity = '../postProcessing/numberDensity/10/numberDensity.xy'
 
     plot '<printf "1 0.05\n1 1e-5\n"' w l lc rgb 'black' t 'Init. Cond.',\
     n(x,10.0) dt 2 lc rgb 'black' t 'Ziff and McGrady (1985)',\
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/system/controlDict b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/system/controlDict
index ce78d1161d..971c9996ad 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/system/controlDict
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/system/controlDict
@@ -60,6 +60,8 @@ functions
         writeControl        outputTime;
         writeInterval       1;
 
+        setFormat           raw;
+
         populationBalance   bubbles;
         functionType        number;
         coordinateType      volume;
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/validation/createGraphs b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/validation/createGraphs
index 3c0b0b2b1f..cf6e22e7d6 100755
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/validation/createGraphs
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/validation/createGraphs
@@ -47,7 +47,7 @@ gnuplot<<EOF
     # Number density at time t
     n(x,t) = (N0/v0)*phi(x,t)
 
-    numberDensity = '../postProcessing/numberDensity/10/numberDensity.dat'
+    numberDensity = '../postProcessing/numberDensity/10/numberDensity.xy'
 
     plot n0(x) ls -1 t 'Initial Condition',\
     n(x,10.0) dt 2 lc rgb 'black' t 'Scott (1968)',\
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/system/controlDict b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/system/controlDict
index 0c35b15653..780adb1fe2 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/system/controlDict
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/system/controlDict
@@ -60,6 +60,8 @@ functions
         writeControl        outputTime;
         writeInterval       1;
 
+        setFormat           raw;
+
         populationBalance   bubbles;
         functionType        number;
         coordinateType      volume;
@@ -74,6 +76,8 @@ functions
         writeControl        runTime;
         writeInterval       0.1;
 
+        setFormat           raw;
+
         populationBalance   bubbles;
         functionType        moments;
         coordinateType      volume;
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/validation/createGraphs b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/validation/createGraphs
index b59308de8c..1520907a1b 100755
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/validation/createGraphs
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/validation/createGraphs
@@ -23,7 +23,7 @@ gnuplot<<EOF
 
     plot '<printf "1.876749927 0\n1.876749927 0.01\n4.144510443 0.01\n4.144510443 0\n"' w l dt 2 lc rgb 'black' t 'Initial condition',\
     '<printf "7.957828406 0\n7.957828406 0.01\n10.14451044 0.01\n10.14451044 0\n"' w l lc rgb 'black' t 'Exact',\
-    '../postProcessing/numberDensity/6/numberDensity.dat' u 1:4 w lp ls 4 lc rgb 'black' t 'Numerical'
+    '../postProcessing/numberDensity/6/numberDensity.xy' u 1:4 w lp ls 4 lc rgb 'black' t 'Numerical'
 
     set output '../moments.eps'
 
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/validation/createGraphs b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/validation/createGraphs
index 09bd0b6ead..b3b9bfc207 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/graph/'.latestTime.'/line_d.bubbles_p_alpha.air1_alpha.air2_alpha.air3_alpha.bubbles.xy'
+    file = '../postProcessing/graph/'.latestTime.'/line.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/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/system/controlDict b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/system/controlDict
index 5dbc855b24..b16b25fcfd 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/system/controlDict
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/system/controlDict
@@ -60,6 +60,8 @@ functions
         writeControl        outputTime;
         writeInterval       1;
 
+        setFormat           raw;
+
         populationBalance   bubbles;
         functionType        number;
         coordinateType      volume;
@@ -74,6 +76,8 @@ functions
         writeControl        runTime;
         writeInterval       0.1;
 
+        setFormat           raw;
+
         populationBalance   bubbles;
         functionType        moments;
         coordinateType      volume;
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/validation/createGraphs b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/validation/createGraphs
index e7516459e2..a635a60ae5 100755
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/validation/createGraphs
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/validation/createGraphs
@@ -23,7 +23,7 @@ gnuplot<<EOF
 
     plot '<printf "7.548417545 0\n7.548417545 0.01\n10.62698298 0.01\n10.62698298 0\n"' w l dt 2 lc rgb 'black' t 'Initial condition',\
     '<printf "3.548417545 0\n3.548417545 0.01\n6.626982979 0.01\n6.626982979 0\n"' w l lc rgb 'black' t 'Exact',\
-    '../postProcessing/numberDensity/4/numberDensity.dat' u 1:4 w lp ls 4 lc rgb 'black' t 'Numerical'
+    '../postProcessing/numberDensity/4/numberDensity.xy' u 1:4 w lp ls 4 lc rgb 'black' t 'Numerical'
 
     set output '../moments.eps'
 
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/system/controlDict b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/system/controlDict
index ecef15c9cb..374f04bb07 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/system/controlDict
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/system/controlDict
@@ -60,6 +60,8 @@ functions
         writeControl        outputTime;
         writeInterval       1;
 
+        setFormat           raw;
+
         populationBalance   bubbles;
         functionType        number;
         coordinateType      diameter;
@@ -75,6 +77,8 @@ functions
         writeControl        outputTime;
         writeInterval       1;
 
+        setFormat           raw;
+
         populationBalance   bubbles;
         functionType        volume;
         coordinateType      diameter;
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/validation/createGraphs b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/validation/createGraphs
index cc17edb8ba..fae2b0f867 100755
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/validation/createGraphs
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/validation/createGraphs
@@ -21,8 +21,8 @@ gnuplot<<EOF
     set xrange [1:10]
     set yrange [0:0.6]
 
-    numberDensity = '../postProcessing/numberDensity/10/numberDensity.dat'
-    volumeDensity = '../postProcessing/volumeDensity/10/volumeDensity.dat'
+    numberDensity = '../postProcessing/numberDensity/10/numberDensity.xy'
+    volumeDensity = '../postProcessing/volumeDensity/10/volumeDensity.xy'
 
     kVConversion = (6/pi)**(1./3.)
 
diff --git a/tutorials/incompressible/pimpleFoam/LES/channel395/Allclean b/tutorials/incompressible/pimpleFoam/LES/channel395/Allclean
deleted file mode 100755
index 7d3f278555..0000000000
--- a/tutorials/incompressible/pimpleFoam/LES/channel395/Allclean
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1    # Run from this directory
-
-
-rm -r constant/polyMesh
-rm log.*
-
-
-#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/streamlines b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/streamlines
index 4d5c7b2ef7..c65e2d2649 100644
--- a/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/streamlines
+++ b/tutorials/incompressible/pisoFoam/LES/motorBike/motorBike/system/streamlines
@@ -14,9 +14,9 @@ streamlines
 
     // Output every
     writeControl    writeTime;
-    // writeInterval 10;
 
-    setFormat       vtk; // gnuplot; // xmgr; //raw; //jplot; //csv; //ensight;
+    // Write format
+    setFormat       vtk;
 
     // Track forward (+U) or backward (-U) or both
     direction       forward;
@@ -37,9 +37,6 @@ streamlines
     seedSampleSet
     {
         type        lineUniform;
-        axis        x;  // distance;
-
-        // Note: tracks slightly offset so as not to be on a face
         start       (-1.001 1e-7 0.0011);
         end         (-1.001 1e-7 1.0011);
         nPoints     20;
diff --git a/tutorials/incompressible/simpleFoam/T3A/validation/createGraphs b/tutorials/incompressible/simpleFoam/T3A/validation/createGraphs
index 20e1699f3d..e7a91615fa 100755
--- a/tutorials/incompressible/simpleFoam/T3A/validation/createGraphs
+++ b/tutorials/incompressible/simpleFoam/T3A/validation/createGraphs
@@ -6,6 +6,8 @@ then
     exit 1
 fi
 
+time=$(foamListTimes -case .. -latestTime)
+
 gnuplot<<EOF
     set term post enhanced color solid linewidth 2.0 20
     set out "graphs.eps"
@@ -15,13 +17,12 @@ gnuplot<<EOF
     set style line 1 lt 1 linecolor rgb "blue"  linewidth 1.5
     set style line 11 lt 2 linecolor rgb "black" linewidth 1.5
 
-    time = system("foamListTimes -case .. | tail -1")
 
     set xlabel "x"
     set ylabel "u'"
     set title "T3A - Flat Plate - turbulent intensity"
     plot [:1.5][:0.05] \
-        "../postProcessing/kGraph/".time."/line_k.xy" \
+        "../postProcessing/kGraph/$time/line.xy" \
         u (\$1-0.04):(1./5.4*sqrt(2./3.*\$2))title "kOmegaSSTLM" w l ls 1, \
         "exptData/T3A.dat" u (\$1/1000):(\$3/100) title "Exp T3A" w p ls 11
 
@@ -29,7 +30,7 @@ gnuplot<<EOF
     set ylabel "c_f"
     set title "T3A - Flat Plate - C_f"
     plot [:6e+5][0:0.01] \
-        "../postProcessing/wallShearStressGraph/".time."/line_wallShearStress.xy" \
+        "../postProcessing/wallShearStressGraph/$time/line.xy" \
         u ((\$1-0.04)*5.4/1.5e-05):(-\$2/0.5/5.4**2) title "kOmegaSSTLM" w l, \
         "exptData/T3A.dat" u (\$1/1000*5.4/1.51e-05):2 title "Exp" w p ls 11
 EOF
diff --git a/tutorials/incompressible/simpleFoam/motorBike/system/streamlines b/tutorials/incompressible/simpleFoam/motorBike/system/streamlines
index 512136db0b..57936bbee6 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/system/streamlines
+++ b/tutorials/incompressible/simpleFoam/motorBike/system/streamlines
@@ -8,16 +8,15 @@
 
 streamlines
 {
-    // Where to load it from
-    libs            ("libfieldFunctionObjects.so");
-
     type            streamlines;
 
+    libs            ("libfieldFunctionObjects.so");
+
     // Output every
     writeControl    writeTime;
-    // writeInterval 10;
 
-    setFormat       vtk; // gnuplot; // xmgr; //raw; //jplot; //csv; //ensight;
+    // Write format
+    setFormat       vtk;
 
     // Track forward (+U) or backward (-U) or both
     direction       forward;
@@ -28,15 +27,8 @@ streamlines
     // Steps particles can travel before being removed
     lifeTime        10000;
 
-    //- Specify either absolute length of steps (trackLength) or a number
-    //  of subcycling steps per cell (nSubCycle)
-
-        // Size of single track segment [m]
-        // trackLength 1e-3;
-
-        // Number of steps per cell (estimate). Set to 1 to disable subcycling.
-        nSubCycle 5;
-
+    // Number of steps per cell (estimate). Set to 1 to disable subcycling.
+    nSubCycle 5;
 
     // Cloud name to use
     cloudName       particleTracks;
@@ -45,9 +37,6 @@ streamlines
     seedSampleSet
     {
         type        lineUniform;
-        axis        x;  // distance;
-
-        // Note: tracks slightly offset so as not to be on a face
         start       (-1.001 -0.05 0.0011);
         end         (-1.001 -0.05 1.0011);
         nPoints     20;
diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict
index 94ad73d508..5d8ca91219 100644
--- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/controlDict
@@ -50,14 +50,13 @@ functions
     {
         type            streamlines;
 
-        // Where to load it from (if not already in solver)
         libs            ("libfieldFunctionObjects.so");
 
         // Output every
         writeControl    writeTime;
-        // writeInterval 10;
 
-        setFormat       vtk; // gnuplot;//xmgr;//raw;//jplot;//csv;//ensight;
+        // Write format
+        setFormat       vtk;
 
         // Track forward (+U) or backward (-U) or both
         direction       forward;
@@ -78,8 +77,6 @@ functions
         seedSampleSet
         {
             type        lineUniform;
-
-            axis        x;  // distance;
             start       (-0.0205 0.001  0.00001);
             end         (-0.0205 0.0251 0.00001);
             nPoints     10;
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/system/controlDict b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/system/controlDict
index 190bd75f81..f9c6171056 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/system/controlDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/system/controlDict
@@ -81,6 +81,8 @@ functions
         writeControl        outputTime;
         writeInterval       1;
 
+        setFormat           raw;
+
         populationBalance   bubbles;
         regionType          cellZone;
         name                injection;
@@ -98,6 +100,8 @@ functions
         writeControl        outputTime;
         writeInterval       1;
 
+        setFormat           raw;
+
         populationBalance   bubbles;
         regionType          cellZone;
         name                outlet;
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/validation/createGraphs b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/validation/createGraphs
index d4ce48118e..832d986f5f 100755
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/validation/createGraphs
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/bubblePipe/validation/createGraphs
@@ -6,42 +6,45 @@ then
     exit 1
 fi
 
+time=$(foamListTimes -case .. -latestTime)
+
+graphFile=../postProcessing/graph/$time/line.xy
+
 gnuplot<<EOF
     set terminal postscript eps color enhanced font "Helvetica,20"
+
     set output '../void_fraction.eps'
 
     set xlabel 'r (mm)'
     set ylabel '{/Symbol a} (-)'
 
-    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',\
-    alpha u (\$1*1000):3 w l lw 2 lc rgb 'red' t 'd > 5.5mm'
+    plot "$graphFile" u (\$1*1000):4 w l lw 3 lc rgb 'black' t 'total',\
+         "$graphFile" u (\$1*1000):2 w l lw 2 lc rgb 'green' t 'd < 5.5mm',\
+         "$graphFile" u (\$1*1000):3 w l lw 2 lc rgb 'red' t 'd > 5.5mm'
 
     set output '../nonDragForces.eps'
 
     set ylabel 'F_{r} (N/m^3)'
 
-    plot forces u (\$1*1000):(-\$2) w l lw 2 t 'Lift',\
-    forces u (\$1*1000):(-\$5) w l lw 2 t 'Wall lubrication',\
-    forces u (\$1*1000):(-\$8) w l lw 2 t 'Turbulent dispersion'
+    plot "$graphFile" u (\$1*1000):(-\$5) w l lw 2 t 'Lift',\
+         "$graphFile" u (\$1*1000):(-\$8) w l lw 2 t 'Wall lubrication',\
+         "$graphFile" u (\$1*1000):(-\$11) w l lw 2 t 'Turbulent dispersion'
 EOF
 
+injectionFile=../postProcessing/probabilityDensity.injection/$time/probabilityDensity.injection.xy
+outletFile=../postProcessing/probabilityDensity.outlet/$time/probabilityDensity.outlet.xy
+
 gnuplot<<EOF
     set terminal postscript eps color enhanced font "Helvetica,20"
+
     set output '../volumeDensity.eps'
 
     set xlabel 'd (mm)'
     set ylabel '({/Symbol a}/{/Symbol a}_{tot})/{/Symbol D}d (mm^{-1})'
     set xtics 1
 
-    injection = system("ls ../postProcessing/probabilityDensity.injection/$(foamListTimes -case .. | tail -1)/*.dat")
-    outlet = system("ls ../postProcessing/probabilityDensity.outlet/$(foamListTimes -case .. | tail -1)/*.dat")
-
-    plot injection u (\$3/1e-3):(\$4/1e3) w histeps lw 3 lc rgb 'green' t 'injection',\
-    outlet u (\$3/1e-3):(\$4/1e3) w histeps lw 3 lc rgb 'red' t 'outlet'
+    plot "$injectionFile" u (\$3/1e-3):(\$4/1e3) w histeps lw 3 lc rgb 'green' t 'injection',\
+         "$outletFile" u (\$3/1e-3):(\$4/1e3) w histeps lw 3 lc rgb 'red' t 'outlet'
 EOF
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/validation/createGraphs b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/validation/createGraphs
index 10d4aa3a70..a33e21dece 100755
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/validation/createGraphs
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoiling/validation/createGraphs
@@ -6,7 +6,7 @@ then
     exit 1
 fi
 
-graphFile=$(foamListTimes -latestTime)/line_alpha.gas_T.liquid_T.gas.xy
+graphFile=$(foamListTimes -latestTime)/line.xy
 surfaceFile=$(cd postProcessing/inflow && ls -1tr */* | tail -n 1)
 
 gnuplot<<EOF
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/validation/createGraphs b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/validation/createGraphs
index 1d6aa72a7f..dcfceca79e 100755
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/validation/createGraphs
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingIATE/validation/createGraphs
@@ -6,7 +6,7 @@ then
     exit 1
 fi
 
-graphFile=$(foamListTimes -latestTime)/line_alpha.gas_T.liquid_T.gas_d.gas.xy
+graphFile=$(foamListTimes -latestTime)/line.xy
 surfaceFile=$(cd postProcessing/inflow && ls -1tr */* | tail -n 1)
 
 gnuplot<<EOF
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/system/controlDict.orig b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/system/controlDict.orig
index 4e40d83b8c..8715c7c109 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/system/controlDict.orig
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/system/controlDict.orig
@@ -58,6 +58,7 @@ functions
         functionObjectLibs ( "libmultiphaseEulerFoamFunctionObjects.so" );
         writeControl    runTime;
         writeInterval   0.5;
+        setFormat       raw;
         log             yes;
         functionType    volume;
         coordinateType  diameter;
@@ -71,6 +72,7 @@ functions
         functionObjectLibs ( "libmultiphaseEulerFoamFunctionObjects.so" );
         writeControl    runTime;
         writeInterval   0.5;
+        setFormat       raw;
         log             yes;
         functionType    volume;
         coordinateType  diameter;
@@ -84,6 +86,7 @@ functions
         functionObjectLibs ( "libmultiphaseEulerFoamFunctionObjects.so" );
         writeControl    runTime;
         writeInterval   0.5;
+        setFormat       raw;
         log             yes;
         functionType    volume;
         coordinateType  diameter;
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/validation/createGraphs b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/validation/createGraphs
index 1d6aa72a7f..dcfceca79e 100755
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/validation/createGraphs
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperse/validation/createGraphs
@@ -6,7 +6,7 @@ then
     exit 1
 fi
 
-graphFile=$(foamListTimes -latestTime)/line_alpha.gas_T.liquid_T.gas_d.gas.xy
+graphFile=$(foamListTimes -latestTime)/line.xy
 surfaceFile=$(cd postProcessing/inflow && ls -1tr */* | tail -n 1)
 
 gnuplot<<EOF
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/system/controlDict.orig b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/system/controlDict.orig
index d8f23c6f1b..8baa5d42bd 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/system/controlDict.orig
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/system/controlDict.orig
@@ -58,6 +58,7 @@ functions
         functionObjectLibs ( "libmultiphaseEulerFoamFunctionObjects.so" );
         writeControl    runTime;
         writeInterval   0.5;
+        setFormat       raw;
         log             yes;
         functionType    volume;
         coordinateType  diameter;
@@ -71,6 +72,7 @@ functions
         functionObjectLibs ( "libmultiphaseEulerFoamFunctionObjects.so" );
         writeControl    runTime;
         writeInterval   0.5;
+        setFormat       raw;
         log             yes;
         functionType    volume;
         coordinateType  diameter;
@@ -84,6 +86,7 @@ functions
         functionObjectLibs ( "libmultiphaseEulerFoamFunctionObjects.so" );
         writeControl    runTime;
         writeInterval   0.5;
+        setFormat       raw;
         log             yes;
         functionType    volume;
         coordinateType  diameter;
diff --git a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/validation/createGraphs b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/validation/createGraphs
index e885b866a6..82a2a0364a 100755
--- a/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/validation/createGraphs
+++ b/tutorials/multiphase/multiphaseEulerFoam/RAS/wallBoilingPolydisperseTwoGroups/validation/createGraphs
@@ -6,7 +6,7 @@ then
     exit 1
 fi
 
-graphFile=$(foamListTimes -latestTime)/line_alpha.gas_alpha.gas2_alpha.liquid_T.liquid_T.gas_d.bubbles.xy
+graphFile=$(foamListTimes -latestTime)/line.xy
 surfaceFile=$(cd postProcessing/inflow && ls -1tr */* | tail -n 1)
 
 gnuplot<<EOF
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/system/controlDict b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/system/controlDict
index 4e2beadbb1..089fd898ab 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/system/controlDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/system/controlDict
@@ -67,6 +67,7 @@ functions
 
         writeControl        outputTime;
         writeInterval       1;
+        setFormat           raw;
         log                 yes;
 
         regionType          cellZone;
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/validation/createGraphs b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/validation/createGraphs
index 6690a72dae..11b7a1ff41 100755
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/validation/createGraphs
+++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesis/validation/createGraphs
@@ -6,6 +6,10 @@ then
     exit 1
 fi
 
+time=$(foamListTimes -case .. -latestTime)
+
+graphFile=../postProcessing/graph/$time/line.xy
+
 gnuplot<<EOF
     set terminal postscript eps color enhanced font "Helvetica,20"
     set output '../species.eps'
@@ -17,14 +21,14 @@ gnuplot<<EOF
     set y2tics nomirror
     set key center
 
-    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',\
-    file u 1:4 w l t 'Cl2',\
-    file u 1:5 axis x1y2 w l t '{/Symbol a}_{particles}'
+    plot "$graphFile" u 1:2 w l t 'TiCl4',\
+         "$graphFile" u 1:3 w l t 'O2',\
+         "$graphFile" u 1:4 w l t 'Cl2',\
+         "$graphFile" u 1:5 axis x1y2 w l t '{/Symbol a}_{particles}'
 EOF
 
+resultFile=../postProcessing/numberConcentration/$time/numberConcentration.xy
+
 gnuplot<<EOF
     set terminal postscript eps color enhanced font "Helvetica,20"
     set output '../sizeDistribution.eps'
@@ -39,11 +43,9 @@ gnuplot<<EOF
     set xrange [1e-3:1]
     set yrange [1e-3:3]
 
-    result = system("ls ../postProcessing/numberConcentration/$(foamListTimes -case .. | tail -1)/numberConcentration.dat")
-
-    plot result u (\$3/1e-6):4 w lp t 'Size distribution',\
-    result u (\$3/1e-6):(\$2/\$1) axis x1y2 w l t '{/Symbol k}',\
-    result u (\$3/1e-6):(6./((6./pi*\$1)**(1./3.))) axis x1y2 w l t '{/Symbol k} lower bound'
+    plot "$resultFile" u (\$3/1e-6):4 w lp t 'Size distribution',\
+         "$resultFile" u (\$3/1e-6):(\$2/\$1) axis x1y2 w l t '{/Symbol k}',\
+         "$resultFile" u (\$3/1e-6):(6./((6./pi*\$1)**(1./3.))) axis x1y2 w l t '{/Symbol k} lower bound'
 EOF
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/system/controlDict b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/system/controlDict
index 74392cc51a..6ac8f06dbc 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/system/controlDict
+++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/system/controlDict
@@ -67,6 +67,7 @@ functions
 
         writeControl        outputTime;
         writeInterval       1;
+        setFormat           raw;
         log                 yes;
 
         regionType          cellZone;
diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/validation/createGraphs b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/validation/createGraphs
index 6690a72dae..11b7a1ff41 100755
--- a/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/validation/createGraphs
+++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/titaniaSynthesisSurface/validation/createGraphs
@@ -6,6 +6,10 @@ then
     exit 1
 fi
 
+time=$(foamListTimes -case .. -latestTime)
+
+graphFile=../postProcessing/graph/$time/line.xy
+
 gnuplot<<EOF
     set terminal postscript eps color enhanced font "Helvetica,20"
     set output '../species.eps'
@@ -17,14 +21,14 @@ gnuplot<<EOF
     set y2tics nomirror
     set key center
 
-    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',\
-    file u 1:4 w l t 'Cl2',\
-    file u 1:5 axis x1y2 w l t '{/Symbol a}_{particles}'
+    plot "$graphFile" u 1:2 w l t 'TiCl4',\
+         "$graphFile" u 1:3 w l t 'O2',\
+         "$graphFile" u 1:4 w l t 'Cl2',\
+         "$graphFile" u 1:5 axis x1y2 w l t '{/Symbol a}_{particles}'
 EOF
 
+resultFile=../postProcessing/numberConcentration/$time/numberConcentration.xy
+
 gnuplot<<EOF
     set terminal postscript eps color enhanced font "Helvetica,20"
     set output '../sizeDistribution.eps'
@@ -39,11 +43,9 @@ gnuplot<<EOF
     set xrange [1e-3:1]
     set yrange [1e-3:3]
 
-    result = system("ls ../postProcessing/numberConcentration/$(foamListTimes -case .. | tail -1)/numberConcentration.dat")
-
-    plot result u (\$3/1e-6):4 w lp t 'Size distribution',\
-    result u (\$3/1e-6):(\$2/\$1) axis x1y2 w l t '{/Symbol k}',\
-    result u (\$3/1e-6):(6./((6./pi*\$1)**(1./3.))) axis x1y2 w l t '{/Symbol k} lower bound'
+    plot "$resultFile" u (\$3/1e-6):4 w lp t 'Size distribution',\
+         "$resultFile" u (\$3/1e-6):(\$2/\$1) axis x1y2 w l t '{/Symbol k}',\
+         "$resultFile" u (\$3/1e-6):(6./((6./pi*\$1)**(1./3.))) axis x1y2 w l t '{/Symbol k} lower bound'
 EOF
 
 #------------------------------------------------------------------------------