diff --git a/src/sampling/Make/files b/src/sampling/Make/files
index 99bafc9da9..a76630c8e1 100644
--- a/src/sampling/Make/files
+++ b/src/sampling/Make/files
@@ -17,6 +17,8 @@ sampledSet/boundaryRandom/boundaryRandom.C
 sampledSet/points/points.C
 sampledSet/sphereRandom/sphereRandom.C
 sampledSet/triSurfaceMeshSampledSet/triSurfaceMeshSampledSet.C
+sampledSet/cellSetSampledSet/cellSetSampledSet.C
+sampledSet/faceSetSampledSet/faceSetSampledSet.C
 
 cuttingPlane/cuttingPlane.C
 
diff --git a/src/sampling/sampledSet/cellSetSampledSet/cellSetSampledSet.C b/src/sampling/sampledSet/cellSetSampledSet/cellSetSampledSet.C
new file mode 100644
index 0000000000..e376c2891b
--- /dev/null
+++ b/src/sampling/sampledSet/cellSetSampledSet/cellSetSampledSet.C
@@ -0,0 +1,88 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Copyright (C) 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 "cellSetSampledSet.H"
+#include "cellSet.H"
+#include "polyMesh.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace sampledSets
+{
+    defineTypeNameAndDebug(cellSetSampledSet, 0);
+    addToRunTimeSelectionTable(sampledSet, cellSetSampledSet, word);
+}
+}
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::sampledSets::cellSetSampledSet::genSamples()
+{
+    const labelList cells(cellSet(mesh(), setName_).toc());
+
+    setSamples
+    (
+        List<point>(IndirectList<point>(mesh().cellCentres(), cells)),
+        cells,
+        labelList(cells.size(), -1),
+        labelList(cells.size(), 0),
+        scalarList(identity(cells.size()))
+    );
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::sampledSets::cellSetSampledSet::cellSetSampledSet
+(
+    const word& name,
+    const polyMesh& mesh,
+    const meshSearch& searchEngine,
+    const dictionary& dict
+)
+:
+    sampledSet(name, mesh, searchEngine, dict),
+    setName_(dict.lookup("set"))
+{
+    genSamples();
+
+    if (debug)
+    {
+        write(Info);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::sampledSets::cellSetSampledSet::~cellSetSampledSet()
+{}
+
+
+// ************************************************************************* //
diff --git a/src/sampling/sampledSet/cellSetSampledSet/cellSetSampledSet.H b/src/sampling/sampledSet/cellSetSampledSet/cellSetSampledSet.H
new file mode 100644
index 0000000000..c5aa93917c
--- /dev/null
+++ b/src/sampling/sampledSet/cellSetSampledSet/cellSetSampledSet.H
@@ -0,0 +1,115 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Copyright (C) 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/>.
+
+Class
+    Foam::sampledSets::cellSetSampledSet
+
+Description
+    Samples at the cell-centres of a given cell set
+
+Usage
+    \table
+        Property    | Description                            | Req'd? | Default
+        set         | Name of the cell set                   | yes    |
+    \endtable
+
+    Example specification:
+    \verbatim
+    {
+        type        cellSet;
+        set         c0;
+    }
+    \endverbatim
+
+SourceFiles
+    cellSetSampledSet.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef cellSetSampledSet_H
+#define cellSetSampledSet_H
+
+#include "sampledSet.H"
+#include "DynamicList.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace sampledSets
+{
+
+/*---------------------------------------------------------------------------*\
+                          Class cellSetSampledSet Declaration
+\*---------------------------------------------------------------------------*/
+
+class cellSetSampledSet
+:
+    public sampledSet
+{
+    // Private Data
+
+        //- Name of the cell set
+        const word setName_;
+
+
+    // Private Member Functions
+
+        //- Uses calcSamples to obtain samples. Copies them into *this.
+        void genSamples();
+
+
+public:
+
+    //- Runtime type information
+    TypeName("cellSet");
+
+
+    // Constructors
+
+        //- Construct from dictionary
+        cellSetSampledSet
+        (
+            const word& name,
+            const polyMesh& mesh,
+            const meshSearch& searchEngine,
+            const dictionary& dict
+        );
+
+
+    // Destructor
+
+        virtual ~cellSetSampledSet();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace sampledSets
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/sampling/sampledSet/faceSetSampledSet/faceSetSampledSet.C b/src/sampling/sampledSet/faceSetSampledSet/faceSetSampledSet.C
new file mode 100644
index 0000000000..7675658196
--- /dev/null
+++ b/src/sampling/sampledSet/faceSetSampledSet/faceSetSampledSet.C
@@ -0,0 +1,88 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Copyright (C) 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 "faceSetSampledSet.H"
+#include "faceSet.H"
+#include "polyMesh.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace sampledSets
+{
+    defineTypeNameAndDebug(faceSetSampledSet, 0);
+    addToRunTimeSelectionTable(sampledSet, faceSetSampledSet, word);
+}
+}
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::sampledSets::faceSetSampledSet::genSamples()
+{
+    const labelList faces(faceSet(mesh(), setName_).toc());
+
+    setSamples
+    (
+        List<point>(IndirectList<point>(mesh().faceCentres(), faces)),
+        labelList(IndirectList<label>(mesh().faceOwner(), faces)),
+        faces,
+        labelList(faces.size(), 0),
+        scalarList(identity(faces.size()))
+    );
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::sampledSets::faceSetSampledSet::faceSetSampledSet
+(
+    const word& name,
+    const polyMesh& mesh,
+    const meshSearch& searchEngine,
+    const dictionary& dict
+)
+:
+    sampledSet(name, mesh, searchEngine, dict),
+    setName_(dict.lookup("set"))
+{
+    genSamples();
+
+    if (debug)
+    {
+        write(Info);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::sampledSets::faceSetSampledSet::~faceSetSampledSet()
+{}
+
+
+// ************************************************************************* //
diff --git a/src/sampling/sampledSet/faceSetSampledSet/faceSetSampledSet.H b/src/sampling/sampledSet/faceSetSampledSet/faceSetSampledSet.H
new file mode 100644
index 0000000000..820f46a656
--- /dev/null
+++ b/src/sampling/sampledSet/faceSetSampledSet/faceSetSampledSet.H
@@ -0,0 +1,115 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Copyright (C) 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/>.
+
+Class
+    Foam::sampledSets::faceSetSampledSet
+
+Description
+    Samples at the face-centres of a given face set
+
+Usage
+    \table
+        Property    | Description                            | Req'd? | Default
+        set         | Name of the face set                   | yes    |
+    \endtable
+
+    Example specification:
+    \verbatim
+    {
+        type        faceSet;
+        set         c0;
+    }
+    \endverbatim
+
+SourceFiles
+    faceSetSampledSet.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef faceSetSampledSet_H
+#define faceSetSampledSet_H
+
+#include "sampledSet.H"
+#include "DynamicList.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace sampledSets
+{
+
+/*---------------------------------------------------------------------------*\
+                          Class faceSetSampledSet Declaration
+\*---------------------------------------------------------------------------*/
+
+class faceSetSampledSet
+:
+    public sampledSet
+{
+    // Private Data
+
+        //- Name of the face set
+        const word setName_;
+
+
+    // Private Member Functions
+
+        //- Uses calcSamples to obtain samples. Copies them into *this.
+        void genSamples();
+
+
+public:
+
+    //- Runtime type information
+    TypeName("faceSet");
+
+
+    // Constructors
+
+        //- Construct from dictionary
+        faceSetSampledSet
+        (
+            const word& name,
+            const polyMesh& mesh,
+            const meshSearch& searchEngine,
+            const dictionary& dict
+        );
+
+
+    // Destructor
+
+        virtual ~faceSetSampledSet();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace sampledSets
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //