diff --git a/src/functionObjects/forces/Make/files b/src/functionObjects/forces/Make/files
index 310f1d60ba..4d8d3dcd63 100644
--- a/src/functionObjects/forces/Make/files
+++ b/src/functionObjects/forces/Make/files
@@ -1,4 +1,5 @@
 forces/forces.C
 forceCoeffs/forceCoeffs.C
+propellerInfo/propellerInfo.C
 
 LIB = $(FOAM_LIBBIN)/libforces
diff --git a/src/functionObjects/forces/Make/options b/src/functionObjects/forces/Make/options
index 3be6e09cef..cdab453037 100644
--- a/src/functionObjects/forces/Make/options
+++ b/src/functionObjects/forces/Make/options
@@ -2,6 +2,7 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
@@ -12,6 +13,7 @@ EXE_INC = \
 LIB_LIBS = \
     -lfiniteVolume \
     -lmeshTools \
+    -lsurfMesh \
     -lfluidThermophysicalModels \
     -lincompressibleTransportModels \
     -lcompressibleTransportModels \
diff --git a/src/functionObjects/forces/propellerInfo/propellerInfo.C b/src/functionObjects/forces/propellerInfo/propellerInfo.C
new file mode 100644
index 0000000000..e696b9d1fb
--- /dev/null
+++ b/src/functionObjects/forces/propellerInfo/propellerInfo.C
@@ -0,0 +1,924 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2021 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+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 "propellerInfo.H"
+#include "cylindricalCS.H"
+#include "fvMesh.H"
+#include "IOMRFZoneList.H"
+#include "mathematicalConstants.H"
+#include "interpolation.H"
+#include "Function1.H"
+#include "surfaceWriter.H"
+#include "treeDataCell.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace functionObjects
+{
+    defineTypeNameAndDebug(propellerInfo, 0);
+    addToRunTimeSelectionTable(functionObject, propellerInfo, dictionary);
+}
+}
+
+const Foam::Enum<Foam::functionObjects::propellerInfo::rotationMode>
+Foam::functionObjects::propellerInfo::rotationModeNames_
+({
+    { rotationMode::SPECIFIED, "specified" },
+    { rotationMode::MRF, "MRF" },
+});
+
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+void Foam::functionObjects::propellerInfo::setCoordinateSystem
+(
+    const dictionary& dict
+)
+{
+    vector origin(Zero);
+    vector axis(Zero);
+
+    switch (rotationMode_)
+    {
+        case rotationMode::SPECIFIED:
+        {
+            origin = dict.get<vector>("origin");
+            axis = dict.get<vector>("axis");
+            axis.normalise();
+
+            n_ = dict.get<scalar>("n");
+            break;
+        }
+        case rotationMode::MRF:
+        {
+            MRFName_ = dict.get<word>("MRF");
+            const auto* MRFZones =
+                mesh_.cfindObject<IOMRFZoneList>("MRFProperties");
+
+            if (!MRFZones)
+            {
+                FatalIOErrorInFunction(dict)
+                    << "Unable to find MRFProperties in the database. "
+                    << "Is this an MRF case?"
+                    << exit(FatalIOError);
+            }
+            const auto& mrf = MRFZones->MRFZoneList::getFromName(MRFName_);
+            vector offset = dict.getOrDefault("originOffset", vector::zero);
+            origin = offset + mrf.origin();
+            axis = mrf.axis();
+
+            // Convert rad/s to revolutions per second
+            n_ = (mrf.Omega() & axis)/constant::mathematical::twoPi;
+            break;
+        }
+        default:
+        {
+            FatalErrorInFunction
+                << "Unhandled enumeration " << rotationModeNames_[rotationMode_]
+                << abort(FatalError);
+        }
+    }
+
+    vector alphaAxis;
+    if (!dict.readIfPresent("alphaAxis", alphaAxis))
+    {
+        // Value has not been set - find vector orthogonal to axis
+
+        vector cand(Zero);
+        scalar minDot = GREAT;
+        for (direction d = 0; d < 3; ++d)
+        {
+            vector test(Zero);
+            test[d] = 1;
+            scalar dotp = mag(test & axis);
+            if (dotp < minDot)
+            {
+                minDot = dotp;
+                cand = test;
+            }
+        }
+
+        alphaAxis = axis ^ cand;
+    }
+
+    alphaAxis.normalise();
+
+    coordSysPtr_.reset(new coordSystem::cylindrical(origin, axis, alphaAxis));
+}
+
+
+void Foam::functionObjects::propellerInfo::setRotationalSpeed()
+{
+    switch (rotationMode_)
+    {
+        case rotationMode::SPECIFIED:
+        {
+            // Set on dictionary re-read
+            break;
+        }
+        case rotationMode::MRF:
+        {
+            const auto* MRFZones =
+                mesh_.cfindObject<IOMRFZoneList>("MRFProperties");
+
+            if (!MRFZones)
+            {
+                FatalErrorInFunction
+                    << "Unable to find MRFProperties in the database. "
+                    << "Is this an MRF case?"
+                    << exit(FatalError);
+            }
+
+            const auto& mrf = MRFZones->MRFZoneList::getFromName(MRFName_);
+
+            // Convert rad/s to revolutions per second
+            n_ = (mrf.Omega() & mrf.axis())/constant::mathematical::twoPi;
+            break;
+        }
+        default:
+        {
+            FatalErrorInFunction
+                << "Unhandled enumeration " << rotationModeNames_[rotationMode_]
+                << abort(FatalError);
+        }
+    }
+}
+
+
+void Foam::functionObjects::propellerInfo::createFiles()
+{
+    if (!writeToFile())
+    {
+        return;
+    }
+
+    if (writePropellerPerformance_ && !propellerPerformanceFilePtr_)
+    {
+        propellerPerformanceFilePtr_ = createFile("propellerPerformance");
+        auto& os = propellerPerformanceFilePtr_();
+
+        writeHeader(os, "Propeller performance");
+        writeHeaderValue(os, "CofR", coordSysPtr_->origin());
+        writeHeaderValue(os, "Radius", radius_);
+        writeHeaderValue(os, "Axis", coordSysPtr_->e3());
+
+        writeHeader(os, "");
+
+        writeCommented(os, "Time");
+        writeTabbed(os, "n");
+        writeTabbed(os, "URef");
+        writeTabbed(os, "J");
+        writeTabbed(os, "KT");
+        writeTabbed(os, "10*KQ");
+        writeTabbed(os, "eta0");
+        os  << nl;
+    }
+
+    if (writeWakeFields_)
+    {
+        if (!wakeFilePtr_) wakeFilePtr_ = createFile("wake");
+        if (!axialWakeFilePtr_) axialWakeFilePtr_ = createFile("axialWake");
+    }
+}
+
+
+const Foam::volVectorField& Foam::functionObjects::propellerInfo::U() const
+{
+    const auto* UPtr = mesh_.cfindObject<volVectorField>(UName_);
+
+    if (!UPtr)
+    {
+        FatalErrorInFunction
+            << "Unable to find velocity field " << UName_
+            << " . Available vector fields are: "
+            << mesh_.names<volVectorField>()
+            << exit(FatalError);
+    }
+
+    return *UPtr;
+}
+
+
+void Foam::functionObjects::propellerInfo::setSampleDiskGeometry
+(
+    const coordinateSystem& coordSys,
+    const scalar r1,
+    const scalar r2,
+    const scalar nTheta,
+    const label nRadius,
+    faceList& faces,
+    pointField& points
+) const
+{
+    label nPoint = nRadius*nTheta;
+    if (r1 < SMALL)
+    {
+        nPoint += 1; // 1 for origin
+    }
+    else
+    {
+        nPoint += nTheta;
+    }
+    const label nFace = nRadius*nTheta;
+
+    points.setSize(nPoint);
+    faces.setSize(nFace);
+
+    const point& origin = coordSys.origin();
+    const scalar zCoord = 0;
+    label pointi = 0;
+    for (int radiusi = 0; radiusi <= nRadius; ++radiusi)
+    {
+        if (r1 < SMALL && radiusi == 0)
+        {
+            points[pointi++] = origin;
+        }
+        else
+        {
+            const scalar r = r1 + radiusi*(r2 - r1)/nRadius;
+
+            for (label i = 0; i < nTheta; ++i)
+            {
+                point p
+                (
+                    r,
+                    (i/scalar(nTheta))*constant::mathematical::twoPi,
+                    zCoord
+                );
+
+                points[pointi++] = coordSys.globalPosition(p);
+            }
+        }
+    }
+
+
+    const List<label> ptIDs(identity(nTheta));
+
+    // Faces
+    label facei = 0;
+    label pointOffset0 = 0;
+    label radiusOffset = 0;
+    DynamicList<label> facePts(4);
+    for (int radiusi = 0; radiusi < nRadius; ++radiusi)
+    {
+        if (r1 < SMALL && radiusi == 0)
+        {
+            radiusOffset = 1;
+            pointOffset0 = 1;
+
+            // Adding faces as a fan about the origin
+            for (label thetai = 1; thetai <= nTheta; ++thetai)
+            {
+                facePts.clear();
+
+                // Append triangle about origin
+                facePts.append(0);
+                facePts.append(thetai);
+                facePts.append(1 + ptIDs.fcIndex(thetai - 1));
+
+                faces[facei++] = face(facePts);
+            }
+        }
+        else
+        {
+            for (label thetai = 0; thetai < nTheta; ++thetai)
+            {
+                facePts.clear();
+
+                label offset = pointOffset0 + (radiusi-radiusOffset)*nTheta;
+
+                // Inner
+                facePts.append(offset + ptIDs.fcIndex(thetai - 1));
+                facePts.append(offset + ptIDs.fcIndex(thetai));
+
+                // Outer
+                facePts.append(offset + nTheta + ptIDs.fcIndex(thetai));
+                facePts.append(offset + nTheta + ptIDs.fcIndex(thetai - 1));
+
+                faces[facei++] = face(facePts);
+            }
+        }
+    }
+}
+
+
+void Foam::functionObjects::propellerInfo::setSampleDiskSurface
+(
+    const dictionary& dict
+)
+{
+    const dictionary& sampleDiskDict(dict.subDict("sampleDisk"));
+
+    const scalar r1 = sampleDiskDict.getScalar("r1");
+    const scalar r2 = sampleDiskDict.getScalar("r2");
+
+    nTheta_ = sampleDiskDict.getLabel("nTheta");
+    nRadial_ = sampleDiskDict.getLabel("nRadial");
+
+    setSampleDiskGeometry
+    (
+        coordSysPtr_(),
+        r1,
+        r2,
+        nTheta_,
+        nRadial_,
+        faces_,
+        points_
+    );
+
+    // Surface writer
+    word surfWriterType;
+    if (sampleDiskDict.readIfPresent("surfaceWriter", surfWriterType))
+    {
+        const auto writeOptions = sampleDiskDict.subOrEmptyDict("writeOptions");
+
+        surfaceWriterPtr_ = surfaceWriter::New
+        (
+            surfWriterType,
+            writeOptions.subOrEmptyDict(surfWriterType)
+        );
+
+        // Use outputDir/TIME/surface-name
+        surfaceWriterPtr_->useTimeDir(true);
+    }
+
+    errorOnPointNotFound_ =
+        sampleDiskDict.getOrDefault("errorOnPointNotFound", false);
+
+    updateSampleDiskCells();
+}
+
+
+void Foam::functionObjects::propellerInfo::updateSampleDiskCells()
+{
+    if (!writeWakeFields_)
+    {
+        return;
+    }
+
+    treeBoundBox bb(points_);
+    bb.inflate(0.05);
+    DynamicList<label> treeCellIDs(10*points_.size());
+
+    const auto& meshCells = mesh_.cells();
+    const auto& meshFaces = mesh_.faces();
+    const auto& meshPoints = mesh_.points();
+
+    forAll(meshCells, celli)
+    {
+        bool found = false;
+
+        for (const label facei : meshCells[celli])
+        {
+            for (const label fpi : meshFaces[facei])
+            {
+                if (bb.contains(meshPoints[fpi]))
+                {
+                    found = true;
+                    break;
+                }
+            }
+
+            if (found)
+            {
+                treeCellIDs.append(celli);
+                break;
+            }
+        }
+    }
+
+    indexedOctree<treeDataCell> tree
+    (
+        treeDataCell(true, mesh_, std::move(treeCellIDs), polyMesh::CELL_TETS),
+        bb,
+        10,
+        100,
+        10
+    );
+
+    cellIds_.setSize(points_.size(), -1);
+    pointMask_.setSize(points_.size(), false);
+
+    // Kick the tet base points calculation to avoid parallel comms later
+    (void)mesh_.tetBasePtIs();
+
+    const auto& cellLabels = tree.shapes().cellLabels();
+
+    forAll(points_, pointi)
+    {
+        const vector& pos = points_[pointi];
+
+//        label meshCelli = mesh_.findCell(pos);
+        label treeCelli = tree.findInside(pos);
+
+        label proci = treeCelli >= 0 ? Pstream::myProcNo() : -1;
+
+        reduce(proci, maxOp<label>());
+
+        pointMask_[pointi] = treeCelli != -1;
+
+        if (proci >= 0)
+        {
+            cellIds_[pointi] =
+                proci == Pstream::myProcNo()
+              ? cellLabels[treeCelli]
+              : -1;
+        }
+        else
+        {
+            if (errorOnPointNotFound_)
+            {
+                FatalErrorInFunction
+                    << "Position " << pos << " not found in mesh"
+                    << abort(FatalError);
+            }
+            else
+            {
+                DebugInfo
+                    << "Position " << pos << " not found in mesh"
+                    << endl;
+            }
+        }
+    }
+
+    Pstream::listCombineGather(pointMask_, orEqOp<bool>());
+    Pstream::listCombineScatter(pointMask_);
+}
+
+
+Foam::scalar Foam::functionObjects::propellerInfo::meanSampleDiskField
+(
+    const scalarField& field
+) const
+{
+    if (field.size() != points_.size())
+    {
+        FatalErrorInFunction
+            << "Inconsistent field sizes: input:" << field.size()
+            << " points:" << points_.size()
+            << abort(FatalError);
+    }
+
+    scalar sumArea = 0;
+    scalar sumFieldArea = 0;
+    forAll(faces_, facei)
+    {
+        const face& f = faces_[facei];
+
+        bool valid = true;
+        scalar faceValue = 0;
+        for (const label pti : f)
+        {
+            // Exclude contributions where sample cell for point was not found
+            if (!pointMask_[pti])
+            {
+                valid = false;
+                break;
+            }
+            faceValue += field[pti];
+        }
+
+        if (valid)
+        {
+            scalar area = f.mag(points_);
+            sumArea += area;
+            sumFieldArea += faceValue/f.size()*area;
+        }
+    }
+
+    return sumFieldArea/(sumArea + ROOTVSMALL);
+}
+
+
+void Foam::functionObjects::propellerInfo::writeSampleDiskSurface
+(
+    const vectorField& U,
+    const vectorField& Ur,
+    const scalar URef
+)
+{
+    // Write surface
+    if (!surfaceWriterPtr_)
+    {
+        return;
+    }
+
+
+    // Time-aware, with time spliced into the output path
+    surfaceWriterPtr_->isPointData(true);
+    surfaceWriterPtr_->beginTime(time_);
+    surfaceWriterPtr_->open
+    (
+        points_,
+        faces_,
+        (baseFileDir() / name() / "surfaces" / "disk"),
+        false  // serial - already merged
+    );
+    surfaceWriterPtr_->nFields(4); // Legacy VTK
+    surfaceWriterPtr_->write("U", U);
+    surfaceWriterPtr_->write("Ur", Ur);
+    surfaceWriterPtr_->write("UNorm", U/URef);
+    surfaceWriterPtr_->write("UrNorm", Ur/URef);
+    surfaceWriterPtr_->endTime();
+    surfaceWriterPtr_->clear();
+}
+
+
+void Foam::functionObjects::propellerInfo::writePropellerPerformance()
+{
+    if (!writePropellerPerformance_)
+    {
+        return;
+    }
+
+    // Update n_
+    setRotationalSpeed();
+
+    const vector sumForce(sum(force_[0]) + sum(force_[1]) + sum(force_[2]));
+    const vector sumMoment(sum(moment_[0]) + sum(moment_[1]) + sum(moment_[2]));
+
+    const scalar diameter = 2*radius_;
+    const scalar URef = URefPtr_->value(time_.timeOutputValue());
+    const scalar j = -URef/mag(n_ + ROOTVSMALL)/diameter;
+    const scalar denom = rhoRef_*sqr(n_)*pow4(diameter);
+    const scalar kt = (sumForce & coordSysPtr_->e3())/denom;
+    const scalar kq =
+        -sign(n_)*(sumMoment & coordSysPtr_->e3())/(denom*diameter);
+    const scalar etaO = kt*j/(kq*constant::mathematical::twoPi + ROOTVSMALL);
+
+    if (writeToFile())
+    {
+        auto& os = propellerPerformanceFilePtr_();
+
+        writeCurrentTime(os);
+        os  << tab << n_
+            << tab << URef
+            << tab << j
+            << tab << kt
+            << tab << 10*kq
+            << tab << etaO
+            << nl;
+
+        os.flush();
+    }
+
+    Log << type() << " " << name() <<  " output:" << nl
+        << "    Revolutions per second, n : " << n_ << nl
+        << "    Reference velocity, URef  : " << URef << nl
+        << "    Advance coefficient, J    : " << j << nl
+        << "    Thrust coefficient, Kt    : " << kt << nl
+        << "    Torque coefficient, 10*Kq : " << 10*kq << nl
+        << "    Efficiency, etaO          : " << etaO << nl
+        << nl;
+
+
+    // Write state/results information
+    setResult("n", n_);
+    setResult("URef", URef);
+    setResult("Kt", kt);
+    setResult("Kq", kq);
+    setResult("J", j);
+    setResult("etaO", etaO);
+}
+
+
+void Foam::functionObjects::propellerInfo::writeWake
+(
+    const vectorField& U,
+    const scalar URef
+)
+{
+    if (!Pstream::master()) return;
+
+    // Velocity
+    auto& os = wakeFilePtr_();
+
+    const pointField propPoints(coordSysPtr_->localPosition(points_));
+    const label offset =
+        mag(propPoints[1][0] - propPoints[0][0]) < SMALL ? 0 : 1;
+    const scalar rMax = propPoints.last()[0];
+
+    const scalar UzMean = meanSampleDiskField(U.component(2));
+
+    writeHeaderValue(os, "Time", time_.timeOutputValue());
+    writeHeaderValue(os, "Reference velocity", URef);
+    writeHeaderValue(os, "Direction", coordSysPtr_->e3());
+    writeHeaderValue(os, "Wake", 1 - UzMean/URef);
+    writeHeader(os, "");
+    writeCommented(os, "r/R");
+    writeTabbed(os, "alpha");
+    writeTabbed(os, "(x y z)");
+    writeTabbed(os, "(Ur Utheta Uz)");
+    os << nl;
+
+    for (label thetai = 0; thetai < nTheta_; ++thetai)
+    {
+        const scalar deg = 360*thetai/scalar(nTheta_);
+
+        for (label radiusi = 0; radiusi <= nRadial_; ++radiusi)
+        {
+            label pointi = radiusi*nTheta_ + thetai + offset;
+
+            if (radiusi == 0 && offset == 1)
+            {
+                // Only a single point at the centre - repeat for all thetai
+                pointi = 0;
+            }
+
+            if (pointMask_[pointi])
+            {
+                const scalar rR = propPoints[radiusi*nTheta_][0]/rMax;
+
+                os  << rR << tab << deg << tab
+                    << points_[pointi] << tab << U[pointi] << nl;
+            }
+        }
+    }
+
+    writeBreak(os);
+
+    os  << endl;
+}
+
+
+void Foam::functionObjects::propellerInfo::writeAxialWake
+(
+    const vectorField& U,
+    const scalar URef
+)
+{
+    if (!Pstream::master()) return;
+
+    // Alternative common format - axial wake component
+    auto& os = axialWakeFilePtr_();
+
+    const pointField propPoints(coordSysPtr_->localPosition(points_));
+    const label offset =
+        mag(propPoints[1][0] - propPoints[0][0]) < SMALL ? 0 : 1;
+    const scalar rMax = propPoints.last()[0];
+
+    writeHeaderValue(os, "Time", time_.timeOutputValue());
+
+    os  << "# angle";
+    for (label radiusi = 0; radiusi <= nRadial_; ++radiusi)
+    {
+        label pointi = radiusi*nTheta_;
+        scalar r = propPoints[pointi][0];
+        os  << tab << "r/R=" << r/rMax;
+    }
+    os  << nl;
+
+    for (label thetai = 0; thetai < nTheta_; ++thetai)
+    {
+        os  << 360*thetai/scalar(nTheta_);
+
+        for (label radiusi = 0; radiusi <= nRadial_; ++radiusi)
+        {
+            label pointi = radiusi*nTheta_ + thetai + offset;
+
+            if (radiusi == 0 && offset == 1)
+            {
+                // Only a single point at the centre - repeat for all thetai
+                pointi = 0;
+            }
+
+            if (pointMask_[pointi])
+            {
+                os << tab << 1 - U[pointi][2]/URef;
+            }
+            else
+            {
+                os << tab << "undefined";
+            }
+        }
+
+        os  << nl;
+    }
+
+    writeBreak(os);
+
+    os  << endl;
+}
+
+
+void Foam::functionObjects::propellerInfo::writeWakeFields(const scalar URef)
+{
+    if (!writeWakeFields_)
+    {
+        return;
+    }
+
+    // Normalised velocity
+    const vectorField UDisk(interpolate(U(), vector::uniform(nanValue_))());
+    const vectorField UrDisk(coordSysPtr_->localVector(UDisk));
+
+    // Surface field data
+    writeSampleDiskSurface(UDisk, UrDisk,  URef);
+
+    // Write wake text files
+    writeWake(UrDisk, URef);
+    writeAxialWake(UrDisk, URef);
+}
+
+
+template<class Type>
+Foam::tmp<Foam::Field<Type>> Foam::functionObjects::propellerInfo::interpolate
+(
+    const GeometricField<Type, fvPatchField, volMesh>& psi,
+    const Type& defaultValue
+) const
+{
+    auto tfield = tmp<Field<Type>>::New(points_.size(), defaultValue);
+    auto& field = tfield.ref();
+
+    autoPtr<interpolation<Type>> interpolator
+    (
+        interpolation<Type>::New(interpolationScheme_, psi)
+    );
+
+    forAll(points_, pointi)
+    {
+        const label celli = cellIds_[pointi];
+
+        if (cellIds_[pointi] != -1)
+        {
+            const point& position = points_[pointi];
+            field[pointi] = interpolator().interpolate(position, celli);
+        }
+    }
+
+    Pstream::listCombineGather(field, maxEqOp<Type>());
+    Pstream::listCombineScatter(field);
+
+    return tfield;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::functionObjects::propellerInfo::propellerInfo
+(
+    const word& name,
+    const Time& runTime,
+    const dictionary& dict,
+    bool readFields
+)
+:
+    forces(name, runTime, dict, false),
+    radius_(0),
+    URefPtr_(nullptr),
+    rotationMode_(rotationMode::SPECIFIED),
+    MRFName_(),
+    n_(0),
+    writePropellerPerformance_(true),
+    propellerPerformanceFilePtr_(nullptr),
+    writeWakeFields_(true),
+    surfaceWriterPtr_(nullptr),
+    nTheta_(0),
+    nRadial_(0),
+    points_(),
+    errorOnPointNotFound_(false),
+    faces_(),
+    cellIds_(),
+    pointMask_(),
+    interpolationScheme_("cell"),
+    wakeFilePtr_(nullptr),
+    axialWakeFilePtr_(nullptr),
+    nanValue_(pTraits<scalar>::min)
+{
+    if (readFields)
+    {
+        read(dict);
+        Log << endl;
+    }
+}
+
+
+Foam::functionObjects::propellerInfo::propellerInfo
+(
+    const word& name,
+    const objectRegistry& obr,
+    const dictionary& dict,
+    bool readFields
+)
+:
+    propellerInfo(name, obr.time(), dict, false)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+bool Foam::functionObjects::propellerInfo::read(const dictionary& dict)
+{
+    if (forces::read(dict))
+    {
+        radius_ = dict.getScalar("radius");
+        URefPtr_.reset(Function1<scalar>::New("URef", dict, &mesh_));
+        rotationMode_ = rotationModeNames_.get("rotationMode", dict);
+
+        // Must be set before setting the surface
+        setCoordinateSystem(dict);
+
+        writePropellerPerformance_ =
+            dict.get<bool>("writePropellerPerformance");
+
+        writeWakeFields_ = dict.get<bool>("writeWakeFields");
+        if (writeWakeFields_)
+        {
+            setSampleDiskSurface(dict);
+
+            dict.readIfPresent("interpolationScheme", interpolationScheme_);
+
+            dict.readIfPresent("nanValue", nanValue_);
+        }
+
+        return true;
+    }
+
+    return false;
+}
+
+
+bool Foam::functionObjects::propellerInfo::execute()
+{
+    calcForcesMoment();
+
+    createFiles();
+
+    if (writeWakeFields_)
+    {
+        // Only setting mean axial velocity result during execute
+        // - wake fields are 'heavy' and controlled separately using the
+        //   writeControl
+        const vectorField
+            UDisk
+            (
+                coordSysPtr_->localVector
+                (
+                    interpolate
+                    (
+                        U(),
+                        vector::uniform(nanValue_)
+                    )()
+                )
+            );
+        const scalar UzMean = meanSampleDiskField(UDisk.component(2));
+
+        setResult("UzMean", UzMean);
+    }
+
+    writePropellerPerformance();
+
+    return true;
+}
+
+
+bool Foam::functionObjects::propellerInfo::write()
+{
+    const scalar URef = URefPtr_->value(time_.timeOutputValue());
+    writeWakeFields(URef);
+
+    return true;
+}
+
+
+void Foam::functionObjects::propellerInfo::UpdateMesh(const mapPolyMesh& mpm)
+{
+    updateSampleDiskCells();
+}
+
+
+void Foam::functionObjects::propellerInfo::movePoints(const polyMesh& mesh)
+{
+    updateSampleDiskCells();
+}
+
+
+// ************************************************************************* //
diff --git a/src/functionObjects/forces/propellerInfo/propellerInfo.H b/src/functionObjects/forces/propellerInfo/propellerInfo.H
new file mode 100644
index 0000000000..63725c2a4c
--- /dev/null
+++ b/src/functionObjects/forces/propellerInfo/propellerInfo.H
@@ -0,0 +1,411 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2021 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+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::functionObjects::propellerInfo
+
+Group
+    grpForcesFunctionObjects
+
+Description
+    Calculates propeller performance and wake field properties.
+
+    Controlled by executeControl:
+    - Propeller performance
+      - Thrust coefficient, Kt
+      - Torque coefficient, 10*Kq
+      - Advance coefficient, J
+      - Open water efficiency, etaO
+      - Written to postProcessing/<name>/<time>/propellerPerformance.dat
+
+    Controlled by writeControl:
+    - Wake field text file
+      - Wake: 1 - UzMean/URef
+      - Velocity in cylindrical coordinates at xyz locations
+      - Written to postProcessing/<name>/<time>/wake.dat
+    - Axial wake field text file
+      - 1 - Uz/URef at r/R and angle
+      - Written to postProcessing/<name>/<time>/axialWake.dat
+    - Velocity surface
+      - Written to postProcessing/<name>/surfaces/time>/disk.<fileType>
+
+Usage
+    Example of function object specification:
+    \verbatim
+    propellerInfo1
+    {
+        type            propellerInfo;
+        libs            (forces);
+        writeControl    writeTime;
+
+        patches         ("propeller.*");
+
+        URef            5; // Function1 type; 'constant' form shown here
+        rho             rhoInf; // incompressible
+        rhoInf          1.2;
+
+        // Optionally write propeller performance data
+        writePropellerPerformance yes;
+
+
+        // Propeller data:
+
+        // Radius
+        radius          0.1;
+
+        rotationMode    specified; // specified | MRF
+
+        // rotationMode = specified:
+        origin          (0 -0.1 0);
+        n               25.15;
+        axis            (0 1 0);
+
+        // Optional reference direction for angle (alpha) = 0
+        alphaAxis       (1 0 0);
+
+
+        //// rotationMode = mrf
+        //// MRF             MRFZoneName;
+        //// (origin, n and axis retrieved from MRF model)
+
+        // Optionally write wake text files
+        // Note: controlled by writeControl
+        writeWakeFields yes;
+
+        // Sample plane (disk) properties
+        // Note: controlled by writeControl
+        sampleDisk
+        {
+            surfaceWriter   vtk;
+            r1              0.05;
+            r2              0.2;
+            nTheta          36;
+            nRadial         10;
+            interpolationScheme cellPoint;
+            errorOnPointNotFound false;
+        }
+    }
+    \endverbatim
+
+    Where the entries comprise:
+    \table
+        Property        | Description                   | Required | Deflt value
+        type            | Type name: propellerInfo      | yes      |
+        log             | Write to standard output      | no       | no
+        patches         | Patches included in the forces calculation | yes |
+        p               | Pressure field name           | no       | p
+        U               | Velocity field name           | no       | U
+        rho             | Density field name            | no       | rho
+        URef            | Reference velocity            | yes      |
+        rotationMode    | Rotation mode (see below)     | yes      |
+        origin          | Sample disk centre            | no*      |
+        n               | Revolutions per second        | no*      |
+        axis            | Propeller axis                | no*      |
+        alphaAxis       | Axis that defines alpha=0 dir | no       |
+        MRF             | Name of MRF zone              | no*      |
+        originOffset    | Origin offset for MRF mode    | no       | (0 0 0)
+        writePropellerPerformance| Write propeller performance text file | yes |
+        writeWakeFields | Write wake field text files   | yes      |
+        surfaceWriter   | Sample disk surface writer    | no*      |
+        r1              | Sample disk inner radius      | no       | 0
+        r2              | Sample disk outer radius      | no*      |
+        nTheta          | Divisions in theta direction  | no*      |
+        nRadial         | Divisions in radial direction | no*      |
+        interpolationScheme | Sampling interpolation scheme | no* | cell
+    \endtable
+
+
+Note
+- URef is a scalar Function1 type, i.e. supports constant, table, lookup values
+- rotationMode is used to set the origin, axis and revolutions per second
+  - if set to 'specified' all 3 entries are required
+    - note: origin is the sample disk origin
+  - if set to 'MRF' only the MRF entry is required
+    - to move the sample disk away from the MRF origin, use the originOffset
+- if writePropellerPerformance is set to on|true:
+  - propellerPerformance text file will be written
+- if writeWakeFields is set to on|true:
+  - wake and axialWake text files will be written
+- if the surfaceWriter entry is set, the sample disk surface will be written
+  - extents set according to the r1 and r2 entries
+  - discretised according to the nTheta and nRadial entries
+
+See also
+    Foam::functionObject::forces
+    Foam::Function1
+
+SourceFiles
+    propellerInfo.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef functionObjects_propellerInfo_H
+#define functionObjects_propellerInfo_H
+
+#include "forces.H"
+#include "Enum.H"
+#include "faceList.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+template<class Type>
+class Function1;
+
+class surfaceWriter;
+
+namespace functionObjects
+{
+
+/*---------------------------------------------------------------------------*\
+                        Class propellerInfo Declaration
+\*---------------------------------------------------------------------------*/
+
+class propellerInfo
+:
+    public forces
+{
+
+public:
+
+    enum class rotationMode
+    {
+        SPECIFIED,
+        MRF
+    };
+
+    static const Enum<rotationMode> rotationModeNames_;
+
+
+protected:
+
+    // Protected data
+
+        //- Propeller radius
+        scalar radius_;
+
+        //- Reference velocity
+        autoPtr<Function1<scalar>> URefPtr_;
+
+        //- Rotation mode
+        rotationMode rotationMode_;
+
+        //- Name of MRF zone (if applicable)
+        word MRFName_;
+
+        //- Propeller speed (revolutions per second)
+        scalar n_;
+
+        //- Flag to write performance data
+        bool writePropellerPerformance_;
+
+        //- Propeller performance file
+        autoPtr<OFstream> propellerPerformanceFilePtr_;
+
+        //- Flag to write wake fields
+        bool writeWakeFields_;
+
+
+        // Wake field output
+
+            //- Surface writer
+            autoPtr<surfaceWriter> surfaceWriterPtr_;
+
+            //- Number of surface divisions in theta direction
+            label nTheta_;
+
+            //- Number of surface divisions in radial direction
+            label nRadial_;
+
+            //- Surface points
+            pointField points_;
+
+            //- Flag to raise an error if the sample point is not found in the
+            //- mesh. Default = false to enable. e.g. reduced geometry/symmetric
+            //- cases
+            bool errorOnPointNotFound_;
+
+            //- Surface faces
+            faceList faces_;
+
+            //- Surface point sample cell IDs
+            labelList cellIds_;
+
+            //- List of participating points (parallel reduced)
+            boolList pointMask_;
+
+            //- Interpolation scheme
+            word interpolationScheme_;
+
+            //- Wake field file
+            autoPtr<OFstream> wakeFilePtr_;
+
+            //- Axial wake field file
+            autoPtr<OFstream> axialWakeFilePtr_;
+
+            //- Default value when a sample point is not found; default =
+            //- scalar::min
+            scalar nanValue_;
+
+
+    // Protected Member Functions
+
+        //- Set the coordinate system
+        void setCoordinateSystem(const dictionary& dict);
+
+        //- Set the rotational speed
+        void setRotationalSpeed();
+
+        //- Create output files
+        void createFiles();
+
+        //- Return the velocity field
+        const volVectorField& U() const;
+
+
+        // Propeller performance text file
+
+            //- Write the wake fields
+            void writePropellerPerformance();
+
+
+        // Wake text files
+
+            //- Write the wake text file
+            void writeWake(const vectorField& U, const scalar URef);
+
+            //- Write the axial wake text file
+            void writeAxialWake(const vectorField& U, const scalar URef);
+
+            //- Write the wake fields
+            void writeWakeFields(const scalar URef);
+
+
+        // Sample surface functions
+
+            //- Set the faces and points for the sample surface
+            void setSampleDiskGeometry
+            (
+                const coordinateSystem& coordSys,
+                const scalar r1,
+                const scalar r2,
+                const scalar nTheta,
+                const label nRadius,
+                faceList& faces,
+                pointField& points
+            ) const;
+
+            //- Set the sample surface based on dictionary settings
+            void setSampleDiskSurface(const dictionary& dict);
+
+            //- Set the sample cells corresponding to the sample points
+            void updateSampleDiskCells();
+
+            //- Return the area average of a field
+            scalar meanSampleDiskField(const scalarField& field) const;
+
+            //- Write the sample surface
+            void writeSampleDiskSurface
+            (
+                const vectorField& U,
+                const vectorField& Ur,
+                const scalar URef
+            );
+
+            //- Interpolate from the mesh onto the sample surface
+            template<class Type>
+            tmp<Field<Type>> interpolate
+            (
+                const GeometricField<Type, fvPatchField, volMesh>& psi,
+                const Type& defaultValue
+            ) const;
+
+        //- No copy construct
+        propellerInfo(const propellerInfo&) = delete;
+
+        //- No copy assignment
+        void operator=(const propellerInfo&) = delete;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("propellerInfo");
+
+
+    // Constructors
+
+        //- Construct from Time and dictionary
+        propellerInfo
+        (
+            const word& name,
+            const Time& runTime,
+            const dictionary& dict,
+            const bool readFields = true
+        );
+
+        //- Construct from objectRegistry and dictionary
+        propellerInfo
+        (
+            const word& name,
+            const objectRegistry& obr,
+            const dictionary& dict,
+            const bool readFields = true
+        );
+
+
+    //- Destructor
+    virtual ~propellerInfo() = default;
+
+
+    // Member Functions
+
+        //- Read the forces data
+        virtual bool read(const dictionary&);
+
+        //- Execute, currently does nothing
+        virtual bool execute();
+
+        //- Write the forces
+        virtual bool write();
+
+        void UpdateMesh(const mapPolyMesh& mpm);
+
+        void movePoints(const polyMesh& mesh);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace functionObjects
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //